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

Conflicts:
	include/config.php
	update.php

1809 files changed, 48636 insertions, 6998 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 56548160d..680ebde55 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.1288' );
+define ( 'FRIENDICA_VERSION',      '2.3.1302' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1134      );
+define ( 'DB_UPDATE_VERSION',      1135      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -90,13 +90,14 @@ 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 
  */
 
-define ( 'NETWORK_ZOT',              'zot!');    // Zot!
 define ( 'NETWORK_DFRN',             'dfrn');    // Friendica, Mistpark, other DFRN implementations
+define ( 'NETWORK_ZOT',              'zot!');    // Zot!
 define ( 'NETWORK_OSTATUS',          'stat');    // status.net, identi.ca, GNU-social, other OStatus implementations
 define ( 'NETWORK_FEED',             'feed');    // RSS/Atom feeds with no known "post/notify" protocol
 define ( 'NETWORK_DIASPORA',         'dspr');    // Diaspora
@@ -108,6 +109,28 @@ 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.
+ */
+
+$netgroup_ids = array(
+	NETWORK_DFRN     => (-1),
+	NETWORK_ZOT      => (-2),
+	NETWORK_OSTATUS  => (-3),
+	NETWORK_FEED     => (-4),
+	NETWORK_DIASPORA => (-5),
+	NETWORK_MAIL     => (-6),
+	NETWORK_MAIL2    => (-7),
+	NETWORK_FACEBOOK => (-8),
+	NETWORK_LINKEDIN => (-9),
+	NETWORK_XMPP     => (-10),
+	NETWORK_MYSPACE  => (-11),
+	NETWORK_GPLUS    => (-12),
+);
+
+
 /**
  * Maximum number of "people who like (or don't like) this"  that we will list by name
  */
@@ -135,6 +158,9 @@ define ( 'NOTIFY_PROFILE',  0x0040 );
 define ( 'NOTIFY_TAGSELF',  0x0080 );
 define ( 'NOTIFY_TAGSHARE', 0x0100 );
 
+define ( 'NOTIFY_SYSTEM',   0x8000 );
+
+
 /**
  * various namespaces we may need to parse
  */
@@ -268,6 +294,8 @@ class App {
 	
 	public $nav_sel;
 
+	public $category;
+
 	private $scheme;
 	private $hostname;
 	private $baseurl;
@@ -352,6 +380,9 @@ class App {
 		$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;
@@ -560,6 +591,10 @@ function absurl($path) {
 	return $path;
 }
 
+function is_ajax() {
+	return (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
+}
+
 
 // Primarily involved with database upgrade, but also sets the 
 // base url for use in cmdline programs which don't have
@@ -955,6 +990,12 @@ function profile_sidebar($profile, $block = 0) {
 	if((remote_user()) && ($_SESSION['visitor_visiting'] == $profile['uid']))
 		$connect = False; 
 
+	if(get_my_url() && $profile['unkmail'])
+		$wallmessage = t('Message');
+	else
+		$wallmessage = false;
+
+
 
 	// show edit profile to yourself
 	if ($profile['uid'] == local_user()) {
@@ -1037,6 +1078,7 @@ function profile_sidebar($profile, $block = 0) {
 	$o .= replace_macros($tpl, array(
 		'$profile' => $profile,
 		'$connect'  => $connect,		
+		'$wallmessage' => $wallmessage,
 		'$location' => template_escape($location),
 		'$gender'   => $gender,
 		'$pdesc'	=> $pdesc,
@@ -1232,17 +1274,20 @@ function current_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'))
+	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'))
+		if(file_exists('view/theme/' . $t . '/style.css')||
+		   file_exists('view/theme/' . $t . '/style.php'))
 			return($t);
 	}
 	
-	$fallback = glob('view/theme/*/style.css');
+	$fallback = glob('view/theme/*/style.[css|php]');
 	if(count($fallback))
-		return (str_replace('view/theme/','', str_replace("/style.css","",$fallback[0])));
+		return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
 
 }}
 
@@ -1254,6 +1299,8 @@ 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');
 }}
 
@@ -1279,8 +1326,12 @@ function feed_birthday($uid,$tz) {
 	 *
 	 */
 
+	
 	$birthday = '';
 
+	if(! strlen($tz))
+		$tz = 'UTC';
+
 	$p = q("SELECT `dob` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
 		intval($uid)
 	);
@@ -1378,6 +1429,29 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 		);
 	}
 
+
+	$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');
-	return replace_macros($tpl,array('$tabs'=>$tabs));
+
+	return replace_macros($tpl,array('$tabs' => $arr['tabs']));
 }}	
+
+function get_my_url() {
+	if(x($_SESSION,'my_url'))
+		return $_SESSION['my_url'];
+	return false;
+}
+
+function zrl($s) {
+	if(! strlen($s))
+		return $s;
+	if(! strpos($s,'/profile/'))
+		return $s;	
+	$achar = strpos($s,'?') ? '&' : '?';
+	$mine = get_my_url();
+	if($mine and ! link_compare($mine,$s))
+		return $s . $achar . 'zrl=' . urlencode($mine);
+	return $s;
+}
diff --git a/database.sql b/database.sql
index a039746e8..010c63bb2 100644
--- a/database.sql
+++ b/database.sql
@@ -290,9 +290,10 @@ CREATE TABLE IF NOT EXISTS `mail` (
   `convid` int(10) unsigned NOT NULL,
   `title` char(255) NOT NULL,
   `body` mediumtext NOT NULL,
-  `seen` tinyint(1) NOT NULL,
+  `seen` tinyint(1) NOT NULL DEFAULT '0',
   `reply` tinyint(1) NOT NULL DEFAULT '0',
-  `replied` tinyint(1) NOT NULL,
+  `replied` tinyint(1) NOT NULL DEFAULT '0',
+  `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',
@@ -301,6 +302,7 @@ CREATE TABLE IF NOT EXISTS `mail` (
   KEY `guid` (`guid`),
   KEY `convid` (`convid`),
   KEY `reply` (`reply`),
+  KEY `unknown` (`unknown`),
   KEY `uri` (`uri`),
   KEY `parent-uri` (`parent-uri`),
   KEY `created` (`created`)
@@ -454,6 +456,8 @@ CREATE TABLE IF NOT EXISTS `user` (
   `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',
   `prvnets` tinyint(1) NOT NULL DEFAULT '0',
@@ -473,6 +477,8 @@ CREATE TABLE IF NOT EXISTS `user` (
   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`)
diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md
index 164a6be46..164a6be46 100755..100644
--- a/doc/Account-Basics.md
+++ b/doc/Account-Basics.md
diff --git a/doc/Bugs-and-Issues.md b/doc/Bugs-and-Issues.md
index 46abea9a3..46abea9a3 100755..100644
--- a/doc/Bugs-and-Issues.md
+++ b/doc/Bugs-and-Issues.md
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 56abe8075..30efc93f7 100755..100644
--- a/doc/Home.md
+++ b/doc/Home.md
@@ -5,6 +5,7 @@ Friendica Documentation and Resources
 **Contents**
 
 * [Account Basics](help/Account-Basics)
+* [New User Quick Start](help/guide)
 * [Profiles](help/Profiles)
 * [Connectors](help/Connectors)
 * [Making Friends](help/Making-Friends)
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..3f1a24c8d 100755..100644
--- a/doc/Making-Friends.md
+++ b/doc/Making-Friends.md
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..29dff3187 100755..100644
--- a/doc/Plugins.md
+++ b/doc/Plugins.md
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..9808ecc5d 100755..100644
--- a/doc/Settings.md
+++ b/doc/Settings.md
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
new file mode 100644
index 000000000..cd8a6994b
--- /dev/null
+++ b/doc/andfinally.md
@@ -0,0 +1,24 @@
+And that brings the Quick Start to an end.
+
+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 = "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://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>
+
+
+**Documentation**
+
+- <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
new file mode 100644
index 000000000..418e682c8
--- /dev/null
+++ b/doc/groupsandpages.md
@@ -0,0 +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.
+
+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>.
+
+<iframe src="http://dir.friendica.com/directory/forum" width="950" height = "600"></iframe>
+
+
diff --git a/doc/guide.md b/doc/guide.md
new file mode 100644
index 000000000..178170c4e
--- /dev/null
+++ b/doc/guide.md
@@ -0,0 +1,13 @@
+First things first, let's make sure you're logged in to your account.  If you're not already logged in, do so in the frame below.
+
+Once you've logged in (or if you are already logged in), you'll now be looking at your profile page.
+
+This is a bit like your Facebook wall.  It's where all your status messgages are kept, and where your friends come to post on your wall.  To write your status, simply click in the box that says "share".  When you do this, the box will expand.  You can see some formatting options at the top such as Bold, Italics and Underline, as well as ways to add links and pictures.  At the bottom you'll find some more links.  You can use these to upload pictures and files from your computer, share websites with a bit of preview text, or embed video and audio files from elsewhere on the web.  You can also set your post location here.
+
+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>
+
+<iframe src="/login" width="950" height = "600"></iframe>
+
+
diff --git a/doc/makingnewfriends.md b/doc/makingnewfriends.md
new file mode 100644
index 000000000..35befaa36
--- /dev/null
+++ b/doc/makingnewfriends.md
@@ -0,0 +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 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!
+
+<iframe src="/suggest" width="950" height = "600"></iframe>
+
+
diff --git a/doc/network.md b/doc/network.md
new file mode 100644
index 000000000..f445b0055
--- /dev/null
+++ b/doc/network.md
@@ -0,0 +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 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>.
+
+<iframe src="/network" width="950" height = "600"></iframe>
+
+
diff --git a/doc/peopleyouknow.md b/doc/peopleyouknow.md
new file mode 100644
index 000000000..143c49217
--- /dev/null
+++ b/doc/peopleyouknow.md
@@ -0,0 +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 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>.
+
+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>
+
+
diff --git a/htconfig.php b/htconfig.php
index 9d9c8a2c7..9d9c8a2c7 100755..100644
--- a/htconfig.php
+++ b/htconfig.php
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/blank.png b/images/blank.png
new file mode 100644
index 000000000..67d391966
--- /dev/null
+++ b/images/blank.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..d9949b1ef 100755..100644
--- a/include/Contact.php
+++ b/include/Contact.php
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..9c237916b 100755..100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
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 013f4b97a..065f14cff 100755..100644
--- a/include/api.php
+++ b/include/api.php
@@ -3,6 +3,7 @@
 	require_once("datetime.php");
 	require_once("conversation.php");
 	require_once("oauth.php");
+	require_once("html2plain.php");
 	/* 
 	 * Twitter-Like API
 	 *  
@@ -82,7 +83,7 @@
 			$record = $r[0];
 		} else {
 		   logger('API_login failure: ' . print_r($_SERVER,true), LOGGER_DEBUG);
-		    header('WWW-Authenticate: Basic realm="Friendika"');
+		    header('WWW-Authenticate: Basic realm="Friendica"');
 		    header('HTTP/1.0 401 Unauthorized');
 		    die('This api requires login');
 		}
@@ -306,10 +307,10 @@
 		}
 
 		$ret = Array(
+			'id' => intval($uinfo[0]['cid']),
 			'self' => intval($uinfo[0]['self']),
 			'uid' => intval($uinfo[0]['uid']),
-			'id' => intval($uinfo[0]['cid']),
-			'name' => $uinfo[0]['name'],
+			'name' => (($uinfo[0]['name']) ? $uinfo[0]['name'] : $uinfo[0]['nick']),
 			'screen_name' => (($uinfo[0]['nick']) ? $uinfo[0]['nick'] : $uinfo[0]['name']),
 			'location' => ($usr) ? $usr[0]['default-location'] : '',
 			'profile_image_url' => $uinfo[0]['micro'],
@@ -347,6 +348,8 @@
 	}
 
 	function api_item_get_user(&$a, $item) {
+		global $usercache;
+
 		// The author is our direct contact, in a conversation with us.
 		if(link_compare($item['url'],$item['author-link'])) {
 			return api_get_user($a,$item['cid']);
@@ -362,27 +365,40 @@
 		
 		list($nick, $name) = array_map("trim",explode("(",$item['author-name']));
 		$name=str_replace(")","",$name);
-		
+
+		if ($name == '')
+			$name = $nick;
+
+		if ($nick == '')
+			$nick = $name;
+
+		// Generating a random ID
+		if (!array_key_exists($nick, $usercache))
+			$usercache[$nick] = mt_rand(2000000, 2100000);
+
 		$ret = array(
-			'uid' => 0,
-			'id' => 0,
+			'id' => $usercache[$nick],
 			'name' => $name,
 			'screen_name' => $nick,
 			'location' => '', //$uinfo[0]['default-location'],
+			'description' => '',
 			'profile_image_url' => $item['author-avatar'],
 			'url' => $item['author-link'],
-			'contact_url' => 0,
 			'protected' => false,	#
+			'followers_count' => 0,
 			'friends_count' => 0,
 			'created_at' => '',
+			'favourites_count' => 0,
 			'utc_offset' => 0, #XXX: fix me
 			'time_zone' => '', //$uinfo[0]['timezone'],
-			'geo_enabled' => false,
 			'statuses_count' => 0,
+			'following' => 1,
+			'statusnet_blocking' => false,
+			'notifications' => false,
+			'uid' => 0,
+			'contact_url' => 0,
+			'geo_enabled' => false,
 			'lang' => 'en', #XXX: fix me
-			'description' => '',
-			'followers_count' => 0,
-			'favourites_count' => 0,
 			'contributors_enabled' => false,
 			'follow_request_sent' => false,
 			'profile_background_color' => 'cfe8f6',
@@ -393,7 +409,6 @@
 			'profile_background_image_url' => '',
 			'profile_background_tile' => false,
 			'profile_use_background_image' => false,
-			'notifications' => false,
 			'verified' => true, #XXX: fix me
 			'followers' => '', #XXX: fix me
 			'status' => array()
@@ -591,16 +606,16 @@
 				$in_reply_to_screen_name = $lastwall['reply_author'];
 			}  
 			$status_info = array(
-				'created_at' => api_date($lastwall['created']),
-				'id' => $lastwall['contact-id'],
-				'text' => strip_tags(bbcode($lastwall['body'])),
-				'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'),
+				'text' => html2plain(bbcode($lastwall['body']), 0),
 				'truncated' => false,
+				'created_at' => api_date($lastwall['created']),
 				'in_reply_to_status_id' => $in_reply_to_status_id,
+				'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'),
+				'id' => $lastwall['contact-id'],
 				'in_reply_to_user_id' => $in_reply_to_user_id,
-				'favorited' => false,
 				'in_reply_to_screen_name' => $in_reply_to_screen_name,
 				'geo' => '',
+				'favorited' => false,
 				'coordinates' => $lastwall['coord'],
 				'place' => $lastwall['location'],
 				'contributors' => ''					
@@ -650,7 +665,7 @@
 			$user_info['status'] = array(
 				'created_at' => api_date($lastwall['created']),
 				'id' => $lastwall['contact-id'],
-				'text' => strip_tags(bbcode($lastwall['body'])),
+				'text' => html2plain(bbcode($lastwall['body']), 0),
 				'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'),
 				'truncated' => false,
 				'in_reply_to_status_id' => $in_reply_to_status_id,
@@ -686,10 +701,17 @@
 		$count = (x($_REQUEST,'count')?$_REQUEST['count']:20);
 		$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
 		if ($page<0) $page=0;
-		$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']: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`,
@@ -722,6 +744,48 @@
 	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_show(&$a, $type){
+		if (local_user()===false) return false;
+
+		$user_info = api_get_user($a);
+
+		// params
+		$id = intval($a->argv[3]);
+
+		logger('API: api_statuses_show: '.$id);		
+
+		//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
+
+		$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 `contact`.`id` = `item`.`contact-id`
+			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			$sql_extra
+			AND `item`.`id`=%d",
+			intval($id)
+		);
+
+		$ret = api_format_items($r,$user_info);
+		
+		$data = array('$status' => $ret[0]);
+		/*switch($type){
+			case "atom":
+			case "rss":
+				$data = api_rss_extra($a, $data, $user_info);
+		}*/
+		return  api_apply_template("status", $type, $data);
+	}
+	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_user_timeline(&$a, $type){
@@ -740,7 +804,8 @@
 		$count = (x($_REQUEST,'count')?$_REQUEST['count']:20);
 		$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
 		if ($page<0) $page=0;
-		$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+		$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+		//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
 		
 		$start = $page*$count;
 
@@ -846,33 +911,64 @@
 		foreach($r as $item) {
 			localize_item($item);
 			$status_user = (($item['cid']==$user_info['id'])?$user_info: api_item_get_user($a,$item));
+
+			if ($item['parent']!=$item['id']) {
+				$r = q("select id from item where parent=%s and id<%s order by id desc limit 1", 
+					intval($item['parent']), intval($item['id']));
+				if ($r)
+					$in_reply_to_status_id = $r[0]['id'];
+				else
+					$in_reply_to_status_id = $item['parent'];
+
+				$r = q("select `item`.`contact-id`, `contact`.nick, `item`.`author-name` from item, contact 
+					where `contact`.`id` = `item`.`contact-id` and `item`.id=%d", intval($in_reply_to_status_id));
+
+				$in_reply_to_screen_name = $r[0]['author-name'];
+				$in_reply_to_user_id = $r[0]['contact-id'];
+
+			} else {
+				$in_reply_to_screen_name = '';
+				$in_reply_to_user_id = 0;
+				$in_reply_to_status_id = 0;
+			}
+
 			$status = array(
+				'text'		=> trim($item['title']." \n".html2plain(bbcode($item['body']), 0)),
+				'truncated' => False,
 				'created_at'=> api_date($item['created']),
-				'published' => api_date($item['created']),
-				'updated'   => api_date($item['edited']),
-				'id'		=> intval($item['id']),
-				'message_id' => $item['uri'],
-				'text'		=> strip_tags(bbcode($item['body'])),
-				'statusnet_html'		=> bbcode($item['body']),
+				'in_reply_to_status_id' => $in_reply_to_status_id,
 				'source'    => (($item['app']) ? $item['app'] : 'web'),
-				'url'		=> ($item['plink']!=''?$item['plink']:$item['author-link']),
-				'truncated' => False,
-				'in_reply_to_status_id' => ($item['parent']!=$item['id']? intval($item['parent']):''),
-				'in_reply_to_user_id' => '',
-				'favorited' => $item['starred'] ? true : false,
-				'in_reply_to_screen_name' => '',
+				'id'		=> intval($item['id']),
+				'in_reply_to_user_id' => $in_reply_to_user_id,
+				'in_reply_to_screen_name' => $in_reply_to_screen_name,
 				'geo' => '',
-				'coordinates' => $item['coord'],
-				'place' => $item['location'],
-				'contributors' => '',
-				'annotations'  => '',
-				'entities'  => '',
+				'favorited' => $item['starred'] ? true : false,
 				'user' =>  $status_user ,
-				'objecttype' => (($item['object-type']) ? $item['object-type'] : ACTIVITY_OBJ_NOTE),
-				'verb' => (($item['verb']) ? $item['verb'] : ACTIVITY_POST),
-				'self' => $a->get_baseurl()."/api/statuses/show/".$item['id'].".".$type,
-				'edit' => $a->get_baseurl()."/api/statuses/show/".$item['id'].".".$type,				
+				'statusnet_html'		=> bbcode($item['body']),
+				'statusnet_conversation_id'	=> 0,
 			);
+
+			// Seesmic doesn't like the following content
+			if ($_SERVER['HTTP_USER_AGENT'] != 'Seesmic') {
+				$status2 = array(
+					'updated'   => api_date($item['edited']),
+					'published' => api_date($item['created']),
+					'message_id' => $item['uri'],
+					'url'		=> ($item['plink']!=''?$item['plink']:$item['author-link']),
+					'coordinates' => $item['coord'],
+					'place' => $item['location'],
+					'contributors' => '',
+					'annotations'  => '',
+					'entities'  => '',
+					'objecttype' => (($item['object-type']) ? $item['object-type'] : ACTIVITY_OBJ_NOTE),
+					'verb' => (($item['verb']) ? $item['verb'] : ACTIVITY_POST),
+					'self' => $a->get_baseurl()."/api/statuses/show/".$item['id'].".".$type,
+					'edit' => $a->get_baseurl()."/api/statuses/show/".$item['id'].".".$type,
+				);
+
+				$status = array_merge($status, $status2);
+			}
+
 			$ret[]=$status;
 		};
 		return $ret;
@@ -882,17 +978,31 @@
 	function api_account_rate_limit_status(&$a,$type) {
 
 		$hash = array(
+			  'reset_time_in_seconds' => strtotime('now + 1 hour'),
 			  'remaining_hits' => (string) 150,
 			  'hourly_limit' => (string) 150,
 			  'reset_time' => datetime_convert('UTC','UTC','now + 1 hour',ATOM_TIME),
-			  'reset_time_in_seconds' => strtotime('now + 1 hour')
 		);
+		if ($type == "xml")
+			$hash['resettime_in_seconds'] = $hash['reset_time_in_seconds'];
 
 		return api_apply_template('ratelimit', $type, array('$hash' => $hash));
 
 	}
 	api_register_func('api/account/rate_limit_status','api_account_rate_limit_status',true);
 
+	function api_help_test(&$a,$type) {
+
+		if ($type == 'xml')
+			$ok = "true";
+		else
+			$ok = "ok";
+
+		return api_apply_template('test', $type, array('$ok' => $ok));
+
+	}
+	api_register_func('api/help/test','api_help_test',true);
+
 	/**
 	 *  https://dev.twitter.com/docs/api/1/get/statuses/friends 
 	 *  This function is deprecated by Twitter
@@ -1075,7 +1185,7 @@
 					'recipient_screen_name'=> $recipient['screen_name'],
 					'recipient'=> $recipient,
 					
-					'text'=> $item['title']."\n".strip_tags(bbcode($item['body'])) ,
+					'text'=> $item['title']."\n".html2plain(bbcode($item['body']), 0) ,
 					
 			);
 		
@@ -1144,7 +1254,7 @@
 				'recipient_screen_name'=> $recipient['screen_name'],
 				'recipient'=> $recipient,
 				
-				'text'=> $item['title']."\n".strip_tags(bbcode($item['body'])) ,
+				'text'=> $item['title']."\n".html2plain(bbcode($item['body']), 0) ,
 				
 			);
 			
@@ -1197,4 +1307,36 @@
 	api_register_func('api/oauth/request_token', 'api_oauth_request_token', false);
 	api_register_func('api/oauth/access_token', 'api_oauth_access_token', false);
 
-
+/*
+Not implemented by now:
+statuses/public_timeline
+statuses/mentions
+statuses/replies
+statuses/retweets_of_me
+statuses/destroy
+statuses/retweet
+friendships/create
+friendships/destroy
+friendships/exists
+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
+
+Not implemented in status.net:
+statuses/retweeted_to_me
+statuses/retweeted_by_me
+direct_messages/destroy
+account/end_session
+account/update_delivery_device
+notifications/follow
+notifications/leave
+blocks/exists
+blocks/blocking
+*/
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 835616a82..1341f3bb8 100755..100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -94,13 +94,17 @@ else {
 
 			// Otherwise it's probably an openid.
 
+                        try {
 			require_once('library/openid.php');
 			$openid = new LightOpenID;
 			$openid->identity = $openid_url;
 			$_SESSION['openid'] = $openid_url;
 			$a = get_app();
 			$openid->returnUrl = $a->get_baseurl(true) . '/openid'; 
-			goaway($openid->authUrl());
+                        goaway($openid->authUrl());
+                        } catch (Exception $e) {
+                            notice( t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'<br /><br >'. t('The error message was:').' '.$e->getMessage());
+                        }
 			// NOTREACHED
 		}
 	}
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 d69cb263f..9befbd0f7 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -189,8 +189,29 @@ function bbcode($Text,$preserve_nl = false) {
 	// Check for [code] text
 	$Text = preg_replace("/\[code\](.*?)\[\/code\]/ism","$CodeLayout", $Text);
 
+	// Declare the format for [spoiler] layout
+	$SpoilerLayout = '<blockquote class="spoiler">$1</blockquote>';
+
+	// Check for [spoiler] text
+	// handle nested quotes
+	$endlessloop = 0;
+	while ((strpos($Text, "[/spoiler]") !== false) and (strpos($Text, "[spoiler]") !== false) and (++$endlessloop < 20))
+		$Text = preg_replace("/\[spoiler\](.*?)\[\/spoiler\]/ism","$SpoilerLayout", $Text);
+
+	// Check for [spoiler=Author] text
+
+	$t_wrote = t('$1 wrote:');
+
+	// handle nested quotes
+	$endlessloop = 0;
+	while ((strpos($Text, "[/spoiler]")!== false)  and (strpos($Text, "[spoiler=") !== false) and (++$endlessloop < 20))
+		$Text = preg_replace("/\[spoiler=[\"\']*(.*?)[\"\']*\](.*?)\[\/spoiler\]/ism",
+        	                     "<br /><strong class=".'"spoiler"'.">" . $t_wrote . "</strong><blockquote class=".'"spoiler"'.">$2</blockquote>",
+                	             $Text);
+
 	// Declare the format for [quote] layout
 	$QuoteLayout = '<blockquote>$1</blockquote>';
+
 	// Check for [quote] text
 	// handle nested quotes
 	$endlessloop = 0;
@@ -205,7 +226,7 @@ function bbcode($Text,$preserve_nl = false) {
 	$endlessloop = 0;
 	while ((strpos($Text, "[/quote]")!== false)  and (strpos($Text, "[quote=") !== false) and (++$endlessloop < 20))
 		$Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism",
-        	                     "<blockquote><strong>" . $t_wrote . "</strong> $2</blockquote>",
+        	                     "<br /><strong class=".'"author"'.">" . $t_wrote . "</strong><blockquote class=".'"author"'.">$2</blockquote>",
                 	             $Text);
 
 	// [img=widthxheight]image source[/img]
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 f93cb52c9..c999b76f2 100644
--- a/include/config.php
+++ b/include/config.php
@@ -81,11 +81,13 @@ if(! function_exists('get_config')) {
  * Return the value, or false if the database update failed
  */
 if(! function_exists('set_config')) {
-	function set_config($family,$key,$value) {
-		global $a;
 
-		// manage array value
-		$dbvalue = (is_array($value)?serialize($value):$value);
+function set_config($family,$key,$value) {
+	global $a;
+	
+	// manage array value
+	$dbvalue = (is_array($value)?serialize($value):$value);
+	$dbvalue = (is_bool($value) ? intval($value) : $value);
 
 		$a->config[$family][$key] = $value;
 		$ret = q("REPLACE INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
@@ -191,6 +193,7 @@ if(! function_exists('set_pconfig')) {
 
 		// manage array value
 		$dbvalue = (is_array($value)?serialize($value):$value);
+		$dbvalue = (is_bool($value)?serialize($value):$value);
 
 
 		$a->config[$uid][$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 605a3eb78..e0f37f078 100755..100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -15,8 +15,6 @@ function findpeople_widget() {
 
 	$a = get_app();
 
-	$inv = (($a->config['register_policy'] != REGISTER_CLOSED) ? t('Invite Friends') : '');
-
 	if(get_config('system','invitation_only')) {
 		$x = get_pconfig(local_user(),'system','invites_remaining');
 		if($x || is_site_admin()) {
@@ -34,7 +32,7 @@ function findpeople_widget() {
 		'$findthem' => t('Find'),
 		'$suggest' => t('Friend Suggestions'),
 		'$similar' => t('Similar Interests'),
-		'$inv' => $inv
+		'$inv' => t('Invite Friends')
 	));
 
 }
@@ -48,7 +46,7 @@ function networks_widget($baseurl,$selected = '') {
 		return '';
 
 	
-	$r = q("select distinct(network) from contact where uid = %d",
+	$r = q("select distinct(network) from contact where uid = %d and self = 0",
 		intval(local_user())
 	);
 
@@ -89,13 +87,41 @@ function fileas_widget($baseurl,$selected = '') {
     $cnt = preg_match_all('/\[(.*?)\]/',$saved,$matches,PREG_SET_ORDER);
     if($cnt) {
 		foreach($matches as $mtch) {
-			$unescaped = file_tag_decode($mtch[1]);
+			$unescaped = xmlify(file_tag_decode($mtch[1]));
 			$terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : ''));
 		}
 	}
 
 	return replace_macros(get_markup_template('fileas_widget.tpl'),array(
-		'$title' => t('File Selections'),
+		'$title' => t('Saved Folders'),
+		'$desc' => '',
+		'$sel_all' => (($selected == '') ? 'selected' : ''),
+		'$all' => t('Everything'),
+		'$terms' => $terms,
+		'$base' => $baseurl,
+
+	));
+}
+
+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'),
diff --git a/include/conversation.php b/include/conversation.php
index 5de4fcb51..df92a40ed 100755..100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -94,9 +94,9 @@ function localize_item(&$item){
 			
 		}
 		
-		$A = '[url=' . $Alink . ']' . $Aname . '[/url]';
-		$B = '[url=' . $Blink . ']' . $Bname . '[/url]';
-		if ($Bphoto!="") $Bphoto = '[url=' . $Blink . '][img]' . $Bphoto . '[/img][/url]';
+		$A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
+		$B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
+		if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]';
 
 		$item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
 
@@ -108,8 +108,8 @@ function localize_item(&$item){
 		if(count($r)==0) return;
 		$obj=$r[0];
 		
-		$author	 = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
-		$objauthor =  '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]';
+		$author	 = '[url=' . zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]';
+		$objauthor =  '[url=' . zrl($obj['author-link']) . ']' . $obj['author-name'] . '[/url]';
 		
 		switch($obj['verb']){
 			case ACTIVITY_POST:
@@ -158,14 +158,21 @@ function localize_item(&$item){
 				$target = $r[0];
 				$Bname = $target['author-name'];
 				$Blink = $target['author-link'];
-				$A = '[url=' . $Alink . ']' . $Aname . '[/url]';
-				$B = '[url=' . $Blink . ']' . $Bname . '[/url]';
+				$A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
+				$B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
 				$P = '[url=' . $target['plink'] . ']' . t('post/item') . '[/url]';
 				$item['body'] = sprintf( t('%1$s marked %2$s\'s %3$s as favorite'), $A, $B, $P)."\n";
 
 			}
 		}
 	}
+	$matches = null;
+	if(preg_match_all('/@\[url=(.*?)\]/is',$item['body'],$matches,PREG_SET_ORDER)) {
+		foreach($matches as $mtch) {
+			if(! strpos($mtch[1],'zrl='))
+				$item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']);
+		}
+	}
 
 }
 
@@ -243,7 +250,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 	$threads = array();
 	$threadsid = -1;
 	
-	if(count($items)) {
+	if($items && count($items)) {
 
 		if($mode === 'network-new' || $mode === 'search' || $mode === 'community') {
 
@@ -276,13 +283,16 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				if($item['author-link'] && (! $item['author-name']))
 					$profile_name = $item['author-link'];
 
+
+
 				$sp = false;
 				$profile_link = best_link_url($item,$sp);
-				if($sp)
-					$sparkle = ' sparkle';
 				if($profile_link === 'mailbox')
 					$profile_link = '';
-
+				if($sp)
+					$sparkle = ' sparkle';
+				else
+					$profile_link = zrl($profile_link);					
 
 				$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
 				if(($normalised != 'mailbox') && (x($a->contacts[$normalised])))
@@ -484,7 +494,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 						// This will have been stored in $a->page_contact by our calling page.
 						// Put this person on the left of the wall-to-wall notice.
 
-						$owner_url = $a->page_contact['url'];
+						$owner_url = zrl($a->page_contact['url']);
 						$owner_photo = $a->page_contact['thumb'];
 						$owner_name = $a->page_contact['name'];
 						$template = $wallwall;
@@ -501,10 +511,12 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 						$commentww = 'ww';
 						// If it is our contact, use a friendly redirect link
 						if((link_compare($item['owner-link'],$item['url'])) 
-							&& ($item['network'] === 'dfrn')) {
+							&& ($item['network'] === NETWORK_DFRN)) {
 							$owner_url = $redirect_url;
 							$osparkle = ' sparkle';
 						}
+						else
+							$owner_url = zrl($owner_url);
 					}
 				}
 
@@ -520,9 +532,12 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 						if ($shareable) $likebuttons['share'] = array( t('Share this'), t('share'));
 					}
 
+					$qc = $qcomment =  null;
 
-					$qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null);
-					$qcomment = (($qc) ? explode("\n",$qc) : null);
+					if(in_array('qcomment',$a->plugins)) {
+						$qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null);
+						$qcomment = (($qc) ? explode("\n",$qc) : null);
+					}
 
 					if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
 						$comment = replace_macros($cmnt_tpl,array(
@@ -580,7 +595,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 							'classtagger' => "",
 						);
 					}
-					$filer = t("file as");
+					$filer = t("save to folder");
 				}
 
 
@@ -596,14 +611,14 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				if($item['author-link'] && (! $item['author-name']))
 					$profile_name = $item['author-link'];
 
-
 				$sp = false;
 				$profile_link = best_link_url($item,$sp);
-				if($sp)
-					$sparkle = ' sparkle';
-
 				if($profile_link === 'mailbox')
 					$profile_link = '';
+				if($sp)
+					$sparkle = ' sparkle';
+				else
+					$profile_link = zrl($profile_link);					
 
 				$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
 				if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
@@ -767,8 +782,10 @@ function item_photo_menu($item){
 		$photos_link = $profile_link . "?url=photos";
 		$profile_link = $profile_link . "?url=profile";
 		$pm_url = $a->get_baseurl($ssl_state) . '/message/new/' . $cid;
+		$zurl = '';
 	}
 	else {
+		$profile_link = zrl($profile_link);
 		if(local_user() && local_user() == $item['uid'] && link_compare($item['url'],$item['author-link'])) {
 			$cid = $item['contact-id'];
 		}		
@@ -795,7 +812,7 @@ function item_photo_menu($item){
 	$menu = Array(
 		t("View status") => $status_link,
 		t("View profile") => $profile_link,
-		t("View photos") => $photos_link,		
+		t("View photos") => $photos_link,
 		t("View recent") => $posts_link, 
 		t("Edit contact") => $contact_url,
 		t("Send PM") => $pm_url,
@@ -828,6 +845,8 @@ function like_puller($a,$item,&$arr,$mode) {
 			$url = $a->get_baseurl(true) . '/redir/' . $item['contact-id'];
 			$sparkle = ' class="sparkle" ';
 		}
+		else
+			$url = zrl($url);
 		if(! ((isset($arr[$item['parent'] . '-l'])) && (is_array($arr[$item['parent'] . '-l']))))
 			$arr[$item['parent'] . '-l'] = array();
 		if(! isset($arr[$item['parent']]))
@@ -896,7 +915,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 		'$vidurl' => t("Please enter a video link/URL:"),
 		'$audurl' => t("Please enter an audio link/URL:"),
 		'$term' => t('Tag term:'),
-		'$fileas' => t('File as:'),
+		'$fileas' => t('Save to Folder:'),
 		'$whereareu' => t('Where are you right now?')
 	));
 
@@ -955,6 +974,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'),
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..6d395fe3f 100755..100644
--- a/include/datetime.php
+++ b/include/datetime.php
diff --git a/include/dba.php b/include/dba.php
index 5beea7a3a..76cc0bc7b 100755..100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -207,8 +207,10 @@ function q($sql) {
 	unset($args[0]);
 
 	if($db && $db->connected) {
-		$ret = $db->q(vsprintf($sql,$args));
-		return $ret;
+		$stmt = vsprintf($sql,$args);
+		if($stmt === false)
+			logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true));
+		return $db->q($stmt);
 	}
 
 	/**
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 1b5af42cd..06df9c24a 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(
@@ -688,9 +700,9 @@ function diaspora_post($importer,$xml) {
 
 				// don't link tags that are already embedded in links
 
-				if(preg_match('/\[(.*?)' . preg_quote($tag) . '(.*?)\]/',$body))
+				if(preg_match('/\[(.*?)' . preg_quote($tag,'/') . '(.*?)\]/',$body))
 					continue;
-				if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag) . '(.*?)\)/',$body))
+				if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag,'/') . '(.*?)\)/',$body))
 					continue;
 
 				$basetag = str_replace('_',' ',substr($tag,1));
@@ -853,9 +865,9 @@ function diaspora_reshare($importer,$xml) {
 
 				// don't link tags that are already embedded in links
 
-				if(preg_match('/\[(.*?)' . preg_quote($tag) . '(.*?)\]/',$body))
+				if(preg_match('/\[(.*?)' . preg_quote($tag,'/') . '(.*?)\]/',$body))
 					continue;
-				if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag) . '(.*?)\)/',$body))
+				if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag,'/') . '(.*?)\)/',$body))
 					continue;
 
 
@@ -1094,9 +1106,9 @@ function diaspora_comment($importer,$xml,$msg) {
 
 				// don't link tags that are already embedded in links
 
-				if(preg_match('/\[(.*?)' . preg_quote($tag) . '(.*?)\]/',$body))
+				if(preg_match('/\[(.*?)' . preg_quote($tag,'/') . '(.*?)\]/',$body))
 					continue;
-				if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag) . '(.*?)\)/',$body))
+				if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag,'/') . '(.*?)\)/',$body))
 					continue;
 
 
@@ -1737,7 +1749,7 @@ function diaspora_retraction($importer,$xml) {
 		contact_remove($contact['id']);
 	}
 	elseif($type === 'Post') {
-		$r = q("select * from item where guid = '%s' and uid = %d limit 1",
+		$r = q("select * from item where guid = '%s' and uid = %d and not file like '%%[%%' limit 1",
 			dbesc('guid'),
 			intval($importer['uid'])
 		);
@@ -1785,7 +1797,7 @@ function diaspora_signed_retraction($importer,$xml,$msg) {
 	}
 
 	if($type === 'StatusMessage') {
-		$r = q("select * from item where guid = '%s' and uid = %d limit 1",
+		$r = q("select * from item where guid = '%s' and uid = %d and not file like '%%[%%' limit 1",
 			dbesc($guid),
 			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 8ea8145fb..b43ae0dc1 100755..100644
--- a/include/email.php
+++ b/include/email.php
@@ -74,7 +74,7 @@ function email_msg_headers($mbox,$uid) {
 }
 
 
-function email_get_msg($mbox,$uid) {
+function email_get_msg($mbox,$uid, $reply) {
 	$ret = array();
 
 	$struc = (($mbox && $uid) ? @imap_fetchstructure($mbox,$uid,FT_UID) : null);
@@ -114,7 +114,7 @@ function email_get_msg($mbox,$uid) {
 	$ret['body'] = removegpg($ret['body']);
 	$msg = removesig($ret['body']);
 	$ret['body'] = $msg['body'];
-	$ret['body'] = convertquote($ret['body'], false);
+	$ret['body'] = convertquote($ret['body'], $reply);
 
 	if (trim($html) != '')
 		$ret['body'] = removelinebreak($ret['body']);
@@ -250,7 +250,7 @@ function email_header_encode($in_str, $charset) {
 
         // remove trailing spacer and
         // add start and end delimiters
-        $spacer = preg_quote($spacer);
+        $spacer = preg_quote($spacer,'/');
         $out_str = preg_replace("/" . $spacer . "$/", "", $out_str);
         $out_str = $start . $out_str . $end;
     }
diff --git a/include/enotify.php b/include/enotify.php
index a505f1f04..8385bdec5 100755..100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -5,6 +5,12 @@ function notification($params) {
 	logger('notification: entry', LOGGER_DEBUG);
 
 	$a = get_app();
+
+	// from here on everything is in the recipients language
+
+	push_lang($params['language']);
+
+
 	$banner = t('Friendica Notification');
 	$product = FRIENDICA_PLATFORM;
 	$siteurl = z_path();
@@ -153,9 +159,33 @@ function notification($params) {
 
 	}
 
-	// from here on everything is in the recipients language
+	if($params['type'] == NOTIFY_SYSTEM) {
+		
+	}
+
+	$h = array(
+		'params'    => $params, 
+		'subject'   => $subject,
+		'preamble'  => $preamble, 
+		'epreamble' => $epreamble, 
+		'body'      => $body, 
+		'sitelink'  => $sitelink,
+		'tsitelink' => $tsitelink,
+		'hsitelink' => $hsitelink,
+		'itemlink'  => $itemlink
+	);
+		
+	call_hooks('enotify',$h);
+
+	$subject   = $h['subject'];
+	$preamble  = $h['preamble'];
+	$epreamble = $h['epreamble'];
+	$body      = $h['body'];
+	$sitelink  = $h['sitelink'];
+	$tsitelink = $h['tsitelink'];
+	$hsitelink = $h['hsitelink'];
+	$itemlink  = $h['itemlink']; 
 
-	push_lang($params['language']);
 
 	require_once('include/html2bbcode.php');	
 
@@ -207,8 +237,10 @@ function notification($params) {
 	);
 	if($r)
 		$notify_id = $r[0]['id'];
-	else
+	else {
+		pop_lang();
 		return;
+	}
 
 	$itemlink = $a->get_baseurl() . '/notify/view/' . $notify_id;
 	$msg = replace_macros($epreamble,array('$itemlink' => $itemlink));
@@ -219,11 +251,10 @@ function notification($params) {
 	);
 		
 
-
 	// send email notification if notification preferences permit
 
 	require_once('bbcode.php');
-	if(intval($params['notify_flags']) & intval($params['type'])) {
+	if((intval($params['notify_flags']) & intval($params['type'])) || $params['type'] == NOTIFY_SYSTEM) {
 
 		logger('notification: sending notification email');
 
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..4a35912e5 100755..100644
--- a/include/group.php
+++ b/include/group.php
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 2a4cf6639..fe0e3326e 100644
--- a/include/html2plain.php
+++ b/include/html2plain.php
@@ -1,9 +1,15 @@
 <?php
 require_once "html2bbcode.php";
 
-function breaklines($line, $level)
+function breaklines($line, $level, $wraplength = 75)
 {
-	$wraplen = 75-$level;
+
+	if ($wraplength == 0)
+		$wraplength = 2000000;
+
+	//	return($line);
+
+	$wraplen = $wraplength-$level;
 
 	$newlines = array();
 
@@ -37,7 +43,7 @@ function breaklines($line, $level)
 	return(implode($newlines, "\n"));
 }
 
-function quotelevel($message)
+function quotelevel($message, $wraplength = 75)
 {
 	$lines = explode("\n", $message);
 
@@ -65,12 +71,31 @@ function quotelevel($message)
 		}
 
 		if (!$startquote or ($line != ''))
-			$newlines[] = breaklines($line, $currlevel);
+			$newlines[] = breaklines($line, $currlevel, $wraplength);
 	}
 	return(implode($newlines, "\n"));
 }
 
-function html2plain($html)
+function collecturls($message) {
+	$pattern = '/<a.*?href="(.*?)".*?>(.*?)<\/a>/is';
+	preg_match_all($pattern, $message, $result, PREG_SET_ORDER);
+
+	$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/",
+				"//facebook.com/profile.php?id=", "//plus.google.com/");
+		foreach ($list as $listitem)
+			if (strpos($treffer[1], $listitem) !== false)
+				$ignore = true;
+
+		if (!$ignore)
+			$urls[$treffer[1]] = $treffer[1];
+	}
+	return($urls);
+}
+
+function html2plain($html, $wraplength = 75, $compact = false)
 {
 	global $lang;
 
@@ -93,22 +118,16 @@ function html2plain($html)
 	$message = str_replace(array("\n<", ">\n", "\r", "\n", "\xC3\x82\xC2\xA0"), array("<", ">", "<br>", " ", ""), $message);
 	$message = preg_replace('= [\s]*=i', " ", $message);
 
-	// nach <a href="...">...</a> suchen, die ... miteinander vergleichen und bei Gleichheit durch ein einzelnes ... ersetzen.
-	$pattern = '/<a.*?href="(.*?)".*?>(.*?)<\/a>/is';
-	preg_match_all($pattern, $message, $result, PREG_SET_ORDER);
+	// Collecting all links
+	$urls = collecturls($message);
 
-	foreach ($result as $treffer) {
-		if ($treffer[1] == $treffer[2]) {
-			$search = '<a href="'.$treffer[1].'" target="_blank">'.$treffer[1].'</a>';
-			$message = str_replace($search, $treffer[1], $message);
-		}
-	}
 	@$doc->loadHTML($message);
 
 	node2bbcode($doc, 'html', array(), '', '');
 	node2bbcode($doc, 'body', array(), '', '');
 
 	// MyBB-Auszeichnungen
+	/*
 	node2bbcode($doc, 'span', array('style'=>'text-decoration: underline;'), '_', '_');
 	node2bbcode($doc, 'span', array('style'=>'font-style: italic;'), '/', '/');
 	node2bbcode($doc, 'span', array('style'=>'font-weight: bold;'), '*', '*');
@@ -117,8 +136,12 @@ function html2plain($html)
 	node2bbcode($doc, 'b', array(), '*', '*');
 	node2bbcode($doc, 'i', array(), '/', '/');
 	node2bbcode($doc, 'u', array(), '_', '_');
+	*/
 
-	node2bbcode($doc, 'blockquote', array(), '[quote]', "[/quote]\n");
+	if ($compact)
+		node2bbcode($doc, 'blockquote', array(), "»", "«");
+	else
+		node2bbcode($doc, 'blockquote', array(), '[quote]', "[/quote]\n");
 
 	node2bbcode($doc, 'br', array(), "\n", '');
 
@@ -143,16 +166,25 @@ function html2plain($html)
 	node2bbcode($doc, 'h5', array(), "\n\n*", "*\n");
 	node2bbcode($doc, 'h6', array(), "\n\n*", "*\n");
 
-	node2bbcode($doc, 'a', array('href'=>'/(.+)/'), ' $1', '', true);
-	node2bbcode($doc, 'img', array('alt'=>'/(.+)/'), '$1', '');
-	node2bbcode($doc, 'img', array('title'=>'/(.+)/'), '$1', '');
-	node2bbcode($doc, 'img', array(), '', '');
-	node2bbcode($doc, 'img', array('src'=>'/(.+)/'), '[img]$1', '[/img]');
+	// Problem: there is no reliable way to detect if it is a link to a tag or profile
+	//node2bbcode($doc, 'a', array('href'=>'/(.+)/'), ' $1 ', '', true);
+	node2bbcode($doc, 'a', array('href'=>'/(.+)/', 'rel'=>'oembed'), ' $1 ', '', true);
+	//node2bbcode($doc, 'img', array('alt'=>'/(.+)/'), '$1', '');
+	//node2bbcode($doc, 'img', array('title'=>'/(.+)/'), '$1', '');
+	//node2bbcode($doc, 'img', array(), '', '');
+	if (!$compact)
+		node2bbcode($doc, 'img', array('src'=>'/(.+)/'), '[img]$1', '[/img]');
+	else
+		node2bbcode($doc, 'img', array('src'=>'/(.+)/'), '', '');
+
+	node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), ' $1 ', '', true);
 
 	$message = $doc->saveHTML();
 
-	$message = str_replace("[img]", "", $message);
-	$message = str_replace("[/img]", "", $message);
+	if (!$compact) {
+		$message = str_replace("[img]", "", $message);
+		$message = str_replace("[/img]", "", $message);
+	}
 
 	// was ersetze ich da?
 	// Irgendein stoerrisches UTF-Zeug
@@ -168,12 +200,20 @@ function html2plain($html)
 
 	$message = html_entity_decode($message, ENT_QUOTES, 'UTF-8');
 
+	if (!$compact) {
+		$counter = 1;
+		foreach ($urls as $id=>$url)
+			if (strpos($message, $url) == false)
+				$message .= "\n".$url." ";
+				//$message .= "\n[".($counter++)."] ".$url;
+	}
+
 	do {
 		$oldmessage = $message;
 		$message = str_replace("\n\n\n", "\n\n", $message);
 	} while ($oldmessage != $message);
 
-	$message = quotelevel(trim($message));
+	$message = quotelevel(trim($message), $wraplength);
 
 	return(trim($message));
 }
diff --git a/include/items.php b/include/items.php
index 5a297c83e..ee6960534 100755..100644
--- a/include/items.php
+++ b/include/items.php
@@ -7,14 +7,11 @@ require_once('include/crypto.php');
 
 function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) {
 
-	// default permissions - anonymous user
-
-	if(! strlen($owner_nick))
-		killme();
 
+	$sitefeed    = ((strlen($owner_nick)) ? false : true); // not yet implemented, need to rewrite huge chunks of following logic
 	$public_feed = (($dfrn_id) ? false : true);
-	$starred = false;
-	$converse = false;
+	$starred     = false;   // not yet implemented, possible security issues
+	$converse    = false;
 
 	if($public_feed && $a->argc > 2) {
 		for($x = 2; $x < $a->argc; $x++) {
@@ -25,6 +22,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 		}
 	}
 
+	// default permissions - anonymous user
 
 	$sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid`  = '' AND `deny_gid`  = '' ";
 
@@ -418,7 +416,7 @@ function get_atom_elements($feed,$item) {
 	// the wild, by sanitising it and converting supported tags to bbcode before we rip out any remaining 
 	// html.
 
-	if((strpos($res['body'],'<') !== false) || (strpos($res['body'],'>') !== false)) {
+	if((strpos($res['body'],'<') !== false) && (strpos($res['body'],'>') !== false)) {
 
 		$res['body'] = reltoabs($res['body'],$base_url);
 
@@ -431,14 +429,22 @@ function get_atom_elements($feed,$item) {
 
 		// we shouldn't need a whitelist, because the bbcode converter
 		// will strip out any unsupported tags.
-		// $config->set('HTML.Allowed', 'p,b,a[href],i'); 
 
 		$purifier = new HTMLPurifier($config);
 		$res['body'] = $purifier->purify($res['body']);
 
-		$res['body'] = html2bbcode($res['body']);
+		$res['body'] = @html2bbcode($res['body']);
+	}
+	elseif(! $have_real_body) {
+
+		// it's not one of our messages and it has no tags
+		// so it's probably just text. We'll escape it just to be safe.
+
+		$res['body'] = escape_tags($res['body']);
 	}
 
+	// this tag is obsolete but we keep it for really old sites
+
 	$allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow');
 	if($allow && $allow[0]['data'] == 1)
 		$res['last-child'] = 1;
@@ -1092,12 +1098,23 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	$postvars     = array();
 	$sent_dfrn_id = hex2bin((string) $res->dfrn_id);
 	$challenge    = hex2bin((string) $res->challenge);
+	$perm         = (($res->perm) ? $res->perm : null);
 	$dfrn_version = (float) (($res->dfrn_version) ? $res->dfrn_version : 2.0);
 	$rino_allowed = ((intval($res->rino) === 1) ? 1 : 0);
 	$page         = (($owner['page-flags'] == PAGE_COMMUNITY) ? 1 : 0);
 
 	$final_dfrn_id = '';
 
+	if($perm) {
+		if((($perm == 'rw') && (! intval($contact['writable']))) 
+		|| (($perm == 'r') && (intval($contact['writable'])))) {
+			q("update contact set writable = %d where id = %d limit 1",
+				intval(($perm == 'rw') ? 1 : 0),
+				intval($contact['id'])
+			);
+			$contact['writable'] = (string) 1 - intval($contact['writable']);			
+		}
+	}
 
 	if(($contact['duplex'] && strlen($contact['pubkey'])) 
 		|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
@@ -1437,7 +1454,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 			}
 			if($deleted && is_array($contact)) {
 				$r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join `contact` on `item`.`contact-id` = `contact`.`id` 
-					WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d LIMIT 1",
+					WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1",
 					dbesc($uri),
 					intval($importer['uid']),
 					intval($contact['id'])
@@ -1582,9 +1599,10 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 
 				if(count($r)) {
 					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
-						$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+						$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['uid'])
@@ -1727,9 +1745,10 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 
 				if(count($r)) {
 					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
-						$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+						$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['uid'])
@@ -1800,7 +1819,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 					// but otherwise there's a possible data mixup on the sender's system.
 					// the tgroup delivery code called from item_store will correct it if it's a forum,
 					// but we're going to unconditionally correct it here so that the post will always be owned by our contact. 
-					logger('local_delivery: Correcting item owner.', LOGGER_DEBUG);
+					logger('consume_feed: Correcting item owner.', LOGGER_DEBUG);
 					$datarray['owner-name']   = $contact['name'];
 					$datarray['owner-link']   = $contact['url'];
 					$datarray['owner-avatar'] = $contact['thumb'];
@@ -1896,6 +1915,14 @@ function local_delivery($importer,$data) {
 		);
 		if(count($r)) {
 			$fid = $r[0]['id'];
+
+			// OK, we do. Do we already have an introduction for this person ?
+			$r = q("select id from intro where uid = %d and fid = %d limit 1",
+				intval($fsugg['uid']),
+				intval($fid)
+			);
+			if(count($r))
+				return 0;
 		}
 		if(! $fid)
 			$r = q("INSERT INTO `fcontact` ( `name`,`url`,`photo`,`request` ) VALUES ( '%s', '%s', '%s', '%s' ) ",
@@ -1916,6 +1943,7 @@ function local_delivery($importer,$data) {
 		else
 			return 0;
 
+
 		$hash = random_string();
  
 		$r = q("INSERT INTO `intro` ( `uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked` )
@@ -2036,7 +2064,7 @@ function local_delivery($importer,$data) {
 			if($deleted) {
 
 				$r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join contact on `item`.`contact-id` = `contact`.`id`
-					WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d LIMIT 1",
+					WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1",
 					dbesc($uri),
 					intval($importer['importer_uid']),
 					intval($importer['id'])
@@ -2332,9 +2360,10 @@ function local_delivery($importer,$data) {
 
 				if(count($r)) {
 					if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
-						$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+						$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'])
@@ -2497,9 +2526,10 @@ function local_delivery($importer,$data) {
 
 			if(count($r)) {
 				if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
-					$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+					$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'])
@@ -2925,6 +2955,11 @@ function item_expire($uid,$days) {
 
 	foreach($r as $item) {
 
+		// don't expire filed items
+
+		if(strpos($item['file'],'[') !== false)
+			continue;
+
 		// Only expire posts, not photos and photo comments
 
 		if($expire_photos==0 && strlen($item['resource-id']))
diff --git a/include/message.php b/include/message.php
index 7ad80ae9c..377d7c715 100755..100644
--- a/include/message.php
+++ b/include/message.php
@@ -1,4 +1,5 @@
 <?php
+
 	// send a private message
 	
 
@@ -155,3 +156,87 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 	}
 
 }
+
+
+
+
+
+function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){ 
+
+	$a = get_app();
+
+	if(! $recipient) return -1;
+	
+	if(! strlen($subject))
+		$subject = t('[no subject]');
+
+	$hash = random_string();
+ 	$uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $hash ;
+
+	$convid = 0;
+	$reply = false;
+
+	require_once('include/Scrape.php');
+
+	$me = probe_url($replyto);
+
+	if(! $me['name'])
+		return -2;
+
+	$conv_guid = get_guid();
+
+	$recip_handle = $recipient['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
+
+	$sender_nick = basename($replyto);
+	$sender_host = substr($replyto,strpos($replyto,'://')+3);
+	$sender_host = substr($sender_host,0,strpos($sender_host,'/'));
+	$sender_handle = $sender_nick . '@' . $sender_host;
+
+	$handles = $recip_handle . ';' . $sender_handle;
+
+	$r = q("insert into conv (uid,guid,creator,created,updated,subject,recips) values(%d, '%s', '%s', '%s', '%s', '%s', '%s') ",
+		intval(local_user()),
+		dbesc($conv_guid),
+		dbesc($sender_handle),
+		dbesc(datetime_convert()),
+		dbesc(datetime_convert()),
+		dbesc($subject),
+		dbesc($handles)
+	);
+
+	$r = q("select * from conv where guid = '%s' and uid = %d limit 1",
+		dbesc($conv_guid),
+		intval($recipient['uid'])
+	);
+	if(count($r))
+		$convid = $r[0]['id'];
+
+	if(! $convid) {
+		logger('send message: conversation not found.');
+		return -4;
+	}
+
+	$r = q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`, 
+		`contact-id`, `title`, `body`, `seen`, `reply`, `replied`, `uri`, `parent-uri`, `created`, `unknown`)
+		VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s', %d )",
+		intval($recipient['uid']),
+		dbesc(get_guid()),
+		intval($convid),
+		dbesc($me['name']),
+		dbesc($me['photo']),
+		dbesc($me['url']),
+		0,
+		dbesc($subject),
+		dbesc($body),
+		0,
+		0,
+		0,
+		dbesc($uri),
+		dbesc($replyto),
+		datetime_convert(),
+		1
+	);
+
+	return 0;
+
+}
diff --git a/include/msgclean.php b/include/msgclean.php
index 284ad1ce4..eabb47788 100644
--- a/include/msgclean.php
+++ b/include/msgclean.php
@@ -13,7 +13,7 @@ function savereplace($pattern, $replace, $text)
 
 function unifyattributionline($message)
 {
-	$quotestr = array('quote', 'collapsed');
+	$quotestr = array('quote', 'spoiler');
 	foreach ($quotestr as $quote) {
 
 		$message = savereplace('/----- Original Message -----\s.*?From: "([^<"].*?)" <(.*?)>\s.*?To: (.*?)\s*?Cc: (.*?)\s*?Sent: (.*?)\s.*?Subject: ([^\n].*)\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
diff --git a/include/nav.php b/include/nav.php
index f40e92dbc..2c9c643a9 100755..100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -69,7 +69,9 @@ function nav(&$a) {
 	 * "Home" should also take you home from an authenticated remote profile connection
 	 */
 
-	$homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
+	$homelink = get_my_url();
+	if(! $homelink)
+		$homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
 
 	if(($a->module != 'home') && (! (local_user()))) 
 		$nav['home'] = array($homelink, t('Home'), "", t('Home Page'));
diff --git a/include/network.php b/include/network.php
index 22157ff18..38d0980d5 100755..100644
--- a/include/network.php
+++ b/include/network.php
@@ -364,6 +364,9 @@ function lrdd($uri, $debug = false) {
 
 	logger('lrdd: host_meta: ' . $xml, LOGGER_DATA);
 
+	if(! stristr($xml,'<xrd'))
+		return array();
+
 	$h = parse_xml_string($xml);
 	if(! $h)
 		return array();
@@ -821,3 +824,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 cc71f9757..1f45d2814 100755..100644
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -38,7 +38,8 @@ function oembed_fetch_url($embedurl){
 					$entries = $xpath->query("//link[@type='application/json+oembed']");
 					foreach($entries as $e){
 						$href = $e->getAttributeNode("href")->nodeValue;
-						$txt = fetch_url($href);
+						$txt = fetch_url($href . '&maxwidth=425');
+						break;
 					}
 				}
 			}
@@ -46,7 +47,7 @@ function oembed_fetch_url($embedurl){
 		
 		if ($txt==false || $txt==""){
 			// try oohembed service
-			$ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl);  
+			$ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=425';  
 			$txt = fetch_url($ourl);
 		}
 		
diff --git a/include/pgettext.php b/include/pgettext.php
index 83e76ba9d..83e76ba9d 100755..100644
--- a/include/pgettext.php
+++ b/include/pgettext.php
diff --git a/include/plugin.php b/include/plugin.php
index 8280b1022..e37ae8435 100755..100644
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -249,6 +249,7 @@ function get_theme_info($theme){
 				list($k,$v) = array_map("trim", explode(":",$l,2));
 				$k= strtolower($k);
 				if ($k=="author"){
+
 					$r=preg_match("|([^<]+)<([^>]+)>|", $v, $m);
 					if ($r) {
 						$info['author'][] = array('name'=>$m[1], 'link'=>$m[2]);
@@ -276,3 +277,13 @@ function get_theme_info($theme){
 	return $info;
 }}
 
+
+function get_theme_screenshot($theme) {
+	$a = get_app();
+	$exts = array('.png','.jpg');
+	foreach($exts as $ext) {
+		if(file_exists('view/theme/' . $theme . '/screenshot' . $ext))
+			return($a->get_baseurl() . '/view/theme/' . $theme . '/screenshot' . $ext);
+	}
+	return($a->get_baseurl() . '/images/blank.png');
+}
diff --git a/include/poller.php b/include/poller.php
index 8262c1d60..90a97867c 100755..100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -504,7 +504,12 @@ function poller_run($argv, $argc){
 							//$datarray['title'] = notags(trim($meta->subject));
 							$datarray['created'] = datetime_convert('UTC','UTC',$meta->date);
 
-							$r = email_get_msg($mbox,$msg_uid);
+							// Is it  reply?
+							$reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") or
+								(substr(strtolower($datarray['title']), 0, 3) == "re-") or
+								(raw_refs != ""));
+
+							$r = email_get_msg($mbox,$msg_uid, $reply);
 							if(! $r) {
 								logger("Mail: can't fetch msg ".$msg_uid);
 								continue;
diff --git a/include/profile_advanced.php b/include/profile_advanced.php
index 004a58524..004a58524 100755..100644
--- a/include/profile_advanced.php
+++ b/include/profile_advanced.php
diff --git a/include/profile_selectors.php b/include/profile_selectors.php
index 92579f64a..92579f64a 100755..100644
--- a/include/profile_selectors.php
+++ b/include/profile_selectors.php
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/quoteconvert.php b/include/quoteconvert.php
index 3aee93234..2a6d28370 100644
--- a/include/quoteconvert.php
+++ b/include/quoteconvert.php
@@ -124,7 +124,7 @@ function removetofu($message)
 	}
 
 	if ($quotestart != 0) {
-		$message = trim(substr($message, 0, $quotestart))."\n[collapsed]\n".substr($message, $quotestart+7, -8).'[/collapsed]';
+		$message = trim(substr($message, 0, $quotestart))."\n[spoiler]".substr($message, $quotestart+7, -8).'[/spoiler]';
 	}
 
 	return($message);
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 19e91eb63..66622fd33 100755..100644
--- a/include/security.php
+++ b/include/security.php
@@ -9,6 +9,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 	$_SESSION['authenticated'] = 1;
 	$_SESSION['page_flags'] = $user_record['page-flags'];
 	$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $user_record['nickname'];
+	$_SESSION['my_address'] = $user_record['nickname'] . '@' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3);
 	$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
 
 	$a->user = $user_record;
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 b2f545509..3f5194049 100755..100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -237,12 +237,14 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
 
 	$r = q("SELECT count(glink.gcid) as `total`, gcontact.* from gcontact 
 		left join glink on glink.gcid = gcontact.id 
-		where uid = %d and not gcontact.nurl in ( select nurl from contact where uid = %d)
+		where uid = %d and not gcontact.nurl in ( select nurl from contact where uid = %d )
+		and not gcontact.name in ( select name from contact where uid = %d )
 		and not gcontact.id in ( select gcid from gcign where uid = %d )
 		group by glink.gcid order by total desc limit %d, %d ",
 		intval($uid),
 		intval($uid),
 		intval($uid),
+		intval($uid),
 		intval($start),
 		intval($limit)
 	);
@@ -252,11 +254,13 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
 
 	$r2 = q("SELECT gcontact.* from gcontact 
 		left join glink on glink.gcid = gcontact.id 
-		where glink.uid = 0 and glink.cid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d)
+		where glink.uid = 0 and glink.cid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d )
+		and not gcontact.name in ( select name from contact where uid = %d )
 		and not gcontact.id in ( select gcid from gcign where uid = %d )
 		order by rand() limit %d, %d ",
 		intval($uid),
 		intval($uid),
+		intval($uid),
 		intval($start),
 		intval($limit)
 	);
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..4c317efe1 100755..100644
--- a/include/template_processor.php
+++ b/include/template_processor.php
diff --git a/include/text.php b/include/text.php
index 92a74eb49..5456b5ad3 100644
--- a/include/text.php
+++ b/include/text.php
@@ -205,7 +205,6 @@ function hex2bin($s) {
 		return '';
 
 	if(! ctype_xdigit($s)) {
-		logger('hex2bin: illegal input: ' . print_r(debug_backtrace(), true));
 		return($s);
 	}
 
@@ -226,6 +225,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'];
@@ -610,6 +612,8 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
 			$url = $redirect_url;
 			$sparkle = ' sparkle';
 		}
+		else
+			$url = zrl($url);
 	}
 	$click = ((x($contact,'click')) ? ' onclick="' . $contact['click'] . '" ' : '');
 	if($click)
@@ -724,6 +728,8 @@ function smilies($s, $sample = false) {
 		'\\o/', 
 		'o.O', 
 		'O.o', 
+		'o_O', 
+		'O_o', 
 		":'(", 
 		":-!", 
 		":-/", 
@@ -758,6 +764,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=":-/" />',
@@ -919,7 +927,7 @@ function prepare_body($item,$attach = false) {
 		foreach($matches as $mtch) {
 			if(strlen($x))
 				$x .= ',';
-			$x .= file_tag_decode($mtch[1]);
+			$x .= xmlify(file_tag_decode($mtch[1]));
 		}
 		if(strlen($x))
 			$s .= '<div class="categorytags"><span>' . t('Categories:') . ' </span>' . $x . '</div>'; 
@@ -934,12 +942,42 @@ function prepare_body($item,$attach = false) {
 		foreach($matches as $mtch) {
 			if(strlen($x))
 				$x .= '&nbsp;&nbsp;&nbsp;';
-			$x .= file_tag_decode($mtch[1]). ' <a href="' . $a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&term=' . file_tag_decode($mtch[1]) . '" title="' . t('remove') . '" >' . t('[remove]') . '</a>';
+			$x .= xmlify(file_tag_decode($mtch[1])) . ' <a href="' . $a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&term=' . xmlify(file_tag_decode($mtch[1])) . '" title="' . t('remove') . '" >' . t('[remove]') . '</a>';
 		}
 		if(strlen($x) && (local_user() == $item['uid']))
 			$s .= '<div class="filesavetags"><span>' . t('Filed under:') . ' </span>' . $x . '</div>'; 
 	}
 
+	// Look for spoiler
+	$spoilersearch = '<blockquote class="spoiler">';
+
+	// Remove line breaks before the spoiler
+	while ((strpos($s, "\n".$spoilersearch) !== false))
+		$s = str_replace("\n".$spoilersearch, $spoilersearch, $s);
+	while ((strpos($s, "<br />".$spoilersearch) !== false))
+		$s = str_replace("<br />".$spoilersearch, $spoilersearch, $s);
+
+	while ((strpos($s, $spoilersearch) !== false)) {
+
+		$pos = strpos($s, $spoilersearch);
+		$rnd = random_string(8);
+		$spoilerreplace = '<br /> <span id="spoiler-wrap-'.$rnd.'" style="white-space:nowrap;" class="fakelink" onclick="openClose(\'spoiler-'.$rnd.'\');">'.sprintf(t('Click to open/close')).'</span>'.
+	                                '<blockquote class="spoiler" id="spoiler-'.$rnd.'" style="display: none;">';
+		$s = substr($s, 0, $pos).$spoilerreplace.substr($s, $pos+strlen($spoilersearch));
+	}
+
+	// Look for quote with author
+	$authorsearch = '<blockquote class="author">';
+
+	while ((strpos($s, $authorsearch) !== false)) {
+
+		$pos = strpos($s, $authorsearch);
+		$rnd = random_string(8);
+		$authorreplace = '<br /> <span id="author-wrap-'.$rnd.'" style="white-space:nowrap;" class="fakelink" onclick="openClose(\'author-'.$rnd.'\');">'.sprintf(t('Click to open/close')).'</span>'.
+	                                '<blockquote class="author" id="author-'.$rnd.'" style="display: block;">';
+		$s = substr($s, 0, $pos).$authorreplace.substr($s, $pos+strlen($authorsearch));
+	}
+
 	$prep_arr = array('item' => $item, 'html' => $s);
 	call_hooks('prepare_body_final', $prep_arr);
 
@@ -1275,13 +1313,126 @@ function file_tag_decode($s) {
 }
 
 function file_tag_file_query($table,$s,$type = 'file') {
+
 	if($type == 'file')
-		$str = preg_quote( '[' . file_tag_encode($s) . ']' );
+		$str = preg_quote( '[' . str_replace('%','%%',file_tag_encode($s)) . ']' );
 	else
-		$str = preg_quote( '<' . file_tag_encode($s) . '>' );
+		$str = preg_quote( '<' . str_replace('%','%%',file_tag_encode($s)) . '>' );
 	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))
@@ -1300,6 +1451,7 @@ function file_tag_save_file($uid,$item,$file) {
 		$saved = get_pconfig($uid,'system','filetags');
 		if((! strlen($saved)) || (! stristr($saved,'[' . file_tag_encode($file) . ']')))
 			set_pconfig($uid,'system','filetags',$saved . '[' . file_tag_encode($file) . ']');
+		info( t('Item filed') );
 	}
 	return true;
 }
@@ -1338,3 +1490,16 @@ function file_tag_unsave_file($uid,$item,$file) {
 function normalise_openid($s) {
 	return trim(str_replace(array('http://','https://'),array('',''),$s),'/');
 }
+
+
+function undo_post_tagging($s) {
+	$matches = null;
+	$cnt = preg_match_all('/([@#])\[url=(.*?)\](.*?)\[\/url\]/ism',$s,$matches,PREG_SET_ORDER);
+	if($cnt) {
+		foreach($matches as $mtch) {
+			$s = str_replace($mtch[0], $mtch[1] . $mtch[3],$s);
+		}
+	}
+	return $s;
+}
+
diff --git a/index.php b/index.php
index 5f6d74adb..e7227962f 100755..100644
--- a/index.php
+++ b/index.php
@@ -93,6 +93,10 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
 	load_translation_table($lang);
 }
 
+if(x($_GET,'zrl')) {
+	$_SESSION['my_url'] = $_GET['zrl'];
+	$a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string);
+}
 
 /**
  *
@@ -240,6 +244,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
@@ -342,13 +348,13 @@ $profile = $a->profile;
 
 header("Content-type: text/html; charset=utf-8");
 
-$template = 'view/' . $lang . '/' 
+$template = 'view/' . current_theme() . '/' 
 	. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php';
 
 if(file_exists($template))
 	require_once($template);
 else
-	require_once(str_replace($lang . '/', '', $template));
+	require_once(str_replace(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 b18a529d1..1c7505580 100755..100644
--- a/js/country.js
+++ b/js/country.js
@@ -52,7 +52,7 @@ aStates[28]="|Central|Chobe|Francistown|Gaborone|Ghanzi|Kgalagadi|Kgatleng|Kwene
 aStates[29]="|Acre|Alagoas|Amapa|Amazonas|Bahia|Ceara|Distrito Federal|Espirito Santo|Goias|Maranhao|Mato Grosso|Mato Grosso do Sul|Minas Gerais|Para|Paraiba|Parana|Pernambuco|Piaui|Rio de Janeiro|Rio Grande do Norte|Rio Grande do Sul|Rondonia|Roraima|Santa Catarina|Sao Paulo|Sergipe|Tocantins";

 aStates[30]="|Anegada|Jost Van Dyke|Tortola|Virgin Gorda";

 aStates[31]="|Belait|Brunei and Muara|Temburong|Tutong";

-aStates[32]="|Blagoevgrad|Burgas|Dobrich|Gabrovo|Khaskovo|Kurdzhali|Kyustendil|Lovech|Montana|Pazardzhik|Pernik|Pleven|Plovdiv|Razgrad|Ruse|Shumen|Silistra|Sliven|Smolyan|Sofiya|Sofiya-Grad|Stara Zagora|Turgovishte|Varna|Veliko Turnovo|Vidin|Vratsa|Yambol";

+aStates[32]="|Blagoevgrad|Burgas|Dobrich|Gabrovo|Haskovo|Kardzhali|Kyustendil|Lovech|Montana|Pazardzhik|Pernik|Pleven|Plovdiv|Razgrad|Rousse|Shumen|Silistra|Sliven|Smolyan|Sofia|Stara Zagora|Turgovishte|Varna|Veliko Turnovo|Vidin|Vratsa|Yambol";

 aStates[33]="|Bale|Bam|Banwa|Bazega|Bougouriba|Boulgou|Boulkiemde|Comoe|Ganzourgou|Gnagna|Gourma|Houet|Ioba|Kadiogo|Kenedougou|Komandjari|Kompienga|Kossi|Koupelogo|Kouritenga|Kourweogo|Leraba|Loroum|Mouhoun|Nahouri|Namentenga|Naumbiel|Nayala|Oubritenga|Oudalan|Passore|Poni|Samentenga|Sanguie|Seno|Sissili|Soum|Sourou|Tapoa|Tuy|Yagha|Yatenga|Ziro|Zondomo|Zoundweogo";

 aStates[34]="|Ayeyarwady|Bago|Chin State|Kachin State|Kayah State|Kayin State|Magway|Mandalay|Mon State|Rakhine State|Sagaing|Shan State|Tanintharyi|Yangon";

 aStates[35]="|Bubanza|Bujumbura|Bururi|Cankuzo|Cibitoke|Gitega|Karuzi|Kayanza|Kirundo|Makamba|Muramvya|Muyinga|Mwaro|Ngozi|Rutana|Ruyigi";

@@ -105,7 +105,7 @@ aStates[79]="|Estuaire|Haut-Ogooue|Moyen-Ogooue|Ngounie|Nyanga|Ogooue-Ivindo|Ogo
 aStates[80]="|Banjul|Central River|Lower River|North Bank|Upper River|Western";

 aStates[81]="|Gaza Strip";

 aStates[82]="|Abashis|Abkhazia or Ap'khazet'is Avtonomiuri Respublika (Sokhumi)|Adigenis|Ajaria or Acharis Avtonomiuri Respublika (Bat'umi)|Akhalgoris|Akhalk'alak'is|Akhalts'ikhis|Akhmetis|Ambrolauris|Aspindzis|Baghdat'is|Bolnisis|Borjomis|Ch'khorotsqus|Ch'okhatauris|Chiat'ura|Dedop'listsqaros|Dmanisis|Dushet'is|Gardabanis|Gori|Goris|Gurjaanis|Javis|K'arelis|K'ut'aisi|Kaspis|Kharagaulis|Khashuris|Khobis|Khonis|Lagodekhis|Lanch'khut'is|Lentekhis|Marneulis|Martvilis|Mestiis|Mts'khet'is|Ninotsmindis|Onis|Ozurget'is|P'ot'i|Qazbegis|Qvarlis|Rust'avi|Sach'kheris|Sagarejos|Samtrediis|Senakis|Sighnaghis|T'bilisi|T'elavis|T'erjolis|T'et'ritsqaros|T'ianet'is|Tqibuli|Ts'ageris|Tsalenjikhis|Tsalkis|Tsqaltubo|Vanis|Zestap'onis|Zugdidi|Zugdidis";

-aStates[83]="|Baden-Wuerttemberg|Bayern|Berlin|Brandenburg|Bremen|Hamburg|Hessen|Mecklenburg-Vorpommern|Niedersachsen|Nordrhein-Westfalen|Rheinland-Pfalz|Saarland|Sachsen|Sachsen-Anhalt|Schleswig-Holstein|Thueringen";

+aStates[83]="|Baden-Württemberg|Bayern|Berlin|Brandenburg|Bremen|Hamburg|Hessen|Mecklenburg-Vorpommern|Niedersachsen|Nordrhein-Westfalen|Rheinland-Pfalz|Saarland|Sachsen|Sachsen-Anhalt|Schleswig-Holstein|Thüringen";

 aStates[84]="|Ashanti|Brong-Ahafo|Central|Eastern|Greater Accra|Northern|Upper East|Upper West|Volta|Western";

 aStates[85]="|Gibraltar";

 aStates[86]="|Ile du Lys|Ile Glorieuse";

@@ -131,8 +131,8 @@ aStates[105]="|Andaman and Nicobar Islands|Andhra Pradesh|Arunachal Pradesh|Assa
 aStates[106]="|Aceh|Bali|Banten|Bengkulu|East Timor|Gorontalo|Irian Jaya|Jakarta Raya|Jambi|Jawa Barat|Jawa Tengah|Jawa Timur|Kalimantan Barat|Kalimantan Selatan|Kalimantan Tengah|Kalimantan Timur|Kepulauan Bangka Belitung|Lampung|Maluku|Maluku Utara|Nusa Tenggara Barat|Nusa Tenggara Timur|Riau|Sulawesi Selatan|Sulawesi Tengah|Sulawesi Tenggara|Sulawesi Utara|Sumatera Barat|Sumatera Selatan|Sumatera Utara|Yogyakarta";

 aStates[107]="|Ardabil|Azarbayjan-e Gharbi|Azarbayjan-e Sharqi|Bushehr|Chahar Mahall va Bakhtiari|Esfahan|Fars|Gilan|Golestan|Hamadan|Hormozgan|Ilam|Kerman|Kermanshah|Khorasan|Khuzestan|Kohgiluyeh va Buyer Ahmad|Kordestan|Lorestan|Markazi|Mazandaran|Qazvin|Qom|Semnan|Sistan va Baluchestan|Tehran|Yazd|Zanjan";

 aStates[108]="|Al Anbar|Al Basrah|Al Muthanna|Al Qadisiyah|An Najaf|Arbil|As Sulaymaniyah|At Ta'mim|Babil|Baghdad|Dahuk|Dhi Qar|Diyala|Karbala'|Maysan|Ninawa|Salah ad Din|Wasit";

-aStates[109]="|Carlow|Cavan|Clare|Cork|Donegal|Dublin|Galway|Kerry|Kildare|Kilkenny|Laois|Leitrim|Limerick|Longford|Louth|Mayo|Meath|Monaghan|Offaly|Roscommon|Sligo|Tipperary|Waterford|Westmeath|Wexford|Wicklow";

-aStates[110]="|Antrim|Ards|Armagh|Ballymena|Ballymoney|Banbridge|Belfast|Carrickfergus|Castlereagh|Coleraine|Cookstown|Craigavon|Derry|Down|Dungannon|Fermanagh|Larne|Limavady|Lisburn|Magherafelt|Moyle|Newry and Mourne|Newtownabbey|North Down|Omagh|Strabane";

+aStates[109]="|Antrim|Armargh|Carlow|Cavan|Clare|Cork|Derry|Donegal|Down|Dún Laoghaire–Rathdown|Fermanagh|Dublin|Fingal|Galway|Kerry|Kildare|Kilkenny|Laois|Leitrim|Limerick|Longford|Louth|Mayo|Meath|Monaghan|Offaly|Roscommon|Sligo|Tipperary|Tyrone|Waterford|Westmeath|Wexford|Wicklow";

+aStates[110]="|Antrim|Armagh|Belfast|Down|Fermanagh|Londonderry|Tyrone";

 aStates[111]="|Central|Haifa|Jerusalem|Northern|Southern|Tel Aviv";

 aStates[112]="|Abruzzi|Basilicata|Calabria|Campania|Emilia-Romagna|Friuli-Venezia Giulia|Lazio|Liguria|Lombardia|Marche|Molise|Piemonte|Puglia|Sardegna|Sicilia|Toscana|Trentino-Alto Adige|Umbria|Valle d'Aosta|Veneto";

 aStates[113]="|Clarendon|Hanover|Kingston|Manchester|Portland|Saint Andrew|Saint Ann|Saint Catherine|Saint Elizabeth|Saint James|Saint Mary|Saint Thomas|Trelawny|Westmoreland";

@@ -222,7 +222,7 @@ aStates[196]="|A'ana|Aiga-i-le-Tai|Atua|Fa'asaleleaga|Gaga'emauga|Gagaifomauga|P
 aStates[197]="|Acquaviva|Borgo Maggiore|Chiesanuova|Domagnano|Faetano|Fiorentino|Monte Giardino|San Marino|Serravalle";

 aStates[198]="|Principe|Sao Tome";

 aStates[199]="|'Asir|Al Bahah|Al Hudud ash Shamaliyah|Al Jawf|Al Madinah|Al Qasim|Ar Riyad|Ash Sharqiyah (Eastern Province)|Ha'il|Jizan|Makkah|Najran|Tabuk";

-aStates[200]="|Aberdeen City|Aberdeenshire|Angus|Argyll and Bute|City of Edinburgh|Clackmannanshire|Dumfries and Galloway|Dundee City|East Ayrshire|East Dunbartonshire|East Lothian|East Renfrewshire|Eilean Siar (Western Isles)|Falkirk|Fife|Glasgow City|Highland|Inverclyde|Midlothian|Moray|North Ayrshire|North Lanarkshire|Orkney Islands|Perth and Kinross|Renfrewshire|Shetland Islands|South Ayrshire|South Lanarkshire|Stirling|The Scottish Borders|West Dunbartonshire|West Lothian";

+aStates[200]="|Aberdeenshire|Angus|Argyll|Ayrshire|Banffshire|Berwickshire|Bute|Caithness|Clackmannanshire|Cromartyshire|Dumfriesshire|Dunbartonshire|Dundee City|East Lothian|Edinburgh|Fife|Glasgow City|Inverness-shire|Kincardineshire|Kinross-shire|Kirkcudbrightshire|Lanarkshire|Midlothian|Moray|Nairnshire|Orkney Islands|Peeblesshire|Perthshire|Renfrewshire|Ross and Cromarty|Ross-shire|Roxburghshire|Selkirkshire|Shetland Islands|Stirlingshire|Sutherland|West Lothian|Wigtownshire";

 aStates[201]="|Dakar|Diourbel|Fatick|Kaolack|Kolda|Louga|Saint-Louis|Tambacounda|Thies|Ziguinchor";

 aStates[202]="|Anse aux Pins|Anse Boileau|Anse Etoile|Anse Louis|Anse Royale|Baie Lazare|Baie Sainte Anne|Beau Vallon|Bel Air|Bel Ombre|Cascade|Glacis|Grand' Anse (on Mahe)|Grand' Anse (on Praslin)|La Digue|La Riviere Anglaise|Mont Buxton|Mont Fleuri|Plaisance|Pointe La Rue|Port Glaud|Saint Louis|Takamaka";

 aStates[203]="|Eastern|Northern|Southern|Western";

@@ -233,7 +233,7 @@ aStates[207]="|Bellona|Central|Choiseul (Lauru)|Guadalcanal|Honiara|Isabel|Makir
 aStates[208]="|Awdal|Bakool|Banaadir|Bari|Bay|Galguduud|Gedo|Hiiraan|Jubbada Dhexe|Jubbada Hoose|Mudug|Nugaal|Sanaag|Shabeellaha Dhexe|Shabeellaha Hoose|Sool|Togdheer|Woqooyi Galbeed";

 aStates[209]="|Eastern Cape|Free State|Gauteng|KwaZulu-Natal|Mpumalanga|North-West|Northern Cape|Northern Province|Western Cape";

 aStates[210]="|Bird Island|Bristol Island|Clerke Rocks|Montagu Island|Saunders Island|South Georgia|Southern Thule|Traversay Islands";

-aStates[211]="|Andalucia|Aragon|Asturias|Baleares (Balearic Islands)|Canarias (Canary Islands)|Cantabria|Castilla y Leon|Castilla-La Mancha|Catalunya|Ceuta|Communidad Valencian|Extremadura|Galicia|Islas Chafarinas|La Rioja|Madrid|Melilla|Murcia|Navarra|Pais Vasco (Basque Country)|Penon de Alhucemas|Penon de Velez de la Gomera";

+aStates[211]="|Andalucia|Aragon|Asturias|Ceuta|Islas Baleares|Islas Chafarinas|Islas Canarias|Cantabria|Castilla y Leon|Castilla-La Mancha|Catalunya|Extremadura|Galicia|La Rioja|Madrid|Melilla|Murcia|Navarra|Pais Vasco|Peñón de Alhucemas|Peñón de Vélez de la Gomera|Valencia";

 aStates[212]="|Spratly Islands";

 aStates[213]="|Central|Eastern|North Central|North Eastern|North Western|Northern|Sabaragamuwa|Southern|Uva|Western";

 aStates[214]="|A'ali an Nil|Al Bahr al Ahmar|Al Buhayrat|Al Jazirah|Al Khartum|Al Qadarif|Al Wahdah|An Nil al Abyad|An Nil al Azraq|Ash Shamaliyah|Bahr al Jabal|Gharb al Istiwa'iyah|Gharb Bahr al Ghazal|Gharb Darfur|Gharb Kurdufan|Janub Darfur|Janub Kurdufan|Junqali|Kassala|Nahr an Nil|Shamal Bahr al Ghazal|Shamal Darfur|Shamal Kurdufan|Sharq al Istiwa'iyah|Sinnar|Warab";

@@ -259,7 +259,7 @@ aStates[233]="|Tuvalu";
 aStates[234]="|Adjumani|Apac|Arua|Bugiri|Bundibugyo|Bushenyi|Busia|Gulu|Hoima|Iganga|Jinja|Kabale|Kabarole|Kalangala|Kampala|Kamuli|Kapchorwa|Kasese|Katakwi|Kibale|Kiboga|Kisoro|Kitgum|Kotido|Kumi|Lira|Luwero|Masaka|Masindi|Mbale|Mbarara|Moroto|Moyo|Mpigi|Mubende|Mukono|Nakasongola|Nebbi|Ntungamo|Pallisa|Rakai|Rukungiri|Sembabule|Soroti|Tororo";

 aStates[235]="|Avtonomna Respublika Krym (Simferopol')|Cherkas'ka (Cherkasy)|Chernihivs'ka (Chernihiv)|Chernivets'ka (Chernivtsi)|Dnipropetrovs'ka (Dnipropetrovs'k)|Donets'ka (Donets'k)|Ivano-Frankivs'ka (Ivano-Frankivs'k)|Kharkivs'ka (Kharkiv)|Khersons'ka (Kherson)|Khmel'nyts'ka (Khmel'nyts'kyy)|Kirovohrads'ka (Kirovohrad)|Kyyiv|Kyyivs'ka (Kiev)|L'vivs'ka (L'viv)|Luhans'ka (Luhans'k)|Mykolayivs'ka (Mykolayiv)|Odes'ka (Odesa)|Poltavs'ka (Poltava)|Rivnens'ka (Rivne)|Sevastopol'|Sums'ka (Sumy)|Ternopil's'ka (Ternopil')|Vinnyts'ka (Vinnytsya)|Volyns'ka (Luts'k)|Zakarpats'ka (Uzhhorod)|Zaporiz'ka (Zaporizhzhya)|Zhytomyrs'ka (Zhytomyr)"

 aStates[236]="|'Ajman|Abu Zaby (Abu Dhabi)|Al Fujayrah|Ash Shariqah (Sharjah)|Dubayy (Dubai)|Ra's al Khaymah|Umm al Qaywayn";

-aStates[237]="|Barking and Dagenham|Barnet|Barnsley|Bath and North East Somerset|Bedfordshire|Bexley|Birmingham|Blackburn with Darwen|Blackpool|Bolton|Bournemouth|Bracknell Forest|Bradford|Brent|Brighton and Hove|Bromley|Buckinghamshire|Bury|Calderdale|Cambridgeshire|Camden|Cheshire|City of Bristol|City of Kingston upon Hull|City of London|Cornwall|Coventry|Croydon|Cumbria|Darlington|Derby|Derbyshire|Devon|Doncaster|Dorset|Dudley|Durham|Ealing|East Riding of Yorkshire|East Sussex|Enfield|Essex|Gateshead|Gloucestershire|Greenwich|Hackney|Halton|Hammersmith and Fulham|Hampshire|Haringey|Harrow|Hartlepool|Havering|Herefordshire|Hertfordshire|Hillingdon|Hounslow|Isle of Wight|Islington|Kensington and Chelsea|Kent|Kingston upon Thames|Kirklees|Knowsley|Lambeth|Lancashire|Leeds|Leicester|Leicestershire|Lewisham|Lincolnshire|Liverpool|Luton|Manchester|Medway|Merton|Middlesbrough|Milton Keynes|Newcastle upon Tyne|Newham|Norfolk|North East Lincolnshire|North Lincolnshire|North Somerset|North Tyneside|North Yorkshire|Northamptonshire|Northumberland|Nottingham|Nottinghamshire|Oldham|Oxfordshire|Peterborough|Plymouth|Poole|Portsmouth|Reading|Redbridge|Redcar and Cleveland|Richmond upon Thames|Rochdale|Rotherham|Rutland|Salford|Sandwell|Sefton|Sheffield|Shropshire|Slough|Solihull|Somerset|South Gloucestershire|South Tyneside|Southampton|Southend-on-Sea|Southwark|St. Helens|Staffordshire|Stockport|Stockton-on-Tees|Stoke-on-Trent|Suffolk|Sunderland|Surrey|Sutton|Swindon|Tameside|Telford and Wrekin|Thurrock|Torbay|Tower Hamlets|Trafford|Wakefield|Walsall|Waltham Forest|Wandsworth|Warrington|Warwickshire|West Berkshire|West Sussex|Westminster|Wigan|Wiltshire|Windsor and Maidenhead|Wirral|Wokingham|Wolverhampton|Worcestershire|York";

+aStates[237]="|Aberdeen|Aberdeenshire|Anglesey|Angus|Antrim|Argyl|Armagh|Avon|Ayrshire|Banffshire|Bedfordshire|Belfast|Berwickshire|Brecknockshire|Bristol|Buckinghamshire|Bute|Caernarfonshire|Cardiganshire|Caithness|Cambridgeshire|Carmarthenshire|Chesire|Clackmannashire|Cleveland|Clwyd|Cornwall|Cromartyshire|Cumberland|Cumbria|Denbighshire|Derbyshire|Devon|Dfyed|Dorset|Down|Dumfriesshire|Dunbartonshire|Dundee|Durham|East Lothian|East Suffolk|Derry|East Sussex|Edinburgh|Essex|Fermanagh|Fife|Flintshire|Glasgow|Glamorgan|Gloucestershire|Greater London|Greater Manchester|Gwent|Gwynedd|Hampshire|Hereford and Worcester|Herefordshire|Inverness-shire|Hertfordshire|Humberside|Huntingdon and Peterborough|Huntingdonshire|Isle of Ely|Isle of Wight|Kent|Kincardineshire|Kincross-shire|Kirkcudbrightshire|Lanarkshire|Lancashire|Leicestershire|Lincolnshire|London|Londonderry|Merionethshire|Merseyside|Middlesex|Mid Glamorgan|Midlothian|Monmouthshire|Montgomeryshire|Moray|Nairnshire|Norfolk|Northamptonshire|Northumberland|North Humberside|North Yorkshire|Nottinghamshire|Orkney|Oxfordshire|Peeblesshire|Pembrokeshire|Perthshire|Powys|Radnorshire|Renfrewshire|Ross And Cromarty|Ross-shire|Roxburghshire|Selkirkshire|Shetland|Stirlingshire|Sutherland|Soke of Peterborough|Rutland|Shropshire|Somerset|South Glamorgan|South Humberside|South Yorkshire|Staffordshite|Suffolk|Surrey|Sussex|Tyne and Wear|Tyrone|Warwickshire|West Glamorgan|West Lothian|West Midlands|Westmorland|West Suffolk|West Sussex|West Yorkshire|Wigtownshire|Wiltshire|Worcestershire|Yorkshire";

 aStates[238]="|Artigas|Canelones|Cerro Largo|Colonia|Durazno|Flores|Florida|Lavalleja|Maldonado|Montevideo|Paysandu|Rio Negro|Rivera|Rocha|Salto|San Jose|Soriano|Tacuarembo|Treinta y Tres";

 aStates[239]="|Alabama|Alaska|Arizona|Arkansas|California|Colorado|Connecticut|Delaware|District of Columbia|Florida|Georgia|Hawaii|Idaho|Illinois|Indiana|Iowa|Kansas|Kentucky|Louisiana|Maine|Maryland|Massachusetts|Michigan|Minnesota|Mississippi|Missouri|Montana|Nebraska|Nevada|New Hampshire|New Jersey|New Mexico|New York|North Carolina|North Dakota|Ohio|Oklahoma|Oregon|Pennsylvania|Rhode Island|South Carolina|South Dakota|Tennessee|Texas|Utah|Vermont|Virginia|Washington|West Virginia|Wisconsin|Wyoming";

 aStates[240]="|Andijon Wiloyati|Bukhoro Wiloyati|Farghona Wiloyati|Jizzakh Wiloyati|Khorazm Wiloyati (Urganch)|Namangan Wiloyati|Nawoiy Wiloyati|Qashqadaryo Wiloyati (Qarshi)|Qoraqalpoghiston (Nukus)|Samarqand Wiloyati|Sirdaryo Wiloyati (Guliston)|Surkhondaryo Wiloyati (Termiz)|Toshkent Shahri|Toshkent Wiloyati";

@@ -267,7 +267,7 @@ aStates[241]="|Malampa|Penama|Sanma|Shefa|Tafea|Torba";
 aStates[242]="|Amazonas|Anzoategui|Apure|Aragua|Barinas|Bolivar|Carabobo|Cojedes|Delta Amacuro|Dependencias Federales|Distrito Federal|Falcon|Guarico|Lara|Merida|Miranda|Monagas|Nueva Esparta|Portuguesa|Sucre|Tachira|Trujillo|Vargas|Yaracuy|Zulia";

 aStates[243]="|An Giang|Ba Ria-Vung Tau|Bac Giang|Bac Kan|Bac Lieu|Bac Ninh|Ben Tre|Binh Dinh|Binh Duong|Binh Phuoc|Binh Thuan|Ca Mau|Can Tho|Cao Bang|Da Nang|Dac Lak|Dong Nai|Dong Thap|Gia Lai|Ha Giang|Ha Nam|Ha Noi|Ha Tay|Ha Tinh|Hai Duong|Hai Phong|Ho Chi Minh|Hoa Binh|Hung Yen|Khanh Hoa|Kien Giang|Kon Tum|Lai Chau|Lam Dong|Lang Son|Lao Cai|Long An|Nam Dinh|Nghe An|Ninh Binh|Ninh Thuan|Phu Tho|Phu Yen|Quang Binh|Quang Nam|Quang Ngai|Quang Ninh|Quang Tri|Soc Trang|Son La|Tay Ninh|Thai Binh|Thai Nguyen|Thanh Hoa|Thua Thien-Hue|Tien Giang|Tra Vinh|Tuyen Quang|Vinh Long|Vinh Phuc|Yen Bai";

 aStates[244]="|Saint Croix|Saint John|Saint Thomas";

-aStates[245]="|Blaenau Gwent|Bridgend|Caerphilly|Cardiff|Carmarthenshire|Ceredigion|Conwy|Denbighshire|Flintshire|Gwynedd|Isle of Anglesey|Merthyr Tydfil|Monmouthshire|Neath Port Talbot|Newport|Pembrokeshire|Powys|Rhondda Cynon Taff|Swansea|The Vale of Glamorgan|Torfaen|Wrexham";

+aStates[245]="|Anglesey|Brecknockshire|Caernfonshire|Cardiganshire|Carmarthenshire|Clwyd|Denbighshire|Dyfed|Flintshire|Glamorgan|Gwent|Gwynedd|Merionethshire|Mid Glamorgan|Monmouthsire|Montgomeryshire|Pembrokeshire|Powys|Radnorshire|South Glamorgan|West Glamorgan";

 aStates[246]="|Alo|Sigave|Wallis";

 aStates[247]="|West Bank";

 aStates[248]="|Western Sahara";

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 babd2a1c3..744691b6d 100755..100644
--- a/js/main.js
+++ b/js/main.js
@@ -16,6 +16,7 @@
       document.getElementById(theID).style.display = "none" 
   }
 
+
 	var src = null;
 	var prev = null;
 	var livetime = null;
@@ -28,13 +29,15 @@
 	var in_progress = false;
 	var langSelect = false;
 	var commentBusy = false;
+	var last_popup_menu = null;
+	var last_popup_button = null;
 
 	$(function() {
 		$.ajaxSetup({cache: false});
 
 		msie = $.browser.msie ;
 		
-		/* setup tooltips */
+		/* setup tooltips *//*
 		$("a,.tt").each(function(){
 			var e = $(this);
 			var pos="bottom";
@@ -43,7 +46,7 @@
 			if (e.hasClass("ttleft")) pos="left";
 			if (e.hasClass("ttright")) pos="right";
 			e.tipTip({defaultPosition: pos, edgeOffset: 8});
-		});
+		});*/
 		
 		
 		
@@ -76,8 +79,23 @@
 			if (menu.attr('popup')=="false") return false;
 			$(this).parent().toggleClass("selected");
 			menu.toggle();
+			if (menu.css("display") == "none") {
+				last_popup_menu = null;
+				last_popup_button = null;
+			} else {
+				last_popup_menu = menu;
+				last_popup_button = $(this).parent();
+			}
 			return false;
 		});
+		$('html').click(function() {
+			if(last_popup_menu) {
+				last_popup_menu.hide();
+				last_popup_button.removeClass("selected");
+				last_popup_menu = null;
+				last_popup_button = null;
+			}
+		});
 		
 		// fancyboxes
 		$("a.popupbox").fancybox({
@@ -151,6 +169,12 @@
  		NavUpdate(); 
 		// Allow folks to stop the ajax page updates with the pause/break key
 		$(document).keydown(function(event) {
+			if(event.keyCode == '8') {
+				var target = event.target || event.srcElement;
+				if (!/input|textarea/i.test(target.nodeName)) {
+					return false;
+				}
+			}
 			if(event.keyCode == '19' || (event.ctrlKey && event.which == '32')) {
 				event.preventDefault();
 				if(stopped == false) {
@@ -573,3 +597,10 @@ Array.prototype.remove = function(item) {
   return this.push.apply(this, rest);
 };
 
+function previewTheme(elm) {
+	theme = $(elm).val();
+	$.getJSON('pretheme?f=&theme=' + theme,function(data) {
+			$('#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/README b/library/mcefixes/README
index dca70e1c3..578163a9d 100644
--- a/library/mcefixes/README
+++ b/library/mcefixes/README
@@ -1,4 +1,8 @@
 In order to make TinyMCE work smoothly with Friendica, the files in this directory are those few files we've changed in TinyMCE. We will attempt to keep them current, but if you decide to upgrade tinymce, it is best to save current copies of the files in question from the active tinymce tree and replace them or merge them after upgrade. 
 
 Except for some simple theming, the primary changes are the advanced theme icon set, which we changed the "html" icon to "[]" to represent BBcode, and major changes have been made to the bbcode plugin. 
- 
\ No newline at end of file
+ 
+
+in TinyMCE 3.5b2 it appears that we are getting double linefeeds. Code has been put in place in mod/item.php and mod/message.php to reduce the duplicates. 
+
+
diff --git a/library/mcefixes/plugins.bbcode.editor_plugin_src.js b/library/mcefixes/plugins.bbcode.editor_plugin_src.js
index 183f2bc68..a2829a21c 100755..100644
--- a/library/mcefixes/plugins.bbcode.editor_plugin_src.js
+++ b/library/mcefixes/plugins.bbcode.editor_plugin_src.js
@@ -150,7 +150,7 @@
 			rep(/<blockquote[^>]*>/gi,"[quote]");

 			rep(/<\/blockquote>/gi,"[/quote]");

 			rep(/<hr \/>/gi,"[hr]");

-			rep(/<br \/>/gi,"\n\n");

+			rep(/<br (.*?)\/>/gi,"\n\n");

 			rep(/<br\/>/gi,"\n\n");

 			rep(/<br>/gi,"\n");

 			rep(/<p>/gi,"");

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/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
index 183f2bc68..a2829a21c 100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -150,7 +150,7 @@
 			rep(/<blockquote[^>]*>/gi,"[quote]");

 			rep(/<\/blockquote>/gi,"[/quote]");

 			rep(/<hr \/>/gi,"[hr]");

-			rep(/<br \/>/gi,"\n\n");

+			rep(/<br (.*?)\/>/gi,"\n\n");

 			rep(/<br\/>/gi,"\n\n");

 			rep(/<br>/gi,"\n");

 			rep(/<p>/gi,"");

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 375c618c8..fe353d1eb 100755..100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -7,10 +7,10 @@ function acl_init(&$a){
 		return "";
 
 
-	$start = (x($_POST,'start')?$_POST['start']:0);
-	$count = (x($_POST,'count')?$_POST['count']:100);
-	$search = (x($_POST,'search')?$_POST['search']:"");
-	$type = (x($_POST,'type')?$_POST['type']:"");
+	$start = (x($_REQUEST,'start')?$_REQUEST['start']:0);
+	$count = (x($_REQUEST,'count')?$_REQUEST['count']:100);
+	$search = (x($_REQUEST,'search')?$_REQUEST['search']:"");
+	$type = (x($_REQUEST,'type')?$_REQUEST['type']:"");
 	
 
 	if ($search!=""){
@@ -34,7 +34,7 @@ function acl_init(&$a){
 		$r = q("SELECT COUNT(`id`) AS c FROM `contact` 
 				WHERE `uid` = %d AND `self` = 0 
 				AND `blocked` = 0 AND `pending` = 0 
-				AND `notify` != '' $sql_extra" ,
+				AND `notify` != '' $sql_extra2" ,
 			intval(local_user())
 		);
 		$contact_count = (int)$r[0]['c'];
diff --git a/mod/admin.php b/mod/admin.php
index a64b26903..a395027c1 100755..100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -208,6 +208,48 @@ function admin_page_site_post(&$a){
 	$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 +260,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);
@@ -583,6 +624,7 @@ function admin_page_plugins(&$a){
 		
 			'$admin_form' => $admin_form,
 			'$function' => 'plugins',
+			'$screenshot' => '',
 			'$readme' => $readme
 		));
 	} 
@@ -738,7 +780,11 @@ function admin_page_themes(&$a){
 		} 
 		
 		$admin_form="";
-		
+
+		$screenshot = array( get_theme_screenshot($theme), t('Screenshot'));
+		if(! stristr($screenshot[0],$theme))
+			$screenshot = null;		
+
 		$t = get_markup_template("admin_plugins_details.tpl");
 		return replace_macros($t, array(
 			'$title' => t('Administration'),
@@ -755,6 +801,7 @@ function admin_page_themes(&$a){
 			'$admin_form' => $admin_form,
 			'$str_author' => t('Author: '),
 			'$str_maintainer' => t('Maintainer: '),			
+			'$screenshot' => $screenshot,
 			'$readme' => $readme
 		));
 	} 
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..f8cc3305b 100755..100644
--- a/mod/community.php
+++ b/mod/community.php
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..8aa51d00a 100755..100644
--- a/mod/contacts.php
+++ b/mod/contacts.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/delegate.php b/mod/delegate.php
index c19df0681..8c5031859 100644
--- a/mod/delegate.php
+++ b/mod/delegate.php
@@ -86,7 +86,7 @@ function delegate_content(&$a) {
 
 	$r = q("select nurl from contact where substring_index(contact.nurl,'/',3) = '%s' 
 		and contact.uid = %d and contact.self = 0 and network = '%s' ",
-		dbesc($a->get_baseurl()),
+		dbesc(normalise_link($a->get_baseurl())),
 		intval(local_user()),
 		dbesc(NETWORK_DFRN)
 	); 
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 71860ac3b..65d39d5fe 100755..100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -99,65 +99,11 @@ 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 contact's ssl policy changed, update our links
 
-	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']);
-	}
+	fix_contact_ssl_policy($importer,$ssl_policy);
 
-	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'])
-		);
-	}
-			
 	logger('dfrn_notify: received notify from ' . $importer['name'] . ' for ' . $importer['username']);
 	logger('dfrn_notify: data: ' . $data, LOGGER_DATA);
 
@@ -174,6 +120,13 @@ function dfrn_notify_post(&$a) {
 
 	}
 
+
+	// If we are setup as a soapbox we aren't accepting input from this person
+
+	if($importer['page-flags'] == PAGE_SOAPBOX)
+		xml_status(0);
+
+
 	if(strlen($key)) {
 		$rawkey = hex2bin(trim($key));
 		logger('rino: md5 raw key: ' . md5($rawkey));
@@ -261,7 +214,7 @@ function dfrn_notify_content(&$a) {
 				break; // NOTREACHED
 		}
 
-		$r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
+		$r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`page-flags` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
 				WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `user`.`nickname` = '%s' 
 				AND `user`.`account_expired` = 0 $sql_extra LIMIT 1",
 				dbesc($a->argv[1])
@@ -299,6 +252,12 @@ function dfrn_notify_content(&$a) {
 		if(! $rino_enable)
 			$rino = 0;
 
+		if((($r[0]['rel']) && ($r[0]['rel'] != CONTACT_IS_SHARING)) || ($r[0]['page-flags'] == PAGE_COMMUNITY)) {
+			$perm = 'rw';
+		}
+		else {
+			$perm = 'r';
+		}
 
 		header("Content-type: text/xml");
 
@@ -306,7 +265,8 @@ function dfrn_notify_content(&$a) {
 			. '<dfrn_notify>' . "\r\n"
 			. "\t" . '<status>' . $status . '</status>' . "\r\n"
 			. "\t" . '<dfrn_version>' . DFRN_PROTOCOL_VERSION . '</dfrn_version>' . "\r\n"
-			. "\t" . '<rino>' . $rino . '</rino>' . "\r\n" 
+			. "\t" . '<rino>' . $rino . '</rino>' . "\r\n"
+			. "\t" . '<perm>' . $perm . '</perm>' . "\r\n" 
 			. "\t" . '<dfrn_id>' . $encrypted_id . '</dfrn_id>' . "\r\n" 
 			. "\t" . '<challenge>' . $challenge . '</challenge>' . "\r\n"
 			. '</dfrn_notify>' . "\r\n" ;
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index fe5cd4906..5c2788983 100755..100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -26,21 +26,24 @@ function dfrn_poll_init(&$a) {
 		$dfrn_id   = substr($dfrn_id,2);
 	}
 
-	if(($dfrn_id === '') && (! x($_POST,'dfrn_id')) && ($a->argc > 1)) {
+	if(($dfrn_id === '') && (! x($_POST,'dfrn_id'))) {
 		if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
 			killme();
 		}
 
-		$r = q("SELECT `hidewall` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1",
-			dbesc($a->argv[1])
-		);
-		if(count($r) && $r[0]['hidewall'])
-			killme();
+		$user = '';
+		if($a->argc > 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']))
+				killme();
+			$user = $r[0]['nickname'];
+		}
  
-		logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] );
+		logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user);
 		header("Content-type: application/atom+xml");
-		$o = get_feed_for($a, '', $a->argv[1],$last_update);
-		echo $o;
+		echo get_feed_for($a, '', $user,$last_update);
 		killme();
 	}
 
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index c2d37dac7..5881b7b51 100755..100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -664,8 +664,8 @@ function dfrn_request_content(&$a) {
 		else
 			$tpl = get_markup_template('auto_request.tpl');
 
-		$page_desc = sprintf( t('Diaspora members: Please do not use this form. Instead, enter "%s" into your Diaspora search bar.'), 
-			$target_addr) . EOL . EOL;
+	#	$page_desc = sprintf( t('Diaspora members: Please do not use this form. Instead, enter "%s" into your Diaspora search bar.'), 
+	#		$target_addr) . EOL . EOL;
 
 		$page_desc .= t("Please enter your 'Identity Address' from one of the following supported communications networks:");
 
@@ -699,7 +699,7 @@ function dfrn_request_content(&$a) {
 			'$friendica' => t('Friendica'),
 			'$statusnet' => t('StatusNet/Federated Social Web'),
 			'$diaspora' => t('Diaspora'),
-			'$diasnote' => t('- please share from your own site as noted above'),
+			'$diasnote' => sprintf (t(' - please do not use this form.  Instead, enter %s into your Diaspora search bar.'),$target_addr),
 			'$your_address' => t('Your Identity Address:'),
 			'$invite_desc' => $invite_desc,
 			'$emailnet' => $emailnet,
diff --git a/mod/directory.php b/mod/directory.php
index 7f18bd026..7f18bd026 100755..100644
--- a/mod/directory.php
+++ b/mod/directory.php
diff --git a/mod/dirfind.php b/mod/dirfind.php
index 75b1c4976..34c54dd91 100755..100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -46,7 +46,7 @@ function dirfind_content(&$a) {
 			foreach($j->results as $jj) {
 				
 				$o .= replace_macros($tpl,array(
-					'$url' => $jj->url,
+					'$url' => zrl($jj->url),
 					'$name' => $jj->name,
 					'$photo' => $jj->photo,
 					'$tags' => $jj->tags
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 778ac3dcc..4c00201ca 100755..100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -104,7 +104,7 @@ function editpost_content(&$a) {
 		'$wait' => t('Please wait'),
 		'$permset' => t('Permission settings'),
 		'$ptyp' => $itm[0]['type'],
-		'$content' => $itm[0]['body'],
+		'$content' => undo_post_tagging($itm[0]['body']),
 		'$post_id' => $post_id,
 		'$baseurl' => $a->get_baseurl(),
 		'$defloc' => $a->user['default-location'],
@@ -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/filer.php b/mod/filer.php
index a9e213536..c0cca9e6d 100755..100644
--- a/mod/filer.php
+++ b/mod/filer.php
@@ -11,13 +11,26 @@ function filer_content(&$a) {
 		killme();
 	}
 
-	$term = notags(trim($_GET['term']));
-	$item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0);
+	$term = unxmlify(trim($_GET['term']));
+	$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
 	logger('filer: tag ' . $term . ' item ' . $item_id);
 
-	if($item_id && strlen($term))
+	if($item_id && strlen($term)){
+		// file item
 		file_tag_save_file(local_user(),$item_id,$term);
-
+	} else {
+		// return filer dialog
+		$filetags = get_pconfig(local_user(),'system','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 -')),
+			'$submit' => t('Save'),
+		));
+		
+		echo $o;
+	}
 	killme();
 }
diff --git a/mod/filerm.php b/mod/filerm.php
index 66b684dc9..c520fec7a 100644
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -6,8 +6,8 @@ function filerm_content(&$a) {
 		killme();
 	}
 
-	$term = notags(trim($_GET['term']));
-	$item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0);
+	$term = unxmlify(trim($_GET['term']));
+	$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
 	logger('filerm: tag ' . $term . ' item ' . $item_id);
 
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 ab92e31ed..52a064224 100755..100644
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -4,8 +4,12 @@ function friendica_init(&$a) {
 	if ($a->argv[1]=="json"){
 		$register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN');
 
+		$sql_extra = '';
+		if(x($a->config,'admin_nickname')) {
+			$sql_extra = sprintf(" AND nickname = '%s' ",dbesc($a->config['admin_nickname']));
+		}
 		if (isset($a->config['admin_email']) && $a->config['admin_email']!=''){
-			$r = q("SELECT username, nickname FROM user WHERE email='%s'", $a->config['admin_email']);
+			$r = q("SELECT username, nickname FROM user WHERE email='%s' $sql_extra", dbesc($a->config['admin_email']));
 			$admin = array(
 				'name' => $r[0]['username'],
 				'profile'=> $a->get_baseurl().'/profile/'.$r[0]['nickname'],
@@ -51,15 +55,20 @@ function friendica_content(&$a) {
 	$o .= '<p></p>';
 
 	if(count($a->plugins)) {
-		$o .= '<p>' . t('Installed plugins/addons/apps') . '</p>';
-		$o .= '<ul>';
-		foreach($a->plugins as $p)
-			if(strlen($p))
-				$o .= '<li>' . $p . '</li>';
-		$o .= '</ul>';
+		$o .= '<p>' . t('Installed plugins/addons/apps:') . '</p>';
+		$sorted = $a->plugins;
+		$s = '';
+		sort($sorted);
+		foreach($sorted as $p) {
+			if(strlen($p)) {
+				if(strlen($s)) $s .= ', ';
+				$s .= $p;
+			}
+		}
+		$o .= '<div style="margin-left: 25px; margin-right: 25px;">' . $s . '</div>';
 	}
 	else
-		$o .= '<p>' . t('No installed plugins/addons/apps');
+		$o .= '<p>' . t('No installed plugins/addons/apps') . '</p>';
 
 	call_hooks('about_hook', $o); 	
 
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..d1142248a 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);
 	}
 	
 
diff --git a/mod/invite.php b/mod/invite.php
index d4eb9c5ef..2dbf93c59 100755..100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -56,7 +56,7 @@ function invite_post(&$a) {
 		else
 			$nmessage = $message;
 
-		$res = mail($recip, sprintf( t('Please join my network on %s'), $a->config['sitename']), 
+		$res = mail($recip, sprintf( t('Please join us on Friendica'), $a->config['sitename']), 
 			$nmessage, 
 			"From: " . $a->user['email'] . "\n"
 			. 'Content-type: text/plain; charset=UTF-8' . "\n"
@@ -94,15 +94,28 @@ function invite_content(&$a) {
 		}
 	}			
 
+	$dirloc = get_config('system','directory_submit_url');
+	if(strlen($dirloc)) {
+		if($a->config['register_policy'] == REGISTER_CLOSED)
+			$linktxt = sprintf( t('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.'), dirname($dirloc) . '/siteinfo');
+		elseif($a->config['register_policy'] != REGISTER_CLOSED)
+			$linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), $a->get_baseurl())
+			. "\r\n" . "\r\n" . sprintf( t('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.'),dirname($dirloc) . '/siteinfo');
+	}
+	else {
+		$o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
+		return $o;
+	}
 
 	$o = replace_macros($tpl, array(
 		'$invite' => t('Send invitations'),
 		'$addr_text' => t('Enter email addresses, one per line:'),
 		'$msg_text' => t('Your message:'),
-		'$default_message' => sprintf(t('Please join my social network on %s'), $a->config['sitename']) . "\r\n" . "\r\n"
-			. t('To accept this invitation, please visit:') . "\r\n" . "\r\n" . $a->get_baseurl()
+		'$default_message' => t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
+			. $linktxt
 			. "\r\n" . "\r\n" . (($invonly) ? t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .t('Once you have registered, please connect with me via my profile page at:') 
-			. "\r\n" . "\r\n" . $a->get_baseurl() . '/profile/' . $a->user['nickname'] ,
+			. "\r\n" . "\r\n" . $a->get_baseurl() . '/profile/' . $a->user['nickname']
+			. "\r\n" . "\r\n" . t('For more information about the Friendica project and why we feel it is important, please visit http://friendica.com') . "\r\n" . "\r\n"  ,
 		'$submit' => t('Submit')
 	));
 
diff --git a/mod/item.php b/mod/item.php
index ee6c5c9a7..72e63865b 100755..100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -171,16 +171,17 @@ function item_post(&$a) {
 		$str_contact_allow = $orig_post['allow_cid'];
 		$str_group_deny    = $orig_post['deny_gid'];
 		$str_contact_deny  = $orig_post['deny_cid'];
-		$title             = $orig_post['title'];
 		$location          = $orig_post['location'];
 		$coord             = $orig_post['coord'];
 		$verb              = $orig_post['verb'];
 		$emailcc           = $orig_post['emailcc'];
 		$app			   = $orig_post['app'];
-
+		$categories        = $orig_post['file'];
+		$title             = notags(trim($_REQUEST['title']));
 		$body              = escape_tags(trim($_REQUEST['body']));
 		$private           = $orig_post['private'];
 		$pubmail_enable    = $orig_post['pubmail'];
+
 	}
 	else {
 
@@ -213,8 +214,8 @@ function item_post(&$a) {
 		$coord             = notags(trim($_REQUEST['coord']));
 		$verb              = notags(trim($_REQUEST['verb']));
 		$emailcc           = notags(trim($_REQUEST['emailcc']));
-
 		$body              = escape_tags(trim($_REQUEST['body']));
+
 		$private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
 
 		if(($parent_item) && 
@@ -242,8 +243,6 @@ function item_post(&$a) {
 			}
 		}
 
-
-
 		if(! strlen($body)) {
 			if($preview)
 				killme();
@@ -254,6 +253,19 @@ 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. 
@@ -500,6 +512,7 @@ function item_post(&$a) {
 	$datarray['location']      = $location;
 	$datarray['coord']         = $coord;
 	$datarray['tag']           = $str_tags;
+	$datarray['file']          = $categories;
 	$datarray['inform']        = $inform;
 	$datarray['verb']          = $verb;
 	$datarray['allow_cid']     = $str_contact_allow;
@@ -559,14 +572,20 @@ function item_post(&$a) {
 
 
 	if($orig_post) {
-		$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			dbesc($title),
-			dbesc($body),
+		$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `attach` = '%s', `file` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			dbesc($datarray['title']),
+			dbesc($datarray['body']),
+			dbesc($datarray['tag']),
+			dbesc($datarray['attach']),
+			dbesc($datarray['file']),
 			dbesc(datetime_convert()),
 			intval($post_id),
 			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);
@@ -580,8 +599,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']),
@@ -619,8 +638,9 @@ function item_post(&$a) {
 		dbesc($datarray['attach']),
 		intval($datarray['bookmark']),
 		intval($datarray['origin']),
-		intval($datarry['moderated'])
-	);
+	        intval($datarray['moderated']),
+	        dbesc($datarray['file'])
+	       );
 
 	$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
 		dbesc($datarray['uri']));
@@ -628,6 +648,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
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 1ae7848a6..926df1dff 100755..100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -51,7 +51,7 @@ function match_content(&$a) {
 				
 				$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
 				$o .= replace_macros($tpl,array(
-					'$url' => $jj->url,
+					'$url' => zrl($jj->url),
 					'$name' => $jj->name,
 					'$photo' => $jj->photo,
 					'$inttxt' => ' ' . t('is interested in:'),
diff --git a/mod/message.php b/mod/message.php
index 0907abd77..1369fde2e 100755..100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -3,6 +3,35 @@
 require_once('include/acl_selectors.php');
 require_once('include/message.php');
 
+function message_init(&$a) {
+	$tabs = array(
+	/*
+		array(
+			'label' => t('All'),
+			'url'=> $a->get_baseurl(true) . '/message',
+			'sel'=> ($a->argc == 1),
+		),
+		array(
+			'label' => t('Sent'),
+			'url' => $a->get_baseurl(true) . '/message/sent',
+			'sel'=> ($a->argv[1] == 'sent'),
+		),
+	*/
+	);
+	$new = array(
+		'label' => t('New Message'),
+		'url' => $a->get_baseurl(true) . '/message/new',
+		'sel'=> ($a->argv[1] == 'new'),
+	);
+	
+	$tpl = get_markup_template('message_side.tpl');
+	$a->page['aside'] = replace_macros($tpl, array(
+		'$tabs'=>$tabs,
+		'$new'=>$new,
+	));
+	
+}
+
 function message_post(&$a) {
 
 	if(! local_user()) {
@@ -15,6 +44,13 @@ function message_post(&$a) {
 	$body      = ((x($_REQUEST,'body'))      ? escape_tags(trim($_REQUEST['body'])) : '');
 	$recipient = ((x($_REQUEST,'messageto')) ? intval($_REQUEST['messageto'])       : 0 );
 
+	// Work around doubled linefeeds in Tinymce 3.5b2
+
+	$plaintext = intval(get_pconfig(local_user(),'system','plaintext'));
+	if(! $plaintext) {
+		$body = str_replace("\r\n","\n",$body);
+		$body = str_replace("\n\n","\n",$body);
+	}
 	
 	$ret = send_message($recipient, $body, $subject, $replyto);
 	$norecip = false;
@@ -59,25 +95,7 @@ function message_content(&$a) {
 	$myprofile = $a->get_baseurl(true) . '/profile/' . $a->user['nickname'];
 
 
-	$tabs = array(
-		array(
-			'label' => t('Inbox'),
-			'url'=> $a->get_baseurl(true) . '/message',
-			'sel'=> (($a->argc == 1) ? 'active' : ''),
-		),
-		array(
-			'label' => t('Outbox'),
-			'url' => $a->get_baseurl(true) . '/message/sent',
-			'sel'=> (($a->argv[1] == 'sent') ? 'active' : ''),
-		),
-		array(
-			'label' => t('New Message'),
-			'url' => $a->get_baseurl(true) . '/message/new',
-			'sel'=> (($a->argv[1] == 'new') ? 'active' : ''),
-		),
-	);
-	$tpl = get_markup_template('common_tabs.tpl');
-	$tab_content = replace_macros($tpl, array('$tabs'=>$tabs));
+
 
 
 	$tpl = get_markup_template('mail_head.tpl');
@@ -174,15 +192,12 @@ function message_content(&$a) {
 		return $o;
 	}
 
-	if(($a->argc == 1) || ($a->argc == 2 && $a->argv[1] === 'sent')) {
+	if($a->argc == 1) {
+
+		// list messages
 
 		$o .= $header;
 		
-		if($a->argc == 2)
-			$eq = '='; // I'm not going to bother escaping this.
-		else
-			$eq = '!='; // or this.
-
 		$r = q("SELECT count(*) AS `total` FROM `mail` 
 			WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `created` DESC",
 			intval(local_user()),
@@ -192,11 +207,12 @@ function message_content(&$a) {
 			$a->set_pager_total($r[0]['total']);
 	
 		$r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, 
-			`mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`  
+			`mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`,
+			count( * ) as count
 			FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` 
-			WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `mailcreated` DESC  LIMIT %d , %d ",
+			WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC  LIMIT %d , %d ",
 			intval(local_user()),
-			dbesc($myprofile),
+			//
 			intval($a->pager['start']),
 			intval($a->pager['itemspage'])
 		);
@@ -207,17 +223,29 @@ function message_content(&$a) {
 
 		$tpl = get_markup_template('mail_list.tpl');
 		foreach($r as $rr) {
+			if($rr['unknown']) {
+				$partecipants = sprintf( t("Unknown sender - %s"),$rr['from-name']);
+			}
+			elseif (link_compare($rr['from-url'],$myprofile)){
+				$partecipants = sprintf( t("You and %s"), $rr['name']);
+			}
+			else {
+				$partecipants = sprintf( t("%s and You"), $rr['from-name']);
+			}
+			
 			$o .= replace_macros($tpl, array(
 				'$id' => $rr['id'],
-				'$from_name' =>$rr['from-name'],
+				'$from_name' => $partecipants,
 				'$from_url' => (($rr['network'] === NETWORK_DFRN) ? $a->get_baseurl(true) . '/redir/' . $rr['contact-id'] : $rr['url']),
 				'$sparkle' => ' sparkle',
-				'$from_photo' => $rr['thumb'],
+				'$from_photo' => (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']),
 				'$subject' => template_escape((($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>')),
 				'$delete' => t('Delete conversation'),
 				'$body' => template_escape($rr['body']),
 				'$to_name' => template_escape($rr['name']),
-				'$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A'))
+				'$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A')),
+				'$seen' => $rr['mailseen'],
+				'$count' => sprintf( tt('%d message', '%d messages', $rr['count']), $rr['count']),
 			));
 		}
 		$o .= paginate($a);	
@@ -271,8 +299,13 @@ function message_content(&$a) {
 		));
 
 
-		$tpl = get_markup_template('mail_conv.tpl');
+		$mails = array();
+		$seen = 0;
+		$unknown = false;
+
 		foreach($messages as $message) {
+			if($message['unknown'])
+				$unknown = true;
 			if($message['from-url'] == $myprofile) {
 				$from_url = $myprofile;
 				$sparkle = '';
@@ -281,24 +314,36 @@ function message_content(&$a) {
 				$from_url = $a->get_baseurl(true) . '/redir/' . $message['contact-id'];
 				$sparkle = ' sparkle';
 			}
-			$o .= replace_macros($tpl, array(
-				'$id' => $message['id'],
-				'$from_name' => template_escape($message['from-name']),
-				'$from_url' => $from_url,
-				'$sparkle' => $sparkle,
-				'$from_photo' => $message['from-photo'],
-				'$subject' => template_escape($message['title']),
-				'$body' => template_escape(smilies(bbcode($message['body']))),
-				'$delete' => t('Delete message'),
-				'$to_name' => template_escape($message['name']),
-				'$date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A')
-			));
+			$mails[] = array(
+				'id' => $message['id'],
+				'from_name' => template_escape($message['from-name']),
+				'from_url' => $from_url,
+				'sparkle' => $sparkle,
+				'from_photo' => $message['from-photo'],
+				'subject' => template_escape($message['title']),
+				'body' => template_escape(smilies(bbcode($message['body']))),
+				'delete' => t('Delete message'),
+				'to_name' => template_escape($message['name']),
+				'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A'),
+			);
 				
+			$seen = $message['seen'];
 		}
 		$select = $message['name'] . '<input type="hidden" name="messageto" value="' . $contact_id . '" />';
 		$parent = '<input type="hidden" name="replyto" value="' . $message['parent-uri'] . '" />';
-		$tpl = get_markup_template('prv_message.tpl');
-		$o .= replace_macros($tpl,array(
+			
+
+		$tpl = get_markup_template('mail_display.tpl');
+		$o = replace_macros($tpl, array(
+			'$thread_id' => $a->argv[1],
+			'$thread_subject' => $message['title'],
+			'$thread_seen' => $seen,
+			'$delete' =>  t('Delete conversation'),
+			'$canreply' => (($unknown) ? false : '1'),
+			'$unknown_text' => t("No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."),			
+			'$mails' => $mails,
+			
+			// reply
 			'$header' => t('Send Reply'),
 			'$to' => t('To:'),
 			'$subject' => t('Subject:'),
@@ -311,6 +356,7 @@ function message_content(&$a) {
 			'$upload' => t('Upload photo'),
 			'$insert' => t('Insert web link'),
 			'$wait' => t('Please wait')
+
 		));
 
 		return $o;
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 9ec8c23b5..d27945a86 100755..100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -250,6 +250,20 @@ function network_content(&$a, $update = 0) {
 	if($cid)
 		$def_acl = array('allow_cid' => '<' . intval($cid) . '>');
 
+	if($nets) {
+		$r = q("select id from contact where uid = %d and network = '%s' and self = 0",
+			intval(local_user()),
+			dbesc($nets)
+		);
+
+		$str = '';
+		if(count($r))
+			foreach($r as $rr)
+				$str .= '<' . $rr['id'] . '>';
+		if(strlen($str))
+			$def_acl = array('allow_cid' => $str);
+	}
+
 	if(! $update) {
 		if($group) {
 			if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
@@ -269,9 +283,9 @@ function network_content(&$a, $update = 0) {
 			'allow_location' => $a->user['allow_location'],
 			'default_location' => $a->user['default-location'],
 			'nickname' => $a->user['nickname'],
-			'lockstate' => ((($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
-			'acl' => populate_acl((($group || $cid) ? $def_acl : $a->user), $celeb),
-			'bang' => (($group || $cid) ? '!' : ''),
+			'lockstate' => ((($group) || ($cid) || ($nets) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
+			'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), $celeb),
+			'bang' => (($group || $cid || $nets) ? '!' : ''),
 			'visitor' => 'block',
 			'profile_uid' => local_user()
 		);
@@ -379,7 +393,7 @@ function network_content(&$a, $update = 0) {
 		);
 	}
 	if(strlen($file)) {
-		$sql_extra .= file_tag_file_query('item',$file);
+		$sql_extra .= file_tag_file_query('item',unxmlify($file));
 	}
 
 	if($conv) {
diff --git a/mod/newmember.php b/mod/newmember.php
index 2ecc89024..683463ecb 100755..100644
--- a/mod/newmember.php
+++ b/mod/newmember.php
@@ -13,6 +13,8 @@ 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="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; 
 
 	$o .= '<li>' . '<a target="newmember" href="settings">' . t('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.') . '</a></li>' . EOL;
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 ff131010f..690a99562 100755..100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -37,7 +37,11 @@ function notifications_post(&$a) {
 				intval($intro_id)
 			);	
 			if(! $fid) {
-				$r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1", 
+
+				// The check for blocked and pending is in case the friendship was already approved
+				// and we just want to get rid of the now pointless notification
+
+				$r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 AND `blocked` = 1 AND `pending` = 1 LIMIT 1", 
 					intval($contact_id),
 					intval(local_user())
 				);
@@ -145,7 +149,7 @@ function notifications_content(&$a) {
 						'$contact_id' => $rr['contact-id'],
 						'$photo' => ((x($rr,'fphoto')) ? $rr['fphoto'] : "images/person-175.jpg"),
 						'$fullname' => $rr['fname'],
-						'$url' => $rr['furl'],
+						'$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')),
 
@@ -195,7 +199,7 @@ function notifications_content(&$a) {
 					'$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')),
-					'$url' => $rr['url'],
+					'$url' => zrl($rr['url']),
 					'$knowyou' => $knowyou,
 					'$approve' => t('Approve'),
 					'$note' => $rr['note'],
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..3a7025120 100755..100644
--- a/mod/photo.php
+++ b/mod/photo.php
diff --git a/mod/photos.php b/mod/photos.php
index b294f0a66..2a808cb41 100755..100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -38,21 +38,22 @@ function photos_init(&$a) {
 			$o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg" alt="' . $a->data['user']['username'] . '" /></div>';
 			$o .= '</div>';
 			
-			$o .= '<div id="side-bar-photos-albums" class="widget">';
-			$o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h3>';
+			if(! intval($a->data['user']['hidewall'])) {
+				$o .= '<div id="side-bar-photos-albums" class="widget">';
+				$o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h3>';
 					
-			$o .= '<ul>';
-			foreach($albums as $album) {
+				$o .= '<ul>';
+				foreach($albums as $album) {
 
-				// don't show contact photos. We once translated this name, but then you could still access it under
-				// a different language setting. Now we store the name in English and check in English (and translated for legacy albums).
+					// don't show contact photos. We once translated this name, but then you could still access it under
+					// a different language setting. Now we store the name in English and check in English (and translated for legacy albums).
 
-				if((! strlen($album['album'])) || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
-					continue;
-				$o .= '<li>' . '<a href="photos/' . $a->argv[1] . '/album/' . bin2hex($album['album']) . '" >' . $album['album'] . '</a></li>'; 
+					if((! strlen($album['album'])) || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
+						continue;
+					$o .= '<li>' . '<a href="photos/' . $a->argv[1] . '/album/' . bin2hex($album['album']) . '" >' . $album['album'] . '</a></li>'; 
+				}
+				$o .= '</ul>';
 			}
-			$o .= '</ul>';
-
 			if(local_user() && $a->data['user']['uid'] == local_user()) {
 				$o .= '<div id="photo-albums-upload-link"><a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload" >' .t('Upload New Photos') . '</a></div>';
 			}
diff --git a/mod/ping.php b/mod/ping.php
index 1562254b1..e911aaf1f 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -22,6 +22,7 @@ function ping_init(&$a) {
 				and seen = 0 order by date desc limit 0, 50",
 				intval(local_user())
 			);
+			$sysnotify = $t[0]['total'];
 		}
 		else {
 			$z1 = q("select * from notify where uid = %d
@@ -35,6 +36,7 @@ function ping_init(&$a) {
 				intval(50 - intval($t[0]['total']))
 			);
 			$z = array_merge($z1,$z2);
+			$sysnotify = 0; // we will update this in a moment
 		}
 
 
@@ -147,13 +149,12 @@ function ping_init(&$a) {
 		$tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags);
 
 		require_once('include/bbcode.php');
-		$sysnotify = 0;
 
 		if($firehose) {
 			echo '	<notif count="'.$tot.'">';
 		}
 		else {
-			if(count($z)) {
+			if(count($z) && (! $sysnotify)) {
 				foreach($z as $zz) {
 					if($zz['seen'] == 0)
 						$sysnotify ++;
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/pretheme.php b/mod/pretheme.php
new file mode 100644
index 000000000..0efa587d8
--- /dev/null
+++ b/mod/pretheme.php
@@ -0,0 +1,16 @@
+<?php
+
+function pretheme_init(&$a) {
+	
+	if($_REQUEST['theme']) {
+		$theme = $_REQUEST['theme'];
+		$info = get_theme_info($theme);
+		if($info) {
+			// unfortunately there will be no translation for this string
+			$desc = $info['description'] . ' ' . $info['version'];
+		}
+		else $desc = '';
+		echo json_encode(array('img' => get_theme_screenshot($theme), 'desc' => $desc));
+	}
+	killme();
+}
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 428679ffc..68d73fba3 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)
@@ -59,6 +64,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();
 	}
@@ -107,13 +119,14 @@ function profile_content(&$a, $update = 0) {
 
 	$is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
 
-	if($a->user['hidewall'] && (! $is_owner) && (! $remote_contact)) {
+	if($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
 		notice( t('Access to this profile has been restricted.') . EOL);
 		return;
 	}
 
-	
 	if(! $update) {
+
+
 		if(x($_GET,'tab'))
 			$tab = notags(trim($_GET['tab']));
 
@@ -135,6 +148,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 +193,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 +223,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 d1fd08eba..ace8dadd4 100755..100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -151,7 +151,7 @@ function profile_photo_content(&$a) {
 			return;
 		};
 		
-		check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
+//		check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
         
 		$resource_id = $a->argv[2];
 		//die(":".local_user());
diff --git a/mod/profiles.php b/mod/profiles.php
index 7b3b6ccc1..7b3b6ccc1 100755..100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
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/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 6d0e2700b..630c0a675 100755..100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -8,6 +8,8 @@ function register_post(&$a) {
 	$verified = 0;
 	$blocked  = 1;
 
+	$arr = array('post' => $_POST);
+	call_hooks('register_post', $arr);
 
 	$max_dailies = intval(get_config('system','max_daily_registrations'));
 	if($max_dailes) {
@@ -218,8 +220,8 @@ function register_post(&$a) {
 	$spubkey = $spkey["key"];
 
 	$r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`,
-		`pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked` )
-		VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
+		`pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone` )
+		VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC' )",
 		dbesc(generate_user_guid()),
 		dbesc($username),
 		dbesc($new_password_encoded),
@@ -540,6 +542,11 @@ function register_content(&$a) {
 	$license = '';
 
 	$o = get_markup_template("register.tpl");
+
+	$arr = array('template' => $o);
+
+	call_hooks('register_form',$arr);
+
 	$o = replace_macros($o, array(
 		'$oidhtml' => $oidhtml,
 		'$invitations' => get_config('system','invitation_only'),
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 50e7a6abc..4ca7db9bb 100755..100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -97,30 +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. 
 
-	$s_regx  = sprintf("AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )", 
-		dbesc(preg_quote($search)), dbesc('\\]' . preg_quote($search) . '\\['));
-
-	$search_alg = $s_regx;
-
-	$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
-		$search_alg ",
-		intval(local_user())
+		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`,
@@ -131,9 +127,12 @@ 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
-		$search_alg
+		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)), 
+		dbesc('\\]' . preg_quote($search) . '\\['),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
 
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 59ede4729..6879da285 100755..100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1,6 +1,19 @@
 <?php
 
 
+function get_theme_config_file($theme){
+	$a = get_app();
+	$base_theme = $a->theme_info['extends'];
+	
+	if (file_exists("view/theme/$theme/config.php")){
+		return "view/theme/$theme/config.php";
+	} 
+	if (file_exists("view/theme/$base_theme/config.php")){
+		return "view/theme/$base_theme/config.php";
+	}
+	return null;
+}
+
 function settings_init(&$a) {
 	if(local_user()) {
 		profile_load($a,$a->user['nickname']);
@@ -193,6 +206,46 @@ function settings_post(&$a) {
 		call_hooks('connector_settings_post', $_POST);
 		return;
 	}
+	
+	if(($a->argc > 1) && ($a->argv[1] == 'display')) {
+		
+		check_form_security_token_redirectOnErr('/settings/display', 'settings_display');
+
+		$theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme']))  : $a->user['theme']);
+		$nosmile = ((x($_POST,'nosmile')) ? intval($_POST['nosmile'])  : 0);  
+		$browser_update   = ((x($_POST,'browser_update')) ? intval($_POST['browser_update']) : 0);
+		$browser_update   = $browser_update * 1000;
+		if($browser_update < 10000)
+			$browser_update = 40000;
+
+		$itemspage_network   = ((x($_POST,'itemspage_network')) ? intval($_POST['itemspage_network']) : 40);
+		if($itemspage_network > 100)
+					$itemspage_network = 40;
+
+
+		set_pconfig(local_user(),'system','update_interval', $browser_update);
+		set_pconfig(local_user(),'system','itemspage_network', $itemspage_network);
+		set_pconfig(local_user(),'system','no_smilies',$nosmile);
+
+
+		if ($theme == $a->user['theme']){
+			// call theme_post only if theme has not been changed
+			if( ($themeconfigfile = get_theme_config_file($theme)) != null){
+				require_once($themeconfigfile);
+				theme_post($a);
+			}
+		}
+
+
+		$r = q("UPDATE `user` SET `theme` = '%s' WHERE `uid` = %d LIMIT 1",
+				dbesc($theme),
+				intval(local_user())
+		);
+	
+		call_hooks('display_settings_post', $_POST);
+		goaway($a->get_baseurl(true) . '/settings/display' );
+		return; // NOTREACHED
+	}
 
 	check_form_security_token_redirectOnErr('/settings', 'settings');
 	
@@ -227,7 +280,7 @@ function settings_post(&$a) {
 		}
 	}
 
-	$theme            = ((x($_POST,'theme'))      ? notags(trim($_POST['theme']))        : $a->user['theme']);
+	
 	$username         = ((x($_POST,'username'))   ? notags(trim($_POST['username']))     : '');
 	$email            = ((x($_POST,'email'))      ? notags(trim($_POST['email']))        : '');
 	$timezone         = ((x($_POST,'timezone'))   ? notags(trim($_POST['timezone']))     : '');
@@ -242,14 +295,6 @@ function settings_post(&$a) {
 	$expire_starred   = ((x($_POST,'expire_starred')) ? intval($_POST['expire_starred']) : 0);
 	$expire_photos    = ((x($_POST,'expire_photos'))? intval($_POST['expire_photos'])	 : 0);
 
-	$browser_update   = ((x($_POST,'browser_update')) ? intval($_POST['browser_update']) : 0);
-	$browser_update   = $browser_update * 1000;
-	if($browser_update < 10000)
-		$browser_update = 40000;
-
-	$itemspage_network   = ((x($_POST,'itemspage_network')) ? intval($_POST['itemspage_network']) : 40);
-	if($itemspage_network > 100)
-                $itemspage_network = 40;
 
 
 	$allow_location   = (((x($_POST,'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
@@ -259,7 +304,8 @@ function settings_post(&$a) {
 	$page_flags       = (((x($_POST,'page-flags')) && (intval($_POST['page-flags']))) ? intval($_POST['page-flags']) : 0);
 	$blockwall        = (((x($_POST,'blockwall')) && (intval($_POST['blockwall']) == 1)) ? 0: 1); // this setting is inverted!
 	$blocktags        = (((x($_POST,'blocktags')) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted!
-
+	$unkmail          = (((x($_POST,'unkmail')) && (intval($_POST['unkmail']) == 1)) ? 1: 0);
+	$cntunkmail       = ((x($_POST,'cntunkmail')) ? intval($_POST['cntunkmail']) : 0);
 	$suggestme        = ((x($_POST,'suggestme')) ? intval($_POST['suggestme'])  : 0);  
 	$hide_friends     = (($_POST['hide-friends'] == 1) ? 1: 0);
 	$hidewall         = (($_POST['hidewall'] == 1) ? 1: 0);
@@ -345,10 +391,9 @@ function settings_post(&$a) {
 	set_pconfig(local_user(),'expire','photos', $expire_photos);
 
 	set_pconfig(local_user(),'system','suggestme', $suggestme);
-	set_pconfig(local_user(),'system','update_interval', $browser_update);
-	set_pconfig(local_user(),'system','itemspage_network', $itemspage_network);
 
-	$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, `theme` = '%s', `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `blockwall` = %d, `hidewall` = %d, `blocktags` = %d  WHERE `uid` = %d LIMIT 1",
+
+	$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",
 			dbesc($username),
 			dbesc($email),
 			dbesc($openid),
@@ -361,13 +406,14 @@ function settings_post(&$a) {
 			intval($page_flags),
 			dbesc($defloc),
 			intval($allow_location),
-			dbesc($theme),
 			intval($maxreq),
 			intval($expire),
 			dbesc($openidserver),
 			intval($blockwall),
 			intval($hidewall),
 			intval($blocktags),
+			intval($unkmail),
+			intval($cntunkmail),
 			intval(local_user())
 	);
 	if($r)
@@ -440,6 +486,12 @@ function settings_content(&$a) {
 			'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':''),
@@ -577,31 +629,31 @@ function settings_content(&$a) {
 		$diasp_enabled = sprintf( t('Built-in support for %s connectivity is %s'), t('Diaspora'), ((get_config('system','diaspora_enabled')) ? t('enabled') : t('disabled')));
 		$ostat_enabled = sprintf( t('Built-in support for %s connectivity is %s'), t('StatusNet'), ((get_config('system','ostatus_disabled')) ? t('disabled') : t('enabled')));
 
-	$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
-	if(get_config('system','dfrn_only'))
-		$mail_disabled = 1;
+		$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) {
-		$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
-			local_user()
-		);
-	}
-	else {
-		$r = null;
-	}
+		if(! $mail_disabled) {
+			$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+				local_user()
+			);
+		}
+		else {
+			$r = null;
+		}
 
-	$mail_server       = ((count($r)) ? $r[0]['server'] : '');
-	$mail_port         = ((count($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : '');
-	$mail_ssl          = ((count($r)) ? $r[0]['ssltype'] : '');
-	$mail_user         = ((count($r)) ? $r[0]['user'] : '');
-	$mail_replyto      = ((count($r)) ? $r[0]['reply_to'] : '');
-	$mail_pubmail      = ((count($r)) ? $r[0]['pubmail'] : 0);
-	$mail_action       = ((count($r)) ? $r[0]['action'] : 0);
-	$mail_movetofolder = ((count($r)) ? $r[0]['movetofolder'] : '');
-	$mail_chk          = ((count($r)) ? $r[0]['last_check'] : '0000-00-00 00:00:00');
+		$mail_server       = ((count($r)) ? $r[0]['server'] : '');
+		$mail_port         = ((count($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : '');
+		$mail_ssl          = ((count($r)) ? $r[0]['ssltype'] : '');
+		$mail_user         = ((count($r)) ? $r[0]['user'] : '');
+		$mail_replyto      = ((count($r)) ? $r[0]['reply_to'] : '');
+		$mail_pubmail      = ((count($r)) ? $r[0]['pubmail'] : 0);
+		$mail_action       = ((count($r)) ? $r[0]['action'] : 0);
+		$mail_movetofolder = ((count($r)) ? $r[0]['movetofolder'] : '');
+		$mail_chk          = ((count($r)) ? $r[0]['last_check'] : '0000-00-00 00:00:00');
 
 
-	$tpl = get_markup_template("settings_connectors.tpl");
+		$tpl = get_markup_template("settings_connectors.tpl");
 		$o .= replace_macros($tpl, array(
 			'$form_security_token' => get_form_security_token("settings_connectors"),
 			
@@ -617,7 +669,7 @@ function settings_content(&$a) {
 			'$mail_disabled' => (($mail_disabled) ? t('Email access is disabled on this site.') : ''),
 			'$mail_server'	=> array('mail_server',  t('IMAP server name:'), $mail_server, ''),
 			'$mail_port'	=> array('mail_port', 	 t('IMAP port:'), $mail_port, ''),
-			'$mail_ssl'		=> array('mail_ssl', 	 t('Security:'), strtoupper($mail_ssl), '', array( ''=>t('None'), 'TLS'=>'TLS', 'SSL'=>'SSL')),
+			'$mail_ssl'		=> array('mail_ssl', 	 t('Security:'), strtoupper($mail_ssl), '', array( 'notls'=>t('None'), 'TLS'=>'TLS', 'SSL'=>'SSL')),
 			'$mail_user'	=> array('mail_user',    t('Email login name:'), $mail_user, ''),
 			'$mail_pass'	=> array('mail_pass', 	 t('Email password:'), '', ''),
 			'$mail_replyto'	=> array('mail_replyto', t('Reply-to address:'), '', 'Optional'),
@@ -628,9 +680,83 @@ function settings_content(&$a) {
 
 			'$settings_connectors' => $settings_connectors
 		));
+
+		call_hooks('display_settings', $o);
 		return $o;
 	}
 
+	/*
+	 * DISPLAY SETTINGS
+	 */
+	if(($a->argc > 1) && ($a->argv[1] === 'display')) {
+		$default_theme = get_config('system','theme');
+		if(! $default_theme)
+			$default_theme = 'default';
+
+		$allowed_themes_str = get_config('system','allowed_themes');
+		$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)))
+					$allowed_themes[] = trim($x);
+
+		
+		$themes = array();
+		$files = glob('view/theme/*');
+		if($allowed_themes) {
+			foreach($allowed_themes as $th) {
+				$f = $th;
+				$is_experimental = file_exists('view/theme/' . $th . '/experimental');
+				$unsupported = file_exists('view/theme/' . $th . '/unsupported');
+				if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){ 
+					$theme_name = (($is_experimental) ?  sprintf("%s - \x28Experimental\x29", $f) : $f);
+					$themes[$f]=$theme_name;
+				}
+			}
+		}
+		$theme_selected = (!x($_SESSION,'theme')? $default_theme : $_SESSION['theme']);
+		
+		$browser_update = intval(get_pconfig(local_user(), 'system','update_interval'));
+		$browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds
+
+		$itemspage_network = intval(get_pconfig(local_user(), 'system','itemspage_network'));
+		$itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : 40); // default if not set: 40 items
+		
+		$nosmile = get_pconfig(local_user(),'system','no_smilies');
+		$nosmile = (($nosmile===false)? '0': $nosmile); // default if not set: 0
+
+
+		$theme_config = "";
+		if( ($themeconfigfile = get_theme_config_file($theme_selected)) != null){
+			require_once($themeconfigfile);
+			$theme_config = theme_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'),
+			'$baseurl' => $a->get_baseurl(true),
+			'$uid' => local_user(),
+		
+			'$theme'	=> array('theme', t('Display Theme:'), $theme_selected, '', $themes),
+			'$ajaxint'   => array('browser_update',  t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')),
+			'$itemspage_network'   => array('itemspage_network',  t("Number of items to display on the network page:"), $itemspage_network, t('Maximum of 100 items')),
+			'$nosmile'	=> array('nosmile', t("Don't show emoticons"), $nosmile, ''),
+			
+			'$theme_config' => $theme_config,
+		));
+		
+		return $o;
+	}
+	
+	
+	/*
+	 * ACCOUNT SETTINGS
+	 */
 
 	require_once('include/acl_selectors.php');
 
@@ -640,17 +766,19 @@ function settings_content(&$a) {
 	if(count($p))
 		$profile = $p[0];
 
-	$username = $a->user['username'];
-	$email    = $a->user['email'];
-	$nickname = $a->user['nickname'];
-	$timezone = $a->user['timezone'];
-	$notify   = $a->user['notify-flags'];
-	$defloc   = $a->user['default-location'];
-	$openid   = $a->user['openid'];
-	$maxreq   = $a->user['maxreq'];
-	$expire   = ((intval($a->user['expire'])) ? $a->user['expire'] : '');
-	$blockwall = $a->user['blockwall'];
-	$blocktags = $a->user['blocktags'];
+	$username   = $a->user['username'];
+	$email      = $a->user['email'];
+	$nickname   = $a->user['nickname'];
+	$timezone   = $a->user['timezone'];
+	$notify     = $a->user['notify-flags'];
+	$defloc     = $a->user['default-location'];
+	$openid     = $a->user['openid'];
+	$maxreq     = $a->user['maxreq'];
+	$expire     = ((intval($a->user['expire'])) ? $a->user['expire'] : '');
+	$blockwall  = $a->user['blockwall'];
+	$blocktags  = $a->user['blocktags'];
+	$unkmail    = $a->user['unkmail'];
+	$cntunkmail = $a->user['cntunkmail'];
 
 	$expire_items = get_pconfig(local_user(), 'expire','items');
 	$expire_items = (($expire_items===false)? '1' : $expire_items); // default if not set: 1
@@ -668,11 +796,7 @@ function settings_content(&$a) {
 	$suggestme = get_pconfig(local_user(), 'system','suggestme');
 	$suggestme = (($suggestme===false)? '0': $suggestme); // default if not set: 0
 
-	$browser_update = intval(get_pconfig(local_user(), 'system','update_interval'));
-	$browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds
 
-	$itemspage_network = intval(get_pconfig(local_user(), 'system','itemspage_network'));
-	$itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : 40); // default if not set: 40 items
 	
 	if(! strlen($a->user['timezone']))
 		$timezone = date_default_timezone_get();
@@ -754,6 +878,12 @@ function settings_content(&$a) {
 	));
 
 
+	$unkmail = replace_macros($opt_tpl,array(
+			'$field' 	=> array('unkmail',  t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'),t('Yes'))),
+
+	));
+
+
 	$invisible = (((! $profile['publish']) && (! $profile['net-publish']))
 		? true : false);
 
@@ -761,33 +891,7 @@ function settings_content(&$a) {
 		info( t('Profile is <strong>not published</strong>.') . EOL );
 
 	
-	$default_theme = get_config('system','theme');
-	if(! $default_theme)
-		$default_theme = 'default';
-
-	$allowed_themes_str = get_config('system','allowed_themes');
-	$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)))
-				$allowed_themes[] = trim($x);
 
-	
-	$themes = array();
-	$files = glob('view/theme/*');
-	if($allowed_themes) {
-		foreach($allowed_themes as $th) {
-			$f = $th;
-			$is_experimental = file_exists('view/theme/' . $th . '/experimental');
-			$unsupported = file_exists('view/theme/' . $th . '/unsupported');
-			if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){ 
-				$theme_name = (($is_experimental) ?  sprintf("%s - \x28Experimental\x29", $f) : $f);
-				$themes[$f]=$theme_name;
-			}
-		}
-	}
-	$theme_selected = (!x($_SESSION,'theme')? $default_theme : $_SESSION['theme']);
 
 
 	$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl(true) . '/profile/' . $nickname : '');
@@ -838,9 +942,7 @@ function settings_content(&$a) {
 		'$timezone' => array('timezone_select' , t('Your Timezone:'), select_timezone($timezone), ''),
 		'$defloc'	=> array('defloc', t('Default Post Location:'), $defloc, ''),
 		'$allowloc' => array('allow_location', t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''),
-		'$theme'	=> array('theme', t('Display Theme:'), $theme_selected, '', $themes),
-		'$ajaxint'   => array('browser_update',  t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')),
-		'$itemspage_network'   => array('itemspage_network',  t("Number of items to display on the network page:"), $itemspage_network, t('Maximum of 100 items')),
+		
 
 		'$h_prv' 	=> t('Security and Privacy Settings'),
 
@@ -858,7 +960,8 @@ function settings_content(&$a) {
 		'$profile_in_net_dir' => $profile_in_net_dir,
 		'$hide_friends' => $hide_friends,
 		'$hide_wall' => $hide_wall,
-		
+		'$unkmail' => $unkmail,		
+		'$cntunkmail' 	=> array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail ,t("\x28to prevent spam abuse\x29")),
 		
 		
 		'$h_not' 	=> t('Notification Settings'),
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 b8ca423c5..7a86d53a1 100755..100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -52,7 +52,7 @@ function suggest_content(&$a) {
 		$connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);			
 
 		$o .= replace_macros($tpl,array(
-			'$url' => $rr['url'],
+			'$url' => zrl($rr['url']),
 			'$name' => $rr['name'],
 			'$photo' => $rr['photo'],
 			'$ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'],
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/view.php b/mod/view.php
new file mode 100644
index 000000000..15b3733b3
--- /dev/null
+++ b/mod/view.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * load view/theme/$current_theme/style.php with friendica contex
+ */
+ 
+function view_init($a){
+	header("Content-Type: text/css");
+		
+	if ($a->argc == 4){
+		$theme = $a->argv[2];
+		$THEMEPATH = "view/theme/$theme";
+		if(file_exists("view/theme/$theme/style.php"))
+			require_once("view/theme/$theme/style.php");
+	}
+	
+	killme();
+}
diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 6b66f60d7..e7d26b73e 100755..100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -54,6 +54,8 @@ function viewcontacts_content(&$a) {
 
 		if($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel']))
 			$url = 'redir/' . $rr['id'];
+		else
+			$url = zrl($url);
 
 		$contacts[] = array(
 			'id' => $rr['id'],
diff --git a/mod/viewsrc.php b/mod/viewsrc.php
index 94847ec7b..3fa4eaed5 100755..100644
--- a/mod/viewsrc.php
+++ b/mod/viewsrc.php
@@ -25,7 +25,12 @@ function viewsrc_content(&$a) {
 	);
 
 	if(count($r))
-		$o .= str_replace("\n",'<br />',$r[0]['body']);
+		if(is_ajax()) {
+			echo str_replace("\n",'<br />',$r[0]['body']);
+			killme();
+		} else {
+			$o .= str_replace("\n",'<br />',$r[0]['body']);
+		}
 	return $o;
 }
 
diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index ecf475291..ecf475291 100755..100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 64f174a78..64f174a78 100755..100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
diff --git a/mod/wallmessage.php b/mod/wallmessage.php
new file mode 100644
index 000000000..1a4882b64
--- /dev/null
+++ b/mod/wallmessage.php
@@ -0,0 +1,149 @@
+<?php
+
+require_once('include/message.php');
+
+function wallmessage_post(&$a) {
+
+	$replyto = get_my_url();
+	if(! $replyto) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+
+	$subject   = ((x($_REQUEST,'subject'))   ? notags(trim($_REQUEST['subject']))   : '');
+	$body      = ((x($_REQUEST,'body'))      ? escape_tags(trim($_REQUEST['body'])) : '');
+
+	$recipient = (($a->argc > 1) ? notags($a->argv[1]) : '');
+	if((! $recipient) || (! $body)) {
+		return;
+	}
+
+	$r = q("select * from user where nickname = '%s' limit 1",
+		dbesc($recipient)
+	);
+
+	if(! count($r)) {
+		logger('wallmessage: no recipient');
+		return;
+	}
+
+	$user = $r[0];
+
+	if(! intval($user['unkmail'])) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+
+	$r = q("select count(*) as total from mail where uid = %d and created > UTC_TIMESTAMP() - INTERVAL 1 day and unknown = 1",
+			intval($user['uid'])
+	);
+
+	if($r[0]['total'] > $user['cntunkmail']) {
+		notice( sprintf( t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])));
+		return;
+	}
+
+	// Work around doubled linefeeds in Tinymce 3.5b2
+dbg(1);
+	$body = str_replace("\r\n","\n",$body);
+	$body = str_replace("\n\n","\n",$body);
+
+	
+	$ret = send_wallmessage($user, $body, $subject, $replyto);
+
+	switch($ret){
+		case -1:
+			notice( t('No recipient selected.') . EOL );
+			break;
+		case -2:
+			notice( t('Unable to check your home location.') . EOL );
+			break;
+		case -3:
+			notice( t('Message could not be sent.') . EOL );
+			break;
+		case -4:
+			notice( t('Message collection failure.') . EOL );
+			break;
+		default:
+			info( t('Message sent.') . EOL );
+	}
+dbg(0);
+//	goaway($a->get_baseurl() . '/profile/' . $user['nickname']);
+	
+}
+
+
+function wallmessage_content(&$a) {
+
+	if(! get_my_url()) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+
+	$recipient = (($a->argc > 1) ? $a->argv[1] : '');
+
+	if(! $recipient) {
+		notice( t('No recipient.') . EOL);
+		return;
+	}
+
+	$r = q("select * from user where nickname = '%s' limit 1",
+		dbesc($recipient)
+	);
+
+	if(! count($r)) {
+		notice( t('No recipient.') . EOL);
+		logger('wallmessage: no recipient');
+		return;
+	}
+
+	$user = $r[0];
+
+	if(! intval($user['unkmail'])) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+
+	$r = q("select count(*) as total from mail where uid = %d and created > UTC_TIMESTAMP() - INTERVAL 1 day and unknown = 1",
+			intval($user['uid'])
+	);
+
+	if($r[0]['total'] > $user['cntunkmail']) {
+		notice( sprintf( t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])));
+		return;
+	}
+
+
+
+	$tpl = get_markup_template('wallmsg-header.tpl');
+
+		$a->page['htmlhead'] .= replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(true),
+			'$editselect' => '/(profile-jot-text|prvmail-text)/',
+			'$nickname' => $user['nickname'],
+			'$linkurl' => t('Please enter a link URL:')
+		));
+	
+
+	
+		$tpl = get_markup_template('wallmessage.tpl');
+		$o .= replace_macros($tpl,array(
+			'$header' => t('Send Private Message'),
+			'$subheader' => sprintf( t('If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders.'), $user['username']),
+			'$to' => t('To:'),
+			'$subject' => t('Subject:'),
+			'$recipname' => $user['username'],
+			'$nickname' => $user['nickname'],
+			'$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
+			'$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
+			'$readonly' => '',
+			'$yourmessage' => t('Your message:'),
+			'$select' => $select,
+			'$parent' => '',
+			'$upload' => t('Upload photo'),
+			'$insert' => t('Insert web link'),
+			'$wait' => t('Please wait')
+		));
+
+		return $o;
+	}
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..9dae920ca 100755..100644
--- a/tests/autoname_test.php
+++ b/tests/autoname_test.php
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..b516a3f14 100755..100644
--- a/tests/expand_acl_test.php
+++ b/tests/expand_acl_test.php
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 adb96b831..ae35d2d50 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1134 );
+define( 'UPDATE_VERSION' , 1135 );
 
 /**
  *
@@ -1137,6 +1137,12 @@ 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` ) ");
+}
+
+function update_1134() {
 	//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 ,
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 7f88e2288..60c71f7fe 100755..100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3.1273\n"
+"Project-Id-Version: 2.3.1302\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-06 15:09-0800\n"
+"POT-Creation-Date: 2012-04-04 15:51-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"
@@ -36,23 +36,26 @@ msgstr ""
 
 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:43
 #: ../../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:866
 #: ../../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/notifications.php:66 ../../mod/contacts.php:125
+#: ../../mod/settings.php:62 ../../mod/settings.php:473
+#: ../../mod/settings.php:478 ../../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:91 ../../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/display.php:138 ../../mod/profiles.php:7
+#: ../../mod/profiles.php:232 ../../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/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:456
+#: ../../include/items.php:3118 ../../index.php:294
 msgid "Permission denied."
 msgstr ""
 
@@ -81,8 +84,8 @@ msgstr ""
 msgid "Return to contact editor"
 msgstr ""
 
-#: ../../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:531
+#: ../../mod/settings.php:558 ../../mod/admin.php:528 ../../mod/admin.php:537
 msgid "Name"
 msgstr ""
 
@@ -119,38 +122,38 @@ msgid "New photo from this URL"
 msgstr ""
 
 #: ../../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/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: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/settings.php:529 ../../mod/settings.php:679
+#: ../../mod/settings.php:741 ../../mod/settings.php:926
+#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:357
+#: ../../mod/admin.php:525 ../../mod/admin.php:654 ../../mod/admin.php:826
+#: ../../mod/admin.php:906 ../../mod/profiles.php:390 ../../mod/invite.php:119
+#: ../../addon/facebook/facebook.php:547 ../../addon/yourls/yourls.php:76
+#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
-#: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:92
+#: ../../addon/randplace/randplace.php:179 ../../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/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/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:547 ../../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:369
 #: ../../addon/posterous/posterous.php:90
-#: ../../view/theme/quattro/theme.php:15 ../../include/conversation.php:552
+#: ../../view/theme/quattro/config.php:21 ../../include/conversation.php:555
 msgid "Submit"
 msgstr ""
 
@@ -158,15 +161,15 @@ msgstr ""
 msgid "Help:"
 msgstr ""
 
-#: ../../mod/help.php:34 ../../include/nav.php:82
+#: ../../mod/help.php:34 ../../include/nav.php:86
 msgid "Help"
 msgstr ""
 
-#: ../../mod/help.php:38 ../../index.php:221
+#: ../../mod/help.php:38 ../../index.php:225
 msgid "Not Found"
 msgstr ""
 
-#: ../../mod/help.php:41 ../../index.php:224
+#: ../../mod/help.php:41 ../../index.php:228
 msgid "Page not found."
 msgstr ""
 
@@ -204,11 +207,15 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:272 ../../include/text.php:982
+#: ../../mod/events.php:272 ../../include/text.php:1050
 msgid "link to source"
 msgstr ""
 
-#: ../../mod/events.php:296 ../../include/nav.php:50 ../../boot.php:1349
+#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:240
+#: ../../view/theme/diabook-blue/theme.php:240
+#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:52
+#: ../../boot.php:1421
 msgid "Events"
 msgstr ""
 
@@ -258,7 +265,7 @@ msgid "Description:"
 msgstr ""
 
 #: ../../mod/events.php:395 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:260 ../../boot.php:980
+#: ../../include/bb2diaspora.php:260 ../../boot.php:1042
 msgid "Location:"
 msgstr ""
 
@@ -267,8 +274,8 @@ msgid "Share this event"
 msgstr ""
 
 #: ../../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:707 ../../mod/settings.php:530
+#: ../../mod/settings.php:557 ../../addon/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""
 
@@ -288,7 +295,7 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: ../../mod/dfrn_poll.php:91 ../../mod/dfrn_poll.php:517
+#: ../../mod/dfrn_poll.php:94 ../../mod/dfrn_poll.php:520
 #, php-format
 msgid "%s welcomes %s"
 msgstr ""
@@ -311,245 +318,257 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
-#: ../../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:695
+#: ../../mod/settings.php:841 ../../mod/settings.php:847
+#: ../../mod/settings.php:855 ../../mod/settings.php:859
+#: ../../mod/settings.php:864 ../../mod/settings.php:870
+#: ../../mod/settings.php:876 ../../mod/settings.php:882
+#: ../../mod/settings.php:916 ../../mod/settings.php:917
+#: ../../mod/settings.php:918 ../../mod/settings.php:919
+#: ../../mod/register.php:536 ../../mod/profiles.php:369
 msgid "Yes"
 msgstr ""
 
-#: ../../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:696
+#: ../../mod/settings.php:841 ../../mod/settings.php:847
+#: ../../mod/settings.php:855 ../../mod/settings.php:859
+#: ../../mod/settings.php:864 ../../mod/settings.php:870
+#: ../../mod/settings.php:876 ../../mod/settings.php:882
+#: ../../mod/settings.php:916 ../../mod/settings.php:917
+#: ../../mod/settings.php:918 ../../mod/settings.php:919
+#: ../../mod/register.php:537 ../../mod/profiles.php:370
 msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:42
+#: ../../mod/photos.php:43
 msgid "Photo Albums"
 msgstr ""
 
-#: ../../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: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:110
+#: ../../view/theme/diabook-blue/theme.php:110
+#: ../../view/theme/diabook/theme.php:114
+#: ../../view/theme/diabook-aerith/theme.php:110
 msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/photos.php:57 ../../mod/photos.php:975 ../../mod/photos.php:1413
+#: ../../mod/photos.php:58 ../../mod/photos.php:976 ../../mod/photos.php:1425
 msgid "Upload New Photos"
 msgstr ""
 
-#: ../../mod/photos.php:68 ../../mod/settings.php:11
+#: ../../mod/photos.php:69 ../../mod/settings.php:24
 msgid "everybody"
 msgstr ""
 
-#: ../../mod/photos.php:139
+#: ../../mod/photos.php:140
 msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../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:598 ../../mod/photos.php:951
+#: ../../mod/photos.php:966 ../../mod/register.php:339
+#: ../../mod/register.php:346 ../../mod/register.php:353
+#: ../../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:111
+#: ../../view/theme/diabook-blue/theme.php:111
+#: ../../view/theme/diabook/theme.php:115
+#: ../../view/theme/diabook-aerith/theme.php:111
 msgid "Profile Photos"
 msgstr ""
 
-#: ../../mod/photos.php:160
+#: ../../mod/photos.php:161
 msgid "Album not found."
 msgstr ""
 
-#: ../../mod/photos.php:178 ../../mod/photos.php:959
+#: ../../mod/photos.php:179 ../../mod/photos.php:960
 msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/photos.php:241 ../../mod/photos.php:1183
+#: ../../mod/photos.php:242 ../../mod/photos.php:1195
 msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/photos.php:528
+#: ../../mod/photos.php:529
 msgid "was tagged in a"
 msgstr ""
 
-#: ../../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
+#: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70
+#: ../../addon/communityhome/communityhome.php:163
+#: ../../view/theme/diabook-red/theme.php:82
+#: ../../view/theme/diabook-blue/theme.php:82
+#: ../../view/theme/diabook/theme.php:86
+#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1294
+#: ../../include/diaspora.php:1650 ../../include/conversation.php:53
 #: ../../include/conversation.php:126
 msgid "photo"
 msgstr ""
 
-#: ../../mod/photos.php:528
+#: ../../mod/photos.php:529
 msgid "by"
 msgstr ""
 
-#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:315
+#: ../../mod/photos.php:632 ../../addon/js_upload/js_upload.php:315
 msgid "Image exceeds size limit of "
 msgstr ""
 
-#: ../../mod/photos.php:639
+#: ../../mod/photos.php:640
 msgid "Image file is empty."
 msgstr ""
 
-#: ../../mod/photos.php:653 ../../mod/profile_photo.php:122
+#: ../../mod/photos.php:654 ../../mod/profile_photo.php:124
 #: ../../mod/wall_upload.php:65
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../mod/photos.php:673 ../../mod/profile_photo.php:251
+#: ../../mod/photos.php:674 ../../mod/profile_photo.php:257
 #: ../../mod/wall_upload.php:84
 msgid "Image upload failed."
 msgstr ""
 
-#: ../../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/photos.php:760 ../../mod/community.php:16
+#: ../../mod/dfrn_request.php:626 ../../mod/viewcontacts.php:17
+#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
 msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/photos.php:769
+#: ../../mod/photos.php:770
 msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/photos.php:846
+#: ../../mod/photos.php:847
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/photos.php:907
+#: ../../mod/photos.php:908
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/photos.php:910 ../../mod/photos.php:954
+#: ../../mod/photos.php:911 ../../mod/photos.php:955
 msgid "New album name: "
 msgstr ""
 
-#: ../../mod/photos.php:911
+#: ../../mod/photos.php:912
 msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/photos.php:912
+#: ../../mod/photos.php:913
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/photos.php:914 ../../mod/photos.php:1178
+#: ../../mod/photos.php:915 ../../mod/photos.php:1190
 msgid "Permissions"
 msgstr ""
 
-#: ../../mod/photos.php:969
+#: ../../mod/photos.php:970
 msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/photos.php:984 ../../mod/photos.php:1396
+#: ../../mod/photos.php:985 ../../mod/photos.php:1408
 msgid "View Photo"
 msgstr ""
 
-#: ../../mod/photos.php:1019
+#: ../../mod/photos.php:1020
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/photos.php:1021
+#: ../../mod/photos.php:1022
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:1071
+#: ../../mod/photos.php:1072
 msgid "View photo"
 msgstr ""
 
-#: ../../mod/photos.php:1071
+#: ../../mod/photos.php:1072
 msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/photos.php:1072
+#: ../../mod/photos.php:1073
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:1078 ../../include/conversation.php:482
+#: ../../mod/photos.php:1079 ../../include/conversation.php:480
 msgid "Private Message"
 msgstr ""
 
-#: ../../mod/photos.php:1089
+#: ../../mod/photos.php:1101
 msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/photos.php:1157
+#: ../../mod/photos.php:1169
 msgid "Tags: "
 msgstr ""
 
-#: ../../mod/photos.php:1160
+#: ../../mod/photos.php:1172
 msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../mod/photos.php:1171
+#: ../../mod/photos.php:1183
 msgid "New album name"
 msgstr ""
 
-#: ../../mod/photos.php:1174
+#: ../../mod/photos.php:1186
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:1176
+#: ../../mod/photos.php:1188
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:1180
+#: ../../mod/photos.php:1192
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1200 ../../include/conversation.php:529
+#: ../../mod/photos.php:1212 ../../include/conversation.php:529
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1201 ../../include/conversation.php:530
+#: ../../mod/photos.php:1213 ../../include/conversation.php:530
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1202 ../../include/conversation.php:933
+#: ../../mod/photos.php:1214 ../../include/conversation.php:960
 msgid "Share"
 msgstr ""
 
-#: ../../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:1215 ../../mod/editpost.php:104
+#: ../../mod/wallmessage.php:145 ../../mod/message.php:189
+#: ../../mod/message.php:358 ../../include/conversation.php:362
+#: ../../include/conversation.php:702 ../../include/conversation.php:979
 msgid "Please wait"
 msgstr ""
 
-#: ../../mod/photos.php:1219 ../../mod/photos.php:1259
-#: ../../mod/photos.php:1290 ../../include/conversation.php:549
+#: ../../mod/photos.php:1231 ../../mod/photos.php:1271
+#: ../../mod/photos.php:1302 ../../include/conversation.php:552
 msgid "This is you"
 msgstr ""
 
-#: ../../mod/photos.php:1221 ../../mod/photos.php:1261
-#: ../../mod/photos.php:1292 ../../include/conversation.php:551
-#: ../../boot.php:447
+#: ../../mod/photos.php:1233 ../../mod/photos.php:1273
+#: ../../mod/photos.php:1304 ../../include/conversation.php:554
+#: ../../boot.php:494
 msgid "Comment"
 msgstr ""
 
-#: ../../mod/photos.php:1223 ../../mod/editpost.php:123
-#: ../../include/conversation.php:553 ../../include/conversation.php:968
+#: ../../mod/photos.php:1235 ../../mod/editpost.php:125
+#: ../../include/conversation.php:556 ../../include/conversation.php:997
 msgid "Preview"
 msgstr ""
 
-#: ../../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:1332 ../../mod/settings.php:593
+#: ../../mod/settings.php:677 ../../mod/group.php:168 ../../mod/admin.php:532
+#: ../../include/conversation.php:318 ../../include/conversation.php:576
 msgid "Delete"
 msgstr ""
 
-#: ../../mod/photos.php:1402
+#: ../../mod/photos.php:1414
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/photos.php:1411
+#: ../../mod/photos.php:1423
 msgid "Recent Photos"
 msgstr ""
 
@@ -557,43 +576,47 @@ msgstr ""
 msgid "Not available."
 msgstr ""
 
-#: ../../mod/community.php:30 ../../include/nav.php:97
+#: ../../mod/community.php:30 ../../addon/pages/pages.php:75
+#: ../../view/theme/diabook-red/theme.php:242
+#: ../../view/theme/diabook-blue/theme.php:242
+#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:101
 msgid "Community"
 msgstr ""
 
-#: ../../mod/community.php:60 ../../mod/search.php:118
+#: ../../mod/community.php:61 ../../mod/search.php:115
 msgid "No results."
 msgstr ""
 
-#: ../../mod/friendica.php:43
+#: ../../mod/friendica.php:47
 msgid "This is Friendica, version"
 msgstr ""
 
-#: ../../mod/friendica.php:44
+#: ../../mod/friendica.php:48
 msgid "running at web location"
 msgstr ""
 
-#: ../../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 ""
 
-#: ../../mod/friendica.php:48
+#: ../../mod/friendica.php:52
 msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: ../../mod/friendica.php:49
+#: ../../mod/friendica.php:53
 msgid ""
 "Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
 "dot com"
 msgstr ""
 
-#: ../../mod/friendica.php:54
-msgid "Installed plugins/addons/apps"
+#: ../../mod/friendica.php:58
+msgid "Installed plugins/addons/apps:"
 msgstr ""
 
-#: ../../mod/friendica.php:62
+#: ../../mod/friendica.php:71
 msgid "No installed plugins/addons/apps"
 msgstr ""
 
@@ -605,26 +628,28 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:80 ../../include/conversation.php:919
+#: ../../mod/editpost.php:80 ../../include/conversation.php:946
 msgid "Post to Email"
 msgstr ""
 
-#: ../../mod/editpost.php:95 ../../mod/settings.php:519
-#: ../../include/conversation.php:560
+#: ../../mod/editpost.php:95 ../../mod/settings.php:592
+#: ../../include/conversation.php:563
 msgid "Edit"
 msgstr ""
 
-#: ../../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:187 ../../mod/message.php:356
+#: ../../include/conversation.php:961
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:97 ../../include/conversation.php:936
+#: ../../mod/editpost.php:97 ../../include/conversation.php:963
 msgid "Attach file"
 msgstr ""
 
-#: ../../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:188 ../../mod/message.php:357
+#: ../../include/conversation.php:965
 msgid "Insert web link"
 msgstr ""
 
@@ -640,201 +665,212 @@ msgstr ""
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editpost.php:102 ../../include/conversation.php:944
+#: ../../mod/editpost.php:102 ../../include/conversation.php:971
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:103 ../../include/conversation.php:946
+#: ../../mod/editpost.php:103 ../../include/conversation.php:973
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:951
+#: ../../mod/editpost.php:105 ../../include/conversation.php:980
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:960
+#: ../../mod/editpost.php:113 ../../include/conversation.php:989
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:961
+#: ../../mod/editpost.php:114 ../../include/conversation.php:990
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:949
+#: ../../mod/editpost.php:117 ../../include/conversation.php:976
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:118 ../../include/conversation.php:963
+#: ../../mod/editpost.php:119 ../../include/conversation.php:978
+msgid "Categories (comma-separated list)"
+msgstr ""
+
+#: ../../mod/editpost.php:120 ../../include/conversation.php:992
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:92
+#: ../../mod/dfrn_request.php:93
 msgid "This introduction has already been accepted."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:381
+#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:382
 msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:386
+#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:387
 msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:388
+#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:389
 msgid "Warning: profile location has no profile photo."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:391
+#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:392
 #, 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] ""
 msgstr[1] ""
 
-#: ../../mod/dfrn_request.php:167
+#: ../../mod/dfrn_request.php:168
 msgid "Introduction complete."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:191
+#: ../../mod/dfrn_request.php:192
 msgid "Unrecoverable protocol error."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:219
+#: ../../mod/dfrn_request.php:220
 msgid "Profile unavailable."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:244
+#: ../../mod/dfrn_request.php:245
 #, php-format
 msgid "%s has received too many connection requests today."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:245
+#: ../../mod/dfrn_request.php:246
 msgid "Spam protection measures have been invoked."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:246
+#: ../../mod/dfrn_request.php:247
 msgid "Friends are advised to please try again in 24 hours."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:306
+#: ../../mod/dfrn_request.php:307
 msgid "Invalid locator"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:326
+#: ../../mod/dfrn_request.php:327
 msgid "Unable to resolve your name at the provided location."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:339
+#: ../../mod/dfrn_request.php:340
 msgid "You have already introduced yourself here."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:343
+#: ../../mod/dfrn_request.php:344
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:364
+#: ../../mod/dfrn_request.php:365
 msgid "Invalid profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:370 ../../mod/follow.php:20
+#: ../../mod/dfrn_request.php:371 ../../mod/follow.php:20
 msgid "Disallowed profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:439 ../../mod/contacts.php:102
+#: ../../mod/dfrn_request.php:440 ../../mod/contacts.php:102
 msgid "Failed to update contact record."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:460
+#: ../../mod/dfrn_request.php:461
 msgid "Your introduction has been sent."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:513
+#: ../../mod/dfrn_request.php:514
 msgid "Please login to confirm introduction."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:527
+#: ../../mod/dfrn_request.php:528
 msgid ""
 "Incorrect identity currently logged in. Please login to <strong>this</"
 "strong> profile."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:539
+#: ../../mod/dfrn_request.php:540
 #, php-format
 msgid "Welcome home %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:540
+#: ../../mod/dfrn_request.php:541
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:541
+#: ../../mod/dfrn_request.php:542
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:582 ../../include/items.php:2566
+#: ../../mod/dfrn_request.php:583 ../../include/items.php:2649
 msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:666
-#, php-format
+#: ../../mod/dfrn_request.php:670
 msgid ""
-"Diaspora members: Please do not use this form. Instead, enter \"%s\" into "
-"your Diaspora search bar."
+"Please enter your 'Identity Address' from one of the following supported "
+"communications networks:"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:686
+msgid "<strike>Connect as an email follower</strike> (Coming soon)"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:669
+#: ../../mod/dfrn_request.php:688
 msgid ""
-"Please enter your 'Identity Address' from one of the following supported "
-"social networks:"
+"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:672
+#: ../../mod/dfrn_request.php:691
 msgid "Friend/Connection Request"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:673
+#: ../../mod/dfrn_request.php:692
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:674
+#: ../../mod/dfrn_request.php:693
 msgid "Please answer the following:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:675
+#: ../../mod/dfrn_request.php:694
 #, php-format
 msgid "Does %s know you?"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:678
+#: ../../mod/dfrn_request.php:697
 msgid "Add a personal note:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:680 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:699 ../../include/contact_selectors.php:76
 msgid "Friendica"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:681
+#: ../../mod/dfrn_request.php:700
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:682 ../../mod/settings.php:555
+#: ../../mod/dfrn_request.php:701 ../../mod/settings.php:629
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:683
-msgid "- please share from your own site as noted above"
+#: ../../mod/dfrn_request.php:702
+#, php-format
+msgid ""
+" - please do not use this form.  Instead, enter %s into your Diaspora search "
+"bar."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:684
+#: ../../mod/dfrn_request.php:703
 msgid "Your Identity Address:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:685
+#: ../../mod/dfrn_request.php:706
 msgid "Submit Request"
 msgstr ""
 
@@ -1129,7 +1165,7 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:930
+#: ../../include/contact_widgets.php:9 ../../boot.php:986
 msgid "Connect"
 msgstr ""
 
@@ -1154,184 +1190,187 @@ 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/notifications.php:51 ../../mod/notifications.php:160
+#: ../../mod/notifications.php:206 ../../mod/contacts.php:302
 #: ../../mod/contacts.php:345
 msgid "Ignore"
 msgstr ""
 
-#: ../../mod/notifications.php:71
+#: ../../mod/notifications.php:75
 msgid "System"
 msgstr ""
 
-#: ../../mod/notifications.php:76 ../../include/nav.php:109
+#: ../../mod/notifications.php:80 ../../include/nav.php:113
 msgid "Network"
 msgstr ""
 
-#: ../../mod/notifications.php:81 ../../mod/network.php:177
+#: ../../mod/notifications.php:85 ../../mod/network.php:182
 msgid "Personal"
 msgstr ""
 
-#: ../../mod/notifications.php:86 ../../include/nav.php:73
-#: ../../include/nav.php:111
+#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:236
+#: ../../view/theme/diabook-blue/theme.php:236
+#: ../../view/theme/diabook/theme.php:244
+#: ../../view/theme/diabook-aerith/theme.php:236 ../../include/nav.php:77
+#: ../../include/nav.php:115
 msgid "Home"
 msgstr ""
 
-#: ../../mod/notifications.php:91 ../../include/nav.php:117
+#: ../../mod/notifications.php:95 ../../include/nav.php:121
 msgid "Introductions"
 msgstr ""
 
-#: ../../mod/notifications.php:96 ../../mod/message.php:76
-#: ../../include/nav.php:124
+#: ../../mod/notifications.php:100 ../../mod/message.php:103
+#: ../../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/notifications.php:153 ../../mod/notifications.php:200
 #: ../../mod/contacts.php:350
 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:486
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/admin.php:530
 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:118
+#: ../../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 ""
 
@@ -1423,12 +1462,12 @@ msgid "View all contacts"
 msgstr ""
 
 #: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:490
+#: ../../mod/admin.php:534
 msgid "Unblock"
 msgstr ""
 
 #: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:533
 msgid "Block"
 msgstr ""
 
@@ -1463,8 +1502,8 @@ msgstr ""
 msgid "Edit contact notes"
 msgstr ""
 
-#: ../../mod/contacts.php:328 ../../mod/contacts.php:497
-#: ../../mod/viewcontacts.php:60
+#: ../../mod/contacts.php:328 ../../mod/contacts.php:501
+#: ../../mod/viewcontacts.php:62
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr ""
@@ -1497,7 +1536,7 @@ msgstr ""
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:341 ../../mod/admin.php:905
+#: ../../mod/contacts.php:341 ../../mod/admin.php:955
 msgid "Update now"
 msgstr ""
 
@@ -1514,57 +1553,64 @@ msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: ../../mod/contacts.php:399 ../../mod/group.php:179
+#: ../../mod/contacts.php:399
+msgid "Suggestions"
+msgstr ""
+
+#: ../../mod/contacts.php:404 ../../mod/group.php:191
 msgid "All Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:404
+#: ../../mod/contacts.php:409
 msgid "Unblocked Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:410
+#: ../../mod/contacts.php:415
 msgid "Blocked Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:416
+#: ../../mod/contacts.php:421
 msgid "Ignored Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:422
+#: ../../mod/contacts.php:427
 msgid "Hidden Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:473
+#: ../../mod/contacts.php:477
 msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../mod/contacts.php:477
+#: ../../mod/contacts.php:481
 msgid "is a fan of yours"
 msgstr ""
 
-#: ../../mod/contacts.php:481
+#: ../../mod/contacts.php:485
 msgid "you are a fan of"
 msgstr ""
 
-#: ../../mod/contacts.php:498 ../../include/Contact.php:135
-#: ../../include/conversation.php:792
+#: ../../mod/contacts.php:502 ../../include/Contact.php:141
+#: ../../include/conversation.php:817
 msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/contacts.php:519 ../../include/nav.php:132
+#: ../../mod/contacts.php:523 ../../view/theme/diabook-red/theme.php:238
+#: ../../view/theme/diabook-blue/theme.php:238
+#: ../../view/theme/diabook/theme.php:246
+#: ../../view/theme/diabook-aerith/theme.php:238 ../../include/nav.php:139
 msgid "Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:523
+#: ../../mod/contacts.php:527
 msgid "Search your contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:524 ../../mod/directory.php:67
+#: ../../mod/contacts.php:528 ../../mod/directory.php:57
 msgid "Finding: "
 msgstr ""
 
-#: ../../mod/contacts.php:525 ../../mod/directory.php:69
-#: ../../include/contact_widgets.php:34
+#: ../../mod/contacts.php:529 ../../mod/directory.php:59
+#: ../../include/contact_widgets.php:32
 msgid "Find"
 msgstr ""
 
@@ -1572,510 +1618,557 @@ msgstr ""
 msgid "No valid account found."
 msgstr ""
 
-#: ../../mod/lostpass.php:31
+#: ../../mod/lostpass.php:32
 msgid "Password reset request issued. Check your email."
 msgstr ""
 
-#: ../../mod/lostpass.php:42
+#: ../../mod/lostpass.php:43
 #, php-format
 msgid "Password reset requested at %s"
 msgstr ""
 
-#: ../../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:392 ../../mod/register.php:446
+#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
+#: ../../addon/facebook/facebook.php:617
+#: ../../addon/facebook/facebook.php:1069 ../../include/items.php:2658
 msgid "Administrator"
 msgstr ""
 
-#: ../../mod/lostpass.php:64
+#: ../../mod/lostpass.php:65
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:82 ../../boot.php:723
+#: ../../mod/lostpass.php:83 ../../boot.php:779
 msgid "Password Reset"
 msgstr ""
 
-#: ../../mod/lostpass.php:83
+#: ../../mod/lostpass.php:84
 msgid "Your password has been reset as requested."
 msgstr ""
 
-#: ../../mod/lostpass.php:84
+#: ../../mod/lostpass.php:85
 msgid "Your new password is"
 msgstr ""
 
-#: ../../mod/lostpass.php:85
+#: ../../mod/lostpass.php:86
 msgid "Save or copy your new password - and then"
 msgstr ""
 
-#: ../../mod/lostpass.php:86
+#: ../../mod/lostpass.php:87
 msgid "click here to login"
 msgstr ""
 
-#: ../../mod/lostpass.php:87
+#: ../../mod/lostpass.php:88
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr ""
 
-#: ../../mod/lostpass.php:118
+#: ../../mod/lostpass.php:119
 msgid "Forgot your Password?"
 msgstr ""
 
-#: ../../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 ""
 
-#: ../../mod/lostpass.php:120
+#: ../../mod/lostpass.php:121
 msgid "Nickname or Email: "
 msgstr ""
 
-#: ../../mod/lostpass.php:121
+#: ../../mod/lostpass.php:122
 msgid "Reset"
 msgstr ""
 
-#: ../../mod/settings.php:72
+#: ../../mod/settings.php:89
 msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/settings.php:75 ../../mod/settings.php:486 ../../mod/admin.php:75
+#: ../../mod/settings.php:92 ../../mod/settings.php:556 ../../mod/admin.php:75
 msgid "Update"
 msgstr ""
 
-#: ../../mod/settings.php:175
+#: ../../mod/settings.php:197
 msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: ../../mod/settings.php:180
+#: ../../mod/settings.php:202
 msgid "Email settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:198
+#: ../../mod/settings.php:261
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:203
+#: ../../mod/settings.php:266
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:214
+#: ../../mod/settings.php:277
 msgid "Password changed."
 msgstr ""
 
-#: ../../mod/settings.php:216
+#: ../../mod/settings.php:279
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:280
+#: ../../mod/settings.php:340
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:282
+#: ../../mod/settings.php:342
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:288
+#: ../../mod/settings.php:348
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:290
+#: ../../mod/settings.php:350
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:358 ../../addon/facebook/facebook.php:321
+#: ../../mod/settings.php:420 ../../addon/facebook/facebook.php:445
 #: ../../addon/impressum/impressum.php:64
 #: ../../addon/openstreetmap/openstreetmap.php:80
-#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:350
+#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:364
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:422 ../../include/nav.php:130
+#: ../../mod/settings.php:484 ../../view/theme/diabook-red/theme.php:284
+#: ../../view/theme/diabook-blue/theme.php:283
+#: ../../view/theme/diabook/theme.php:293
+#: ../../view/theme/diabook-aerith/theme.php:283 ../../include/nav.php:137
 msgid "Account settings"
 msgstr ""
 
-#: ../../mod/settings.php:427
+#: ../../mod/settings.php:489 ../../view/theme/diabook-red/theme.php:289
+#: ../../view/theme/diabook-blue/theme.php:288
+#: ../../view/theme/diabook/theme.php:298
+#: ../../view/theme/diabook-aerith/theme.php:288
+msgid "Display settings"
+msgstr ""
+
+#: ../../mod/settings.php:495 ../../view/theme/diabook-red/theme.php:298
+#: ../../view/theme/diabook-blue/theme.php:297
+#: ../../view/theme/diabook/theme.php:307
+#: ../../view/theme/diabook-aerith/theme.php:297
 msgid "Connector settings"
 msgstr ""
 
-#: ../../mod/settings.php:432
+#: ../../mod/settings.php:500 ../../view/theme/diabook-red/theme.php:303
+#: ../../view/theme/diabook-blue/theme.php:302
+#: ../../view/theme/diabook/theme.php:312
+#: ../../view/theme/diabook-aerith/theme.php:302
 msgid "Plugin settings"
 msgstr ""
 
-#: ../../mod/settings.php:437
+#: ../../mod/settings.php:505 ../../view/theme/diabook-red/theme.php:308
+#: ../../view/theme/diabook-blue/theme.php:307
+#: ../../view/theme/diabook/theme.php:317
+#: ../../view/theme/diabook-aerith/theme.php:307
 msgid "Connections"
 msgstr ""
 
-#: ../../mod/settings.php:442
+#: ../../mod/settings.php:510 ../../view/theme/diabook-red/theme.php:313
+#: ../../view/theme/diabook-blue/theme.php:312
+#: ../../view/theme/diabook/theme.php:322
+#: ../../view/theme/diabook-aerith/theme.php:312
 msgid "Export personal data"
 msgstr ""
 
-#: ../../mod/settings.php:459 ../../mod/settings.php:485
-#: ../../mod/settings.php:518
+#: ../../mod/settings.php:528 ../../mod/settings.php:555
+#: ../../mod/settings.php:591
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:463 ../../mod/settings.php:489
-#: ../../addon/statusnet/statusnet.php:526
+#: ../../mod/settings.php:532 ../../mod/settings.php:559
+#: ../../addon/statusnet/statusnet.php:541
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:464 ../../mod/settings.php:490
-#: ../../addon/statusnet/statusnet.php:525
+#: ../../mod/settings.php:533 ../../mod/settings.php:560
+#: ../../addon/statusnet/statusnet.php:540
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:465 ../../mod/settings.php:491
+#: ../../mod/settings.php:534 ../../mod/settings.php:561
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:466 ../../mod/settings.php:492
+#: ../../mod/settings.php:535 ../../mod/settings.php:562
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:477
+#: ../../mod/settings.php:546
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:517
+#: ../../mod/settings.php:590
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:521
+#: ../../mod/settings.php:594
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:522
+#: ../../mod/settings.php:595
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:523
+#: ../../mod/settings.php:596
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:535
+#: ../../mod/settings.php:608
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:542 ../../addon/widgets/widgets.php:122
+#: ../../mod/settings.php:616 ../../addon/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../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 ""
 
-#: ../../mod/settings.php:555 ../../mod/settings.php:556
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
 msgid "enabled"
 msgstr ""
 
-#: ../../mod/settings.php:555 ../../mod/settings.php:556
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
 msgid "disabled"
 msgstr ""
 
-#: ../../mod/settings.php:556
+#: ../../mod/settings.php:630
 msgid "StatusNet"
 msgstr ""
 
-#: ../../mod/settings.php:584
+#: ../../mod/settings.php:660
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:590
+#: ../../mod/settings.php:666
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/settings.php:591
+#: ../../mod/settings.php:667
 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:592
+#: ../../mod/settings.php:668
 msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/settings.php:593
+#: ../../mod/settings.php:669
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/settings.php:594
+#: ../../mod/settings.php:670
 msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/settings.php:595
+#: ../../mod/settings.php:671
 msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/settings.php:596
+#: ../../mod/settings.php:672
 msgid "Security:"
 msgstr ""
 
-#: ../../mod/settings.php:596 ../../mod/settings.php:601
+#: ../../mod/settings.php:672 ../../mod/settings.php:677
 msgid "None"
 msgstr ""
 
-#: ../../mod/settings.php:597
+#: ../../mod/settings.php:673
 msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/settings.php:598
+#: ../../mod/settings.php:674
 msgid "Email password:"
 msgstr ""
 
-#: ../../mod/settings.php:599
+#: ../../mod/settings.php:675
 msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/settings.php:600
+#: ../../mod/settings.php:676
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/settings.php:601
+#: ../../mod/settings.php:677
 msgid "Action after import:"
 msgstr ""
 
-#: ../../mod/settings.php:601
+#: ../../mod/settings.php:677
 msgid "Mark as seen"
 msgstr ""
 
-#: ../../mod/settings.php:601
+#: ../../mod/settings.php:677
 msgid "Move to folder"
 msgstr ""
 
-#: ../../mod/settings.php:602
+#: ../../mod/settings.php:678
 msgid "Move to folder:"
 msgstr ""
 
-#: ../../mod/settings.php:659 ../../mod/admin.php:142 ../../mod/admin.php:462
+#: ../../mod/settings.php:739
+msgid "Display Settings"
+msgstr ""
+
+#: ../../mod/settings.php:745
+msgid "Display Theme:"
+msgstr ""
+
+#: ../../mod/settings.php:746
+msgid "Update browser every xx seconds"
+msgstr ""
+
+#: ../../mod/settings.php:746
+msgid "Minimum of 10 seconds, no maximum"
+msgstr ""
+
+#: ../../mod/settings.php:747
+msgid "Number of items to display on the network page:"
+msgstr ""
+
+#: ../../mod/settings.php:747
+msgid "Maximum of 100 items"
+msgstr ""
+
+#: ../../mod/settings.php:748
+msgid "Don't show emoticons"
+msgstr ""
+
+#: ../../mod/settings.php:808 ../../mod/admin.php:142 ../../mod/admin.php:506
 msgid "Normal Account"
 msgstr ""
 
-#: ../../mod/settings.php:660
+#: ../../mod/settings.php:809
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/settings.php:663 ../../mod/admin.php:143 ../../mod/admin.php:463
+#: ../../mod/settings.php:812 ../../mod/admin.php:143 ../../mod/admin.php:507
 msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/settings.php:664
+#: ../../mod/settings.php:813
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/settings.php:667 ../../mod/admin.php:144 ../../mod/admin.php:464
+#: ../../mod/settings.php:816 ../../mod/admin.php:144 ../../mod/admin.php:508
 msgid "Community/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:668
+#: ../../mod/settings.php:817
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/settings.php:671 ../../mod/admin.php:145 ../../mod/admin.php:465
+#: ../../mod/settings.php:820 ../../mod/admin.php:145 ../../mod/admin.php:509
 msgid "Automatic Friend Account"
 msgstr ""
 
-#: ../../mod/settings.php:672
+#: ../../mod/settings.php:821
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/settings.php:682
+#: ../../mod/settings.php:831
 msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/settings.php:682
+#: ../../mod/settings.php:831
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:692
+#: ../../mod/settings.php:841
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/settings.php:698
+#: ../../mod/settings.php:847
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/settings.php:706
+#: ../../mod/settings.php:855
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/settings.php:710
+#: ../../mod/settings.php:859
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/settings.php:715
+#: ../../mod/settings.php:864
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/settings.php:721
+#: ../../mod/settings.php:870
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: ../../mod/settings.php:727
+#: ../../mod/settings.php:876
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:882
+msgid "Permit unknown people to send you private mail?"
+msgstr ""
+
+#: ../../mod/settings.php:891
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:768 ../../mod/profile_photo.php:206
+#: ../../mod/settings.php:897 ../../mod/profile_photo.php:211
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:773
+#: ../../mod/settings.php:902
 msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/settings.php:784
+#: ../../mod/settings.php:913
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:784
+#: ../../mod/settings.php:913
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/settings.php:785
+#: ../../mod/settings.php:914
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:786
+#: ../../mod/settings.php:915
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:787
+#: ../../mod/settings.php:916
 msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/settings.php:788
+#: ../../mod/settings.php:917
 msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/settings.php:789
+#: ../../mod/settings.php:918
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:790
+#: ../../mod/settings.php:919
 msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/settings.php:795
+#: ../../mod/settings.php:924
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:803
+#: ../../mod/settings.php:933
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:804
+#: ../../mod/settings.php:934
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:805
+#: ../../mod/settings.php:935
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:805
+#: ../../mod/settings.php:935
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:809
+#: ../../mod/settings.php:939
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:810 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:940 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/settings.php:811
+#: ../../mod/settings.php:941
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:812
+#: ../../mod/settings.php:942
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:813
+#: ../../mod/settings.php:943
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:814
+#: ../../mod/settings.php:944
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:815
-msgid "Display Theme:"
-msgstr ""
-
-#: ../../mod/settings.php:816
-msgid "Update browser every xx seconds"
-msgstr ""
-
-#: ../../mod/settings.php:816
-msgid "Minimum of 10 seconds, no maximum"
-msgstr ""
-
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:947
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:820
+#: ../../mod/settings.php:949
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:820
+#: ../../mod/settings.php:949 ../../mod/settings.php:964
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:821
+#: ../../mod/settings.php:950
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:822
+#: ../../mod/settings.php:951
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:837
+#: ../../mod/settings.php:964
+msgid "Maximum private messages per day from unknown people:"
+msgstr ""
+
+#: ../../mod/settings.php:967
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:838
+#: ../../mod/settings.php:968
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:839
+#: ../../mod/settings.php:969
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:840
+#: ../../mod/settings.php:970
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:841
+#: ../../mod/settings.php:971
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:842
+#: ../../mod/settings.php:972
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:843
+#: ../../mod/settings.php:973
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:844
+#: ../../mod/settings.php:974
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:845
+#: ../../mod/settings.php:975
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:848
+#: ../../mod/settings.php:978
 msgid "Advanced Page Settings"
 msgstr ""
 
@@ -2097,39 +2190,39 @@ msgstr ""
 msgid "Search Results For:"
 msgstr ""
 
-#: ../../mod/network.php:77 ../../mod/search.php:16
+#: ../../mod/network.php:82 ../../mod/search.php:16
 msgid "Remove term"
 msgstr ""
 
-#: ../../mod/network.php:86 ../../mod/search.php:13
+#: ../../mod/network.php:91 ../../mod/search.php:13
 msgid "Saved Searches"
 msgstr ""
 
-#: ../../mod/network.php:87 ../../include/group.php:216
+#: ../../mod/network.php:92 ../../include/group.php:216
 msgid "add"
 msgstr ""
 
-#: ../../mod/network.php:166
+#: ../../mod/network.php:171
 msgid "Commented Order"
 msgstr ""
 
-#: ../../mod/network.php:171
+#: ../../mod/network.php:176
 msgid "Posted Order"
 msgstr ""
 
-#: ../../mod/network.php:182
+#: ../../mod/network.php:187
 msgid "New"
 msgstr ""
 
-#: ../../mod/network.php:187
+#: ../../mod/network.php:192
 msgid "Starred"
 msgstr ""
 
-#: ../../mod/network.php:192
-msgid "Bookmarks"
+#: ../../mod/network.php:197
+msgid "Shared Links"
 msgstr ""
 
-#: ../../mod/network.php:250
+#: ../../mod/network.php:270
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
@@ -2137,42 +2230,103 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/network.php:253
+#: ../../mod/network.php:273
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:298
+#: ../../mod/network.php:318
 msgid "No such group"
 msgstr ""
 
-#: ../../mod/network.php:309
+#: ../../mod/network.php:329
 msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/network.php:313
+#: ../../mod/network.php:333
 msgid "Group: "
 msgstr ""
 
-#: ../../mod/network.php:323
+#: ../../mod/network.php:343
 msgid "Contact: "
 msgstr ""
 
-#: ../../mod/network.php:325
+#: ../../mod/network.php:345
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:330
+#: ../../mod/network.php:350
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1354
+#: ../../mod/notes.php:44 ../../boot.php:1426
 msgid "Personal Notes"
 msgstr ""
 
-#: ../../mod/notes.php:63 ../../include/text.php:645
+#: ../../mod/notes.php:63 ../../mod/filer.php:29
+#: ../../addon/facebook/facebook.php:673 ../../include/text.php:649
 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:60
+msgid "No recipient selected."
+msgstr ""
+
+#: ../../mod/wallmessage.php:59
+msgid "Unable to check your home location."
+msgstr ""
+
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:67
+msgid "Message could not be sent."
+msgstr ""
+
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:70
+msgid "Message collection failure."
+msgstr ""
+
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:73
+msgid "Message sent."
+msgstr ""
+
+#: ../../mod/wallmessage.php:86 ../../mod/wallmessage.php:95
+msgid "No recipient."
+msgstr ""
+
+#: ../../mod/wallmessage.php:124 ../../mod/message.php:170
+#: ../../include/conversation.php:914
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../mod/wallmessage.php:131 ../../mod/message.php:178
+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:179
+#: ../../mod/message.php:348
+msgid "To:"
+msgstr ""
+
+#: ../../mod/wallmessage.php:134 ../../mod/message.php:180
+#: ../../mod/message.php:349
+msgid "Subject:"
+msgstr ""
+
+#: ../../mod/wallmessage.php:140 ../../mod/message.php:184
+#: ../../mod/message.php:352 ../../mod/invite.php:113
+msgid "Your message:"
+msgstr ""
+
 #: ../../mod/newmember.php:6
 msgid "Welcome to Friendica"
 msgstr ""
@@ -2191,12 +2345,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 "
@@ -2204,61 +2365,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 "
@@ -2267,14 +2428,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."
@@ -2288,51 +2449,51 @@ msgstr ""
 msgid "Item was not found."
 msgstr ""
 
-#: ../../mod/group.php:27
+#: ../../mod/group.php:29
 msgid "Group created."
 msgstr ""
 
-#: ../../mod/group.php:33
+#: ../../mod/group.php:35
 msgid "Could not create group."
 msgstr ""
 
-#: ../../mod/group.php:43 ../../mod/group.php:127
+#: ../../mod/group.php:47 ../../mod/group.php:137
 msgid "Group not found."
 msgstr ""
 
-#: ../../mod/group.php:56
+#: ../../mod/group.php:60
 msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/group.php:67 ../../mod/profperm.php:19 ../../index.php:287
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:293
 msgid "Permission denied"
 msgstr ""
 
-#: ../../mod/group.php:85
+#: ../../mod/group.php:90
 msgid "Create a group of contacts/friends."
 msgstr ""
 
-#: ../../mod/group.php:86 ../../mod/group.php:166
+#: ../../mod/group.php:91 ../../mod/group.php:177
 msgid "Group Name: "
 msgstr ""
 
-#: ../../mod/group.php:102
+#: ../../mod/group.php:110
 msgid "Group removed."
 msgstr ""
 
-#: ../../mod/group.php:104
+#: ../../mod/group.php:112
 msgid "Unable to remove group."
 msgstr ""
 
-#: ../../mod/group.php:165
+#: ../../mod/group.php:176
 msgid "Group Editor"
 msgstr ""
 
-#: ../../mod/group.php:177
+#: ../../mod/group.php:189
 msgid "Members"
 msgstr ""
 
-#: ../../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 ""
 
@@ -2344,9 +2505,12 @@ msgstr ""
 msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../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-red/theme.php:237
+#: ../../view/theme/diabook-blue/theme.php:237
+#: ../../view/theme/diabook/theme.php:245
+#: ../../view/theme/diabook-aerith/theme.php:237
+#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76
+#: ../../include/nav.php:50 ../../boot.php:1408
 msgid "Profile"
 msgstr ""
 
@@ -2362,157 +2526,163 @@ msgstr ""
 msgid "No contacts."
 msgstr ""
 
-#: ../../mod/viewcontacts.php:74 ../../include/text.php:584
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:586
 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:252
+#: ../../mod/register.php:153 ../../mod/register.php:264
 msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: ../../mod/register.php:170
+#: ../../mod/register.php:163
+msgid ""
+"Nickname was once registered here and may not be re-used. Please choose "
+"another."
+msgstr ""
+
+#: ../../mod/register.php:182
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: ../../mod/register.php:238
+#: ../../mod/register.php:250
 msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: ../../mod/register.php:274
+#: ../../mod/register.php:286
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: ../../mod/register.php:378 ../../mod/regmod.php:52
+#: ../../mod/register.php:390 ../../mod/regmod.php:52
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
-#: ../../mod/register.php:386
+#: ../../mod/register.php:398
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/register.php:390
+#: ../../mod/register.php:402
 msgid "Failed to send email message. Here is the message that failed."
 msgstr ""
 
-#: ../../mod/register.php:395
+#: ../../mod/register.php:407
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/register.php:432
+#: ../../mod/register.php:444
 #, php-format
 msgid "Registration request at %s"
 msgstr ""
 
-#: ../../mod/register.php:441
+#: ../../mod/register.php:453
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/register.php:479
+#: ../../mod/register.php:491
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr ""
 
-#: ../../mod/register.php:505
+#: ../../mod/register.php:517
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/register.php:506
+#: ../../mod/register.php:518
 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:507
+#: ../../mod/register.php:519
 msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/register.php:521
+#: ../../mod/register.php:533
 msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/register.php:536
+#: ../../mod/register.php:553
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../mod/register.php:537
+#: ../../mod/register.php:554
 msgid "Your invitation ID: "
 msgstr ""
 
-#: ../../mod/register.php:540 ../../mod/admin.php:314
+#: ../../mod/register.php:557 ../../mod/admin.php:358
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/register.php:548
+#: ../../mod/register.php:565
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/register.php:549
+#: ../../mod/register.php:566
 msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/register.php:550
+#: ../../mod/register.php:567
 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:551
+#: ../../mod/register.php:568
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:554 ../../include/nav.php:77 ../../boot.php:693
+#: ../../mod/register.php:571 ../../include/nav.php:81 ../../boot.php:745
 msgid "Register"
 msgstr ""
 
@@ -2521,18 +2691,29 @@ msgid "People Search"
 msgstr ""
 
 #: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1092
+#: ../../addon/facebook/facebook.php:1440
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
-#: ../../include/diaspora.php:1600 ../../include/conversation.php:48
+#: ../../view/theme/diabook-red/theme.php:77
+#: ../../view/theme/diabook-red/theme.php:86
+#: ../../view/theme/diabook-blue/theme.php:77
+#: ../../view/theme/diabook-blue/theme.php:86
+#: ../../view/theme/diabook/theme.php:81 ../../view/theme/diabook/theme.php:90
+#: ../../view/theme/diabook-aerith/theme.php:77
+#: ../../view/theme/diabook-aerith/theme.php:86
+#: ../../include/diaspora.php:1650 ../../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:1096
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1444
 #: ../../addon/communityhome/communityhome.php:172
-#: ../../include/diaspora.php:1616 ../../include/conversation.php:65
+#: ../../view/theme/diabook-red/theme.php:91
+#: ../../view/theme/diabook-blue/theme.php:91
+#: ../../view/theme/diabook/theme.php:95
+#: ../../view/theme/diabook-aerith/theme.php:91
+#: ../../include/diaspora.php:1666 ../../include/conversation.php:65
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
@@ -2543,13 +2724,12 @@ 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:522 ../../mod/admin.php:700 ../../mod/display.php:29
-#: ../../mod/display.php:137 ../../mod/viewd.php:14
-#: ../../include/items.php:2942
+#: ../../mod/admin.php:566 ../../mod/admin.php:745 ../../mod/display.php:37
+#: ../../mod/display.php:142 ../../include/items.php:3030
 msgid "Item not found."
 msgstr ""
 
-#: ../../mod/viewsrc.php:7 ../../mod/viewd.php:6
+#: ../../mod/viewsrc.php:7
 msgid "Access denied."
 msgstr ""
 
@@ -2557,12 +2737,12 @@ msgstr ""
 msgid "Account approved."
 msgstr ""
 
-#: ../../mod/regmod.php:93
+#: ../../mod/regmod.php:98
 #, php-format
 msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../mod/regmod.php:105
+#: ../../mod/regmod.php:110
 msgid "Please login."
 msgstr ""
 
@@ -2574,96 +2754,96 @@ msgstr ""
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:351 ../../mod/wall_upload.php:81
+#: ../../mod/item.php:373 ../../mod/wall_upload.php:81
 #: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97
-#: ../../include/message.php:143
+#: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/item.php:833
+#: ../../mod/item.php:763
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:858
+#: ../../mod/item.php:788
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: ../../mod/item.php:860
+#: ../../mod/item.php:790
 #, php-format
 msgid "You may visit them online at %s"
 msgstr ""
 
-#: ../../mod/item.php:861
+#: ../../mod/item.php:791
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""
 
-#: ../../mod/item.php:863
+#: ../../mod/item.php:793
 #, php-format
 msgid "%s posted an update."
 msgstr ""
 
-#: ../../mod/profile_photo.php:28
+#: ../../mod/profile_photo.php:30
 msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: ../../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 ""
 
-#: ../../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 ""
 
-#: ../../mod/profile_photo.php:99
+#: ../../mod/profile_photo.php:101
 msgid "Unable to process image"
 msgstr ""
 
-#: ../../mod/profile_photo.php:113 ../../mod/wall_upload.php:56
+#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:56
 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr ""
 
-#: ../../mod/profile_photo.php:203
+#: ../../mod/profile_photo.php:207
 msgid "Upload File:"
 msgstr ""
 
-#: ../../mod/profile_photo.php:204
+#: ../../mod/profile_photo.php:208
 msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../mod/profile_photo.php:205
+#: ../../mod/profile_photo.php:209
 msgid "Upload"
 msgstr ""
 
-#: ../../mod/profile_photo.php:206
+#: ../../mod/profile_photo.php:211
 msgid "skip this step"
 msgstr ""
 
-#: ../../mod/profile_photo.php:206
+#: ../../mod/profile_photo.php:211
 msgid "select a photo from your photo albums"
 msgstr ""
 
-#: ../../mod/profile_photo.php:219
+#: ../../mod/profile_photo.php:224
 msgid "Crop Image"
 msgstr ""
 
-#: ../../mod/profile_photo.php:220
+#: ../../mod/profile_photo.php:225
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: ../../mod/profile_photo.php:221
+#: ../../mod/profile_photo.php:227
 msgid "Done Editing"
 msgstr ""
 
-#: ../../mod/profile_photo.php:249
+#: ../../mod/profile_photo.php:255
 msgid "Image uploaded successfully."
 msgstr ""
 
@@ -2685,88 +2865,71 @@ msgstr ""
 msgid "Please enter your password for verification:"
 msgstr ""
 
-#: ../../mod/message.php:23
-msgid "No recipient selected."
+#: ../../mod/message.php:22 ../../include/nav.php:131
+msgid "New Message"
 msgstr ""
 
-#: ../../mod/message.php:26
+#: ../../mod/message.php:64
 msgid "Unable to locate contact information."
 msgstr ""
 
-#: ../../mod/message.php:29
-msgid "Message could not be sent."
-msgstr ""
-
-#: ../../mod/message.php:32
-msgid "Message collection failure."
-msgstr ""
-
-#: ../../mod/message.php:35
-msgid "Message sent."
-msgstr ""
-
-#: ../../mod/message.php:55
-msgid "Inbox"
-msgstr ""
-
-#: ../../mod/message.php:60
-msgid "Outbox"
-msgstr ""
-
-#: ../../mod/message.php:65
-msgid "New Message"
-msgstr ""
-
-#: ../../mod/message.php:91
+#: ../../mod/message.php:118
 msgid "Message deleted."
 msgstr ""
 
-#: ../../mod/message.php:121
+#: ../../mod/message.php:148
 msgid "Conversation removed."
 msgstr ""
 
-#: ../../mod/message.php:137 ../../include/conversation.php:887
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: ../../mod/message.php:145
-msgid "Send Private Message"
-msgstr ""
-
-#: ../../mod/message.php:146 ../../mod/message.php:287
-msgid "To:"
+#: ../../mod/message.php:220
+msgid "No messages."
 msgstr ""
 
-#: ../../mod/message.php:147 ../../mod/message.php:288
-msgid "Subject:"
+#: ../../mod/message.php:227
+#, php-format
+msgid "Unknown sender - %s"
 msgstr ""
 
-#: ../../mod/message.php:150 ../../mod/message.php:291
-#: ../../mod/invite.php:101
-msgid "Your message:"
+#: ../../mod/message.php:230
+#, php-format
+msgid "You and %s"
 msgstr ""
 
-#: ../../mod/message.php:188
-msgid "No messages."
+#: ../../mod/message.php:233
+#, php-format
+msgid "%s and You"
 msgstr ""
 
-#: ../../mod/message.php:201
+#: ../../mod/message.php:243 ../../mod/message.php:341
 msgid "Delete conversation"
 msgstr ""
 
-#: ../../mod/message.php:204
+#: ../../mod/message.php:246
 msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: ../../mod/message.php:239
+#: ../../mod/message.php:248
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/message.php:283
 msgid "Message not available."
 msgstr ""
 
-#: ../../mod/message.php:276
+#: ../../mod/message.php:325
 msgid "Delete message"
 msgstr ""
 
-#: ../../mod/message.php:286
+#: ../../mod/message.php:343
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr ""
+
+#: ../../mod/message.php:347
 msgid "Send Reply"
 msgstr ""
 
@@ -2779,23 +2942,23 @@ msgstr ""
 msgid "No friends to display."
 msgstr ""
 
-#: ../../mod/admin.php:71 ../../mod/admin.php:312
+#: ../../mod/admin.php:71 ../../mod/admin.php:356
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:72 ../../mod/admin.php:480 ../../mod/admin.php:492
+#: ../../mod/admin.php:72 ../../mod/admin.php:524 ../../mod/admin.php:536
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:73 ../../mod/admin.php:569 ../../mod/admin.php:608
+#: ../../mod/admin.php:73 ../../mod/admin.php:613 ../../mod/admin.php:653
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:74 ../../mod/admin.php:742 ../../mod/admin.php:775
+#: ../../mod/admin.php:74 ../../mod/admin.php:791 ../../mod/admin.php:825
 msgid "Themes"
 msgstr ""
 
-#: ../../mod/admin.php:89 ../../mod/admin.php:855
+#: ../../mod/admin.php:89 ../../mod/admin.php:905
 msgid "Logs"
 msgstr ""
 
@@ -2803,501 +2966,534 @@ msgstr ""
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../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:157 ../../mod/admin.php:355 ../../mod/admin.php:523
+#: ../../mod/admin.php:612 ../../mod/admin.php:652 ../../mod/admin.php:790
+#: ../../mod/admin.php:824 ../../mod/admin.php:904
 msgid "Administration"
 msgstr ""
 
-#: ../../mod/admin.php:162
+#: ../../mod/admin.php:158
 msgid "Summary"
 msgstr ""
 
-#: ../../mod/admin.php:163
+#: ../../mod/admin.php:159
 msgid "Registered users"
 msgstr ""
 
-#: ../../mod/admin.php:165
+#: ../../mod/admin.php:161
 msgid "Pending registrations"
 msgstr ""
 
-#: ../../mod/admin.php:166
+#: ../../mod/admin.php:162
 msgid "Version"
 msgstr ""
 
-#: ../../mod/admin.php:168
+#: ../../mod/admin.php:164
 msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:260
+#: ../../mod/admin.php:298
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:304
+#: ../../mod/admin.php:342
 msgid "Closed"
 msgstr ""
 
-#: ../../mod/admin.php:305
+#: ../../mod/admin.php:343
 msgid "Requires approval"
 msgstr ""
 
-#: ../../mod/admin.php:306
+#: ../../mod/admin.php:344
 msgid "Open"
 msgstr ""
 
-#: ../../mod/admin.php:315
+#: ../../mod/admin.php:348
+msgid "No SSL policy, links will track page SSL state"
+msgstr ""
+
+#: ../../mod/admin.php:349
+msgid "Force all links to use SSL"
+msgstr ""
+
+#: ../../mod/admin.php:350
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+msgstr ""
+
+#: ../../mod/admin.php:359
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:316
+#: ../../mod/admin.php:360
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:317
+#: ../../mod/admin.php:361
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:321 ../../addon/statusnet/statusnet.php:523
+#: ../../mod/admin.php:365 ../../addon/statusnet/statusnet.php:538
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:322
+#: ../../mod/admin.php:366
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:323
+#: ../../mod/admin.php:367
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:324
+#: ../../mod/admin.php:368
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:324
+#: ../../mod/admin.php:368
 msgid "Default system theme - may be over-ridden by user profiles"
 msgstr ""
 
-#: ../../mod/admin.php:326
+#: ../../mod/admin.php:369
+msgid "SSL link policy"
+msgstr ""
+
+#: ../../mod/admin.php:369
+msgid "Determines whether generated links should be forced to use SSL"
+msgstr ""
+
+#: ../../mod/admin.php:370
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:326
+#: ../../mod/admin.php:370
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:328
+#: ../../mod/admin.php:372
 msgid "Register policy"
 msgstr ""
 
-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:373
 msgid "Register text"
 msgstr ""
 
-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:373
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:330
+#: ../../mod/admin.php:374
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:330
+#: ../../mod/admin.php:374
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:331
+#: ../../mod/admin.php:375
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/admin.php:331
+#: ../../mod/admin.php:375
 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:332
+#: ../../mod/admin.php:376
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:332
+#: ../../mod/admin.php:376
 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:333
+#: ../../mod/admin.php:377
 msgid "Block public"
 msgstr ""
 
-#: ../../mod/admin.php:333
+#: ../../mod/admin.php:377
 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:334
+#: ../../mod/admin.php:378
 msgid "Force publish"
 msgstr ""
 
-#: ../../mod/admin.php:334
+#: ../../mod/admin.php:378
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:335
+#: ../../mod/admin.php:379
 msgid "Global directory update URL"
 msgstr ""
 
-#: ../../mod/admin.php:335
+#: ../../mod/admin.php:379
 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:337
+#: ../../mod/admin.php:381
 msgid "Block multiple registrations"
 msgstr ""
 
-#: ../../mod/admin.php:337
+#: ../../mod/admin.php:381
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: ../../mod/admin.php:338
+#: ../../mod/admin.php:382
 msgid "OpenID support"
 msgstr ""
 
-#: ../../mod/admin.php:338
+#: ../../mod/admin.php:382
 msgid "OpenID support for registration and logins."
 msgstr ""
 
-#: ../../mod/admin.php:339
+#: ../../mod/admin.php:383
 msgid "Gravatar support"
 msgstr ""
 
-#: ../../mod/admin.php:339
+#: ../../mod/admin.php:383
 msgid "Search new user's photo on Gravatar."
 msgstr ""
 
-#: ../../mod/admin.php:340
+#: ../../mod/admin.php:384
 msgid "Fullname check"
 msgstr ""
 
-#: ../../mod/admin.php:340
+#: ../../mod/admin.php:384
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr ""
 
-#: ../../mod/admin.php:341
+#: ../../mod/admin.php:385
 msgid "UTF-8 Regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:341
+#: ../../mod/admin.php:385
 msgid "Use PHP UTF8 regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:342
+#: ../../mod/admin.php:386
 msgid "Show Community Page"
 msgstr ""
 
-#: ../../mod/admin.php:342
+#: ../../mod/admin.php:386
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr ""
 
-#: ../../mod/admin.php:343
+#: ../../mod/admin.php:387
 msgid "Enable OStatus support"
 msgstr ""
 
-#: ../../mod/admin.php:343
+#: ../../mod/admin.php:387
 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:344
+#: ../../mod/admin.php:388
 msgid "Enable Diaspora support"
 msgstr ""
 
-#: ../../mod/admin.php:344
+#: ../../mod/admin.php:388
 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: ../../mod/admin.php:345
+#: ../../mod/admin.php:389
 msgid "Only allow Friendica contacts"
 msgstr ""
 
-#: ../../mod/admin.php:345
+#: ../../mod/admin.php:389
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""
 
-#: ../../mod/admin.php:346
+#: ../../mod/admin.php:390
 msgid "Verify SSL"
 msgstr ""
 
-#: ../../mod/admin.php:346
+#: ../../mod/admin.php:390
 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:347
+#: ../../mod/admin.php:391
 msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/admin.php:348
+#: ../../mod/admin.php:392
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:349
+#: ../../mod/admin.php:393
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:349
+#: ../../mod/admin.php:393
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:370
+#: ../../mod/admin.php:414
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:377
+#: ../../mod/admin.php:421
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:411
+#: ../../mod/admin.php:455
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:418
+#: ../../mod/admin.php:462
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:418
+#: ../../mod/admin.php:462
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:526
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:527
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:484
+#: ../../mod/admin.php:528
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:484 ../../mod/admin.php:493
+#: ../../mod/admin.php:528 ../../mod/admin.php:537
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr ""
 
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:529
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:487
+#: ../../mod/admin.php:531
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:493
+#: ../../mod/admin.php:537
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:493
+#: ../../mod/admin.php:537
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:493
+#: ../../mod/admin.php:537
 msgid "Last item"
 msgstr ""
 
-#: ../../mod/admin.php:493
+#: ../../mod/admin.php:537
 msgid "Account"
 msgstr ""
 
-#: ../../mod/admin.php:495
+#: ../../mod/admin.php:539
 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:496
+#: ../../mod/admin.php:540
 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:532
+#: ../../mod/admin.php:576
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:536
+#: ../../mod/admin.php:580
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:546 ../../mod/admin.php:724
+#: ../../mod/admin.php:590 ../../mod/admin.php:769
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:548 ../../mod/admin.php:726
+#: ../../mod/admin.php:592 ../../mod/admin.php:771
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:570 ../../mod/admin.php:743
+#: ../../mod/admin.php:614 ../../mod/admin.php:792
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:571 ../../mod/admin.php:744 ../../include/nav.php:130
+#: ../../mod/admin.php:615 ../../mod/admin.php:793 ../../include/nav.php:137
 msgid "Settings"
 msgstr ""
 
-#: ../../mod/admin.php:578 ../../mod/admin.php:753
+#: ../../mod/admin.php:622 ../../mod/admin.php:802
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:579 ../../mod/admin.php:754
+#: ../../mod/admin.php:623 ../../mod/admin.php:803
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:689
+#: ../../mod/admin.php:734
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:780
+#: ../../mod/admin.php:784
+msgid "Screenshot"
+msgstr ""
+
+#: ../../mod/admin.php:830
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:781
+#: ../../mod/admin.php:831
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:804
+#: ../../mod/admin.php:854
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:857
+#: ../../mod/admin.php:907
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:863
+#: ../../mod/admin.php:913
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:864
+#: ../../mod/admin.php:914
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:864
+#: ../../mod/admin.php:914
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: ../../mod/admin.php:865
+#: ../../mod/admin.php:915
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:906
+#: ../../mod/admin.php:956
 msgid "Close"
 msgstr ""
 
-#: ../../mod/admin.php:912
+#: ../../mod/admin.php:962
 msgid "FTP Host"
 msgstr ""
 
-#: ../../mod/admin.php:913
+#: ../../mod/admin.php:963
 msgid "FTP Path"
 msgstr ""
 
-#: ../../mod/admin.php:914
+#: ../../mod/admin.php:964
 msgid "FTP User"
 msgstr ""
 
-#: ../../mod/admin.php:915
+#: ../../mod/admin.php:965
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:15 ../../boot.php:845
+#: ../../mod/profile.php:20 ../../boot.php:901
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../mod/profile.php:111 ../../mod/display.php:67
+#: ../../mod/profile.php:123 ../../mod/display.php:75
 msgid "Access to this profile has been restricted."
 msgstr ""
 
-#: ../../mod/profile.php:131
+#: ../../mod/profile.php:144
 msgid "Tips for New Members"
 msgstr ""
 
-#: ../../mod/ping.php:174
+#: ../../mod/ping.php:175
 msgid "{0} wants to be your friend"
 msgstr ""
 
-#: ../../mod/ping.php:179
+#: ../../mod/ping.php:180
 msgid "{0} sent you a message"
 msgstr ""
 
-#: ../../mod/ping.php:184
+#: ../../mod/ping.php:185
 msgid "{0} requested registration"
 msgstr ""
 
-#: ../../mod/ping.php:190
+#: ../../mod/ping.php:191
 #, php-format
 msgid "{0} commented %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:195
+#: ../../mod/ping.php:196
 #, php-format
 msgid "{0} liked %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:200
+#: ../../mod/ping.php:201
 #, php-format
 msgid "{0} disliked %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:205
+#: ../../mod/ping.php:206
 #, php-format
 msgid "{0} is now friends with %s"
 msgstr ""
 
-#: ../../mod/ping.php:210
+#: ../../mod/ping.php:211
 msgid "{0} posted"
 msgstr ""
 
-#: ../../mod/ping.php:215
+#: ../../mod/ping.php:216
 #, php-format
 msgid "{0} tagged %s's post with #%s"
 msgstr ""
 
-#: ../../mod/ping.php:221
+#: ../../mod/ping.php:222
 msgid "{0} mentioned you in a post"
 msgstr ""
 
-#: ../../mod/openid.php:63 ../../mod/openid.php:77 ../../include/auth.php:90
-#: ../../include/auth.php:115 ../../include/auth.php:169
+#: ../../mod/openid.php:24
+msgid "OpenID protocol error. No ID returned."
+msgstr ""
+
+#: ../../mod/openid.php:53
+msgid ""
+"Account not found and OpenID registration is not permitted on this site."
+msgstr ""
+
+#: ../../mod/openid.php:93 ../../include/auth.php:90
+#: ../../include/auth.php:153
 msgid "Login failed."
 msgstr ""
 
@@ -3354,7 +3550,7 @@ msgstr ""
 msgid "No friends in common."
 msgstr ""
 
-#: ../../mod/display.php:130
+#: ../../mod/display.php:135
 msgid "Item has been removed."
 msgstr ""
 
@@ -3370,222 +3566,233 @@ msgstr ""
 msgid "Search This Site"
 msgstr ""
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:239
-#: ../../mod/profiles.php:344 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:242
+#: ../../mod/profiles.php:356 ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr ""
 
-#: ../../mod/profiles.php:28
+#: ../../mod/profiles.php:31
 msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/profiles.php:198
+#: ../../mod/profiles.php:201
 msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/profiles.php:256
+#: ../../mod/profiles.php:261
 msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/profiles.php:272 ../../mod/profiles.php:303
+#: ../../mod/profiles.php:279 ../../mod/profiles.php:313
 msgid "Profile-"
 msgstr ""
 
-#: ../../mod/profiles.php:291 ../../mod/profiles.php:330
+#: ../../mod/profiles.php:298 ../../mod/profiles.php:340
 msgid "New profile created."
 msgstr ""
 
-#: ../../mod/profiles.php:309
+#: ../../mod/profiles.php:319
 msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/profiles.php:356
+#: ../../mod/profiles.php:368
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/profiles.php:374
+#: ../../mod/profiles.php:389
 msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/profiles.php:376
+#: ../../mod/profiles.php:391
 msgid "View this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:377
+#: ../../mod/profiles.php:392
 msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/profiles.php:378
+#: ../../mod/profiles.php:393
 msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:379
+#: ../../mod/profiles.php:394
 msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:380
+#: ../../mod/profiles.php:395
 msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:381
+#: ../../mod/profiles.php:396
 msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:382
+#: ../../mod/profiles.php:397
 msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/profiles.php:383
+#: ../../mod/profiles.php:398
 msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/profiles.php:384
+#: ../../mod/profiles.php:399
 #, php-format
 msgid "Birthday (%s):"
 msgstr ""
 
-#: ../../mod/profiles.php:385
+#: ../../mod/profiles.php:400
 msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/profiles.php:386
+#: ../../mod/profiles.php:401
 msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/profiles.php:387
+#: ../../mod/profiles.php:402
 msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/profiles.php:388
+#: ../../mod/profiles.php:403
 msgid "Country:"
 msgstr ""
 
-#: ../../mod/profiles.php:389
+#: ../../mod/profiles.php:404
 msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/profiles.php:390
+#: ../../mod/profiles.php:405
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: ../../mod/profiles.php:391
+#: ../../mod/profiles.php:406
 msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/profiles.php:392
+#: ../../mod/profiles.php:407
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/profiles.php:393 ../../include/profile_advanced.php:43
+#: ../../mod/profiles.php:408 ../../include/profile_advanced.php:43
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../mod/profiles.php:394
+#: ../../mod/profiles.php:409
 msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:49
+#: ../../mod/profiles.php:410 ../../include/profile_advanced.php:49
 msgid "Political Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:396
+#: ../../mod/profiles.php:411
 msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:397
+#: ../../mod/profiles.php:412
 msgid "Public Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:398
+#: ../../mod/profiles.php:413
 msgid "Private Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:399
+#: ../../mod/profiles.php:414
 msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/profiles.php:400
+#: ../../mod/profiles.php:415
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: ../../mod/profiles.php:401
+#: ../../mod/profiles.php:416
 msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: ../../mod/profiles.php:402
+#: ../../mod/profiles.php:417
 msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/profiles.php:403
+#: ../../mod/profiles.php:418
 msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:404
+#: ../../mod/profiles.php:419
 msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/profiles.php:405
+#: ../../mod/profiles.php:420
 msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/profiles.php:406
+#: ../../mod/profiles.php:421
 msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/profiles.php:407
+#: ../../mod/profiles.php:422
 msgid "Television"
 msgstr ""
 
-#: ../../mod/profiles.php:408
+#: ../../mod/profiles.php:423
 msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/profiles.php:409
+#: ../../mod/profiles.php:424
 msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/profiles.php:410
+#: ../../mod/profiles.php:425
 msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/profiles.php:411
+#: ../../mod/profiles.php:426
 msgid "School/education"
 msgstr ""
 
-#: ../../mod/profiles.php:416
+#: ../../mod/profiles.php:431
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/profiles.php:426 ../../mod/directory.php:124
+#: ../../mod/profiles.php:441 ../../mod/directory.php:111
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:461
+#: ../../mod/profiles.php:476 ../../view/theme/diabook-red/theme.php:294
+#: ../../view/theme/diabook-blue/theme.php:293
+#: ../../view/theme/diabook/theme.php:303
+#: ../../view/theme/diabook-aerith/theme.php:293
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:462 ../../boot.php:946
+#: ../../mod/profiles.php:477 ../../boot.php:1008
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:463 ../../boot.php:947
+#: ../../mod/profiles.php:478 ../../boot.php:1009
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:473 ../../boot.php:957
+#: ../../mod/profiles.php:489 ../../boot.php:1019
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:475 ../../boot.php:960
+#: ../../mod/profiles.php:491 ../../boot.php:1022
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:476 ../../boot.php:961
+#: ../../mod/profiles.php:492 ../../boot.php:1023
 msgid "Edit visibility"
 msgstr ""
 
+#: ../../mod/filer.php:28 ../../include/conversation.php:918
+msgid "Save to Folder:"
+msgstr ""
+
+#: ../../mod/filer.php:28
+msgid "- select -"
+msgstr ""
+
 #: ../../mod/tagger.php:103 ../../include/conversation.php:138
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
@@ -3626,7 +3833,11 @@ msgstr ""
 msgid "No entries."
 msgstr ""
 
-#: ../../mod/suggest.php:38 ../../include/contact_widgets.php:35
+#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:146
+#: ../../view/theme/diabook-blue/theme.php:146
+#: ../../view/theme/diabook/theme.php:150
+#: ../../view/theme/diabook-aerith/theme.php:146
+#: ../../include/contact_widgets.php:33
 msgid "Friend Suggestions"
 msgstr ""
 
@@ -3640,31 +3851,26 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../mod/directory.php:51
+#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:144
+#: ../../view/theme/diabook-blue/theme.php:144
+#: ../../view/theme/diabook/theme.php:148
+#: ../../view/theme/diabook-aerith/theme.php:144
 msgid "Global Directory"
 msgstr ""
 
-#: ../../mod/directory.php:57
-msgid "Normal site view"
-msgstr ""
-
-#: ../../mod/directory.php:59
-msgid "Admin - View all site entries"
-msgstr ""
-
-#: ../../mod/directory.php:65
+#: ../../mod/directory.php:55
 msgid "Find on this site"
 msgstr ""
 
-#: ../../mod/directory.php:68
+#: ../../mod/directory.php:58
 msgid "Site Directory"
 msgstr ""
 
-#: ../../mod/directory.php:127
+#: ../../mod/directory.php:114
 msgid "Gender: "
 msgstr ""
 
-#: ../../mod/directory.php:153
+#: ../../mod/directory.php:140
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
@@ -3674,8 +3880,7 @@ msgid "%s : Not a valid email address."
 msgstr ""
 
 #: ../../mod/invite.php:59
-#, php-format
-msgid "Please join my network on %s"
+msgid "Please join us on Friendica"
 msgstr ""
 
 #: ../../mod/invite.php:69
@@ -3694,179 +3899,212 @@ msgstr[1] ""
 msgid "You have no more invitations available"
 msgstr ""
 
-#: ../../mod/invite.php:99
-msgid "Send invitations"
-msgstr ""
-
 #: ../../mod/invite.php:100
-msgid "Enter email addresses, one per line:"
+#, 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 ""
 
 #: ../../mod/invite.php:102
 #, php-format
-msgid "Please join my social network on %s"
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
 msgstr ""
 
 #: ../../mod/invite.php:103
-msgid "To accept this invitation, please visit:"
+#, 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 ""
 
-#: ../../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 ""
+
+#: ../../mod/invite.php:111
+msgid "Send invitations"
+msgstr ""
+
+#: ../../mod/invite.php:112
+msgid "Enter email addresses, one per line:"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../mod/invite.php:116
 msgid "You will need to supply this invitation code: $invite_code"
 msgstr ""
 
-#: ../../mod/invite.php:104
+#: ../../mod/invite.php:116
 msgid ""
 "Once you have registered, please connect with me via my profile page at:"
 msgstr ""
 
+#: ../../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 ""
+
 #: ../../mod/dfrn_confirm.php:119
 msgid ""
 "This may occasionally happen if contact was requested by both persons and it "
 "has already been approved."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:239
+#: ../../mod/dfrn_confirm.php:242
 msgid "Response from remote site was not understood."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:248
+#: ../../mod/dfrn_confirm.php:251
 msgid "Unexpected response from remote site: "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:256
+#: ../../mod/dfrn_confirm.php:259
 msgid "Confirmation completed successfully."
 msgstr ""
 
-#: ../../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 ""
 
-#: ../../mod/dfrn_confirm.php:270
+#: ../../mod/dfrn_confirm.php:273
 msgid "Temporary failure. Please wait and try again."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:277
+#: ../../mod/dfrn_confirm.php:280
 msgid "Introduction failed or was revoked."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:422
+#: ../../mod/dfrn_confirm.php:425
 msgid "Unable to set contact photo."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:474 ../../include/diaspora.php:495
+#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:503
 #: ../../include/conversation.php:101
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:544
+#: ../../mod/dfrn_confirm.php:548
 #, php-format
 msgid "No user record found for '%s' "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:554
+#: ../../mod/dfrn_confirm.php:558
 msgid "Our site encryption key is apparently messed up."
 msgstr ""
 
-#: ../../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 ""
 
-#: ../../mod/dfrn_confirm.php:586
+#: ../../mod/dfrn_confirm.php:590
 msgid "Contact record was not found for you on our site."
 msgstr ""
 
-#: ../../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 ""
 
-#: ../../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 ""
 
-#: ../../mod/dfrn_confirm.php:631
+#: ../../mod/dfrn_confirm.php:635
 msgid "Unable to set your contact credentials on our system."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:694
+#: ../../mod/dfrn_confirm.php:700
 msgid "Unable to update your contact profile details on our system"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:724
+#: ../../mod/dfrn_confirm.php:730
 #, php-format
 msgid "Connection accepted at %s"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:338
+#: ../../addon/facebook/facebook.php:462
 msgid "Facebook disabled"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:343
+#: ../../addon/facebook/facebook.php:467
 msgid "Updating contacts"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:352
+#: ../../addon/facebook/facebook.php:488
 msgid "Facebook API key is missing."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:359
+#: ../../addon/facebook/facebook.php:495
 msgid "Facebook Connect"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:365
+#: ../../addon/facebook/facebook.php:501
 msgid "Install Facebook connector for this account."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:372
+#: ../../addon/facebook/facebook.php:508
 msgid "Remove Facebook connector"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:377
+#: ../../addon/facebook/facebook.php:513
 msgid ""
 "Re-authenticate [This is necessary whenever your Facebook password is "
 "changed.]"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:384
+#: ../../addon/facebook/facebook.php:520
 msgid "Post to Facebook by default"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:388
+#: ../../addon/facebook/facebook.php:524
 msgid "Link all your Facebook friends and conversations on this website"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:390
+#: ../../addon/facebook/facebook.php:526
 msgid ""
 "Facebook conversations consist of your <em>profile wall</em> and your friend "
 "<em>stream</em>."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:391
+#: ../../addon/facebook/facebook.php:527
 msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:392
+#: ../../addon/facebook/facebook.php:528
 msgid ""
 "The following settings determine the privacy of your Facebook profile wall "
 "on this website."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:396
+#: ../../addon/facebook/facebook.php:532
 msgid ""
 "On this website your Facebook profile wall conversations will only be "
 "visible to you"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:401
+#: ../../addon/facebook/facebook.php:537
 msgid "Do not import your Facebook profile wall conversations"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:403
+#: ../../addon/facebook/facebook.php:539
 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 "
@@ -3874,43 +4112,125 @@ msgid ""
 "who may see the conversations."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:408
+#: ../../addon/facebook/facebook.php:544
 msgid "Comma separated applications to ignore"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:476
+#: ../../addon/facebook/facebook.php:615
+msgid "Problems with Facebook Real-Time Updates"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:639
 #: ../../include/contact_selectors.php:81
 msgid "Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:477
+#: ../../addon/facebook/facebook.php:640
 msgid "Facebook Connector Settings"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:491
+#: ../../addon/facebook/facebook.php:649
+msgid "Facebook API Key"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:658
+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:663
+msgid ""
+"Error: the given API Key seems to be incorrect (the application access token "
+"could not be retrieved)."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:665
+msgid "The given API Key seems to work correctly."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:667
+msgid ""
+"The correctness of the API Key could not be detected. Somthing strange's "
+"going on."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:670
+msgid "App-ID / API-Key"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:671
+msgid "Application secret"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:672
+#, php-format
+msgid "Polling Interval (min. %1$s minutes)"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:676
+msgid "Real-Time Updates"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:680
+msgid "Real-Time Updates are activated."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:681
+msgid "Deactivate Real-Time Updates"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:683
+msgid "Real-Time Updates not activated."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:683
+msgid "Activate Real-Time Updates"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:697
+msgid "The new values have been saved."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:716
 msgid "Post to Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:582
+#: ../../addon/facebook/facebook.php:808
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:651
-msgid "Image: "
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:728
+#: ../../addon/facebook/facebook.php:1026
 msgid "View on Friendica"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:752
+#: ../../addon/facebook/facebook.php:1051
 msgid "Facebook post failed. Queued for retry."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:877 ../../addon/facebook/facebook.php:886
-#: ../../include/bb2diaspora.php:102
+#: ../../addon/facebook/facebook.php:1087
+msgid "Your Facebook connection became invalid. Please Re-authenticate."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:1088
+msgid "Facebook connection became invalid"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:1089
+#, 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/facebook/facebook.php:1214
+#: ../../addon/facebook/facebook.php:1223 ../../include/bb2diaspora.php:102
 msgid "link"
 msgstr ""
 
@@ -3928,15 +4248,15 @@ msgid_plural "%d people don't like this"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../addon/widgets/widgets.php:55
+#: ../../addon/widgets/widgets.php:56
 msgid "Generate new key"
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:58
+#: ../../addon/widgets/widgets.php:59
 msgid "Widgets key"
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:60
+#: ../../addon/widgets/widgets.php:61
 msgid "Widgets available"
 msgstr ""
 
@@ -3968,40 +4288,50 @@ msgstr ""
 msgid "yourls Settings saved."
 msgstr ""
 
-#: ../../addon/ljpost/ljpost.php:38
+#: ../../addon/ljpost/ljpost.php:39
 msgid "Post to LiveJournal"
 msgstr ""
 
-#: ../../addon/ljpost/ljpost.php:69
+#: ../../addon/ljpost/ljpost.php:70
 msgid "LiveJournal Post Settings"
 msgstr ""
 
-#: ../../addon/ljpost/ljpost.php:71
+#: ../../addon/ljpost/ljpost.php:72
 msgid "Enable LiveJournal Post Plugin"
 msgstr ""
 
-#: ../../addon/ljpost/ljpost.php:76
+#: ../../addon/ljpost/ljpost.php:77
 msgid "LiveJournal username"
 msgstr ""
 
-#: ../../addon/ljpost/ljpost.php:81
+#: ../../addon/ljpost/ljpost.php:82
 msgid "LiveJournal password"
 msgstr ""
 
-#: ../../addon/ljpost/ljpost.php:86
+#: ../../addon/ljpost/ljpost.php:87
 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
@@ -4017,11 +4347,15 @@ msgstr ""
 msgid "%s - Click to open/close"
 msgstr ""
 
+#: ../../addon/page/page.php:47
+msgid "Forums"
+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:62 ../../boot.php:710
+#: ../../include/nav.php:64 ../../boot.php:766
 msgid "Login"
 msgstr ""
 
@@ -4031,7 +4365,8 @@ msgid "OpenID"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:38
-msgid "Last users"
+#: ../../addon/communityhome/twillingham/communityhome.php:38
+msgid "Latest users"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:81
@@ -4040,22 +4375,22 @@ msgid "Most active users"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:98
-msgid "Last photos"
+msgid "Latest photos"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:133
-msgid "Last likes"
+msgid "Latest likes"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:155 ../../include/text.php:1224
+#: ../../addon/communityhome/communityhome.php:155
+#: ../../view/theme/diabook-red/theme.php:74
+#: ../../view/theme/diabook-blue/theme.php:74
+#: ../../view/theme/diabook/theme.php:78
+#: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1292
 #: ../../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 ""
@@ -4142,27 +4477,27 @@ msgstr ""
 msgid "Enable Randplace Plugin"
 msgstr ""
 
-#: ../../addon/dwpost/dwpost.php:38
+#: ../../addon/dwpost/dwpost.php:39
 msgid "Post to Dreamwidth"
 msgstr ""
 
-#: ../../addon/dwpost/dwpost.php:69
+#: ../../addon/dwpost/dwpost.php:70
 msgid "Dreamwidth Post Settings"
 msgstr ""
 
-#: ../../addon/dwpost/dwpost.php:71
+#: ../../addon/dwpost/dwpost.php:72
 msgid "Enable dreamwidth Post Plugin"
 msgstr ""
 
-#: ../../addon/dwpost/dwpost.php:76
+#: ../../addon/dwpost/dwpost.php:77
 msgid "dreamwidth username"
 msgstr ""
 
-#: ../../addon/dwpost/dwpost.php:81
+#: ../../addon/dwpost/dwpost.php:82
 msgid "dreamwidth password"
 msgstr ""
 
-#: ../../addon/dwpost/dwpost.php:86
+#: ../../addon/dwpost/dwpost.php:87
 msgid "Post to dreamwidth by default"
 msgstr ""
 
@@ -4202,7 +4537,7 @@ msgstr ""
 msgid "Post to Drupal by default"
 msgstr ""
 
-#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:172
+#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190
 #: ../../addon/posterous/posterous.php:173
 msgid "Post from Friendica"
 msgstr ""
@@ -4387,15 +4722,39 @@ msgstr ""
 msgid "Disable richtext status editor"
 msgstr ""
 
-#: ../../addon/pageheader/pageheader.php:47
+#: ../../addon/pageheader/pageheader.php:50
 msgid "\"pageheader\" Settings"
 msgstr ""
 
-#: ../../addon/pageheader/pageheader.php:65
+#: ../../addon/pageheader/pageheader.php:68
 msgid "pageheader Settings saved."
 msgstr ""
 
-#: ../../addon/viewsrc/viewsrc.php:25
+#: ../../addon/ijpost/ijpost.php:39
+msgid "Post to Insanejournal"
+msgstr ""
+
+#: ../../addon/ijpost/ijpost.php:70
+msgid "InsaneJournal Post Settings"
+msgstr ""
+
+#: ../../addon/ijpost/ijpost.php:72
+msgid "Enable InsaneJournal Post Plugin"
+msgstr ""
+
+#: ../../addon/ijpost/ijpost.php:77
+msgid "InsaneJournal username"
+msgstr ""
+
+#: ../../addon/ijpost/ijpost.php:82
+msgid "InsaneJournal password"
+msgstr ""
+
+#: ../../addon/ijpost/ijpost.php:87
+msgid "Post to InsaneJournal by default"
+msgstr ""
+
+#: ../../addon/viewsrc/viewsrc.php:37
 msgid "View Source"
 msgstr ""
 
@@ -4403,40 +4762,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 "
@@ -4445,19 +4804,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 "
@@ -4465,38 +4824,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 "
@@ -4504,19 +4863,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:539
 msgid "API URL"
 msgstr ""
 
@@ -4623,8 +4986,9 @@ msgstr ""
 msgid "Show More Settings saved."
 msgstr ""
 
-#: ../../addon/showmore/showmore.php:86
-msgid "Show More"
+#: ../../addon/showmore/showmore.php:86 ../../include/conversation.php:466
+#: ../../boot.php:495
+msgid "show more"
 msgstr ""
 
 #: ../../addon/piwik/piwik.php:79
@@ -4667,21 +5031,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 "
@@ -4690,22 +5054,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 "
@@ -4713,24 +5077,32 @@ 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:371
 msgid "Consumer key"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:358
+#: ../../addon/twitter/twitter.php:372
 msgid "Consumer secret"
 msgstr ""
 
-#: ../../addon/irc/irc.php:20
-msgid "irc Chatroom"
+#: ../../addon/irc/irc.php:25
+msgid "IRC Chatroom"
+msgstr ""
+
+#: ../../addon/irc/irc.php:46
+msgid "Popular Channels"
 msgstr ""
 
 #: ../../addon/posterous/posterous.php:36
@@ -4757,23 +5129,183 @@ msgstr ""
 msgid "Post to Posterous by default"
 msgstr ""
 
-#: ../../view/theme/quattro/theme.php:17
+#: ../../view/theme/diabook-red/theme.php:23
+#: ../../view/theme/diabook-blue/theme.php:23
+#: ../../view/theme/diabook/theme.php:27
+#: ../../view/theme/dispy-dark/theme.php:116
+#: ../../view/theme/diabook-aerith/theme.php:23
+msgid "Last users"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:52
+#: ../../view/theme/diabook-blue/theme.php:52
+#: ../../view/theme/diabook/theme.php:56
+#: ../../view/theme/diabook-aerith/theme.php:52
+msgid "Last likes"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:97
+#: ../../view/theme/diabook-blue/theme.php:97
+#: ../../view/theme/diabook/theme.php:101
+#: ../../view/theme/diabook-aerith/theme.php:97
+msgid "Last photos"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:142
+#: ../../view/theme/diabook-blue/theme.php:142
+#: ../../view/theme/diabook/theme.php:146
+#: ../../view/theme/diabook-aerith/theme.php:142
+msgid "Find Friends"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:143
+#: ../../view/theme/diabook-blue/theme.php:143
+#: ../../view/theme/diabook/theme.php:147
+#: ../../view/theme/diabook-aerith/theme.php:143
+msgid "Local Directory"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:145
+#: ../../view/theme/diabook-blue/theme.php:145
+#: ../../view/theme/diabook/theme.php:149
+#: ../../view/theme/diabook-aerith/theme.php:145
+#: ../../include/contact_widgets.php:34
+msgid "Similar Interests"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:147
+#: ../../view/theme/diabook-blue/theme.php:147
+#: ../../view/theme/diabook/theme.php:151
+#: ../../view/theme/diabook-aerith/theme.php:147
+#: ../../include/contact_widgets.php:35
+msgid "Invite Friends"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:162
+#: ../../view/theme/diabook-red/theme.php:243
+#: ../../view/theme/diabook-blue/theme.php:162
+#: ../../view/theme/diabook-blue/theme.php:243
+#: ../../view/theme/diabook/theme.php:167
+#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook-aerith/theme.php:162
+#: ../../view/theme/diabook-aerith/theme.php:243
+msgid "Community Pages"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:195
+#: ../../view/theme/diabook-blue/theme.php:195
+#: ../../view/theme/diabook/theme.php:200
+#: ../../view/theme/diabook-aerith/theme.php:195
+msgid "Help or @NewHere ?"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:201
+#: ../../view/theme/diabook-blue/theme.php:201
+#: ../../view/theme/diabook/theme.php:206
+#: ../../view/theme/diabook-aerith/theme.php:201
+msgid "Connect Services"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:207
+#: ../../view/theme/diabook-blue/theme.php:207
+#: ../../view/theme/diabook/theme.php:212
+#: ../../view/theme/diabook-aerith/theme.php:207
+msgid "PostIt to Friendica"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:207
+#: ../../view/theme/diabook-blue/theme.php:207
+#: ../../view/theme/diabook/theme.php:212
+#: ../../view/theme/diabook-aerith/theme.php:207
+msgid "Post to Friendica"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:208
+#: ../../view/theme/diabook-blue/theme.php:208
+#: ../../view/theme/diabook/theme.php:213
+#: ../../view/theme/diabook-aerith/theme.php:208
+msgid " from anywhere by bookmarking this Link."
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:236
+#: ../../view/theme/diabook-blue/theme.php:236
+#: ../../view/theme/diabook/theme.php:244
+#: ../../view/theme/diabook-aerith/theme.php:236 ../../include/nav.php:49
+#: ../../include/nav.php:115
+msgid "Your posts and conversations"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:237
+#: ../../view/theme/diabook-blue/theme.php:237
+#: ../../view/theme/diabook/theme.php:245
+#: ../../view/theme/diabook-aerith/theme.php:237 ../../include/nav.php:50
+msgid "Your profile page"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:238
+#: ../../view/theme/diabook-blue/theme.php:238
+#: ../../view/theme/diabook/theme.php:246
+#: ../../view/theme/diabook-aerith/theme.php:238
+msgid "Your contacts"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:239
+#: ../../view/theme/diabook-blue/theme.php:239
+#: ../../view/theme/diabook/theme.php:247
+#: ../../view/theme/diabook-aerith/theme.php:239 ../../include/nav.php:51
+#: ../../boot.php:1413
+msgid "Photos"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:239
+#: ../../view/theme/diabook-blue/theme.php:239
+#: ../../view/theme/diabook/theme.php:247
+#: ../../view/theme/diabook-aerith/theme.php:239 ../../include/nav.php:51
+msgid "Your photos"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:240
+#: ../../view/theme/diabook-blue/theme.php:240
+#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:52
+msgid "Your events"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:241
+#: ../../view/theme/diabook-blue/theme.php:241
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:53
+msgid "Personal notes"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:241
+#: ../../view/theme/diabook-blue/theme.php:241
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:53
+msgid "Your personal photos"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:23
 msgid "Theme settings"
 msgstr ""
 
-#: ../../view/theme/quattro/theme.php:18
+#: ../../view/theme/quattro/config.php:24
 msgid "Alignment"
 msgstr ""
 
-#: ../../view/theme/quattro/theme.php:18
+#: ../../view/theme/quattro/config.php:24
 msgid "Left"
 msgstr ""
 
-#: ../../view/theme/quattro/theme.php:18
+#: ../../view/theme/quattro/config.php:24
 msgid "Center"
 msgstr ""
 
-#: ../../include/profile_advanced.php:17 ../../boot.php:982
+#: ../../view/theme/quattro/config.php:25
+msgid "Color scheme"
+msgstr ""
+
+#: ../../include/profile_advanced.php:17 ../../boot.php:1044
 msgid "Gender:"
 msgstr ""
 
@@ -4786,7 +5318,7 @@ msgid "j F"
 msgstr ""
 
 #: ../../include/profile_advanced.php:30 ../../include/datetime.php:438
-#: ../../include/items.php:1349
+#: ../../include/items.php:1392
 msgid "Birthday:"
 msgstr ""
 
@@ -4794,11 +5326,11 @@ msgstr ""
 msgid "Age:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:37 ../../boot.php:985
+#: ../../include/profile_advanced.php:37 ../../boot.php:1047
 msgid "Status:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:45 ../../boot.php:987
+#: ../../include/profile_advanced.php:45 ../../boot.php:1049
 msgid "Homepage:"
 msgstr ""
 
@@ -5142,168 +5674,192 @@ msgstr ""
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/delivery.php:425 ../../include/notifier.php:638
+#: ../../include/delivery.php:434 ../../include/notifier.php:651
 msgid "(no subject)"
 msgstr ""
 
-#: ../../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 ""
 
-#: ../../include/text.php:238
+#: ../../include/text.php:240
 msgid "prev"
 msgstr ""
 
-#: ../../include/text.php:240
+#: ../../include/text.php:242
 msgid "first"
 msgstr ""
 
-#: ../../include/text.php:269
+#: ../../include/text.php:271
 msgid "last"
 msgstr ""
 
-#: ../../include/text.php:272
+#: ../../include/text.php:274
 msgid "next"
 msgstr ""
 
-#: ../../include/text.php:563
+#: ../../include/text.php:565
 msgid "No contacts"
 msgstr ""
 
-#: ../../include/text.php:572
+#: ../../include/text.php:574
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:643 ../../include/nav.php:87
+#: ../../include/text.php:647 ../../include/nav.php:91
 msgid "Search"
 msgstr ""
 
-#: ../../include/text.php:831
+#: ../../include/text.php:828
 msgid "Monday"
 msgstr ""
 
-#: ../../include/text.php:831
+#: ../../include/text.php:828
 msgid "Tuesday"
 msgstr ""
 
-#: ../../include/text.php:831
+#: ../../include/text.php:828
 msgid "Wednesday"
 msgstr ""
 
-#: ../../include/text.php:831
+#: ../../include/text.php:828
 msgid "Thursday"
 msgstr ""
 
-#: ../../include/text.php:831
+#: ../../include/text.php:828
 msgid "Friday"
 msgstr ""
 
-#: ../../include/text.php:831
+#: ../../include/text.php:828
 msgid "Saturday"
 msgstr ""
 
-#: ../../include/text.php:831
+#: ../../include/text.php:828
 msgid "Sunday"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:832
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:832
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:832
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:832
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:832
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:832
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:832
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:832
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:832
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:832
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:832
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:832
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:905
+#: ../../include/text.php:916
 msgid "bytes"
 msgstr ""
 
-#: ../../include/text.php:1000
+#: ../../include/text.php:933
+msgid "Categories:"
+msgstr ""
+
+#: ../../include/text.php:945
+msgid "remove"
+msgstr ""
+
+#: ../../include/text.php:945
+msgid "[remove]"
+msgstr ""
+
+#: ../../include/text.php:948
+msgid "Filed under:"
+msgstr ""
+
+#: ../../include/text.php:964 ../../include/text.php:976
+msgid "Click to open/close"
+msgstr ""
+
+#: ../../include/text.php:1068
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1012
+#: ../../include/text.php:1080
 msgid "default"
 msgstr ""
 
-#: ../../include/text.php:1228
+#: ../../include/text.php:1296
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:1230
+#: ../../include/text.php:1298
 msgid "comment"
 msgstr ""
 
-#: ../../include/text.php:1231
+#: ../../include/text.php:1299
 msgid "post"
 msgstr ""
 
-#: ../../include/diaspora.php:570
+#: ../../include/text.php:1454
+msgid "Item filed"
+msgstr ""
+
+#: ../../include/diaspora.php:578
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/diaspora.php:1911
+#: ../../include/diaspora.php:1965
 msgid "Attachments:"
 msgstr ""
 
-#: ../../include/diaspora.php:2094
+#: ../../include/diaspora.php:2148
 #, php-format
 msgid "[Relayed] Comment authored by %s from network %s"
 msgstr ""
 
-#: ../../include/network.php:814
+#: ../../include/network.php:817
 msgid "view full size"
 msgstr ""
 
-#: ../../include/oembed.php:128
+#: ../../include/oembed.php:132
 msgid "Embedded content"
 msgstr ""
 
-#: ../../include/oembed.php:137
+#: ../../include/oembed.php:141
 msgid "Embedding disabled"
 msgstr ""
 
@@ -5334,135 +5890,115 @@ msgstr ""
 msgid "Create a new group"
 msgstr ""
 
-#: ../../include/nav.php:44 ../../boot.php:709
+#: ../../include/nav.php:46 ../../boot.php:765
 msgid "Logout"
 msgstr ""
 
-#: ../../include/nav.php:44
+#: ../../include/nav.php:46
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:47 ../../boot.php:1331
+#: ../../include/nav.php:49 ../../boot.php:1403
 msgid "Status"
 msgstr ""
 
-#: ../../include/nav.php:47 ../../include/nav.php:111
-msgid "Your posts and conversations"
-msgstr ""
-
-#: ../../include/nav.php:48
-msgid "Your profile page"
-msgstr ""
-
-#: ../../include/nav.php:49 ../../boot.php:1341
-msgid "Photos"
-msgstr ""
-
-#: ../../include/nav.php:49
-msgid "Your photos"
-msgstr ""
-
-#: ../../include/nav.php:50
-msgid "Your events"
-msgstr ""
-
-#: ../../include/nav.php:51
-msgid "Personal notes"
-msgstr ""
-
-#: ../../include/nav.php:51
-msgid "Your personal photos"
-msgstr ""
-
-#: ../../include/nav.php:62
+#: ../../include/nav.php:64
 msgid "Sign in"
 msgstr ""
 
-#: ../../include/nav.php:73
+#: ../../include/nav.php:77
 msgid "Home Page"
 msgstr ""
 
-#: ../../include/nav.php:77
+#: ../../include/nav.php:81
 msgid "Create an account"
 msgstr ""
 
-#: ../../include/nav.php:82
+#: ../../include/nav.php:86
 msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/nav.php:85
+#: ../../include/nav.php:89
 msgid "Apps"
 msgstr ""
 
-#: ../../include/nav.php:85
+#: ../../include/nav.php:89
 msgid "Addon applications, utilities, games"
 msgstr ""
 
-#: ../../include/nav.php:87
+#: ../../include/nav.php:91
 msgid "Search site content"
 msgstr ""
 
-#: ../../include/nav.php:97
+#: ../../include/nav.php:101
 msgid "Conversations on this site"
 msgstr ""
 
-#: ../../include/nav.php:99
+#: ../../include/nav.php:103
 msgid "Directory"
 msgstr ""
 
-#: ../../include/nav.php:99
+#: ../../include/nav.php:103
 msgid "People directory"
 msgstr ""
 
-#: ../../include/nav.php:109
+#: ../../include/nav.php:113
 msgid "Conversations from your friends"
 msgstr ""
 
-#: ../../include/nav.php:117
+#: ../../include/nav.php:121
 msgid "Friend Requests"
 msgstr ""
 
-#: ../../include/nav.php:119
+#: ../../include/nav.php:123
 msgid "See all notifications"
 msgstr ""
 
-#: ../../include/nav.php:120
+#: ../../include/nav.php:124
 msgid "Mark all system notifications seen"
 msgstr ""
 
-#: ../../include/nav.php:124
+#: ../../include/nav.php:128
 msgid "Private mail"
 msgstr ""
 
-#: ../../include/nav.php:127
+#: ../../include/nav.php:129
+msgid "Inbox"
+msgstr ""
+
+#: ../../include/nav.php:130
+msgid "Outbox"
+msgstr ""
+
+#: ../../include/nav.php:134
 msgid "Manage"
 msgstr ""
 
-#: ../../include/nav.php:127
+#: ../../include/nav.php:134
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:131 ../../boot.php:940
+#: ../../include/nav.php:138 ../../boot.php:1002
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:131 ../../boot.php:940
+#: ../../include/nav.php:138 ../../boot.php:1002
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/nav.php:132
+#: ../../include/nav.php:139
 msgid "Manage/edit friends and contacts"
 msgstr ""
 
-#: ../../include/nav.php:139
+#: ../../include/nav.php:146
 msgid "Admin"
 msgstr ""
 
-#: ../../include/nav.php:139
+#: ../../include/nav.php:146
 msgid "Site setup and configuration"
 msgstr ""
 
-#: ../../include/nav.php:162
+#: ../../include/nav.php:169
 msgid "Nothing new here"
 msgstr ""
 
@@ -5478,49 +6014,63 @@ msgstr ""
 msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
-#: ../../include/contact_widgets.php:18
-msgid "Invite Friends"
-msgstr ""
-
-#: ../../include/contact_widgets.php:24
+#: ../../include/contact_widgets.php:22
 #, php-format
 msgid "%d invitation available"
 msgid_plural "%d invitations available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/contact_widgets.php:30
+#: ../../include/contact_widgets.php:28
 msgid "Find People"
 msgstr ""
 
-#: ../../include/contact_widgets.php:31
+#: ../../include/contact_widgets.php:29
 msgid "Enter name or interest"
 msgstr ""
 
-#: ../../include/contact_widgets.php:32
+#: ../../include/contact_widgets.php:30
 msgid "Connect/Follow"
 msgstr ""
 
-#: ../../include/contact_widgets.php:33
+#: ../../include/contact_widgets.php:31
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: ../../include/contact_widgets.php:36
-msgid "Similar Interests"
-msgstr ""
-
-#: ../../include/contact_widgets.php:68
+#: ../../include/contact_widgets.php:66
 msgid "Networks"
 msgstr ""
 
-#: ../../include/contact_widgets.php:71
+#: ../../include/contact_widgets.php:69
 msgid "All Networks"
 msgstr ""
 
+#: ../../include/contact_widgets.php:96
+msgid "Saved Folders"
+msgstr ""
+
+#: ../../include/contact_widgets.php:99 ../../include/contact_widgets.php:127
+msgid "Everything"
+msgstr ""
+
+#: ../../include/contact_widgets.php:124
+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 ""
@@ -5594,232 +6144,232 @@ msgstr ""
 msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/poller.php:513
+#: ../../include/poller.php:533
 msgid "From: "
 msgstr ""
 
-#: ../../include/bbcode.php:202
+#: ../../include/bbcode.php:203 ../../include/bbcode.php:223
 msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/bbcode.php:216 ../../include/bbcode.php:282
+#: ../../include/bbcode.php:237 ../../include/bbcode.php:303
 msgid "Image/photo"
 msgstr ""
 
-#: ../../include/dba.php:39
+#: ../../include/dba.php:41
 #, php-format
 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 ""
 
-#: ../../include/acl_selectors.php:284
+#: ../../include/acl_selectors.php:286
 msgid "Visible to everybody"
 msgstr ""
 
-#: ../../include/acl_selectors.php:285
+#: ../../include/acl_selectors.php:287
 msgid "show"
 msgstr ""
 
-#: ../../include/acl_selectors.php:286
+#: ../../include/acl_selectors.php:288
 msgid "don't show"
 msgstr ""
 
-#: ../../include/enotify.php:8
+#: ../../include/enotify.php:14
 msgid "Friendica Notification"
 msgstr ""
 
-#: ../../include/enotify.php:11
+#: ../../include/enotify.php:17
 msgid "Thank You,"
 msgstr ""
 
-#: ../../include/enotify.php:13
+#: ../../include/enotify.php:19
 #, php-format
 msgid "%s Administrator"
 msgstr ""
 
-#: ../../include/enotify.php:29
+#: ../../include/enotify.php:35
 #, php-format
 msgid "%s <!item_type!>"
 msgstr ""
 
-#: ../../include/enotify.php:33
+#: ../../include/enotify.php:39
 #, php-format
 msgid "[Friendica:Notify] New mail received at %s"
 msgstr ""
 
-#: ../../include/enotify.php:35
+#: ../../include/enotify.php:41
 #, php-format
 msgid "%s sent you a new private message at %s."
 msgstr ""
 
-#: ../../include/enotify.php:36
+#: ../../include/enotify.php:42
 #, php-format
 msgid "%s sent you %s."
 msgstr ""
 
-#: ../../include/enotify.php:36
+#: ../../include/enotify.php:42
 msgid "a private message"
 msgstr ""
 
-#: ../../include/enotify.php:37
+#: ../../include/enotify.php:43
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: ../../include/enotify.php:67
+#: ../../include/enotify.php:73
 #, php-format
 msgid "%s's"
 msgstr ""
 
-#: ../../include/enotify.php:71
+#: ../../include/enotify.php:77
 msgid "your"
 msgstr ""
 
-#: ../../include/enotify.php:78
+#: ../../include/enotify.php:84
 #, php-format
 msgid "[Friendica:Notify] Comment to conversation #%d by %s"
 msgstr ""
 
-#: ../../include/enotify.php:79
+#: ../../include/enotify.php:85
 #, php-format
 msgid "%s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../include/enotify.php:80
+#: ../../include/enotify.php:86
 #, php-format
 msgid "%s commented on %s."
 msgstr ""
 
-#: ../../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 ""
 
-#: ../../include/enotify.php:89
+#: ../../include/enotify.php:95
 #, php-format
 msgid "[Friendica:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: ../../include/enotify.php:91
+#: ../../include/enotify.php:97
 #, php-format
 msgid "%s posted to your profile wall at %s"
 msgstr ""
 
-#: ../../include/enotify.php:93
+#: ../../include/enotify.php:99
 #, php-format
 msgid "%s posted to %s"
 msgstr ""
 
-#: ../../include/enotify.php:93
+#: ../../include/enotify.php:99
 msgid "your profile wall."
 msgstr ""
 
-#: ../../include/enotify.php:102
+#: ../../include/enotify.php:108
 #, php-format
 msgid "[Friendica:Notify] %s tagged you"
 msgstr ""
 
-#: ../../include/enotify.php:103
+#: ../../include/enotify.php:109
 #, php-format
 msgid "%s tagged you at %s"
 msgstr ""
 
-#: ../../include/enotify.php:104
+#: ../../include/enotify.php:110
 #, php-format
 msgid "%s %s."
 msgstr ""
 
-#: ../../include/enotify.php:104
+#: ../../include/enotify.php:110
 msgid "tagged you"
 msgstr ""
 
-#: ../../include/enotify.php:113
+#: ../../include/enotify.php:119
 #, php-format
 msgid "[Friendica:Notify] %s tagged your post"
 msgstr ""
 
-#: ../../include/enotify.php:114
+#: ../../include/enotify.php:120
 #, php-format
 msgid "%s tagged your post at %s"
 msgstr ""
 
-#: ../../include/enotify.php:115
+#: ../../include/enotify.php:121
 #, php-format
 msgid "%s tagged %s"
 msgstr ""
 
-#: ../../include/enotify.php:115
+#: ../../include/enotify.php:121
 msgid "your post"
 msgstr ""
 
-#: ../../include/enotify.php:124
+#: ../../include/enotify.php:130
 msgid "[Friendica:Notify] Introduction received"
 msgstr ""
 
-#: ../../include/enotify.php:125
+#: ../../include/enotify.php:131
 #, php-format
 msgid "You've received an introduction from '%s' at %s"
 msgstr ""
 
-#: ../../include/enotify.php:126
+#: ../../include/enotify.php:132
 #, php-format
 msgid "You've received %s from %s."
 msgstr ""
 
-#: ../../include/enotify.php:126
+#: ../../include/enotify.php:132
 msgid "an introduction"
 msgstr ""
 
-#: ../../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 ""
 
-#: ../../include/enotify.php:129
+#: ../../include/enotify.php:135
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr ""
 
-#: ../../include/enotify.php:136
+#: ../../include/enotify.php:142
 msgid "[Friendica:Notify] Friend suggestion received"
 msgstr ""
 
-#: ../../include/enotify.php:137
+#: ../../include/enotify.php:143
 #, php-format
 msgid "You've received a friend suggestion from '%s' at %s"
 msgstr ""
 
-#: ../../include/enotify.php:138
+#: ../../include/enotify.php:144
 #, php-format
 msgid "You've received %s for %s from %s."
 msgstr ""
 
-#: ../../include/enotify.php:139
+#: ../../include/enotify.php:145
 msgid "a friend suggestion"
 msgstr ""
 
-#: ../../include/enotify.php:142
+#: ../../include/enotify.php:148
 msgid "Name:"
 msgstr ""
 
-#: ../../include/enotify.php:143
+#: ../../include/enotify.php:149
 msgid "Photo:"
 msgstr ""
 
-#: ../../include/enotify.php:146
+#: ../../include/enotify.php:152
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/items.php:2573
+#: ../../include/items.php:2656
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:2573
+#: ../../include/items.php:2656
 msgid "You have a new follower at "
 msgstr ""
 
@@ -5828,37 +6378,43 @@ msgstr ""
 msgid "image/photo"
 msgstr ""
 
-#: ../../include/security.php:20
+#: ../../include/security.php:21
 msgid "Welcome "
 msgstr ""
 
-#: ../../include/security.php:21
+#: ../../include/security.php:22
 msgid "Please upload a profile photo."
 msgstr ""
 
-#: ../../include/security.php:24
+#: ../../include/security.php:25
 msgid "Welcome back "
 msgstr ""
 
-#: ../../include/Contact.php:131 ../../include/conversation.php:788
+#: ../../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."
+msgstr ""
+
+#: ../../include/Contact.php:137 ../../include/conversation.php:813
 msgid "View status"
 msgstr ""
 
-#: ../../include/Contact.php:132 ../../include/conversation.php:789
+#: ../../include/Contact.php:138 ../../include/conversation.php:814
 msgid "View profile"
 msgstr ""
 
-#: ../../include/Contact.php:133 ../../include/conversation.php:790
+#: ../../include/Contact.php:139 ../../include/conversation.php:815
 msgid "View photos"
 msgstr ""
 
-#: ../../include/Contact.php:134 ../../include/Contact.php:147
-#: ../../include/conversation.php:791
+#: ../../include/Contact.php:140 ../../include/Contact.php:153
+#: ../../include/conversation.php:816
 msgid "View recent"
 msgstr ""
 
-#: ../../include/Contact.php:136 ../../include/Contact.php:147
-#: ../../include/conversation.php:793
+#: ../../include/Contact.php:142 ../../include/Contact.php:153
+#: ../../include/conversation.php:818
 msgid "Send PM"
 msgstr ""
 
@@ -5871,36 +6427,32 @@ msgstr ""
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:303 ../../include/conversation.php:572
+#: ../../include/conversation.php:317 ../../include/conversation.php:575
 msgid "Select"
 msgstr ""
 
-#: ../../include/conversation.php:320 ../../include/conversation.php:665
-#: ../../include/conversation.php:666
+#: ../../include/conversation.php:334 ../../include/conversation.php:672
+#: ../../include/conversation.php:673
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/conversation.php:330 ../../include/conversation.php:677
+#: ../../include/conversation.php:344 ../../include/conversation.php:684
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../../include/conversation.php:346
+#: ../../include/conversation.php:360
 msgid "View in context"
 msgstr ""
 
-#: ../../include/conversation.php:467
+#: ../../include/conversation.php:465
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:468 ../../boot.php:448
-msgid "show more"
-msgstr ""
-
 #: ../../include/conversation.php:529
 msgid "like"
 msgstr ""
@@ -5917,205 +6469,209 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: ../../include/conversation.php:582
+#: ../../include/conversation.php:588
 msgid "add star"
 msgstr ""
 
-#: ../../include/conversation.php:583
+#: ../../include/conversation.php:589
 msgid "remove star"
 msgstr ""
 
-#: ../../include/conversation.php:584
+#: ../../include/conversation.php:590
 msgid "toggle star status"
 msgstr ""
 
-#: ../../include/conversation.php:587
+#: ../../include/conversation.php:593
 msgid "starred"
 msgstr ""
 
-#: ../../include/conversation.php:588
+#: ../../include/conversation.php:594
 msgid "add tag"
 msgstr ""
 
-#: ../../include/conversation.php:667
+#: ../../include/conversation.php:598
+msgid "save to folder"
+msgstr ""
+
+#: ../../include/conversation.php:674
 msgid "to"
 msgstr ""
 
-#: ../../include/conversation.php:668
+#: ../../include/conversation.php:675
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../include/conversation.php:669
+#: ../../include/conversation.php:676
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/conversation.php:713
+#: ../../include/conversation.php:721
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:845
+#: ../../include/conversation.php:872
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:845
+#: ../../include/conversation.php:872
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:849
+#: ../../include/conversation.php:876
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:851
+#: ../../include/conversation.php:878
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:857
+#: ../../include/conversation.php:884
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:860
+#: ../../include/conversation.php:887
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:861
+#: ../../include/conversation.php:888
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:861
+#: ../../include/conversation.php:888
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:886
+#: ../../include/conversation.php:913
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:888
+#: ../../include/conversation.php:915
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:889
+#: ../../include/conversation.php:916
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:890
+#: ../../include/conversation.php:917
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:891
+#: ../../include/conversation.php:919
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:892
-msgid "Enter a title for this item"
-msgstr ""
-
-#: ../../include/conversation.php:935
+#: ../../include/conversation.php:962
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:937
+#: ../../include/conversation.php:964
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:939
+#: ../../include/conversation.php:966
 msgid "web link"
 msgstr ""
 
-#: ../../include/conversation.php:940
+#: ../../include/conversation.php:967
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:941
+#: ../../include/conversation.php:968
 msgid "video link"
 msgstr ""
 
-#: ../../include/conversation.php:942
+#: ../../include/conversation.php:969
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:943
+#: ../../include/conversation.php:970
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:945
+#: ../../include/conversation.php:972
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:947
+#: ../../include/conversation.php:974
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:952
+#: ../../include/conversation.php:981
 msgid "permissions"
 msgstr ""
 
-#: ../../boot.php:446
+#: ../../boot.php:493
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:449
+#: ../../boot.php:496
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:692
+#: ../../boot.php:744
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:712
+#: ../../boot.php:768
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:713
+#: ../../boot.php:769
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:716
+#: ../../boot.php:772
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:722
+#: ../../boot.php:778
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:879
+#: ../../boot.php:935
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1046 ../../boot.php:1117
+#: ../../boot.php:994
+msgid "Message"
+msgstr ""
+
+#: ../../boot.php:1109 ../../boot.php:1180
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1047 ../../boot.php:1118
+#: ../../boot.php:1110 ../../boot.php:1181
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1072
+#: ../../boot.php:1135
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1073
+#: ../../boot.php:1136
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1096 ../../boot.php:1160
+#: ../../boot.php:1159 ../../boot.php:1223
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1141
+#: ../../boot.php:1204
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1142
+#: ../../boot.php:1205
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1154
+#: ../../boot.php:1217
 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..e20cce86a 100755..100644
--- a/util/typo.php
+++ b/util/typo.php
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..9d133b155 100755..100644
--- a/view/admin_logs.tpl
+++ b/view/admin_logs.tpl
diff --git a/view/admin_plugins.tpl b/view/admin_plugins.tpl
index 8367ff6a1..8367ff6a1 100755..100644
--- a/view/admin_plugins.tpl
+++ b/view/admin_plugins.tpl
diff --git a/view/admin_plugins_details.tpl b/view/admin_plugins_details.tpl
index ead356f5b..cbaef2d66 100755..100644
--- a/view/admin_plugins_details.tpl
+++ b/view/admin_plugins_details.tpl
@@ -16,6 +16,10 @@
 	{{ endfor }}
 	</p>
 	
+	{{ if $screenshot }}
+	<a href="$screenshot.0" ><img src="$screenshot.0" width="320" height="240" alt="$screenshot.1" /></a>
+	{{ endif }}
+
 	{{ if $admin_form }}
 	<h3>$settings</h3>
 	<form method="post" action="$baseurl/admin/$function/$plugin/">
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..01fe893c6 100755..100644
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
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..bde7edb59 100755..100644
--- a/view/admin_users.tpl
+++ b/view/admin_users.tpl
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 42439f8b5..36ec1993d 100755..100644
--- a/view/api_ratelimit_xml.tpl
+++ b/view/api_ratelimit_xml.tpl
@@ -1,5 +1,6 @@
 <hash>
-		<remaining-hits type="integer">$hash.remaining_hits</remaining-hits>
-		<hourly-limit type="integer">$hash.hourly_limit</hourly-limit>
-		<reset-time type="datetime">$hash.reset_time</reset-time>
-</hash>
\ No newline at end of file
+ <remaining-hits type="integer">$hash.remaining_hits</remaining-hits>
+ <hourly-limit type="integer">$hash.hourly_limit</hourly-limit>
+ <reset-time type="datetime">$hash.reset_time</reset-time>
+ <reset_time_in_seconds type="integer">$hash.resettime_in_seconds</reset_time_in_seconds>
+</hash>
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_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..17860ca61 100755..100644
--- a/view/api_timeline_xml.tpl
+++ b/view/api_timeline_xml.tpl
diff --git a/view/api_user_xml.tpl b/view/api_user_xml.tpl
index 78cc1f530..f1e122f3e 100755..100644
--- a/view/api_user_xml.tpl
+++ b/view/api_user_xml.tpl
@@ -43,4 +43,4 @@
     <place>$user.status.place</place>
     <contributors>$user.status.contributors</contributors>
   {{ endif }}</status>
-</user>
\ No newline at end of file
+</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..2958397c9 100755..100644
--- a/view/auto_request.tpl
+++ b/view/auto_request.tpl
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..8463ceb12 100755..100644
--- a/view/ca/messages.po
+++ b/view/ca/messages.po
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..e5aed8be6 100755..100644
--- a/view/ca/strings.php
+++ b/view/ca/strings.php
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 cde4ca3ca..a1d4e1043 100755..100644
--- a/view/comment_item.tpl
+++ b/view/comment_item.tpl
@@ -11,13 +11,15 @@
 					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
 				</div>
 				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
 				{{ 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 }}
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
 
 				<div class="comment-edit-text-end"></div>
 				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
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_edit.tpl b/view/contact_edit.tpl
index fc1a3d47b..417578a32 100755..100644
--- a/view/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -63,7 +63,7 @@
 
 <div id="contact-edit-info-wrapper">
 <h4>$lbl_info1</h4>
-	<textarea id="contact-edit-info" rows=8 cols=72 name="info" >$info</textarea>
+	<textarea id="contact-edit-info" rows="8" cols="60" name="info">$info</textarea>
 	<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
 </div>
 <div id="contact-edit-info-end"></div>
diff --git a/view/contact_head.tpl b/view/contact_head.tpl
index c7de390af..a76293a68 100755..100644
--- a/view/contact_head.tpl
+++ b/view/contact_head.tpl
@@ -13,8 +13,8 @@ tinyMCE.init({
 	theme_advanced_buttons3 : "",
 	theme_advanced_toolbar_location : "top",
 	theme_advanced_toolbar_align : "center",
-	theme_advanced_styles : "Code=codeStyle;Quote=quoteStyle",
-	content_css : "bbcode.css",
+	theme_advanced_styles : "blockquote,code",
+	gecko_spellcheck : true,
 	entity_encoding : "raw",
 	add_unload_trigger : false,
 	remove_linebreaks : false,
diff --git a/view/contact_template.tpl b/view/contact_template.tpl
index b826acc65..48930b48a 100755..100644
--- a/view/contact_template.tpl
+++ b/view/contact_template.tpl
@@ -1,26 +1,25 @@
 
-<div class="contact-wrapper" id="contact-entry-wrapper-$id" >
-	<div class="contact-photo-wrapper" >
-		<div class="contact-photo mframe" id="contact-entry-photo-$contact.id"
+<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 }}
-			<a href="#" rel="#contact-photo-menu-$contact.id" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-$contact.id">menu</a>
-			<ul class="contact-photo-menu menu-popup" id="contact-photo-menu-$contact.id">
-				$contact.photo_menu
-			</ul>
+			<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-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-	{{ if $contact.alt_text }}<div class="contact-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
-	<div class="contact-details" id="contact-entry-url-$contact.id" >$contact.itemurl</div>
-	<div class="contact-details" id="contact-entry-network-$contact.id" >$contact.network</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/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 ff202bbe4..43bb1dd47 100755..100644
--- a/view/conversation.tpl
+++ b/view/conversation.tpl
@@ -17,7 +17,9 @@
 {{ endfor }}
 
 {{ if $dropping }}
-<a href="#" onclick="deleteCheckedItems();return false;">
-	<span class="icon s22 delete text">$dropping</span>
-</a>
+<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/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..908d0df40 100755..100644
--- a/view/de/friend_complete_eml.tpl
+++ b/view/de/friend_complete_eml.tpl
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..ff9b8a379 100755..100644
--- a/view/de/intro_complete_eml.tpl
+++ b/view/de/intro_complete_eml.tpl
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/passchanged_eml.tpl b/view/de/passchanged_eml.tpl
index d5e8d9048..d5e8d9048 100755..100644
--- a/view/de/passchanged_eml.tpl
+++ b/view/de/passchanged_eml.tpl
diff --git a/view/de/register_open_eml.tpl b/view/de/register_open_eml.tpl
index d27c3c743..d27c3c743 100755..100644
--- a/view/de/register_open_eml.tpl
+++ b/view/de/register_open_eml.tpl
diff --git a/view/de/register_verify_eml.tpl b/view/de/register_verify_eml.tpl
index 7ae432d61..7ae432d61 100755..100644
--- a/view/de/register_verify_eml.tpl
+++ b/view/de/register_verify_eml.tpl
diff --git a/view/de/request_notify_eml.tpl b/view/de/request_notify_eml.tpl
index 55fa98e96..55fa98e96 100755..100644
--- a/view/de/request_notify_eml.tpl
+++ b/view/de/request_notify_eml.tpl
diff --git a/view/de/strings.php b/view/de/strings.php
index 5438a1c9f..c9cd91138 100755..100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -4,31 +4,32 @@ function string_plural_select_de($n){
 	return ($n != 1);
 }
 ;
-$a->strings["Post successful."] = "Beitrag erfolgreich ver�ffentlicht.";
+$a->strings["Post successful."] = "Beitrag erfolgreich veröffentlicht.";
 $a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]";
 $a->strings["Contact settings applied."] = "Einstellungen zum Kontakt angewandt.";
 $a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren.";
 $a->strings["Permission denied."] = "Zugriff verweigert.";
 $a->strings["Contact not found."] = "Kontakt nicht gefunden.";
 $a->strings["Repair Contact Settings"] = "Kontakt-Einstellungen reparieren";
-$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn Du etwas falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr.";
-$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Bitte nutze den Zur�ck-Button deines Browsers <strong>jetzt</strong>, wenn du dir unsicher bist, was auf dieser Seite gemacht wird.";
-$a->strings["Return to contact editor"] = "Zur�ck zum Kontakteditor";
+$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr.";
+$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button deines Browsers <strong>jetzt</strong>, wenn du dir unsicher bist, was du tun willst.";
+$a->strings["Return to contact editor"] = "Zurück zum Kontakteditor";
 $a->strings["Name"] = "Name";
 $a->strings["Account Nickname"] = "Account-Spitzname";
-$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - �berschreibt Name/Spitzname";
+$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - überschreibt Name/Spitzname";
 $a->strings["Account URL"] = "Account-URL";
-$a->strings["Friend Request URL"] = "URL f�r Freundschaftsanfragen";
-$a->strings["Friend Confirm URL"] = "URL f�r Best�tigungen von Freundschaftsanfragen";
-$a->strings["Notification Endpoint URL"] = "URL-Endpunkt f�r Benachrichtigungen";
+$a->strings["Friend Request URL"] = "URL für Freundschaftsanfragen";
+$a->strings["Friend Confirm URL"] = "URL für Bestätigungen von Freundschaftsanfragen";
+$a->strings["Notification Endpoint URL"] = "URL-Endpunkt für Benachrichtigungen";
 $a->strings["Poll/Feed URL"] = "Pull/Feed-URL";
 $a->strings["New photo from this URL"] = "Neues Foto von dieser URL";
 $a->strings["Submit"] = "Senden";
 $a->strings["Help:"] = "Hilfe:";
 $a->strings["Help"] = "Hilfe";
+$a->strings["Help or @NewHere ?"] = "Hilfe oder @NeuHier";
 $a->strings["Not Found"] = "Nicht gefunden";
 $a->strings["Page not found."] = "Seite nicht gefunden.";
-$a->strings["File exceeds size limit of %d"] = "Die Datei ist gr��er als das erlaubte Limit von %d";
+$a->strings["File exceeds size limit of %d"] = "Die Datei ist größer als das erlaubte Limit von %d";
 $a->strings["File upload failed."] = "Hochladen der Datei fehlgeschlagen.";
 $a->strings["Friend suggestion sent."] = "Kontaktvorschlag gesendet.";
 $a->strings["Suggest Friends"] = "Kontakte vorschlagen";
@@ -40,7 +41,7 @@ $a->strings["link to source"] = "Link zum Originalbeitrag";
 $a->strings["Events"] = "Veranstaltungen";
 $a->strings["Create New Event"] = "Neue Veranstaltung erstellen";
 $a->strings["Previous"] = "Vorherige";
-$a->strings["Next"] = "N�chste";
+$a->strings["Next"] = "Nächste";
 $a->strings["hour:minute"] = "Stunde:Minute";
 $a->strings["Event details"] = "Veranstaltungsdetails";
 $a->strings["Format is %s %s. Starting date and Description are required."] = "Format ist %s %s. Anfangsdatum und Beschreibung sind notwendig.";
@@ -125,6 +126,9 @@ $a->strings["No installed plugins/addons/apps"] = "Keine Plugins/Erweiterungen/A
 $a->strings["Item not found"] = "Beitrag nicht gefunden";
 $a->strings["Edit post"] = "Beitrag bearbeiten";
 $a->strings["Post to Email"] = "An E-Mail senden";
+$a->strings["PostIt to Friendica"] = "Teile mit Friendica";
+$a->strings["Post to Friendica"] = "Teile mit Friendica";
+$a->strings[" from anywhere by bookmarking this Link."] = " von &uuml;berall her, indem du diesen Link zu deinen Lesezeichen hinzuf&uuml;gst.";
 $a->strings["Edit"] = "Bearbeiten";
 $a->strings["Upload photo"] = "Foto hochladen";
 $a->strings["Attach file"] = "Datei anhängen";
@@ -244,6 +248,7 @@ $a->strings["Profile Match"] = "Profilübereinstimmungen";
 $a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu deinem Standardprofil hinzu.";
 $a->strings["is interested in:"] = "ist interessiert an:";
 $a->strings["Connect"] = "Verbinden";
+$a->strings["Connect Services"] = "Verbinde Dienste";
 $a->strings["No matches"] = "Keine Übereinstimmungen";
 $a->strings["Remote privacy information not available."] = "Entfernte Privatsphäreneinstellungen nicht verfügbar.";
 $a->strings["Visible to:"] = "Sichtbar für:";
@@ -676,6 +681,7 @@ $a->strings["Force users to register with a space between firstname and lastname
 $a->strings["UTF-8 Regular expressions"] = "UTF-8 Reguläre Ausdrücke";
 $a->strings["Use PHP UTF8 regular expressions"] = "PHP UTF8 Ausdrücke verwenden";
 $a->strings["Show Community Page"] = "Gemeinschaftsseite anzeigen";
+$a->strings["Community Pages"] = "Foren";
 $a->strings["Display a Community page showing all recent public postings on this site."] = "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server.";
 $a->strings["Enable OStatus support"] = "OStatus Unterstützung aktivieren";
 $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."] = "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.";
@@ -830,6 +836,7 @@ $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["Local Directory"] = "Lokales 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";
@@ -1164,6 +1171,7 @@ $a->strings["Dating"] = "Dating";
 $a->strings["Unfaithful"] = "Untreu";
 $a->strings["Sex Addict"] = "Sexbesessen";
 $a->strings["Friends"] = "Freunde";
+$a->strings["Find Friends"] = "Freunde finden";
 $a->strings["Friends/Benefits"] = "Freunde/Zuwendungen";
 $a->strings["Casual"] = "Casual";
 $a->strings["Engaged"] = "Verlobt";
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 ab1cb0f09..61f5f6863 100755..100644
--- a/view/default.php
+++ b/view/default.php
@@ -10,7 +10,8 @@
 	<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>

 	<section><?php if(x($page,'content')) echo $page['content']; ?>

 		<div id="page-footer"></div>

-	</section>

+	</section>
+	<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>

 	<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>

 </body>

 </html>

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..d8aa8b181 100755..100644
--- a/view/dfrn_request.tpl
+++ b/view/dfrn_request.tpl
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..ae758c9a8 100755..100644
--- a/view/en/follow_notify_eml.tpl
+++ b/view/en/follow_notify_eml.tpl
diff --git a/view/en/friend_complete_eml.tpl b/view/en/friend_complete_eml.tpl
index ab12fcb6b..ab12fcb6b 100755..100644
--- a/view/en/friend_complete_eml.tpl
+++ b/view/en/friend_complete_eml.tpl
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..a60745ec5 100755..100644
--- a/view/en/intro_complete_eml.tpl
+++ b/view/en/intro_complete_eml.tpl
diff --git a/view/en/lostpass_eml.tpl b/view/en/lostpass_eml.tpl
index c350236a4..c350236a4 100755..100644
--- a/view/en/lostpass_eml.tpl
+++ b/view/en/lostpass_eml.tpl
diff --git a/view/en/passchanged_eml.tpl b/view/en/passchanged_eml.tpl
index 9692159e1..9692159e1 100755..100644
--- a/view/en/passchanged_eml.tpl
+++ b/view/en/passchanged_eml.tpl
diff --git a/view/en/register_open_eml.tpl b/view/en/register_open_eml.tpl
index 221e6ec74..221e6ec74 100755..100644
--- a/view/en/register_open_eml.tpl
+++ b/view/en/register_open_eml.tpl
diff --git a/view/en/register_verify_eml.tpl b/view/en/register_verify_eml.tpl
index 60c38d800..60c38d800 100755..100644
--- a/view/en/register_verify_eml.tpl
+++ b/view/en/register_verify_eml.tpl
diff --git a/view/en/request_notify_eml.tpl b/view/en/request_notify_eml.tpl
index 9eef7a61e..9eef7a61e 100755..100644
--- a/view/en/request_notify_eml.tpl
+++ b/view/en/request_notify_eml.tpl
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..d3f8557e9 100755..100644
--- a/view/es/messages.po
+++ b/view/es/messages.po
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..ac53a45a9 100755..100644
--- a/view/es/strings.php
+++ b/view/es/strings.php
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 498ac9941..97201e722 100755..100644
--- a/view/event_head.tpl
+++ b/view/event_head.tpl
@@ -74,6 +74,7 @@ tinyMCE.init({
 	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,
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..725df4cdf 100755..100644
--- a/view/field_checkbox.tpl
+++ b/view/field_checkbox.tpl
diff --git a/view/field_combobox.tpl b/view/field_combobox.tpl
new file mode 100644
index 000000000..a4dc8e571
--- /dev/null
+++ b/view/field_combobox.tpl
@@ -0,0 +1,18 @@
+	
+	<div class='field combobox'>
+		<label for='id_$field.0' id='id_$field.0_label'>$field.1</label>
+		{# html5 don't work on Chrome, Safari and IE9
+		<input id="id_$field.0" type="text" list="data_$field.0" >
+		<datalist id="data_$field.0" >
+		   {{ for $field.4 as $opt=>$val }}<option value="$val">{{ endfor }}
+		</datalist> #}
+		
+		<input id="id_$field.0" type="text" value="$field.2">
+		<select id="select_$field.0" onChange="$('#id_$field.0').val($(this).val())">
+			<option value="">$field.5</option>
+			{{ for $field.4 as $opt=>$val }}<option value="$val">$val</option>{{ endfor }}
+		</select>
+		
+		<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
new file mode 100644
index 000000000..f9f99492c
--- /dev/null
+++ b/view/field_themeselect.tpl
@@ -0,0 +1,9 @@
+	
+	<div class='field select'>
+		<label for='id_$field.0'>$field.1</label>
+		<select name='$field.0' id='id_$field.0' onchange="previewTheme(this);" >
+			{{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }}
+		</select>
+		<span class='field_help'>$field.3</span>
+		<div id="theme-preview"></div>
+	</div>
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/filer_dialog.tpl b/view/filer_dialog.tpl
new file mode 100644
index 000000000..ae837d6b7
--- /dev/null
+++ b/view/filer_dialog.tpl
@@ -0,0 +1,4 @@
+{{ inc field_combobox.tpl }}{{ endinc }}
+<div class="settings-submit-wrapper" >
+	<input id="filer_save" type="button" class="settings-submit" value="$submit" />
+</div>
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..345405760 100755..100644
--- a/view/fr/messages.po
+++ b/view/fr/messages.po
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..dda24d3be 100755..100644
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
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/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 596a8d13f..0353b1d2c 100755..100644
--- a/view/group_side.tpl
+++ b/view/group_side.tpl
@@ -1,29 +1,28 @@
-<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"> $add</span></a>
-	</div>
+<div class="widget" id="group-sidebar">
+<h3>$title</h3>
 
-	<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">$group.edit.title</span></a>
-				{{ endif }}
+<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" title="$edittext"><span id="edit-sidebar-group-element-$group.id" class="group-edit-icon iconspacer small-pencil"></span></a>
 				{{ endif }}
+				<a id="sidebar-group-element-$group.id" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
 			</li>
-			{{ endfor }}
-		</ul>
+		{{ endfor }}
+	</ul>
 	</div>
-</div>	
+  <div id="sidebar-new-group">
+  <a href="group/new">$createtext</a>
+  </div>
+</div>
+
 
diff --git a/view/head.tpl b/view/head.tpl
index 722c79441..cd6f5ca97 100755..100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -65,6 +65,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();
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..e0375764f 100755..100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
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..5fd187f7a 100755..100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
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 ef760abe0..67e5eb681 100755..100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -11,6 +11,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',
@@ -32,6 +33,7 @@ function initEditor(cb){
 			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,
@@ -262,15 +264,36 @@ function enableOnUser(){
 	}
 
 	function itemFiler(id) {
-		reply = prompt("$fileas");
-		if(reply && reply.length) {
-			commentBusy = true;
-			$('body').css('cursor', 'wait');
-			$.get('filer/' + id + '?term=' + reply);
-			if(timer) clearTimeout(timer);
-			timer = setTimeout(NavUpdate,3000);
-			liking = 1;
-		}
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.fancybox(data);
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply);
+					if(timer) clearTimeout(timer);
+					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.fancybox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+		
 	}
 
 	function jotClearLocation() {
diff --git a/view/jot.tpl b/view/jot.tpl
index 2f89d4372..91de628ac 100755..100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -1,9 +1,12 @@
-<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" />
-		<div id="character-counter" class="grey jothidden"></div>
 
+<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" />
@@ -11,25 +14,55 @@
 		<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-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>
+		</div>
+
+<div id="profile-jot-submit-wrapper" 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-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>
+
 
-		<ul id="jot-tools" class="jothidden" style="display:none">
-			<li><a href="#" onclick="return false;" id="wall-image-upload" title="$upload">$shortupload</a></a></li>
-			<li><a href="#" onclick="return false;" id="wall-file-upload"  title="$attach">$shortattach</a></li>
-			<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>
-			<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
-
-			<li class="perms"><a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon s22 $lockstate $bang"  title="$permset" ></a></li>
-			<li class="submit"><input type="submit" id="profile-jot-submit" name="submit" value="$share" /></li>
-			<li id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait"  /></li>
-		</ul>
+	<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="jot-preview-content" style="display:none;"></div>
 
@@ -43,6 +76,10 @@
 		</div>
 	</div>
 
-</form>
 
-{{ if $content }}<script>initEditor();</script>{{ endif }}
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+		{{ if $content }}<script>initEditor();</script>{{ endif }}
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/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 ed36a7bb2..75a4506f6 100755..100644
--- a/view/mail_conv.tpl
+++ b/view/mail_conv.tpl
@@ -1,13 +1,13 @@
 <div class="mail-conv-outside-wrapper">
 	<div class="mail-conv-sender" >
-		<a href="$from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$sparkle" src="$from_photo" heigth="80" width="80" alt="$from_name" /></a>
+		<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" >$from_name</div>
-		<div class="mail-conv-date">$date</div>
-		<div class="mail-conv-subject">$subject</div>
-		<div class="mail-conv-body">$body</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$id" ><a href="message/drop/$id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$delete" id="mail-conv-delete-icon-$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-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>
diff --git a/view/mail_display.tpl b/view/mail_display.tpl
new file mode 100644
index 000000000..8fbc12929
--- /dev/null
+++ b/view/mail_display.tpl
@@ -0,0 +1,10 @@
+
+{{ for $mails as $mail }}
+	{{ inc mail_conv.tpl }}{{endinc}}
+{{ endfor }}
+
+{{ if $canreply }}
+{{ inc prv_message.tpl }}{{ endinc }}
+{{ else }}
+$unknown_text
+{{endif }}
\ No newline at end of file
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/message_side.tpl b/view/message_side.tpl
new file mode 100644
index 000000000..fce771bd5
--- /dev/null
+++ b/view/message_side.tpl
@@ -0,0 +1,10 @@
+<div id="message-sidebar" class="widget">
+	<div id="message-new"><a href="$new.url" class="{{ if $new.sel }}newmessage-selected{{ endif }}">$new.label</a> </div>
+	
+	<ul class="message-ul">
+		{{ for $tabs as $t }}
+			<li class="tool"><a href="$t.url" class="message-link{{ if $t.sel }}message-selected{{ endif }}">$t.label</a></li>
+		{{ endfor }}
+	</ul>
+	
+</div>
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 098333893..2d1ea7a61 100755..100644
--- a/view/msg-header.tpl
+++ b/view/msg-header.tpl
@@ -16,6 +16,7 @@ if(plaintext != 'none') {
 		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 +41,9 @@ if(plaintext != 'none') {
 		}
 	});
 }
+else
+	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+
 
 </script>
 <script type="text/javascript" src="js/ajaxupload.js" ></script>
diff --git a/view/nav.tpl b/view/nav.tpl
index 8c872864c..4675c3e5c 100755..100644
--- a/view/nav.tpl
+++ b/view/nav.tpl
@@ -1,131 +1,68 @@
-<header>
-	{# $langselector #}
+<nav>
+	$langselector
 
 	<div id="site-location">$sitelocation</div>
-	<div id="banner">$banner</div>
-</header>
-<nav>
-	<ul>
-		{{ 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.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.community }}
-			<li id="nav-community-link" class="nav-menu $sel.community">
-				<a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-			</li>
-		{{ endif }}
-		
-		{{ if $nav.network }}
-			<li id="nav-network-link" class="nav-menu $sel.network">
-				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-				<span id="net-update" class="nav-notify"></span>
-			</li>
-		{{ endif }}
-		{{ if $nav.home }}
-			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-				<span id="home-update" class="nav-notify"></span>
-			</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 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>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-			</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.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 }}<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 }}
 
-				{{ 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 }}
-				{{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
-			</ul>		
-		</li>
-		
-		{{ if $nav.help }} 
-		<li id="nav-help-link" class="nav-menu $sel.help">
-			<a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-		</li>
-		{{ endif }}
+	<span id="nav-link-wrapper" >
 
-		<li id="nav-search-link" class="nav-menu $sel.search">
-			<a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-		</li>
-		<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>
+	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
 		
-		{{ if $nav.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 }}
-	</ul>
-
-</nav>
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
+	{{ 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.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 }}
+	{{ 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 }}
 
-<span id="nav-link-wrapper" >
+	{{ if $nav.network }}
+	<a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.home }}
+	<a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.community }}
+	<a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+	{{ endif }}
+	{{ if $nav.introductions }}
+	<a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
+	<span id="intro-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.messages }}
+	<a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{ endif }}
 
-{{ if $nav.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.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.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.notifications }}
+			<a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
+				<span id="notify-update" class="nav-ajax-left"></span>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+					<li class="empty">$emptynotifications</li>
+				</ul>
+		{{ endif }}		
 
-{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+	{{ if $nav.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>
 
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
diff --git a/view/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 cbadf1361..b0cb8890c 100755..100644
--- a/view/nets.tpl
+++ b/view/nets.tpl
@@ -1,12 +1,10 @@
 <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">
-		<li class="tool {{ if $sel_all }}selected{{ endif }}"><a href="$base" class="nets-link nets-all">$all</a>
-		{{ for $nets as $net }}
-			<li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?f=&nets=$net.ref" class="nets-link">$net.name</a></li>
-		{{ endfor }}
+	{{ 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/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..eeae2a29a 100755..100644
--- a/view/peoplefind.tpl
+++ b/view/peoplefind.tpl
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 e1df2c4ad..a3267d591 100755..100644
--- a/view/profed_head.tpl
+++ b/view/profed_head.tpl
@@ -13,6 +13,7 @@ tinyMCE.init({
 	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,
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..e5c7162d0 100755..100644
--- a/view/profile_edit.tpl
+++ b/view/profile_edit.tpl
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 7cd02f164..d1e684795 100755..100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -1,27 +1,11 @@
 <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>
+	<div class="fn label">$profile.name</div>
+	
 				
-			</ul>
-			</div>
-		{{ endif }}
-	</div>
-
-
+	
 	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
 
 
 
@@ -54,6 +38,9 @@
 			{{ if $connect }}
 				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
 			{{ endif }}
+			{{ if $wallmessage }}
+				<li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li>
+			{{ endif }}
 		</ul>
 	</div>
 </div>
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 9c10a26de..e6a0d6278 100755..100644
--- a/view/saved_searches_aside.tpl
+++ b/view/saved_searches_aside.tpl
@@ -1,15 +1,14 @@
-<div id="saved-search-list" class="widget">
-	<h3 class="title">$title</h3>
-
+<div class="widget" id="saved-search-list">
+	<h3 id="search">$title</h3>
+	$searchbox
+	
 	<ul id="saved-search-ul">
 		{{ for $saved as $search }}
-			<li class="tool {{if $search.selected}}selected{{endif}}">
-					<a href="network/?f=&search=$search.encodedterm" class="label" >$search.term</a>
-					<a href="network/?f=&remove=1&search=$search.encodedterm" class="action icon s10 delete" title="$search.delete" onclick="return confirmDelete();"></a>
-			</li>
+		<li class="saved-search-li clear">
+			<a title="$search.delete" onclick="return confirmDelete();" id="drop-saved-search-term-$search.id" class="iconspacer savedsearchdrop " 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>
-	
-	$searchbox
-	
+	<div class="clear"></div>
 </div>
diff --git a/view/search_item.tpl b/view/search_item.tpl
index 80d6678fb..bfad1b7b7 100755..100644
--- a/view/search_item.tpl
+++ b/view/search_item.tpl
@@ -1,91 +1,54 @@
-
-<div class="wall-item-decor">
-	<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
-	{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-
-<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)">
+<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info" id="wall-item-info-$item.id">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
+				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="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="wall-item-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
+				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+					<ul>
+						$item.item_photo_menu
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
+				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
 			</div>
-			<div class="wall-item-location">$item.location</div>	
-		</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="">
-			{{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ 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-actions">
-			<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">$item.ago</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			{{ if $item.star }}
-				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
-				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
-			{{ endif }}
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
-			{{ endif }}			
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
-			
-			<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 delete s16" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			
+				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+			<div class="wall-item-delete-end"></div>
 		</div>
 	</div>
-	<div class="wall-item-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>
-		{{ if $item.conv }}
-		<div class="wall-item-conv" id="wall-item-conv-$item.id" >
+	<div class="wall-item-wrapper-end"></div>
+
+
+	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
+	{{ if $item.conv }}
 			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-		{{ endif }}
-		</div>
+	{{ endif }}
 	</div>
-	
-	
+
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+
 </div>
 
+
diff --git a/view/settings.tpl b/view/settings.tpl
index 25479b5bf..8753474af 100755..100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -28,9 +28,6 @@ $nickname_block
 {{inc field_custom.tpl with $field=$timezone }}{{endinc}}
 {{inc field_input.tpl with $field=$defloc }}{{endinc}}
 {{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
-{{inc field_select.tpl with $field=$theme }}{{endinc}}
-{{inc field_input.tpl with $field=$ajaxint }}{{endinc}}
-{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}}
 
 
 <div class="settings-submit-wrapper" >
@@ -59,6 +56,10 @@ $blocktags
 
 $suggestme
 
+$unkmail
+
+{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
+
 {{inc field_input.tpl with $field=$expire.days }}{{endinc}}
 <div class="field input">
 	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
diff --git a/view/settings_addons.tpl b/view/settings_addons.tpl
index 28fca5362..28fca5362 100755..100644
--- a/view/settings_addons.tpl
+++ b/view/settings_addons.tpl
diff --git a/view/settings_connectors.tpl b/view/settings_connectors.tpl
index 43c0346bb..43c0346bb 100755..100644
--- a/view/settings_connectors.tpl
+++ b/view/settings_connectors.tpl
diff --git a/view/settings_display.tpl b/view/settings_display.tpl
new file mode 100644
index 000000000..fc7a56c8a
--- /dev/null
+++ b/view/settings_display.tpl
@@ -0,0 +1,23 @@
+$tabs
+
+<h1>$ptitle</h1>
+
+<form action="settings/display" id="settings-form" method="post" autocomplete="off" >
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+{{inc field_themeselect.tpl with $field=$theme }}{{endinc}}
+{{inc field_input.tpl with $field=$ajaxint }}{{endinc}}
+{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+{{ if $theme_config }}
+<h2>Theme settings</h2>
+$theme_config
+{{ endif }}
+
+</form>
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..da1398ab9 100755..100644
--- a/view/settings_oauth.tpl
+++ b/view/settings_oauth.tpl
diff --git a/view/settings_oauth_edit.tpl b/view/settings_oauth_edit.tpl
index d29341386..d29341386 100755..100644
--- a/view/settings_oauth_edit.tpl
+++ b/view/settings_oauth_edit.tpl
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/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/clean/unsupported b/view/theme/clean/unsupported
deleted file mode 100644
index e69de29bb..000000000
--- a/view/theme/clean/unsupported
+++ /dev/null
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/screenshot.jpg b/view/theme/comix-plain/screenshot.jpg
new file mode 100644
index 000000000..80e66e312
--- /dev/null
+++ b/view/theme/comix-plain/screenshot.jpg
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/screenshot.jpg b/view/theme/comix/screenshot.jpg
new file mode 100644
index 000000000..5ad46cd8b
--- /dev/null
+++ b/view/theme/comix/screenshot.jpg
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/screenshot.jpg b/view/theme/darkbubble/screenshot.jpg
new file mode 100644
index 000000000..0d9af2c04
--- /dev/null
+++ b/view/theme/darkbubble/screenshot.jpg
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/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/darkness/unsupported b/view/theme/darkness/unsupported
deleted file mode 100644
index e69de29bb..000000000
--- a/view/theme/darkness/unsupported
+++ /dev/null
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/screenshot.jpg b/view/theme/darkzero-NS/screenshot.jpg
new file mode 100644
index 000000000..e91ae13f5
--- /dev/null
+++ b/view/theme/darkzero-NS/screenshot.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..2d3e4fd56 100755..100644
--- a/view/theme/darkzero-NS/theme.php
+++ b/view/theme/darkzero-NS/theme.php
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/screenshot.jpg b/view/theme/darkzero/screenshot.jpg
new file mode 100644
index 000000000..e91ae13f5
--- /dev/null
+++ b/view/theme/darkzero/screenshot.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..8c4d3e9ac 100755..100644
--- a/view/theme/darkzero/theme.php
+++ b/view/theme/darkzero/theme.php
diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl
new file mode 100644
index 000000000..4873cdd14
--- /dev/null
+++ b/view/theme/diabook-aerith/communityhome.tpl
@@ -0,0 +1,93 @@
+<div id="close_pages">
+{{ if $page }}
+<div>$page</div>
+{{ endif }}
+</div>
+
+<div id="close_helpers">
+{{ if $lastusers_title }}
+<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
+<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
+<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
+<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
+<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
+{{ endif }}
+</div>
+
+<div id="close_services">
+{{ if $lastusers_title }}
+<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
+<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
+<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-aerith/icons/facebook.png" title="Facebook"></a>
+<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-aerith/icons/StatusNet.png?" title="StatusNet"></a>
+<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-aerith/icons/livejournal.png?" title="LiveJournal"></a>
+<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-aerith/icons/posterous.png?" title="Posterous"></a>
+<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-aerith/icons/tumblr.png?" title="Tumblr"></a>
+<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-aerith/icons/twitter.png?" title="Twitter"></a>
+<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-aerith/icons/wordpress.png?" title="WordPress"></a>
+<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-aerith/icons/email.png?" title="E-Mail"></a>
+</div>
+{{ endif }}
+</div>
+
+<div id="close_friends" style="margin-bottom:53px;">
+{{ if $nv }}
+<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
+<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
+<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
+<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
+<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
+<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>			
+$nv.search
+{{ endif }}
+</div>
+
+<div id="close_postit">
+{{ if $lastusers_title }}
+<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
+<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</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/duepuntozero/contact_template.tpl b/view/theme/diabook-aerith/contact_template.tpl
index 48930b48a..48930b48a 100755..100644
--- a/view/theme/duepuntozero/contact_template.tpl
+++ b/view/theme/diabook-aerith/contact_template.tpl
diff --git a/view/theme/diabook-aerith/directory_item.tpl b/view/theme/diabook-aerith/directory_item.tpl
new file mode 100644
index 000000000..db1936e4b
--- /dev/null
+++ b/view/theme/diabook-aerith/directory_item.tpl
@@ -0,0 +1,10 @@
+
+<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-aerith/fpostit/README b/view/theme/diabook-aerith/fpostit/README
new file mode 100644
index 000000000..39b7c5761
--- /dev/null
+++ b/view/theme/diabook-aerith/fpostit/README
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 000000000..d183c7573
--- /dev/null
+++ b/view/theme/diabook-aerith/fpostit/fpostit.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000..4505c9946
--- /dev/null
+++ b/view/theme/diabook-aerith/fpostit/fpostit.php
@@ -0,0 +1,135 @@
+<?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
new file mode 100644
index 000000000..61764bf20
--- /dev/null
+++ b/view/theme/diabook-aerith/fpostit/friendika-32.png
diff --git a/view/theme/diabook-aerith/group_side.tpl b/view/theme/diabook-aerith/group_side.tpl
new file mode 100644
index 000000000..af183d04d
--- /dev/null
+++ b/view/theme/diabook-aerith/group_side.tpl
@@ -0,0 +1,29 @@
+<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/StatusNet.png b/view/theme/diabook-aerith/icons/StatusNet.png
new file mode 100644
index 000000000..398bca716
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/StatusNet.png
diff --git a/view/theme/diabook-aerith/icons/attach.png b/view/theme/diabook-aerith/icons/attach.png
new file mode 100644
index 000000000..1958041cf
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/attach.png
diff --git a/view/theme/diabook-aerith/icons/audio.png b/view/theme/diabook-aerith/icons/audio.png
new file mode 100644
index 000000000..8d779a409
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/audio.png
diff --git a/view/theme/diabook-aerith/icons/bluebug.png b/view/theme/diabook-aerith/icons/bluebug.png
new file mode 100644
index 000000000..3979e7d8e
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/bluebug.png
diff --git a/view/theme/diabook-aerith/icons/camera.png b/view/theme/diabook-aerith/icons/camera.png
new file mode 100644
index 000000000..a5c7f1236
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/camera.png
diff --git a/view/theme/diabook-aerith/icons/close_box.png b/view/theme/diabook-aerith/icons/close_box.png
new file mode 100644
index 000000000..28e2675b8
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/close_box.png
diff --git a/view/theme/diabook-aerith/icons/com_side.png b/view/theme/diabook-aerith/icons/com_side.png
new file mode 100644
index 000000000..bc5969ef1
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/com_side.png
diff --git a/view/theme/diabook-aerith/icons/community.png b/view/theme/diabook-aerith/icons/community.png
new file mode 100644
index 000000000..7c91e8b75
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/community.png
diff --git a/view/theme/diabook-aerith/icons/contacts.png b/view/theme/diabook-aerith/icons/contacts.png
new file mode 100644
index 000000000..cd0e289a7
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/contacts.png
diff --git a/view/theme/diabook-aerith/icons/contacts2.png b/view/theme/diabook-aerith/icons/contacts2.png
new file mode 100644
index 000000000..cd0e289a7
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/contacts2.png
diff --git a/view/theme/diabook-aerith/icons/dislike.png b/view/theme/diabook-aerith/icons/dislike.png
new file mode 100644
index 000000000..23de426c5
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/dislike.png
diff --git a/view/theme/diabook-aerith/icons/drop.png b/view/theme/diabook-aerith/icons/drop.png
new file mode 100644
index 000000000..2abb82ef2
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/drop.png
diff --git a/view/theme/diabook-aerith/icons/email.png b/view/theme/diabook-aerith/icons/email.png
new file mode 100644
index 000000000..240cef2c3
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/email.png
diff --git a/view/theme/diabook-aerith/icons/events.png b/view/theme/diabook-aerith/icons/events.png
new file mode 100644
index 000000000..4a0b3f3f1
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/events.png
diff --git a/view/theme/diabook-aerith/icons/facebook.png b/view/theme/diabook-aerith/icons/facebook.png
new file mode 100644
index 000000000..3e5dd39c3
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/facebook.png
diff --git a/view/theme/diabook-aerith/icons/file_as.png b/view/theme/diabook-aerith/icons/file_as.png
new file mode 100644
index 000000000..16713fa53
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/file_as.png
diff --git a/view/theme/diabook-aerith/icons/ftdevs.gif b/view/theme/diabook-aerith/icons/ftdevs.gif
new file mode 100644
index 000000000..e0fc25743
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/ftdevs.gif
diff --git a/view/theme/diabook-aerith/icons/globe.png b/view/theme/diabook-aerith/icons/globe.png
new file mode 100644
index 000000000..6bb9bc09d
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/globe.png
diff --git a/view/theme/diabook-aerith/icons/home.png b/view/theme/diabook-aerith/icons/home.png
new file mode 100644
index 000000000..be47a48fc
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/home.png
diff --git a/view/theme/diabook-aerith/icons/language.png b/view/theme/diabook-aerith/icons/language.png
new file mode 100644
index 000000000..8029c0155
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/language.png
diff --git a/view/theme/diabook-aerith/icons/like.png b/view/theme/diabook-aerith/icons/like.png
new file mode 100644
index 000000000..b65edccc0
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/like.png
diff --git a/view/theme/diabook-aerith/icons/link.png b/view/theme/diabook-aerith/icons/link.png
new file mode 100644
index 000000000..0ef666a67
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/link.png
diff --git a/view/theme/diabook-aerith/icons/livejournal.png b/view/theme/diabook-aerith/icons/livejournal.png
new file mode 100644
index 000000000..6d27d265e
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/livejournal.png
diff --git a/view/theme/diabook-aerith/icons/lock.png b/view/theme/diabook-aerith/icons/lock.png
new file mode 100644
index 000000000..7e34bf279
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/lock.png
diff --git a/view/theme/diabook-aerith/icons/lupe.png b/view/theme/diabook-aerith/icons/lupe.png
new file mode 100644
index 000000000..f8b228347
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/lupe.png
diff --git a/view/theme/diabook-aerith/icons/mess_side.png b/view/theme/diabook-aerith/icons/mess_side.png
new file mode 100644
index 000000000..49ef896bc
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/mess_side.png
diff --git a/view/theme/diabook-aerith/icons/messages.png b/view/theme/diabook-aerith/icons/messages.png
new file mode 100644
index 000000000..e2bf7d24d
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/messages.png
diff --git a/view/theme/diabook-aerith/icons/messages2.png b/view/theme/diabook-aerith/icons/messages2.png
new file mode 100644
index 000000000..e2bf7d24d
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/messages2.png
diff --git a/view/theme/diabook-aerith/icons/next.png b/view/theme/diabook-aerith/icons/next.png
new file mode 100644
index 000000000..7b5e25b90
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/next.png
diff --git a/view/theme/diabook-aerith/icons/notes.png b/view/theme/diabook-aerith/icons/notes.png
new file mode 100644
index 000000000..7d4afca90
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/notes.png
diff --git a/view/theme/diabook-aerith/icons/notifications.png b/view/theme/diabook-aerith/icons/notifications.png
new file mode 100644
index 000000000..2b4fbb818
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/notifications.png
diff --git a/view/theme/diabook-aerith/icons/notify.png b/view/theme/diabook-aerith/icons/notify.png
new file mode 100644
index 000000000..9765bfd53
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/notify.png
diff --git a/view/theme/diabook-aerith/icons/notify2.png b/view/theme/diabook-aerith/icons/notify2.png
new file mode 100644
index 000000000..9765bfd53
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/notify2.png
diff --git a/view/theme/diabook-aerith/icons/pencil.png b/view/theme/diabook-aerith/icons/pencil.png
new file mode 100644
index 000000000..772e49b17
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/pencil.png
diff --git a/view/theme/diabook-aerith/icons/pencil2.png b/view/theme/diabook-aerith/icons/pencil2.png
new file mode 100644
index 000000000..3b47d1864
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/pencil2.png
diff --git a/view/theme/diabook-aerith/icons/photo-menu.jpg b/view/theme/diabook-aerith/icons/photo-menu.jpg
new file mode 100644
index 000000000..fde5eb535
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/photo-menu.jpg
diff --git a/view/theme/diabook-aerith/icons/posterous.png b/view/theme/diabook-aerith/icons/posterous.png
new file mode 100644
index 000000000..c8e86078e
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/posterous.png
diff --git a/view/theme/diabook-aerith/icons/prev.png b/view/theme/diabook-aerith/icons/prev.png
new file mode 100644
index 000000000..55c1464ba
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/prev.png
diff --git a/view/theme/diabook-aerith/icons/pscontacts.png b/view/theme/diabook-aerith/icons/pscontacts.png
new file mode 100644
index 000000000..acf857f32
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/pscontacts.png
diff --git a/view/theme/diabook-aerith/icons/pubgroups.png b/view/theme/diabook-aerith/icons/pubgroups.png
new file mode 100644
index 000000000..6d9539610
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/pubgroups.png
diff --git a/view/theme/diabook-aerith/icons/recycle.png b/view/theme/diabook-aerith/icons/recycle.png
new file mode 100644
index 000000000..c3b8d2bf4
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/recycle.png
diff --git a/view/theme/diabook-aerith/icons/remote.png b/view/theme/diabook-aerith/icons/remote.png
new file mode 100644
index 000000000..a560cc55e
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/remote.png
diff --git a/view/theme/diabook-aerith/icons/scroll_top.png b/view/theme/diabook-aerith/icons/scroll_top.png
new file mode 100644
index 000000000..0e7f7ae6a
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/scroll_top.png
diff --git a/view/theme/diabook-aerith/icons/selected.png b/view/theme/diabook-aerith/icons/selected.png
new file mode 100644
index 000000000..2a30ae252
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/selected.png
diff --git a/view/theme/diabook-aerith/icons/srch_bg.gif b/view/theme/diabook-aerith/icons/srch_bg.gif
new file mode 100644
index 000000000..6a523ba8f
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/srch_bg.gif
diff --git a/view/theme/diabook-aerith/icons/srch_l.gif b/view/theme/diabook-aerith/icons/srch_l.gif
new file mode 100644
index 000000000..6d95bf35d
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/srch_l.gif
diff --git a/view/theme/diabook-aerith/icons/srch_r.gif b/view/theme/diabook-aerith/icons/srch_r.gif
new file mode 100644
index 000000000..89833a316
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/srch_r.gif
diff --git a/view/theme/diabook-aerith/icons/srch_r_f2.gif b/view/theme/diabook-aerith/icons/srch_r_f2.gif
new file mode 100644
index 000000000..6df457bed
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/srch_r_f2.gif
diff --git a/view/theme/diabook-aerith/icons/star.png b/view/theme/diabook-aerith/icons/star.png
new file mode 100644
index 000000000..0b00cb189
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/star.png
diff --git a/view/theme/diabook-aerith/icons/star_dummy.png b/view/theme/diabook-aerith/icons/star_dummy.png
new file mode 100644
index 000000000..ce11f30d4
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/star_dummy.png
diff --git a/view/theme/diabook-aerith/icons/starred.png b/view/theme/diabook-aerith/icons/starred.png
new file mode 100644
index 000000000..2b82dfca3
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/starred.png
diff --git a/view/theme/diabook-aerith/icons/tagged.png b/view/theme/diabook-aerith/icons/tagged.png
new file mode 100644
index 000000000..144649ef8
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/tagged.png
diff --git a/view/theme/diabook-aerith/icons/toogle_off.png b/view/theme/diabook-aerith/icons/toogle_off.png
new file mode 100644
index 000000000..0fcce4d5a
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/toogle_off.png
diff --git a/view/theme/diabook-aerith/icons/toogle_on.png b/view/theme/diabook-aerith/icons/toogle_on.png
new file mode 100644
index 000000000..79ce07f0e
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/toogle_on.png
diff --git a/view/theme/diabook-aerith/icons/tumblr.png b/view/theme/diabook-aerith/icons/tumblr.png
new file mode 100644
index 000000000..1dc7fa072
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/tumblr.png
diff --git a/view/theme/diabook-aerith/icons/twitter.png b/view/theme/diabook-aerith/icons/twitter.png
new file mode 100644
index 000000000..b7a687b9f
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/twitter.png
diff --git a/view/theme/diabook-aerith/icons/unlock.png b/view/theme/diabook-aerith/icons/unlock.png
new file mode 100644
index 000000000..a0cda0ae5
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/unlock.png
diff --git a/view/theme/diabook-aerith/icons/unstarred.png b/view/theme/diabook-aerith/icons/unstarred.png
new file mode 100644
index 000000000..ba3183f5c
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/unstarred.png
diff --git a/view/theme/diabook-aerith/icons/video.png b/view/theme/diabook-aerith/icons/video.png
new file mode 100644
index 000000000..a03d1d818
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/video.png
diff --git a/view/theme/diabook-aerith/icons/weblink.png b/view/theme/diabook-aerith/icons/weblink.png
new file mode 100644
index 000000000..216e78344
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/weblink.png
diff --git a/view/theme/diabook-aerith/icons/wordpress.png b/view/theme/diabook-aerith/icons/wordpress.png
new file mode 100644
index 000000000..f564c4300
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/wordpress.png
diff --git a/view/theme/duepuntozero/jot.tpl b/view/theme/diabook-aerith/jot.tpl
index 5fe1f954e..ee30da7bf 100755..100644
--- a/view/theme/duepuntozero/jot.tpl
+++ b/view/theme/diabook-aerith/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>
 
@@ -14,55 +13,57 @@
 		<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-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
-		<div id="jot-text-wrap">
+		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+		<div id="character-counter" class="grey"></div>		
 		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-		</div>
 
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
 
+<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="icon camera" title="$upload"></a></div>
+		<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="icon attach" title="$attach"></a></div>
+		<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="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+		<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="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
+		<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="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
+		<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="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
+		<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="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
+		<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>
 
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
-
-	<div id="profile-jot-perms-end"></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;">
@@ -76,9 +77,8 @@
 	</div>
 
 
-</div>
 
-<div id="profile-jot-end"></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
new file mode 100644
index 000000000..6d5974a2c
--- /dev/null
+++ b/view/theme/diabook-aerith/js/jquery.cookie.js
@@ -0,0 +1,47 @@
+/*!
+ * 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
new file mode 100644
index 000000000..989f17878
--- /dev/null
+++ b/view/theme/diabook-aerith/mail_conv.tpl
@@ -0,0 +1,60 @@
+<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
new file mode 100644
index 000000000..8b82e95c6
--- /dev/null
+++ b/view/theme/diabook-aerith/mail_display.tpl
@@ -0,0 +1,12 @@
+<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
new file mode 100644
index 000000000..6bc6c84f6
--- /dev/null
+++ b/view/theme/diabook-aerith/mail_list.tpl
@@ -0,0 +1,8 @@
+<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
new file mode 100644
index 000000000..9f1587096
--- /dev/null
+++ b/view/theme/diabook-aerith/message_side.tpl
@@ -0,0 +1,10 @@
+<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
new file mode 100644
index 000000000..f84b902d5
--- /dev/null
+++ b/view/theme/diabook-aerith/nav.tpl
@@ -0,0 +1,188 @@
+<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
new file mode 100644
index 000000000..511fc73ac
--- /dev/null
+++ b/view/theme/diabook-aerith/photo_view.tpl
@@ -0,0 +1,27 @@
+<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
new file mode 100644
index 000000000..94396300f
--- /dev/null
+++ b/view/theme/diabook-aerith/profile_side.tpl
@@ -0,0 +1,21 @@
+<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/loozah/profile_vcard.tpl b/view/theme/diabook-aerith/profile_vcard.tpl
index b3f5cc50d..e28ec2909 100755..100644
--- a/view/theme/loozah/profile_vcard.tpl
+++ b/view/theme/diabook-aerith/profile_vcard.tpl
@@ -1,16 +1,33 @@
 <div class="vcard">
 
-	<div class="fn label">$profile.name</div>
-	
+	<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="175" height="175" src="$profile.photo" alt="$profile.name"></div>
 
+	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 
 
 	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
+		<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">
diff --git a/view/theme/diabook-aerith/right_aside.tpl b/view/theme/diabook-aerith/right_aside.tpl
new file mode 100644
index 000000000..a65677696
--- /dev/null
+++ b/view/theme/diabook-aerith/right_aside.tpl
@@ -0,0 +1,20 @@
+<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
new file mode 100644
index 000000000..6a1c5c71b
--- /dev/null
+++ b/view/theme/diabook-aerith/rs_common_tabs.tpl
@@ -0,0 +1,6 @@
+<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
new file mode 100644
index 000000000..0c2f50894
--- /dev/null
+++ b/view/theme/diabook-aerith/screenshot.png
diff --git a/view/theme/diabook-aerith/search_item.tpl b/view/theme/diabook-aerith/search_item.tpl
new file mode 100644
index 000000000..123834064
--- /dev/null
+++ b/view/theme/diabook-aerith/search_item.tpl
@@ -0,0 +1,100 @@
+{{ 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/style-network.css b/view/theme/diabook-aerith/style-network.css
new file mode 100644
index 000000000..6e3b3f822
--- /dev/null
+++ b/view/theme/diabook-aerith/style-network.css
@@ -0,0 +1,2627 @@
+/**
+ * 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("../../../view/theme/diabook-aerith/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook-aerith/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook-aerith/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook-aerith/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/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"); 
+			  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;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/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"); 
+			  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("../../../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;}
+.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("../../../view/theme/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"); 
+  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: #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: #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: #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: 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: #ff500f;
+  color: #000;
+  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;
+}
+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("../../../view/theme/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");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/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;
+ 
+}
+#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;
+  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("../../../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;
+	}
+/* 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;
+}
+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("../../../view/theme/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;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../../../view/theme/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;
+	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-right: 5px; 
+    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("../../../view/theme/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");
+		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;
+}
+.tread-wrapper a{
+  color: #3465A4;
+}
+
+.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 {
+  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;
+  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 0px 0px 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: 710px;
+  border: 1px solid #2d2d2d;
+  margin-top: 10px;
+}
+.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 #ffffff;
+}
+#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: #3465A4;
+    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: #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: 2px 5px 2px 5px;
+max-height: 85%;
+max-width: 85%;
+}
+.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;
+}
+.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;}
+*/
+
+#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 {
+        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-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-aerith/style-profile.css
new file mode 100644
index 000000000..f41c4a98a
--- /dev/null
+++ b/view/theme/diabook-aerith/style-profile.css
@@ -0,0 +1,2617 @@
+/**
+ * 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("../../../view/theme/diabook-aerith/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook-aerith/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook-aerith/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook-aerith/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/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"); 
+			  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;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/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"); 
+			  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("../../../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;}
+.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("../../../view/theme/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"); 
+  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: #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;
+}
+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-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");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/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("../../../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;
+	}
+
+/* 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("../../../view/theme/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;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../../../view/theme/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;
+	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-right: 5px; 
+    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("../../../view/theme/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");
+		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;
+}
+.tread-wrapper a{
+  color: #3465A4;
+}
+
+.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 {
+  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;
+  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 1px 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: 710px;
+  border: 1px solid #2d2d2d;
+  margin-top: 10px;
+}
+.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 #ffffff;
+}
+#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: #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**/
+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: #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: 2px 5px 2px 5px;
+max-height: 85%;
+max-width: 85%;
+border-radius: 10px;
+}
+.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;
+}
+.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;}
+*/
+
+#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 {
+        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-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-settings.css b/view/theme/diabook-aerith/style-settings.css
new file mode 100644
index 000000000..8963065ca
--- /dev/null
+++ b/view/theme/diabook-aerith/style-settings.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("../../../view/theme/diabook-aerith/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook-aerith/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook-aerith/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook-aerith/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/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"); 
+			  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;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/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"); 
+			  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("../../../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;}
+.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("../../../view/theme/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"); 
+  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: #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: #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: #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: 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: #ff500f;
+  color: #000;
+  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;
+}
+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("../../../view/theme/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");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/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;
+ 
+}
+#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;
+  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("../../../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;
+	}
+/* aside */
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 200px;
+  padding: 0px 10px 0px 10px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+aside #page-sidebar{display: none;}
+aside .vcard {display: none;}
+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 {display: none;}
+#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("../../../view/theme/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;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../../../view/theme/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;
+	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: 650px;
+  padding: 0px 0px 0px 20px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+
+#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 {display: none;}
+.tab.button{display: none;}
+.rs_tabs {
+    
+    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;
+	}
+	
+#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: 5px; 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("../../../view/theme/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");
+		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;
+}
+.tread-wrapper a{
+  color: #3465A4;
+}
+
+.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 {
+  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;
+  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 0px 0px 80px;
+  background-color: #fff;
+  width: 500px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+  display: none;
+}
+.wall-item-comment-wrapper textarea {
+  height: 2.0em;
+  width: 93%;
+  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;
+  height: 4em;
+  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;
+  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;
+}
+#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 #ffffff;
+}
+#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: #3465A4;
+    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.rs_tabs {
+  list-style-type: none;
+
+  font-size: 11px;
+}
+ul.rs_tabs li {
+  float: left;
+  margin-bottom: 30px;
+  clear: both;
+}
+ul.rs_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;
+}
+/**
+ * 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: 2px 5px 2px 5px;
+max-height: 85%;
+max-width: 85%;
+}
+.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;
+}
+.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;}
+*/
+
+#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 {
+        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-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: -2px;
+  top: -20px;
+}
+.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.css b/view/theme/diabook-aerith/style.css
new file mode 100644
index 000000000..3d53115df
--- /dev/null
+++ b/view/theme/diabook-aerith/style.css
@@ -0,0 +1,2630 @@
+/**
+ * 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("../../../view/theme/diabook-aerith/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook-aerith/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook-aerith/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook-aerith/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/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"); 
+			  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;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/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"); 
+			  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("../../../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;}
+/*.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-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"); 
+  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;
+}
+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: 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;
+}
+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-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");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/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("../../../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;
+	}
+/* 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;
+}
+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;		
+	}
+/* 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-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: 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-right: 5px; 
+    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;
+}
+.tread-wrapper a{
+  color: #3465A4;
+}
+.wall-item-decor {
+  position: absolute;
+  left: 790px;
+  top: -10px;
+  width: 16px;
+}
+
+.wall-item-container {
+  display: table;
+  width: 780px;
+}
+
+
+.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 {
+  font-size: 12.5px;
+  max-width: 720px;
+  word-wrap: break-word;
+  line-height: 1.2;
+}
+
+.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 1px 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: 710px;
+  border: 1px solid #2d2d2d;
+  margin-top: 10px;
+}
+.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 {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #ffffff;
+}
+#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;
+}
+.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**/
+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: #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;
+}
+.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: 2px 5px 2px 5px;
+max-height: 85%;
+max-width: 85%;
+border-radius: 10px;
+}
+.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;
+}
+.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;}
+*/
+
+#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 {
+        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-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/theme.php b/view/theme/diabook-aerith/theme.php
new file mode 100644
index 000000000..e56f0ab74
--- /dev/null
+++ b/view/theme/diabook-aerith/theme.php
@@ -0,0 +1,450 @@
+<?php
+
+/*
+ * Name: Diabook-aerith
+ * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
+ * Version: (Version: 1.012)
+ * 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['title'] = Array("", t('Find Friends'), "", "");
+	$nv['directory'] = Array('directory', t('Local Directory'), "", "");
+	$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
+	$nv['match'] = Array('match', t('Similar Interests'), "", "");
+	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
+	$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
+	
+	$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
+						<span class="sbox_l"></span>
+						<span class="sbox">
+						<input type="text" name="search" size="13" maxlength="50">
+						</span>
+						<span class="sbox_r" id="srch_clear"></span>';
+						
+	$aside['$nv'] = $nv;
+	};
+	//Community Page
+	if(local_user()) {
+   $page = '<div id="page-sidebar-right_aside" class="widget">
+			<div class="title tool">
+			<h3>'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
+			<div id="sidebar-page-list"><ul>';
+
+	$pagelist = array();
+
+	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
+			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
+			ORDER BY `name` ASC",
+			intval($a->user['uid'])
+	);
+
+	$pageD = array();
+
+	// Look if the profile is a community page
+	foreach($contacts as $contact) {
+		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
+	};
+	
+
+	$contacts = $pageD;
+
+	foreach($contacts as $contact) {
+		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
+				$contact["name"]."</a></li>";
+	}
+	$page .= '</ul></div></div>';
+	//if (sizeof($contacts) > 0)
+		
+		$aside['$page'] = $page;
+	}		
+  //END Community Page	
+  //helpers
+   $helpers = array();
+	$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
+	
+	$aside['$helpers'] = $helpers;
+   //end helpers
+   //connectable services
+   $con_services = array();
+	$con_services['title'] = Array("", t('Connect Services'), "", "");
+	
+	$aside['$con_services'] = $con_services;
+   //end connectable services
+   //postit
+   $postit = array();
+	$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
+	$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
+	
+	$aside['$postit'] = $postit;
+   //end postit
+  
+   //get_baseurl	      
+   $url = $a->get_baseurl($ssl_state);   
+   $aside['$url'] = $url;
+
+	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
+	$a->page['right_aside'] = replace_macros($tpl, $aside);
+	
+}
+
+
+//profile_side at networkpages
+if ($a->argv[0] === "network" && local_user()){
+
+	// USER MENU
+	if(local_user()) {
+		
+		$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
+				
+		$userinfo = array(
+					'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
+					'name' => $a->user['username'],
+				);	
+		$ps = array('usermenu'=>array());
+		$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
+		$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
+		$ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));		
+		$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
+		$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
+		$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
+		$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
+		$ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", "");
+
+		$tpl = get_markup_template('profile_side.tpl');
+
+		$a->page['aside'] .= replace_macros($tpl, array(
+				'$userinfo' => $userinfo,
+				'$ps' => $ps,
+			));
+
+	}
+	
+	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_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'] .= '
+
+<script>
+ $(function() {
+	$("a.lightbox").fancybox(); // Select all links with lightbox class
+ });
+  
+ </script>';
+
+
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
+$a->page['htmlhead'] .= '
+<script>
+
+$("right_aside").ready(function(){
+	
+	if($.cookie("close_pages") == "1") 
+		{
+		document.getElementById( "close_pages" ).style.display = "none";
+			};
+	
+	if($.cookie("close_helpers") == "1") 
+		{
+		document.getElementById( "close_helpers" ).style.display = "none";
+			};
+			
+	if($.cookie("close_services") == "1") 
+		{
+		document.getElementById( "close_services" ).style.display = "none";
+			};
+			
+	if($.cookie("close_friends") == "1") 
+		{
+		document.getElementById( "close_friends" ).style.display = "none";
+			};
+	
+	if($.cookie("close_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>';}
\ No newline at end of file
diff --git a/view/theme/diabook-aerith/wall_item.tpl b/view/theme/diabook-aerith/wall_item.tpl
new file mode 100644
index 000000000..123834064
--- /dev/null
+++ b/view/theme/diabook-aerith/wall_item.tpl
@@ -0,0 +1,100 @@
+{{ 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
new file mode 100644
index 000000000..6a0c93f88
--- /dev/null
+++ b/view/theme/diabook-aerith/wallwall_item.tpl
@@ -0,0 +1,106 @@
+{{ if $item.indent }}{{ else }}
+<div class="wall-item-decor">
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+{{ endif }}
+<div class="wall-item-container $item.indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
+					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
+				</a>
+			</div>
+			<div class="contact-photo-wrapper mframe wwfrom"
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+				$item.item_photo_menu
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
+				$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a>
+				 $item.vwall <span class="wall-item-ago">- &nbsp;
+			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
+			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+			$item.body
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{ for $item.tags as $tag }}
+				<span class='tag'>$tag</span>
+			{{ endfor }}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+
+		</div>
+		<div class="wall-item-actions">
+
+			<div class="wall-item-actions-social">
+			
+			
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+			{{ endif }}
+						
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
+			{{ endif }}	
+
+
+			{{ if $item.star }}
+				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
+				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+			{{ endif }}	
+			
+			{{ if $item.filer }}
+			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
+			{{ endif }}				
+			
+			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+			
+					
+					
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{ if $item.drop.dropping }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
+				{{ endif }}
+				{{ if $item.edpost }}
+					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+				{{ endif }}
+			</div>
+			<div class="wall-item-location">$item.location&nbsp;</div>
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
+	</div>
+</div>
+
+<div class="wall-item-comment-wrapper" >
+	$item.comment
+</div>
\ No newline at end of file
diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl
new file mode 100644
index 000000000..6e126827b
--- /dev/null
+++ b/view/theme/diabook-blue/communityhome.tpl
@@ -0,0 +1,93 @@
+<div id="close_pages">
+{{ if $page }}
+<div>$page</div>
+{{ endif }}
+</div>
+
+<div id="close_helpers">
+{{ if $lastusers_title }}
+<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
+<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
+<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
+<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
+<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
+{{ endif }}
+</div>
+
+<div id="close_services">
+{{ if $lastusers_title }}
+<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
+<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
+<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-blue/icons/facebook.png" title="Facebook"></a>
+<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-blue/icons/StatusNet.png?" title="StatusNet"></a>
+<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-blue/icons/livejournal.png?" title="LiveJournal"></a>
+<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-blue/icons/posterous.png?" title="Posterous"></a>
+<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-blue/icons/tumblr.png?" title="Tumblr"></a>
+<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-blue/icons/twitter.png?" title="Twitter"></a>
+<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-blue/icons/wordpress.png?" title="WordPress"></a>
+<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-blue/icons/email.png?" title="E-Mail"></a>
+</div>
+{{ endif }}
+</div>
+
+<div id="close_friends" style="margin-bottom:53px;">
+{{ if $nv }}
+<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
+<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
+<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
+<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
+<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
+<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>			
+$nv.search
+{{ endif }}
+</div>
+
+<div id="close_postit">
+{{ if $lastusers_title }}
+<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
+<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</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
index 48930b48a..48930b48a 100755..100644
--- a/view/theme/diabook-blue/contact_template.tpl
+++ b/view/theme/diabook-blue/contact_template.tpl
diff --git a/view/theme/diabook-blue/directory_item.tpl b/view/theme/diabook-blue/directory_item.tpl
new file mode 100644
index 000000000..db1936e4b
--- /dev/null
+++ b/view/theme/diabook-blue/directory_item.tpl
@@ -0,0 +1,10 @@
+
+<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
new file mode 100644
index 000000000..39b7c5761
--- /dev/null
+++ b/view/theme/diabook-blue/fpostit/README
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 000000000..d183c7573
--- /dev/null
+++ b/view/theme/diabook-blue/fpostit/fpostit.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000..4505c9946
--- /dev/null
+++ b/view/theme/diabook-blue/fpostit/fpostit.php
@@ -0,0 +1,135 @@
+<?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
new file mode 100644
index 000000000..61764bf20
--- /dev/null
+++ b/view/theme/diabook-blue/fpostit/friendika-32.png
diff --git a/view/theme/diabook-blue/group_side.tpl b/view/theme/diabook-blue/group_side.tpl
index af183d04d..af183d04d 100755..100644
--- a/view/theme/diabook-blue/group_side.tpl
+++ b/view/theme/diabook-blue/group_side.tpl
diff --git a/view/theme/diabook-blue/icons/StatusNet.png b/view/theme/diabook-blue/icons/StatusNet.png
new file mode 100644
index 000000000..398bca716
--- /dev/null
+++ b/view/theme/diabook-blue/icons/StatusNet.png
diff --git a/view/theme/diabook-blue/icons/attach.png b/view/theme/diabook-blue/icons/attach.png
index 1958041cf..1958041cf 100755..100644
--- a/view/theme/diabook-blue/icons/attach.png
+++ b/view/theme/diabook-blue/icons/attach.png
diff --git a/view/theme/diabook-blue/icons/audio.png b/view/theme/diabook-blue/icons/audio.png
index 8d779a409..8d779a409 100755..100644
--- a/view/theme/diabook-blue/icons/audio.png
+++ b/view/theme/diabook-blue/icons/audio.png
diff --git a/view/theme/diabook-blue/icons/camera.png b/view/theme/diabook-blue/icons/camera.png
index a5c7f1236..a5c7f1236 100755..100644
--- a/view/theme/diabook-blue/icons/camera.png
+++ b/view/theme/diabook-blue/icons/camera.png
diff --git a/view/theme/diabook-blue/icons/close_box.png b/view/theme/diabook-blue/icons/close_box.png
new file mode 100644
index 000000000..28e2675b8
--- /dev/null
+++ b/view/theme/diabook-blue/icons/close_box.png
diff --git a/view/theme/diabook-blue/icons/contacts2.png b/view/theme/diabook-blue/icons/contacts2.png
index 7817279f4..7817279f4 100755..100644
--- a/view/theme/diabook-blue/icons/contacts2.png
+++ b/view/theme/diabook-blue/icons/contacts2.png
diff --git a/view/theme/diabook-blue/icons/drop.png b/view/theme/diabook-blue/icons/drop.png
index 2abb82ef2..2abb82ef2 100755..100644
--- a/view/theme/diabook-blue/icons/drop.png
+++ b/view/theme/diabook-blue/icons/drop.png
diff --git a/view/theme/diabook-blue/icons/email.png b/view/theme/diabook-blue/icons/email.png
new file mode 100644
index 000000000..240cef2c3
--- /dev/null
+++ b/view/theme/diabook-blue/icons/email.png
diff --git a/view/theme/diabook-blue/icons/facebook.png b/view/theme/diabook-blue/icons/facebook.png
new file mode 100644
index 000000000..3e5dd39c3
--- /dev/null
+++ b/view/theme/diabook-blue/icons/facebook.png
diff --git a/view/theme/diabook-blue/icons/file_as.png b/view/theme/diabook-blue/icons/file_as.png
index 16713fa53..16713fa53 100755..100644
--- a/view/theme/diabook-blue/icons/file_as.png
+++ b/view/theme/diabook-blue/icons/file_as.png
diff --git a/view/theme/diabook-blue/icons/link.png b/view/theme/diabook-blue/icons/link.png
index 0ef666a67..0ef666a67 100755..100644
--- a/view/theme/diabook-blue/icons/link.png
+++ b/view/theme/diabook-blue/icons/link.png
diff --git a/view/theme/diabook-blue/icons/livejournal.png b/view/theme/diabook-blue/icons/livejournal.png
new file mode 100644
index 000000000..6d27d265e
--- /dev/null
+++ b/view/theme/diabook-blue/icons/livejournal.png
diff --git a/view/theme/diabook-blue/icons/lock.png b/view/theme/diabook-blue/icons/lock.png
index 7e34bf279..7e34bf279 100755..100644
--- a/view/theme/diabook-blue/icons/lock.png
+++ b/view/theme/diabook-blue/icons/lock.png
diff --git a/view/theme/diabook-blue/icons/lupe.png b/view/theme/diabook-blue/icons/lupe.png
index f8b228347..f8b228347 100755..100644
--- a/view/theme/diabook-blue/icons/lupe.png
+++ b/view/theme/diabook-blue/icons/lupe.png
diff --git a/view/theme/diabook-blue/icons/messages.png b/view/theme/diabook-blue/icons/messages.png
index f7010c98c..f7010c98c 100755..100644
--- a/view/theme/diabook-blue/icons/messages.png
+++ b/view/theme/diabook-blue/icons/messages.png
diff --git a/view/theme/diabook-blue/icons/next.png b/view/theme/diabook-blue/icons/next.png
index 7b5e25b90..7b5e25b90 100755..100644
--- a/view/theme/diabook-blue/icons/next.png
+++ b/view/theme/diabook-blue/icons/next.png
diff --git a/view/theme/diabook-blue/icons/notifications.png b/view/theme/diabook-blue/icons/notifications.png
index c23673dbd..c23673dbd 100755..100644
--- a/view/theme/diabook-blue/icons/notifications.png
+++ b/view/theme/diabook-blue/icons/notifications.png
diff --git a/view/theme/diabook-blue/icons/notify.png b/view/theme/diabook-blue/icons/notify.png
index 8a7bdc38f..8a7bdc38f 100755..100644
--- a/view/theme/diabook-blue/icons/notify.png
+++ b/view/theme/diabook-blue/icons/notify.png
diff --git a/view/theme/diabook-blue/icons/pencil.png b/view/theme/diabook-blue/icons/pencil.png
index 772e49b17..772e49b17 100755..100644
--- a/view/theme/diabook-blue/icons/pencil.png
+++ b/view/theme/diabook-blue/icons/pencil.png
diff --git a/view/theme/diabook-blue/icons/posterous.png b/view/theme/diabook-blue/icons/posterous.png
new file mode 100644
index 000000000..c8e86078e
--- /dev/null
+++ b/view/theme/diabook-blue/icons/posterous.png
diff --git a/view/theme/diabook-blue/icons/prev.png b/view/theme/diabook-blue/icons/prev.png
index 55c1464ba..55c1464ba 100755..100644
--- a/view/theme/diabook-blue/icons/prev.png
+++ b/view/theme/diabook-blue/icons/prev.png
diff --git a/view/theme/diabook-blue/icons/pscontacts.png b/view/theme/diabook-blue/icons/pscontacts.png
new file mode 100644
index 000000000..acf857f32
--- /dev/null
+++ b/view/theme/diabook-blue/icons/pscontacts.png
diff --git a/view/theme/diabook-blue/icons/pubgroups.png b/view/theme/diabook-blue/icons/pubgroups.png
index acf857f32..6d9539610 100644
--- a/view/theme/diabook-blue/icons/pubgroups.png
+++ b/view/theme/diabook-blue/icons/pubgroups.png
diff --git a/view/theme/diabook-blue/icons/recycle.png b/view/theme/diabook-blue/icons/recycle.png
index c3b8d2bf4..c3b8d2bf4 100755..100644
--- a/view/theme/diabook-blue/icons/recycle.png
+++ b/view/theme/diabook-blue/icons/recycle.png
diff --git a/view/theme/diabook-blue/icons/remote.png b/view/theme/diabook-blue/icons/remote.png
index a560cc55e..a560cc55e 100755..100644
--- a/view/theme/diabook-blue/icons/remote.png
+++ b/view/theme/diabook-blue/icons/remote.png
diff --git a/view/theme/diabook-blue/icons/scroll_top.png b/view/theme/diabook-blue/icons/scroll_top.png
index 0e7f7ae6a..0e7f7ae6a 100755..100644
--- a/view/theme/diabook-blue/icons/scroll_top.png
+++ b/view/theme/diabook-blue/icons/scroll_top.png
diff --git a/view/theme/diabook-blue/icons/selected.png b/view/theme/diabook-blue/icons/selected.png
index 2a30ae252..2a30ae252 100755..100644
--- a/view/theme/diabook-blue/icons/selected.png
+++ b/view/theme/diabook-blue/icons/selected.png
diff --git a/view/theme/diabook-blue/icons/srch_bg.gif b/view/theme/diabook-blue/icons/srch_bg.gif
new file mode 100644
index 000000000..6a523ba8f
--- /dev/null
+++ b/view/theme/diabook-blue/icons/srch_bg.gif
diff --git a/view/theme/diabook-blue/icons/srch_l.gif b/view/theme/diabook-blue/icons/srch_l.gif
new file mode 100644
index 000000000..6d95bf35d
--- /dev/null
+++ b/view/theme/diabook-blue/icons/srch_l.gif
diff --git a/view/theme/diabook-blue/icons/srch_r.gif b/view/theme/diabook-blue/icons/srch_r.gif
new file mode 100644
index 000000000..89833a316
--- /dev/null
+++ b/view/theme/diabook-blue/icons/srch_r.gif
diff --git a/view/theme/diabook-blue/icons/srch_r_f2.gif b/view/theme/diabook-blue/icons/srch_r_f2.gif
new file mode 100644
index 000000000..6df457bed
--- /dev/null
+++ b/view/theme/diabook-blue/icons/srch_r_f2.gif
diff --git a/view/theme/diabook-blue/icons/star.png b/view/theme/diabook-blue/icons/star.png
index 0b00cb189..0b00cb189 100755..100644
--- a/view/theme/diabook-blue/icons/star.png
+++ b/view/theme/diabook-blue/icons/star.png
diff --git a/view/theme/diabook-blue/icons/starred.png b/view/theme/diabook-blue/icons/starred.png
index 2b82dfca3..2b82dfca3 100755..100644
--- a/view/theme/diabook-blue/icons/starred.png
+++ b/view/theme/diabook-blue/icons/starred.png
diff --git a/view/theme/diabook-blue/icons/tagged.png b/view/theme/diabook-blue/icons/tagged.png
index 144649ef8..144649ef8 100755..100644
--- a/view/theme/diabook-blue/icons/tagged.png
+++ b/view/theme/diabook-blue/icons/tagged.png
diff --git a/view/theme/diabook-blue/icons/tumblr.png b/view/theme/diabook-blue/icons/tumblr.png
new file mode 100644
index 000000000..1dc7fa072
--- /dev/null
+++ b/view/theme/diabook-blue/icons/tumblr.png
diff --git a/view/theme/diabook-blue/icons/twitter.png b/view/theme/diabook-blue/icons/twitter.png
new file mode 100644
index 000000000..b7a687b9f
--- /dev/null
+++ b/view/theme/diabook-blue/icons/twitter.png
diff --git a/view/theme/diabook-blue/icons/unlock.png b/view/theme/diabook-blue/icons/unlock.png
index a0cda0ae5..a0cda0ae5 100755..100644
--- a/view/theme/diabook-blue/icons/unlock.png
+++ b/view/theme/diabook-blue/icons/unlock.png
diff --git a/view/theme/diabook-blue/icons/unstarred.png b/view/theme/diabook-blue/icons/unstarred.png
index ba3183f5c..ba3183f5c 100755..100644
--- a/view/theme/diabook-blue/icons/unstarred.png
+++ b/view/theme/diabook-blue/icons/unstarred.png
diff --git a/view/theme/diabook-blue/icons/video.png b/view/theme/diabook-blue/icons/video.png
index a03d1d818..a03d1d818 100755..100644
--- a/view/theme/diabook-blue/icons/video.png
+++ b/view/theme/diabook-blue/icons/video.png
diff --git a/view/theme/diabook-blue/icons/weblink.png b/view/theme/diabook-blue/icons/weblink.png
index 216e78344..216e78344 100755..100644
--- a/view/theme/diabook-blue/icons/weblink.png
+++ b/view/theme/diabook-blue/icons/weblink.png
diff --git a/view/theme/diabook-blue/icons/wordpress.png b/view/theme/diabook-blue/icons/wordpress.png
new file mode 100644
index 000000000..f564c4300
--- /dev/null
+++ b/view/theme/diabook-blue/icons/wordpress.png
diff --git a/view/theme/diabook-blue/jot.tpl b/view/theme/diabook-blue/jot.tpl
index 387eb1f91..bd43994b5 100755..100644
--- a/view/theme/diabook-blue/jot.tpl
+++ b/view/theme/diabook-blue/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,29 +14,30 @@
 		<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="character-counter" class="grey"></div>		
 		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
 
 
 <div id="profile-jot-submit-wrapper" class="jothidden">
 	
-	<div id="profile-upload-wrapper" style="/*display: $visitor;*/" >
+	<div id="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="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);" >
+	<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;*/" >
+	<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;*/" >
+	<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;*/" >
+	<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;*/" >
diff --git a/view/theme/diabook-blue/js/jquery.cookie.js b/view/theme/diabook-blue/js/jquery.cookie.js
new file mode 100644
index 000000000..6d5974a2c
--- /dev/null
+++ b/view/theme/diabook-blue/js/jquery.cookie.js
@@ -0,0 +1,47 @@
+/*!
+ * 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
new file mode 100644
index 000000000..989f17878
--- /dev/null
+++ b/view/theme/diabook-blue/mail_conv.tpl
@@ -0,0 +1,60 @@
+<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
new file mode 100644
index 000000000..8b82e95c6
--- /dev/null
+++ b/view/theme/diabook-blue/mail_display.tpl
@@ -0,0 +1,12 @@
+<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
new file mode 100644
index 000000000..6bc6c84f6
--- /dev/null
+++ b/view/theme/diabook-blue/mail_list.tpl
@@ -0,0 +1,8 @@
+<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
new file mode 100644
index 000000000..9f1587096
--- /dev/null
+++ b/view/theme/diabook-blue/message_side.tpl
@@ -0,0 +1,10 @@
+<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
index 289581c36..3b78b5995 100644
--- a/view/theme/diabook-blue/nav.tpl
+++ b/view/theme/diabook-blue/nav.tpl
@@ -11,16 +11,16 @@
 			{{ 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></a>
-				<span id="net-update" class="nav-notify"></span>
+				<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></a>
-				<span id="intro-update" class="nav-notify"></span>
+				<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> 
@@ -31,8 +31,8 @@
 			{{ 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></a>
-				<span id="mail-update" class="nav-notify"></span>
+			  <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>
@@ -43,8 +43,10 @@
 			{{ 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></a>
-				<span id="notify-update" class="nav-notify"></span>
+			<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>
@@ -65,15 +67,11 @@
 			<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.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.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
-
+				{{ 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 }}
 
-										<li><a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
+				{{ 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>
+										 <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 }}
@@ -84,13 +82,13 @@
 			</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>
@@ -102,10 +100,10 @@
 			</li>	
 		{{ endif }}		
 		
-      {{ if $nav.home }}
+      {{ 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</a>
-				<span id="home-update" class="nav-notify"></span>
+				<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 }}		
 		
diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl
index 902c2a0ed..20926656a 100755..100644
--- a/view/theme/diabook-blue/photo_view.tpl
+++ b/view/theme/diabook-blue/photo_view.tpl
@@ -12,7 +12,7 @@
 
 <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="fancy-photo" title="$photo.title"><img src="$photo.src" /></a>
+	<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>
 
@@ -24,4 +24,5 @@
 {{ 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 }}
+
diff --git a/view/theme/diabook-blue/profile_side.tpl b/view/theme/diabook-blue/profile_side.tpl
index a65677696..94396300f 100644
--- a/view/theme/diabook-blue/profile_side.tpl
+++ b/view/theme/diabook-blue/profile_side.tpl
@@ -9,12 +9,13 @@
 <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="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</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>
 
-				
\ No newline at end of file
+				
diff --git a/view/theme/diabook-blue/profile_vcard.tpl b/view/theme/diabook-blue/profile_vcard.tpl
index 3a545f9ba..e28ec2909 100644
--- a/view/theme/diabook-blue/profile_vcard.tpl
+++ b/view/theme/diabook-blue/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="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
 
+	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 
 
 	{{ if $location }}
diff --git a/view/theme/diabook-blue/right_aside.tpl b/view/theme/diabook-blue/right_aside.tpl
new file mode 100644
index 000000000..a65677696
--- /dev/null
+++ b/view/theme/diabook-blue/right_aside.tpl
@@ -0,0 +1,20 @@
+<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
new file mode 100644
index 000000000..6a1c5c71b
--- /dev/null
+++ b/view/theme/diabook-blue/rs_common_tabs.tpl
@@ -0,0 +1,6 @@
+<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
new file mode 100644
index 000000000..b1c890285
--- /dev/null
+++ b/view/theme/diabook-blue/screenshot.png
diff --git a/view/theme/diabook-blue/search_item.tpl b/view/theme/diabook-blue/search_item.tpl
new file mode 100644
index 000000000..123834064
--- /dev/null
+++ b/view/theme/diabook-blue/search_item.tpl
@@ -0,0 +1,100 @@
+{{ 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/style-network.css b/view/theme/diabook-blue/style-network.css
new file mode 100644
index 000000000..991b19849
--- /dev/null
+++ b/view/theme/diabook-blue/style-network.css
@@ -0,0 +1,2588 @@
+/**
+ * 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("../../../view/theme/diabook-blue/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook-blue/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook-blue/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook-blue/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/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"); 
+			  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;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/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"); 
+			  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("../../../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;}
+/*.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-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"); 
+  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 {
+	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;
+}
+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-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");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/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("../../../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;
+	}
+/* 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;
+}
+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("../../../view/theme/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;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../../../view/theme/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;
+	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-right: 5px; 
+    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("../../../view/theme/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");
+		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;
+}
+.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 {
+  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;
+  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 0px 0px 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: 710px;
+  border: 1px solid #2d2d2d;
+  margin-top: 10px;
+}
+.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 #ffffff;
+}
+#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: 2px 5px 2px 5px;
+max-height: 85%;
+max-width: 85%;
+}
+.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;
+}
+.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;}
+*/
+
+#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 {
+        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-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-profile.css b/view/theme/diabook-blue/style-profile.css
new file mode 100644
index 000000000..fca29d088
--- /dev/null
+++ b/view/theme/diabook-blue/style-profile.css
@@ -0,0 +1,2584 @@
+/**
+ * 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("../../../view/theme/diabook-blue/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook-blue/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook-blue/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook-blue/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/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"); 
+			  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;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/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"); 
+			  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("../../../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;}
+/*.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-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"); 
+  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: #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;
+}
+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-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");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/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("../../../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;
+	}
+
+/* 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: #1872A2;
+}
+.widget .tool.selected {
+  background: url("../../../view/theme/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;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../../../view/theme/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;
+	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-right: 5px; 
+    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;
+  /*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("../../../view/theme/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");
+		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;
+}
+.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 {
+  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;
+  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 1px 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: 710px;
+  border: 1px solid #2d2d2d;
+  margin-top: 10px;
+}
+.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 #ffffff;
+}
+#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: #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: 2px 5px 2px 5px;
+max-height: 85%;
+max-width: 85%;
+border-radius: 10px;
+}
+.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;
+}
+.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;}
+*/
+
+#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 {
+        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-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-blue/style-settings.css
new file mode 100644
index 000000000..e07962bc7
--- /dev/null
+++ b/view/theme/diabook-blue/style-settings.css
@@ -0,0 +1,2573 @@
+/**
+ * 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("../../../view/theme/diabook-blue/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook-blue/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook-blue/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook-blue/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/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"); 
+			  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;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/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"); 
+			  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("../../../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;}
+/*.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-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"); 
+  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: #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;
+}
+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-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");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/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("../../../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;
+	}
+
+/* aside */
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 200px;
+  padding: 0px 10px 0px 10px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+
+aside .vcard  {
+  display: none;
+}
+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;
+	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 {
+  display: none;
+}
+#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("../../../view/theme/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;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../../../view/theme/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;
+	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: 650px;
+  padding: 0px 0px 0px 20px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+
+#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 {display: none;}
+.tab.button{display: none;}
+.rs_tabs {
+    
+    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;
+	}
+	
+#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: 5px; 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("../../../view/theme/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");
+		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;
+}
+.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 {
+  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;
+  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 1px 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: 710px;
+  border: 1px solid #2d2d2d;
+  margin-top: 10px;
+}
+.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;
+}
+#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 #ffffff;
+}
+#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.rs_tabs {
+  list-style-type: none;
+
+  font-size: 11px;
+}
+ul.rs_tabs li {
+  float: left;
+  margin-bottom: 30px;
+  clear: both;
+}
+ul.rs_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;
+}
+/**
+ * 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: 2px 5px 2px 5px;
+max-height: 85%;
+max-width: 85%;
+}
+.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;
+}
+.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;}
+*/
+
+#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 {
+        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-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: -2px;
+  top: -20px;
+}
+.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.css b/view/theme/diabook-blue/style.css
index d3d3d9eb7..8a05fc4c4 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -178,8 +178,8 @@
 
 .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.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;}
 /*.tagged     { background-position: -130px -60px;}*/
 
 .attachtype {
@@ -387,15 +387,13 @@
   margin-bottom: 5px;
   width: 684px;
   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;
+  font-size: 12.5px;
   background-color: #ffffff;
   color: #2d2d2d;
   margin: 50px auto auto;
@@ -543,15 +541,97 @@ 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 {
+  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 {
@@ -630,7 +710,7 @@ nav #logo-text {
 nav .nav-menu-search {
   position: relative;
 
-  margin: 3px 17px;
+  margin: 4px 17px;
   margin-right: 0px;
   height: 17px;
   width: 180px;
@@ -641,6 +721,10 @@ 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;
 	}
 
 
@@ -793,7 +877,7 @@ ul.menu-popup a {
   text-decoration: none;
 }
 ul.menu-popup a:hover {
-  background-color: #14618a; /*bdcdd4;*/
+  background-color: #308DBF; /*bdcdd4;*/
   color: #fff;
 }
 ul.menu-popup .menu-sep {
@@ -887,6 +971,8 @@ ul.menu-popup .empty {
   position: absolute;
   padding-top: 4px;
   padding-left: 5px;	
+  word-wrap: break-word;
+  width: 130px;
 	}
 #ps-username:hover{
   text-decoration: none;	
@@ -933,6 +1019,9 @@ ul.menu-popup .empty {
 .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;
+	}
 /* aside */
 aside {
   display: table-cell;
@@ -943,6 +1032,7 @@ aside {
   float: left;
   /* background: #F1F1F1; */
 }
+aside #page-sidebar{display: none;}
 aside .vcard .fn {
   font-size: 18px;
   font-weight: bold;
@@ -997,6 +1087,12 @@ 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;
+border-bottom-left-radius: 15px;
 }
 aside #side-follow-url {
 	width: 173px;
@@ -1119,10 +1215,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;	
 	}
@@ -1235,10 +1335,10 @@ body .pageheader{
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 13px;
+  font-size: 12.5px;
   max-width: 720px;
   word-wrap: break-word;
-  line-height: 1.4;
+  line-height: 1.2;
 }
 
 .wall-item-container .wall-item-content img {
@@ -1484,6 +1584,11 @@ body .pageheader{
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -1624,7 +1729,7 @@ body .pageheader{
 #profile-jot-submit {
 	float: right;
 	margin-top: 2px;
-	
+	font-size: 14px;
 }
 #profile-upload-wrapper {
 	float: left;
@@ -1676,7 +1781,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;
@@ -1687,18 +1794,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;
@@ -1889,6 +1998,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;
 	}
@@ -1953,6 +2070,7 @@ box-shadow: 2px 2px 5px 0px #000000;
 margin: 2px 5px 2px 5px;
 max-height: 85%;
 max-width: 85%;
+border-radius: 10px;
 }
 .lframe {
   float: left;
@@ -2357,8 +2475,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/theme.php b/view/theme/diabook-blue/theme.php
index f9128ea1f..2e7aca92a 100755..100644
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -3,122 +3,448 @@
 /*
  * Name: Diabook-blue
  * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: 
+ * Version: (Version: 1.012)
  * Author: 
  */
 
-$a->theme_info = array(
-  'extends' => 'diabook',
-);
 
-//fancybox: provide $photo.href to photo_top.tpl to img in org. scale
+//change css on network and profilepages
+$cssFile = null;
+
 
-//profile_side
+/**
+ * prints last community activity
+ */
+function diabook_blue_community_info(){
+	$a = get_app();
+	//right_aside at networkpages
 
-$nav['usermenu']=array();
-$userinfo = null;
+	// 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 ";
 
-if(local_user()) {
+	$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>';
 
-$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
+		$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
 		
-$userinfo = array(
-			'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
-			'name' => $a->user['username'],
-		);	
-	
-$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'][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'), "", "");
-
-if($is_url = preg_match ("/\bnetwork\b/i", $_SERVER['REQUEST_URI'])) {
-$tpl = get_markup_template('profile_side.tpl');
-
-$a->page['aside'] .= replace_macros($tpl, array(
-		'$userinfo' => $userinfo,
-		'$ps' => $ps,
-	));
+	}
+	
+	
+	// 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['title'] = Array("", t('Find Friends'), "", "");
+	$nv['directory'] = Array('directory', t('Local Directory'), "", "");
+	$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
+	$nv['match'] = Array('match', t('Similar Interests'), "", "");
+	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
+	$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
+	
+	$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
+						<span class="sbox_l"></span>
+						<span class="sbox">
+						<input type="text" name="search" size="13" maxlength="50">
+						</span>
+						<span class="sbox_r" id="srch_clear"></span>';
+						
+	$aside['$nv'] = $nv;
+	};
+	//Community Page
+	if(local_user()) {
+   $page = '<div id="page-sidebar-right_aside" class="widget">
+			<div class="title tool">
+			<h3>'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
+			<div id="sidebar-page-list"><ul>';
+
+	$pagelist = array();
+
+	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
+			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
+			ORDER BY `name` ASC",
+			intval($a->user['uid'])
+	);
+
+	$pageD = array();
+
+	// Look if the profile is a community page
+	foreach($contacts as $contact) {
+		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
+	};
+	
+
+	$contacts = $pageD;
+
+	foreach($contacts as $contact) {
+		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
+				$contact["name"]."</a></li>";
+	}
+	$page .= '</ul></div></div>';
+	//if (sizeof($contacts) > 0)
+		
+		$aside['$page'] = $page;
+	}		
+  //END Community Page
+  //helpers
+   $helpers = array();
+	$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
+	
+	$aside['$helpers'] = $helpers;
+   //end helpers
+   //connectable services
+   $con_services = array();
+	$con_services['title'] = Array("", t('Connect Services'), "", "");
+	
+	$aside['$con_services'] = $con_services;
+   //end connectable services
+   //postit
+   $postit = array();
+	$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
+	$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
+	
+	$aside['$postit'] = $postit;
+   //end postit
+  
+   //get_baseurl   
+   $url = $a->get_baseurl($ssl_state);   
+   $aside['$url'] = $url;
+
+	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
+	$a->page['right_aside'] = replace_macros($tpl, $aside);
+	
 }
+
+
+//profile_side at networkpages
+if ($a->argv[0] === "network" && local_user()){
+
+	// USER MENU
+	if(local_user()) {
+		
+		$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
+				
+		$userinfo = array(
+					'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
+					'name' => $a->user['username'],
+				);	
+		$ps = array('usermenu'=>array());
+		$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
+		$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
+		$ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));		
+		$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
+		$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
+		$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
+		$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
+		$ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", "");
+
+		$tpl = get_markup_template('profile_side.tpl');
+
+		$a->page['aside'] .= replace_macros($tpl, array(
+				'$userinfo' => $userinfo,
+				'$ps' => $ps,
+			));
+
+	}
+	
+	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_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";
+	}
 }
 
-//js scripts
-$a->page['htmlhead'] .= <<< EOT
 
-<script>
 
-//contacts
-$('html').click(function() {
- $('#nav-contacts-linkmenu').removeClass('selected');
- document.getElementById( "nav-contacts-menu" ).style.display = "none";
- });
- 
- $('#nav-contacts-linkmenu').click(function(event){
-     event.stopPropagation();
- });
+//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";
+	}
+}
 
-//messages
-$('html').click(function() {
- $('#nav-messages-linkmenu').removeClass('selected');
- document.getElementById( "nav-messages-menu" ).style.display = "none";
- });
+//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";
+	
+}
 
- $('#nav-messages-linkmenu').click(function(event){
-     event.stopPropagation();
- });
 
-//notifications
-$('html').click(function() {
- $('#nav-notifications-linkmenu').removeClass('selected');
- document.getElementById( "nav-notifications-menu" ).style.display = "none";
- });
+// custom css
+if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
 
- $('#nav-notifications-linkmenu').click(function(event){
-     event.stopPropagation();
- });
+//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);
 
-//usermenu
-$('html').click(function() {
- $('#nav-user-linkmenu').removeClass('selected');
- document.getElementById( "nav-user-menu" ).style.display = "none";
- });
 
- $('#nav-user-linkmenu').click(function(event){
-     event.stopPropagation();
- });
- 
- //settingsmenu
- $('html').click(function() {
- $('#nav-site-linkmenu').removeClass('selected');
- document.getElementById( "nav-site-menu" ).style.display = "none";
- });
+//js scripts
 
- $('#nav-site-linkmenu').click(function(event){
-     event.stopPropagation();
- });
- //appsmenu
- $('html').click(function() {
- $('#nav-apps-link').removeClass('selected');
- document.getElementById( "nav-apps-menu" ).style.display = "none";
- });
+$a->page['htmlhead'] .= '
 
- $('#nav-apps-link').click(function(event){
-     event.stopPropagation();
+<script>
+ $(function() {
+	$("a.lightbox").fancybox(); // Select all links with lightbox class
  });
- 
+  
+ </script>';
+
+
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
+$a->page['htmlhead'] .= '
+<script>
+
+$("right_aside").ready(function(){
+	
+	if($.cookie("close_pages") == "1") 
+		{
+		document.getElementById( "close_pages" ).style.display = "none";
+			};
+	
+	if($.cookie("close_helpers") == "1") 
+		{
+		document.getElementById( "close_helpers" ).style.display = "none";
+			};
+			
+	if($.cookie("close_services") == "1") 
+		{
+		document.getElementById( "close_services" ).style.display = "none";
+			};
+			
+	if($.cookie("close_friends") == "1") 
+		{
+		document.getElementById( "close_friends" ).style.display = "none";
+			};
+	
+	if($.cookie("close_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";
+			};}
 
+);
 
- $(document).ready(function() {
-	$("a.fancy-photo").fancybox(); // Select all links with lightbox class 
-	$("a.fancy-album").fancybox();
-});
+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: "/" });
+ };
  
- </script>
-EOT;
+ 
+
+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>';}
diff --git a/view/theme/diabook-blue/wall_item.tpl b/view/theme/diabook-blue/wall_item.tpl
index 20d24702b..123834064 100644
--- a/view/theme/diabook-blue/wall_item.tpl
+++ b/view/theme/diabook-blue/wall_item.tpl
@@ -1,6 +1,5 @@
 {{ if $item.indent }}{{ else }}
 <div class="wall-item-decor">
-	{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ 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 }}
diff --git a/view/theme/diabook-blue/wallwall_item.tpl b/view/theme/diabook-blue/wallwall_item.tpl
index e02e5a8be..bee75ad99 100644
--- a/view/theme/diabook-blue/wallwall_item.tpl
+++ b/view/theme/diabook-blue/wallwall_item.tpl
@@ -1,6 +1,5 @@
 {{ if $item.indent }}{{ else }}
 <div class="wall-item-decor">
-	{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ 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 }}
@@ -72,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/diabook-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl
new file mode 100644
index 000000000..c47bfbda5
--- /dev/null
+++ b/view/theme/diabook-red/communityhome.tpl
@@ -0,0 +1,93 @@
+<div id="close_pages">
+{{ if $page }}
+<div>$page</div>
+{{ endif }}
+</div>
+
+<div id="close_helpers">
+{{ if $lastusers_title }}
+<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
+<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
+<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
+<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
+<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
+{{ endif }}
+</div>
+
+<div id="close_services">
+{{ if $lastusers_title }}
+<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
+<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
+<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-red/icons/facebook.png" title="Facebook"></a>
+<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-red/icons/StatusNet.png?" title="StatusNet"></a>
+<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-red/icons/livejournal.png?" title="LiveJournal"></a>
+<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-red/icons/posterous.png?" title="Posterous"></a>
+<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-red/icons/tumblr.png?" title="Tumblr"></a>
+<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-red/icons/twitter.png?" title="Twitter"></a>
+<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-red/icons/wordpress.png?" title="WordPress"></a>
+<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-red/icons/email.png?" title="E-Mail"></a>
+</div>
+{{ endif }}
+</div>
+
+<div id="close_friends" style="margin-bottom:53px;">
+{{ if $nv }}
+<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
+<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
+<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
+<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
+<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
+<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>			
+$nv.search
+{{ endif }}
+</div>
+
+<div id="close_postit">
+{{ if $lastusers_title }}
+<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
+<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</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/loozah/contact_template.tpl b/view/theme/diabook-red/contact_template.tpl
index 48930b48a..48930b48a 100755..100644
--- a/view/theme/loozah/contact_template.tpl
+++ b/view/theme/diabook-red/contact_template.tpl
diff --git a/view/theme/diabook-red/directory_item.tpl b/view/theme/diabook-red/directory_item.tpl
new file mode 100644
index 000000000..db1936e4b
--- /dev/null
+++ b/view/theme/diabook-red/directory_item.tpl
@@ -0,0 +1,10 @@
+
+<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
new file mode 100644
index 000000000..39b7c5761
--- /dev/null
+++ b/view/theme/diabook-red/fpostit/README
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 000000000..d183c7573
--- /dev/null
+++ b/view/theme/diabook-red/fpostit/fpostit.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000..4505c9946
--- /dev/null
+++ b/view/theme/diabook-red/fpostit/fpostit.php
@@ -0,0 +1,135 @@
+<?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
new file mode 100644
index 000000000..61764bf20
--- /dev/null
+++ b/view/theme/diabook-red/fpostit/friendika-32.png
diff --git a/view/theme/diabook-red/group_side.tpl b/view/theme/diabook-red/group_side.tpl
new file mode 100644
index 000000000..af183d04d
--- /dev/null
+++ b/view/theme/diabook-red/group_side.tpl
@@ -0,0 +1,29 @@
+<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/StatusNet.png b/view/theme/diabook-red/icons/StatusNet.png
new file mode 100644
index 000000000..398bca716
--- /dev/null
+++ b/view/theme/diabook-red/icons/StatusNet.png
diff --git a/view/theme/diabook-red/icons/attach.png b/view/theme/diabook-red/icons/attach.png
new file mode 100644
index 000000000..1958041cf
--- /dev/null
+++ b/view/theme/diabook-red/icons/attach.png
diff --git a/view/theme/diabook-red/icons/audio.png b/view/theme/diabook-red/icons/audio.png
new file mode 100644
index 000000000..8d779a409
--- /dev/null
+++ b/view/theme/diabook-red/icons/audio.png
diff --git a/view/theme/diabook-red/icons/bluebug.png b/view/theme/diabook-red/icons/bluebug.png
new file mode 100644
index 000000000..3979e7d8e
--- /dev/null
+++ b/view/theme/diabook-red/icons/bluebug.png
diff --git a/view/theme/diabook-red/icons/camera.png b/view/theme/diabook-red/icons/camera.png
new file mode 100644
index 000000000..a5c7f1236
--- /dev/null
+++ b/view/theme/diabook-red/icons/camera.png
diff --git a/view/theme/diabook-red/icons/close_box.png b/view/theme/diabook-red/icons/close_box.png
new file mode 100644
index 000000000..28e2675b8
--- /dev/null
+++ b/view/theme/diabook-red/icons/close_box.png
diff --git a/view/theme/diabook-red/icons/com_side.png b/view/theme/diabook-red/icons/com_side.png
new file mode 100644
index 000000000..bc5969ef1
--- /dev/null
+++ b/view/theme/diabook-red/icons/com_side.png
diff --git a/view/theme/diabook-red/icons/community.png b/view/theme/diabook-red/icons/community.png
new file mode 100644
index 000000000..7c91e8b75
--- /dev/null
+++ b/view/theme/diabook-red/icons/community.png
diff --git a/view/theme/diabook-red/icons/contacts.png b/view/theme/diabook-red/icons/contacts.png
new file mode 100644
index 000000000..20c990c84
--- /dev/null
+++ b/view/theme/diabook-red/icons/contacts.png
diff --git a/view/theme/diabook-red/icons/contacts2.png b/view/theme/diabook-red/icons/contacts2.png
new file mode 100644
index 000000000..7817279f4
--- /dev/null
+++ b/view/theme/diabook-red/icons/contacts2.png
diff --git a/view/theme/diabook-red/icons/dislike.png b/view/theme/diabook-red/icons/dislike.png
new file mode 100644
index 000000000..23de426c5
--- /dev/null
+++ b/view/theme/diabook-red/icons/dislike.png
diff --git a/view/theme/diabook-red/icons/drop.png b/view/theme/diabook-red/icons/drop.png
new file mode 100644
index 000000000..2abb82ef2
--- /dev/null
+++ b/view/theme/diabook-red/icons/drop.png
diff --git a/view/theme/diabook-red/icons/email.png b/view/theme/diabook-red/icons/email.png
new file mode 100644
index 000000000..240cef2c3
--- /dev/null
+++ b/view/theme/diabook-red/icons/email.png
diff --git a/view/theme/diabook-red/icons/events.png b/view/theme/diabook-red/icons/events.png
new file mode 100644
index 000000000..4a0b3f3f1
--- /dev/null
+++ b/view/theme/diabook-red/icons/events.png
diff --git a/view/theme/diabook-red/icons/facebook.png b/view/theme/diabook-red/icons/facebook.png
new file mode 100644
index 000000000..3e5dd39c3
--- /dev/null
+++ b/view/theme/diabook-red/icons/facebook.png
diff --git a/view/theme/diabook-red/icons/file_as.png b/view/theme/diabook-red/icons/file_as.png
new file mode 100644
index 000000000..16713fa53
--- /dev/null
+++ b/view/theme/diabook-red/icons/file_as.png
diff --git a/view/theme/diabook-red/icons/ftdevs.gif b/view/theme/diabook-red/icons/ftdevs.gif
new file mode 100644
index 000000000..e0fc25743
--- /dev/null
+++ b/view/theme/diabook-red/icons/ftdevs.gif
diff --git a/view/theme/diabook-red/icons/globe.png b/view/theme/diabook-red/icons/globe.png
new file mode 100644
index 000000000..6bb9bc09d
--- /dev/null
+++ b/view/theme/diabook-red/icons/globe.png
diff --git a/view/theme/diabook-red/icons/home.png b/view/theme/diabook-red/icons/home.png
new file mode 100644
index 000000000..be47a48fc
--- /dev/null
+++ b/view/theme/diabook-red/icons/home.png
diff --git a/view/theme/diabook-red/icons/language.png b/view/theme/diabook-red/icons/language.png
new file mode 100644
index 000000000..8029c0155
--- /dev/null
+++ b/view/theme/diabook-red/icons/language.png
diff --git a/view/theme/diabook-red/icons/like.png b/view/theme/diabook-red/icons/like.png
new file mode 100644
index 000000000..b65edccc0
--- /dev/null
+++ b/view/theme/diabook-red/icons/like.png
diff --git a/view/theme/diabook-red/icons/link.png b/view/theme/diabook-red/icons/link.png
new file mode 100644
index 000000000..0ef666a67
--- /dev/null
+++ b/view/theme/diabook-red/icons/link.png
diff --git a/view/theme/diabook-red/icons/livejournal.png b/view/theme/diabook-red/icons/livejournal.png
new file mode 100644
index 000000000..6d27d265e
--- /dev/null
+++ b/view/theme/diabook-red/icons/livejournal.png
diff --git a/view/theme/diabook-red/icons/lock.png b/view/theme/diabook-red/icons/lock.png
new file mode 100644
index 000000000..7e34bf279
--- /dev/null
+++ b/view/theme/diabook-red/icons/lock.png
diff --git a/view/theme/diabook-red/icons/lupe.png b/view/theme/diabook-red/icons/lupe.png
new file mode 100644
index 000000000..f8b228347
--- /dev/null
+++ b/view/theme/diabook-red/icons/lupe.png
diff --git a/view/theme/diabook-red/icons/mess_side.png b/view/theme/diabook-red/icons/mess_side.png
new file mode 100644
index 000000000..49ef896bc
--- /dev/null
+++ b/view/theme/diabook-red/icons/mess_side.png
diff --git a/view/theme/diabook-red/icons/messages.png b/view/theme/diabook-red/icons/messages.png
new file mode 100644
index 000000000..4a9e9de13
--- /dev/null
+++ b/view/theme/diabook-red/icons/messages.png
diff --git a/view/theme/diabook-red/icons/messages2.png b/view/theme/diabook-red/icons/messages2.png
new file mode 100644
index 000000000..54b68e7f7
--- /dev/null
+++ b/view/theme/diabook-red/icons/messages2.png
diff --git a/view/theme/diabook-red/icons/next.png b/view/theme/diabook-red/icons/next.png
new file mode 100644
index 000000000..7b5e25b90
--- /dev/null
+++ b/view/theme/diabook-red/icons/next.png
diff --git a/view/theme/diabook-red/icons/notes.png b/view/theme/diabook-red/icons/notes.png
new file mode 100644
index 000000000..7d4afca90
--- /dev/null
+++ b/view/theme/diabook-red/icons/notes.png
diff --git a/view/theme/diabook-red/icons/notifications.png b/view/theme/diabook-red/icons/notifications.png
new file mode 100644
index 000000000..97e5c311c
--- /dev/null
+++ b/view/theme/diabook-red/icons/notifications.png
diff --git a/view/theme/diabook-red/icons/notify.png b/view/theme/diabook-red/icons/notify.png
new file mode 100644
index 000000000..3a8e1d4b8
--- /dev/null
+++ b/view/theme/diabook-red/icons/notify.png
diff --git a/view/theme/diabook-red/icons/notify2.png b/view/theme/diabook-red/icons/notify2.png
new file mode 100644
index 000000000..407e2dbb4
--- /dev/null
+++ b/view/theme/diabook-red/icons/notify2.png
diff --git a/view/theme/diabook-red/icons/pencil.png b/view/theme/diabook-red/icons/pencil.png
new file mode 100644
index 000000000..772e49b17
--- /dev/null
+++ b/view/theme/diabook-red/icons/pencil.png
diff --git a/view/theme/diabook-red/icons/pencil2.png b/view/theme/diabook-red/icons/pencil2.png
new file mode 100644
index 000000000..3b47d1864
--- /dev/null
+++ b/view/theme/diabook-red/icons/pencil2.png
diff --git a/view/theme/diabook-red/icons/photo-menu.jpg b/view/theme/diabook-red/icons/photo-menu.jpg
new file mode 100644
index 000000000..fde5eb535
--- /dev/null
+++ b/view/theme/diabook-red/icons/photo-menu.jpg
diff --git a/view/theme/diabook-red/icons/posterous.png b/view/theme/diabook-red/icons/posterous.png
new file mode 100644
index 000000000..c8e86078e
--- /dev/null
+++ b/view/theme/diabook-red/icons/posterous.png
diff --git a/view/theme/diabook-red/icons/prev.png b/view/theme/diabook-red/icons/prev.png
new file mode 100644
index 000000000..55c1464ba
--- /dev/null
+++ b/view/theme/diabook-red/icons/prev.png
diff --git a/view/theme/diabook-red/icons/pscontacts.png b/view/theme/diabook-red/icons/pscontacts.png
new file mode 100644
index 000000000..acf857f32
--- /dev/null
+++ b/view/theme/diabook-red/icons/pscontacts.png
diff --git a/view/theme/diabook-red/icons/pubgroups.png b/view/theme/diabook-red/icons/pubgroups.png
new file mode 100644
index 000000000..6d9539610
--- /dev/null
+++ b/view/theme/diabook-red/icons/pubgroups.png
diff --git a/view/theme/diabook-red/icons/recycle.png b/view/theme/diabook-red/icons/recycle.png
new file mode 100644
index 000000000..c3b8d2bf4
--- /dev/null
+++ b/view/theme/diabook-red/icons/recycle.png
diff --git a/view/theme/diabook-red/icons/remote.png b/view/theme/diabook-red/icons/remote.png
new file mode 100644
index 000000000..a560cc55e
--- /dev/null
+++ b/view/theme/diabook-red/icons/remote.png
diff --git a/view/theme/diabook-red/icons/scroll_top.png b/view/theme/diabook-red/icons/scroll_top.png
new file mode 100644
index 000000000..0e7f7ae6a
--- /dev/null
+++ b/view/theme/diabook-red/icons/scroll_top.png
diff --git a/view/theme/diabook-red/icons/selected.png b/view/theme/diabook-red/icons/selected.png
new file mode 100644
index 000000000..2a30ae252
--- /dev/null
+++ b/view/theme/diabook-red/icons/selected.png
diff --git a/view/theme/diabook-red/icons/srch_bg.gif b/view/theme/diabook-red/icons/srch_bg.gif
new file mode 100644
index 000000000..6a523ba8f
--- /dev/null
+++ b/view/theme/diabook-red/icons/srch_bg.gif
diff --git a/view/theme/diabook-red/icons/srch_l.gif b/view/theme/diabook-red/icons/srch_l.gif
new file mode 100644
index 000000000..6d95bf35d
--- /dev/null
+++ b/view/theme/diabook-red/icons/srch_l.gif
diff --git a/view/theme/diabook-red/icons/srch_r.gif b/view/theme/diabook-red/icons/srch_r.gif
new file mode 100644
index 000000000..89833a316
--- /dev/null
+++ b/view/theme/diabook-red/icons/srch_r.gif
diff --git a/view/theme/diabook-red/icons/srch_r_f2.gif b/view/theme/diabook-red/icons/srch_r_f2.gif
new file mode 100644
index 000000000..6df457bed
--- /dev/null
+++ b/view/theme/diabook-red/icons/srch_r_f2.gif
diff --git a/view/theme/diabook-red/icons/star.png b/view/theme/diabook-red/icons/star.png
new file mode 100644
index 000000000..0b00cb189
--- /dev/null
+++ b/view/theme/diabook-red/icons/star.png
diff --git a/view/theme/diabook-red/icons/star_dummy.png b/view/theme/diabook-red/icons/star_dummy.png
new file mode 100644
index 000000000..ce11f30d4
--- /dev/null
+++ b/view/theme/diabook-red/icons/star_dummy.png
diff --git a/view/theme/diabook-red/icons/starred.png b/view/theme/diabook-red/icons/starred.png
new file mode 100644
index 000000000..2b82dfca3
--- /dev/null
+++ b/view/theme/diabook-red/icons/starred.png
diff --git a/view/theme/diabook-red/icons/tagged.png b/view/theme/diabook-red/icons/tagged.png
new file mode 100644
index 000000000..144649ef8
--- /dev/null
+++ b/view/theme/diabook-red/icons/tagged.png
diff --git a/view/theme/diabook-red/icons/toogle_off.png b/view/theme/diabook-red/icons/toogle_off.png
new file mode 100644
index 000000000..0fcce4d5a
--- /dev/null
+++ b/view/theme/diabook-red/icons/toogle_off.png
diff --git a/view/theme/diabook-red/icons/toogle_on.png b/view/theme/diabook-red/icons/toogle_on.png
new file mode 100644
index 000000000..79ce07f0e
--- /dev/null
+++ b/view/theme/diabook-red/icons/toogle_on.png
diff --git a/view/theme/diabook-red/icons/tumblr.png b/view/theme/diabook-red/icons/tumblr.png
new file mode 100644
index 000000000..1dc7fa072
--- /dev/null
+++ b/view/theme/diabook-red/icons/tumblr.png
diff --git a/view/theme/diabook-red/icons/twitter.png b/view/theme/diabook-red/icons/twitter.png
new file mode 100644
index 000000000..b7a687b9f
--- /dev/null
+++ b/view/theme/diabook-red/icons/twitter.png
diff --git a/view/theme/diabook-red/icons/unlock.png b/view/theme/diabook-red/icons/unlock.png
new file mode 100644
index 000000000..a0cda0ae5
--- /dev/null
+++ b/view/theme/diabook-red/icons/unlock.png
diff --git a/view/theme/diabook-red/icons/unstarred.png b/view/theme/diabook-red/icons/unstarred.png
new file mode 100644
index 000000000..ba3183f5c
--- /dev/null
+++ b/view/theme/diabook-red/icons/unstarred.png
diff --git a/view/theme/diabook-red/icons/video.png b/view/theme/diabook-red/icons/video.png
new file mode 100644
index 000000000..a03d1d818
--- /dev/null
+++ b/view/theme/diabook-red/icons/video.png
diff --git a/view/theme/diabook-red/icons/weblink.png b/view/theme/diabook-red/icons/weblink.png
new file mode 100644
index 000000000..216e78344
--- /dev/null
+++ b/view/theme/diabook-red/icons/weblink.png
diff --git a/view/theme/diabook-red/icons/wordpress.png b/view/theme/diabook-red/icons/wordpress.png
new file mode 100644
index 000000000..f564c4300
--- /dev/null
+++ b/view/theme/diabook-red/icons/wordpress.png
diff --git a/view/theme/loozah/jot.tpl b/view/theme/diabook-red/jot.tpl
index ac64223fb..bd43994b5 100755..100644
--- a/view/theme/loozah/jot.tpl
+++ b/view/theme/diabook-red/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>
 
@@ -12,60 +11,61 @@
 		<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" />
-
+		<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="character-counter" class="grey"></div>		
 		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
 
 
-<div id="profile-jot-submit-wrapper" style="display:none" class="jothidden">
-<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
+<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="icon camera" title="$upload"></a></div>
+		<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="icon attach" title="$attach"></a></div>
+		<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="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+		<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="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
+		<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="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
+		<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="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
+		<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="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 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 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 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
@@ -76,9 +76,9 @@
 		</div>
 	</div>
 
-</div>
 
-<div id="profile-jot-end"></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
new file mode 100644
index 000000000..6d5974a2c
--- /dev/null
+++ b/view/theme/diabook-red/js/jquery.cookie.js
@@ -0,0 +1,47 @@
+/*!
+ * 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
new file mode 100644
index 000000000..989f17878
--- /dev/null
+++ b/view/theme/diabook-red/mail_conv.tpl
@@ -0,0 +1,60 @@
+<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
new file mode 100644
index 000000000..8b82e95c6
--- /dev/null
+++ b/view/theme/diabook-red/mail_display.tpl
@@ -0,0 +1,12 @@
+<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
new file mode 100644
index 000000000..6bc6c84f6
--- /dev/null
+++ b/view/theme/diabook-red/mail_list.tpl
@@ -0,0 +1,8 @@
+<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
new file mode 100644
index 000000000..9f1587096
--- /dev/null
+++ b/view/theme/diabook-red/message_side.tpl
@@ -0,0 +1,10 @@
+<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
new file mode 100644
index 000000000..fdf748cb2
--- /dev/null
+++ b/view/theme/diabook-red/nav.tpl
@@ -0,0 +1,188 @@
+<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
new file mode 100644
index 000000000..511fc73ac
--- /dev/null
+++ b/view/theme/diabook-red/photo_view.tpl
@@ -0,0 +1,27 @@
+<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
new file mode 100644
index 000000000..94396300f
--- /dev/null
+++ b/view/theme/diabook-red/profile_side.tpl
@@ -0,0 +1,21 @@
+<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
new file mode 100644
index 000000000..e28ec2909
--- /dev/null
+++ b/view/theme/diabook-red/profile_vcard.tpl
@@ -0,0 +1,64 @@
+<div class="vcard">
+
+	<div class="tool">
+		<div class="fn label">$profile.name</div>
+		{{ if $profile.edit }}
+			<div class="action">
+			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
+			<ul id="profiles-menu" class="menu-popup">
+				{{ for $profile.menu.entries as $e }}
+				<li>
+					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
+				</li>
+				{{ endfor }}
+				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
+				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
+				<li><a href="profiles" >$profile.edit.3</a></li>
+								
+			</ul>
+			</div>
+		{{ endif }}
+	</div>
+				
+	
+
+	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
+
+
+	{{ if $location }}
+		<dl class="location"><dt class="location-label">$location</dt><br> 
+		<dd class="adr">
+			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
+			<span class="city-state-zip">
+				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+				<span class="region">$profile.region</span>
+				<span class="postal-code">$profile.postal-code</span>
+			</span>
+			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+		</dd>
+		</dl>
+	{{ endif }}
+
+	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
+	
+	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
+
+	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
+
+	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
+
+	{{ inc diaspora_vcard.tpl }}{{ endinc }}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{ if $connect }}
+				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
+			{{ endif }}
+		</ul>
+	</div>
+</div>
+
+$contact_block
+
+
diff --git a/view/theme/diabook-red/right_aside.tpl b/view/theme/diabook-red/right_aside.tpl
new file mode 100644
index 000000000..a65677696
--- /dev/null
+++ b/view/theme/diabook-red/right_aside.tpl
@@ -0,0 +1,20 @@
+<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
new file mode 100644
index 000000000..6a1c5c71b
--- /dev/null
+++ b/view/theme/diabook-red/rs_common_tabs.tpl
@@ -0,0 +1,6 @@
+<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
new file mode 100644
index 000000000..eced010b9
--- /dev/null
+++ b/view/theme/diabook-red/screenshot.png
diff --git a/view/theme/diabook-red/search_item.tpl b/view/theme/diabook-red/search_item.tpl
new file mode 100644
index 000000000..123834064
--- /dev/null
+++ b/view/theme/diabook-red/search_item.tpl
@@ -0,0 +1,100 @@
+{{ 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/style-network.css b/view/theme/diabook-red/style-network.css
new file mode 100644
index 000000000..863ad87ad
--- /dev/null
+++ b/view/theme/diabook-red/style-network.css
@@ -0,0 +1,2624 @@
+/**
+ * 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("../../../view/theme/diabook-red/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook-red/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook-red/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook-red/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/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"); 
+			  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;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/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"); 
+			  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("../../../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;}
+.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("../../../view/theme/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"); 
+  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: #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 {
+	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(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: 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;
+}
+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;
+}
+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-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");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/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;
+  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("../../../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;
+	}
+/* 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;
+}
+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("../../../view/theme/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;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../../../view/theme/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;
+	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-right: 5px; 
+    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: red;}
+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("../../../view/theme/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");
+		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;
+}
+.tread-wrapper a{
+  color: red;
+}
+
+.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 {
+  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;
+  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 0px 0px 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: 710px;
+  border: 1px solid #2d2d2d;
+  margin-top: 10px;
+}
+.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 #ffffff;
+}
+#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: #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**/
+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: #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: 2px 5px 2px 5px;
+max-height: 85%;
+max-width: 85%;
+}
+.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;
+}
+.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;}
+*/
+
+#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 {
+        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-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-profile.css b/view/theme/diabook-red/style-profile.css
new file mode 100644
index 000000000..dcd0092c9
--- /dev/null
+++ b/view/theme/diabook-red/style-profile.css
@@ -0,0 +1,2598 @@
+/**
+ * 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("../../../view/theme/diabook-red/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook-red/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook-red/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook-red/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/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"); 
+			  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;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/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"); 
+			  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("../../../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;}
+.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("../../../view/theme/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"); 
+  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: #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 {
+	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(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%);
+}
+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;
+}
+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: #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%);
+}
+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: #fff4d6;
+}
+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;
+}
+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-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");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/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;
+  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("../../../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;
+	}
+
+/* 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: #1872A2;
+}
+.widget .tool.selected {
+  background: url("../../../view/theme/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;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../../../view/theme/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;
+	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-right: 5px; 
+    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;
+  /*padding-right: 10px;*/
+  /*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: 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("../../../view/theme/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");
+		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;
+}
+.tread-wrapper a{
+  color: red;
+}
+
+.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 {
+  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;
+  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 1px 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: 710px;
+  border: 1px solid #2d2d2d;
+  margin-top: 10px;
+}
+.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 #ffffff;
+}
+#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: #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**/
+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: #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: 2px 5px 2px 5px;
+max-height: 85%;
+max-width: 85%;
+border-radius: 10px;
+}
+.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;
+}
+.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;}
+*/
+
+#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 {
+        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-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-settings.css b/view/theme/diabook-red/style-settings.css
new file mode 100644
index 000000000..43bb3d037
--- /dev/null
+++ b/view/theme/diabook-red/style-settings.css
@@ -0,0 +1,2590 @@
+/**
+ * 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("../../../view/theme/diabook-red/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook-red/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook-red/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook-red/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/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"); 
+			  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;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/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"); 
+			  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("../../../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;}
+.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("../../../view/theme/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"); 
+  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: #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 {
+	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(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%);
+}
+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;
+}
+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: #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%);
+}
+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: #fff4d6;
+}
+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;
+}
+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-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");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/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;
+  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("../../../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;
+	}
+
+/* aside */
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 200px;
+  padding: 0px 10px 0px 10px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+
+aside .vcard {
+  display: none;
+}
+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 {
+  display: none;
+}
+#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("../../../view/theme/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;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../../../view/theme/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;
+	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: 650px;
+  padding: 0px 0px 0px 20px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+
+#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 {display: none;}
+.tab.button{display: none;}
+.rs_tabs {
+    
+    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;
+	}
+
+	
+#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: red;}
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; 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("../../../view/theme/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");
+		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;
+}
+.tread-wrapper a{
+  color: red;
+}
+
+.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 {
+  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;
+  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 1px 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: 710px;
+  border: 1px solid #2d2d2d;
+  margin-top: 10px;
+}
+.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;
+}
+#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 #ffffff;
+}
+#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: #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**/
+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 .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;
+}
+/**
+ * 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: 2px 5px 2px 5px;
+max-height: 85%;
+max-width: 85%;
+}
+.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;
+}
+.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;}
+*/
+
+#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 {
+        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-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: -2px;
+  top: -20px;
+}
+.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.css b/view/theme/diabook-red/style.css
new file mode 100644
index 000000000..b1061f035
--- /dev/null
+++ b/view/theme/diabook-red/style.css
@@ -0,0 +1,2616 @@
+/**
+ * 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("../../../view/theme/diabook-red/icons/contacts.png");}
+.icon.notifications {
+  background-image: url("../../../view/theme/diabook-red/icons/notifications.png");}
+.icon.notify {
+  background-image: url("../../../view/theme/diabook-red/icons/notify.png");}
+.icon.messages {
+  background-image: url("../../../view/theme/diabook-red/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.attach 	{ background-image: url("../../../view/theme/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"); 
+			  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;
+			  }
+.audio2 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.weblink 	{ background-image: url("../../../view/theme/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"); 
+			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+			  }
+.unglobe 	{ background-image: url("../../../view/theme/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"); 
+			  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("../../../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;}
+/*.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-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"); 
+  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;
+}
+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;
+}
+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(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;
+}
+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;
+}
+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-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");
+	}
+	
+nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{
+	background-image: url("../../../view/theme/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;
+  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("../../../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;
+	}
+/* 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;
+}
+#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("../../../view/theme/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: 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-right: 5px; 
+    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;
+}
+.tread-wrapper a{
+  color: red;
+}
+
+.wall-item-decor {
+  position: absolute;
+  left: 790px;
+  top: -10px;
+  width: 16px;
+}
+
+.wall-item-container {
+  display: table;
+  width: 780px;
+}
+
+
+.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 {
+  font-size: 12.5px;
+  max-width: 720px;
+  word-wrap: break-word;
+  line-height: 1.2;
+}
+
+.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 1px 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: 710px;
+  border: 1px solid #2d2d2d;
+  margin-top: 10px;
+}
+.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 {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #ffffff;
+}
+#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;
+}
+.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**/
+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: #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;
+}
+.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: 2px 5px 2px 5px;
+max-height: 85%;
+max-width: 85%;
+border-radius: 10px;
+}
+.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;
+}
+.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;}
+*/
+
+#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 {
+        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-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/theme.php b/view/theme/diabook-red/theme.php
new file mode 100644
index 000000000..0db9818e4
--- /dev/null
+++ b/view/theme/diabook-red/theme.php
@@ -0,0 +1,451 @@
+<?php
+
+/*
+ * Name: Diabook-red
+ * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
+ * Version: (Version: 1.012)
+ * 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['title'] = Array("", t('Find Friends'), "", "");
+	$nv['directory'] = Array('directory', t('Local Directory'), "", "");
+	$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
+	$nv['match'] = Array('match', t('Similar Interests'), "", "");
+	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
+	$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
+	
+	$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
+						<span class="sbox_l"></span>
+						<span class="sbox">
+						<input type="text" name="search" size="13" maxlength="50">
+						</span>
+						<span class="sbox_r" id="srch_clear"></span>';
+						
+	$aside['$nv'] = $nv;
+	};
+	//Community Page
+	if(local_user()) {
+   $page = '<div id="page-sidebar-right_aside" class="widget">
+			<div class="title tool">
+			<h3>'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
+			<div id="sidebar-page-list"><ul>';
+
+	$pagelist = array();
+
+	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
+			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
+			ORDER BY `name` ASC",
+			intval($a->user['uid'])
+	);
+
+	$pageD = array();
+
+	// Look if the profile is a community page
+	foreach($contacts as $contact) {
+		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
+	};
+	
+
+	$contacts = $pageD;
+
+	foreach($contacts as $contact) {
+		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
+				$contact["name"]."</a></li>";
+	}
+	$page .= '</ul></div></div>';
+	//if (sizeof($contacts) > 0)
+		
+		$aside['$page'] = $page;
+	}		
+  //END Community Page	
+  //helpers
+   $helpers = array();
+	$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
+	
+	$aside['$helpers'] = $helpers;
+   //end helpers
+   //connectable services
+   $con_services = array();
+	$con_services['title'] = Array("", t('Connect Services'), "", "");
+	
+	$aside['$con_services'] = $con_services;
+   //end connectable services
+   //postit
+   $postit = array();
+	$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
+	$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
+	
+	$aside['$postit'] = $postit;
+   //end postit
+  
+   //get_baseurl   
+   $url = $a->get_baseurl($ssl_state);   
+   $aside['$url'] = $url;
+
+	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
+	$a->page['right_aside'] = replace_macros($tpl, $aside);
+	
+}
+
+
+//profile_side at networkpages
+if ($a->argv[0] === "network" && local_user()){
+
+	// USER MENU
+	if(local_user()) {
+		
+		$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
+				
+		$userinfo = array(
+					'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
+					'name' => $a->user['username'],
+				);	
+		$ps = array('usermenu'=>array());
+		$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
+		$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
+		$ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));		
+		$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
+		$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
+		$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
+		$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
+		$ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", "");
+
+		$tpl = get_markup_template('profile_side.tpl');
+
+		$a->page['aside'] .= replace_macros($tpl, array(
+				'$userinfo' => $userinfo,
+				'$ps' => $ps,
+			));
+
+	}
+	
+	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_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'] .= '
+
+<script>
+ $(function() {
+	$("a.lightbox").fancybox(); // Select all links with lightbox class
+ });
+  
+ </script>';
+
+
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
+$a->page['htmlhead'] .= '
+<script>
+
+$("right_aside").ready(function(){
+	
+	if($.cookie("close_pages") == "1") 
+		{
+		document.getElementById( "close_pages" ).style.display = "none";
+			};
+	
+	if($.cookie("close_helpers") == "1") 
+		{
+		document.getElementById( "close_helpers" ).style.display = "none";
+			};
+			
+	if($.cookie("close_services") == "1") 
+		{
+		document.getElementById( "close_services" ).style.display = "none";
+			};
+			
+	if($.cookie("close_friends") == "1") 
+		{
+		document.getElementById( "close_friends" ).style.display = "none";
+			};
+	
+	if($.cookie("close_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>';}
diff --git a/view/theme/diabook-red/wall_item.tpl b/view/theme/diabook-red/wall_item.tpl
new file mode 100644
index 000000000..123834064
--- /dev/null
+++ b/view/theme/diabook-red/wall_item.tpl
@@ -0,0 +1,100 @@
+{{ 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
new file mode 100644
index 000000000..bee75ad99
--- /dev/null
+++ b/view/theme/diabook-red/wallwall_item.tpl
@@ -0,0 +1,106 @@
+{{ if $item.indent }}{{ else }}
+<div class="wall-item-decor">
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+{{ endif }}
+<div class="wall-item-container $item.indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
+					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
+				</a>
+			</div>
+			<div class="contact-photo-wrapper mframe wwfrom"
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+				$item.item_photo_menu
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
+				$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a>
+				 $item.vwall <span class="wall-item-ago">- &nbsp;
+			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
+			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+			$item.body
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{ for $item.tags as $tag }}
+				<span class='tag'>$tag</span>
+			{{ endfor }}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+
+		</div>
+		<div class="wall-item-actions">
+
+			<div class="wall-item-actions-social">
+			
+			
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+			{{ endif }}
+						
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
+			{{ endif }}	
+
+
+			{{ if $item.star }}
+				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
+				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+			{{ endif }}	
+			
+			{{ if $item.filer }}
+			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
+			{{ endif }}	
+			
+			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+			
+					
+					
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{ if $item.drop.dropping }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
+				{{ endif }}
+				{{ if $item.edpost }}
+					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+				{{ endif }}
+			</div>
+			<div class="wall-item-location">$item.location&nbsp;</div>
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
+	</div>
+</div>
+
+<div class="wall-item-comment-wrapper" >
+	$item.comment
+</div>
\ No newline at end of file
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
new file mode 100644
index 000000000..5c2164b50
--- /dev/null
+++ b/view/theme/diabook/communityhome.tpl
@@ -0,0 +1,92 @@
+<div id="close_pages">
+{{ if $page }}
+<div>$page</div>
+{{ endif }}
+</div>
+
+<div id="close_helpers">
+{{ if $lastusers_title }}
+<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
+<a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
+<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
+<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
+<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
+{{ endif }}
+</div>
+
+<div id="close_services">
+{{ if $lastusers_title }}
+<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
+<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
+<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook/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>
+<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook/icons/posterous.png?" title="Posterous"></a>
+<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook/icons/tumblr.png?" title="Tumblr"></a>
+<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook/icons/twitter.png?" title="Twitter"></a>
+<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook/icons/wordpress.png?" title="WordPress"></a>
+<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook/icons/email.png?" title="E-Mail"></a>
+</div>
+{{ endif }}
+</div>
+
+<div id="close_friends" style="margin-bottom:53px;">
+{{ if $nv }}
+<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
+<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
+<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
+<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
+<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
+<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>
+$nv.search
+{{ endif }}
+</div>
+
+<div id="close_postit">
+{{ if $lastusers_title }}
+<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
+<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</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/contact_template.tpl b/view/theme/diabook/contact_template.tpl
index 48930b48a..48930b48a 100755..100644
--- a/view/theme/diabook/contact_template.tpl
+++ b/view/theme/diabook/contact_template.tpl
diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl
new file mode 100644
index 000000000..db1936e4b
--- /dev/null
+++ b/view/theme/diabook/directory_item.tpl
@@ -0,0 +1,10 @@
+
+<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/fpostit/README b/view/theme/diabook/fpostit/README
new file mode 100644
index 000000000..39b7c5761
--- /dev/null
+++ b/view/theme/diabook/fpostit/README
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 000000000..d183c7573
--- /dev/null
+++ b/view/theme/diabook/fpostit/fpostit.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000..4505c9946
--- /dev/null
+++ b/view/theme/diabook/fpostit/fpostit.php
@@ -0,0 +1,135 @@
+<?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
new file mode 100644
index 000000000..61764bf20
--- /dev/null
+++ b/view/theme/diabook/fpostit/friendika-32.png
diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl
index af183d04d..af183d04d 100755..100644
--- a/view/theme/diabook/group_side.tpl
+++ b/view/theme/diabook/group_side.tpl
diff --git a/view/theme/diabook/icons/StatusNet.png b/view/theme/diabook/icons/StatusNet.png
new file mode 100644
index 000000000..398bca716
--- /dev/null
+++ b/view/theme/diabook/icons/StatusNet.png
diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png
index 1958041cf..1958041cf 100755..100644
--- a/view/theme/diabook/icons/attach.png
+++ b/view/theme/diabook/icons/attach.png
diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png
index 8d779a409..8d779a409 100755..100644
--- a/view/theme/diabook/icons/audio.png
+++ b/view/theme/diabook/icons/audio.png
diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png
index a5c7f1236..a5c7f1236 100755..100644
--- a/view/theme/diabook/icons/camera.png
+++ b/view/theme/diabook/icons/camera.png
diff --git a/view/theme/diabook/icons/close_box.png b/view/theme/diabook/icons/close_box.png
new file mode 100644
index 000000000..28e2675b8
--- /dev/null
+++ b/view/theme/diabook/icons/close_box.png
diff --git a/view/theme/diabook/icons/contacts2.png b/view/theme/diabook/icons/contacts2.png
index 7817279f4..7817279f4 100755..100644
--- a/view/theme/diabook/icons/contacts2.png
+++ b/view/theme/diabook/icons/contacts2.png
diff --git a/view/theme/diabook/icons/drop.png b/view/theme/diabook/icons/drop.png
index 2abb82ef2..2abb82ef2 100755..100644
--- a/view/theme/diabook/icons/drop.png
+++ b/view/theme/diabook/icons/drop.png
diff --git a/view/theme/diabook/icons/email.png b/view/theme/diabook/icons/email.png
new file mode 100644
index 000000000..240cef2c3
--- /dev/null
+++ b/view/theme/diabook/icons/email.png
diff --git a/view/theme/diabook/icons/expand.png b/view/theme/diabook/icons/expand.png
new file mode 100644
index 000000000..a46e88ea5
--- /dev/null
+++ b/view/theme/diabook/icons/expand.png
diff --git a/view/theme/diabook/icons/facebook.png b/view/theme/diabook/icons/facebook.png
new file mode 100644
index 000000000..3e5dd39c3
--- /dev/null
+++ b/view/theme/diabook/icons/facebook.png
diff --git a/view/theme/diabook/icons/file_as.png b/view/theme/diabook/icons/file_as.png
index 16713fa53..16713fa53 100755..100644
--- a/view/theme/diabook/icons/file_as.png
+++ b/view/theme/diabook/icons/file_as.png
diff --git a/view/theme/diabook/icons/link.png b/view/theme/diabook/icons/link.png
index 0ef666a67..0ef666a67 100755..100644
--- a/view/theme/diabook/icons/link.png
+++ b/view/theme/diabook/icons/link.png
diff --git a/view/theme/diabook/icons/livejournal.png b/view/theme/diabook/icons/livejournal.png
new file mode 100644
index 000000000..6d27d265e
--- /dev/null
+++ b/view/theme/diabook/icons/livejournal.png
diff --git a/view/theme/diabook/icons/lock.png b/view/theme/diabook/icons/lock.png
index 7e34bf279..7e34bf279 100755..100644
--- a/view/theme/diabook/icons/lock.png
+++ b/view/theme/diabook/icons/lock.png
diff --git a/view/theme/diabook/icons/lupe.png b/view/theme/diabook/icons/lupe.png
index f8b228347..f8b228347 100755..100644
--- a/view/theme/diabook/icons/lupe.png
+++ b/view/theme/diabook/icons/lupe.png
diff --git a/view/theme/diabook/icons/messages.png b/view/theme/diabook/icons/messages.png
index 38e11ef88..38e11ef88 100755..100644
--- a/view/theme/diabook/icons/messages.png
+++ b/view/theme/diabook/icons/messages.png
diff --git a/view/theme/diabook/icons/next.png b/view/theme/diabook/icons/next.png
index 7b5e25b90..7b5e25b90 100755..100644
--- a/view/theme/diabook/icons/next.png
+++ b/view/theme/diabook/icons/next.png
diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png
index 270997740..270997740 100755..100644
--- a/view/theme/diabook/icons/notifications.png
+++ b/view/theme/diabook/icons/notifications.png
diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png
index 9b852d05b..9b852d05b 100755..100644
--- a/view/theme/diabook/icons/notify.png
+++ b/view/theme/diabook/icons/notify.png
diff --git a/view/theme/diabook/icons/pencil.png b/view/theme/diabook/icons/pencil.png
index 772e49b17..772e49b17 100755..100644
--- a/view/theme/diabook/icons/pencil.png
+++ b/view/theme/diabook/icons/pencil.png
diff --git a/view/theme/diabook/icons/posterous.png b/view/theme/diabook/icons/posterous.png
new file mode 100644
index 000000000..c8e86078e
--- /dev/null
+++ b/view/theme/diabook/icons/posterous.png
diff --git a/view/theme/diabook/icons/prev.png b/view/theme/diabook/icons/prev.png
index 55c1464ba..55c1464ba 100755..100644
--- a/view/theme/diabook/icons/prev.png
+++ b/view/theme/diabook/icons/prev.png
diff --git a/view/theme/diabook/icons/pscontacts.png b/view/theme/diabook/icons/pscontacts.png
new file mode 100644
index 000000000..acf857f32
--- /dev/null
+++ b/view/theme/diabook/icons/pscontacts.png
diff --git a/view/theme/diabook/icons/pubgroups.png b/view/theme/diabook/icons/pubgroups.png
index acf857f32..6d9539610 100644
--- a/view/theme/diabook/icons/pubgroups.png
+++ b/view/theme/diabook/icons/pubgroups.png
diff --git a/view/theme/diabook/icons/recycle.png b/view/theme/diabook/icons/recycle.png
index c3b8d2bf4..c3b8d2bf4 100755..100644
--- a/view/theme/diabook/icons/recycle.png
+++ b/view/theme/diabook/icons/recycle.png
diff --git a/view/theme/diabook/icons/remote.png b/view/theme/diabook/icons/remote.png
index a560cc55e..a560cc55e 100755..100644
--- a/view/theme/diabook/icons/remote.png
+++ b/view/theme/diabook/icons/remote.png
diff --git a/view/theme/diabook/icons/scroll_top.png b/view/theme/diabook/icons/scroll_top.png
index 0e7f7ae6a..0e7f7ae6a 100755..100644
--- a/view/theme/diabook/icons/scroll_top.png
+++ b/view/theme/diabook/icons/scroll_top.png
diff --git a/view/theme/diabook/icons/selected.png b/view/theme/diabook/icons/selected.png
index 2a30ae252..2a30ae252 100755..100644
--- a/view/theme/diabook/icons/selected.png
+++ b/view/theme/diabook/icons/selected.png
diff --git a/view/theme/diabook/icons/srch_bg.gif b/view/theme/diabook/icons/srch_bg.gif
new file mode 100644
index 000000000..6a523ba8f
--- /dev/null
+++ b/view/theme/diabook/icons/srch_bg.gif
diff --git a/view/theme/diabook/icons/srch_l.gif b/view/theme/diabook/icons/srch_l.gif
new file mode 100644
index 000000000..6d95bf35d
--- /dev/null
+++ b/view/theme/diabook/icons/srch_l.gif
diff --git a/view/theme/diabook/icons/srch_r.gif b/view/theme/diabook/icons/srch_r.gif
new file mode 100644
index 000000000..89833a316
--- /dev/null
+++ b/view/theme/diabook/icons/srch_r.gif
diff --git a/view/theme/diabook/icons/srch_r_f2.gif b/view/theme/diabook/icons/srch_r_f2.gif
new file mode 100644
index 000000000..6df457bed
--- /dev/null
+++ b/view/theme/diabook/icons/srch_r_f2.gif
diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png
index 0b00cb189..0b00cb189 100755..100644
--- a/view/theme/diabook/icons/star.png
+++ b/view/theme/diabook/icons/star.png
diff --git a/view/theme/diabook/icons/starred.png b/view/theme/diabook/icons/starred.png
index 2b82dfca3..2b82dfca3 100755..100644
--- a/view/theme/diabook/icons/starred.png
+++ b/view/theme/diabook/icons/starred.png
diff --git a/view/theme/diabook/icons/tagged.png b/view/theme/diabook/icons/tagged.png
index 144649ef8..144649ef8 100755..100644
--- a/view/theme/diabook/icons/tagged.png
+++ b/view/theme/diabook/icons/tagged.png
diff --git a/view/theme/diabook/icons/tumblr.png b/view/theme/diabook/icons/tumblr.png
new file mode 100644
index 000000000..1dc7fa072
--- /dev/null
+++ b/view/theme/diabook/icons/tumblr.png
diff --git a/view/theme/diabook/icons/twitter.png b/view/theme/diabook/icons/twitter.png
new file mode 100644
index 000000000..b7a687b9f
--- /dev/null
+++ b/view/theme/diabook/icons/twitter.png
diff --git a/view/theme/diabook/icons/unlock.png b/view/theme/diabook/icons/unlock.png
index a0cda0ae5..a0cda0ae5 100755..100644
--- a/view/theme/diabook/icons/unlock.png
+++ b/view/theme/diabook/icons/unlock.png
diff --git a/view/theme/diabook/icons/unstarred.png b/view/theme/diabook/icons/unstarred.png
index ba3183f5c..ba3183f5c 100755..100644
--- a/view/theme/diabook/icons/unstarred.png
+++ b/view/theme/diabook/icons/unstarred.png
diff --git a/view/theme/diabook/icons/video.png b/view/theme/diabook/icons/video.png
index a03d1d818..a03d1d818 100755..100644
--- a/view/theme/diabook/icons/video.png
+++ b/view/theme/diabook/icons/video.png
diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png
index 216e78344..216e78344 100755..100644
--- a/view/theme/diabook/icons/weblink.png
+++ b/view/theme/diabook/icons/weblink.png
diff --git a/view/theme/diabook/icons/wordpress.png b/view/theme/diabook/icons/wordpress.png
new file mode 100644
index 000000000..f564c4300
--- /dev/null
+++ b/view/theme/diabook/icons/wordpress.png
diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl
index 387eb1f91..bd43994b5 100755..100644
--- 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,29 +14,30 @@
 		<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="character-counter" class="grey"></div>		
 		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
 
 
 <div id="profile-jot-submit-wrapper" class="jothidden">
 	
-	<div id="profile-upload-wrapper" style="/*display: $visitor;*/" >
+	<div id="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="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);" >
+	<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;*/" >
+	<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;*/" >
+	<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;*/" >
+	<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;*/" >
diff --git a/view/theme/diabook/js/jquery.cookie.js b/view/theme/diabook/js/jquery.cookie.js
new file mode 100644
index 000000000..6d5974a2c
--- /dev/null
+++ b/view/theme/diabook/js/jquery.cookie.js
@@ -0,0 +1,47 @@
+/*!
+ * 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/mail_conv.tpl b/view/theme/diabook/mail_conv.tpl
new file mode 100644
index 000000000..989f17878
--- /dev/null
+++ b/view/theme/diabook/mail_conv.tpl
@@ -0,0 +1,60 @@
+<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/mail_display.tpl b/view/theme/diabook/mail_display.tpl
new file mode 100644
index 000000000..8b82e95c6
--- /dev/null
+++ b/view/theme/diabook/mail_display.tpl
@@ -0,0 +1,12 @@
+<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/mail_list.tpl b/view/theme/diabook/mail_list.tpl
new file mode 100644
index 000000000..6bc6c84f6
--- /dev/null
+++ b/view/theme/diabook/mail_list.tpl
@@ -0,0 +1,8 @@
+<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/message_side.tpl b/view/theme/diabook/message_side.tpl
new file mode 100644
index 000000000..9f1587096
--- /dev/null
+++ b/view/theme/diabook/message_side.tpl
@@ -0,0 +1,10 @@
+<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/nav.tpl b/view/theme/diabook/nav.tpl
index 5776b6cf7..78eb34197 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -11,16 +11,16 @@
 			{{ 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></a>
-				<span id="net-update" class="nav-notify"></span>
+				<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></a>
-				<span id="intro-update" class="nav-notify"></span>
+				<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> 
@@ -32,8 +32,8 @@
 			{{ 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></a>
-				<span id="mail-update" class="nav-notify"></span>
+			  <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>
@@ -44,8 +44,10 @@
 			{{ 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></a>
-				<span id="notify-update" class="nav-notify"></span>
+			<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>
@@ -66,16 +68,12 @@
 			<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.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.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
-
-
-										<li><a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
+				{{ 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>
 										
-										<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 }}
 
@@ -103,10 +101,10 @@
 			</li>	
 		{{ endif }}		
 		
-      {{ if $nav.home }}
+      {{ 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</a>
-				<span id="home-update" class="nav-notify"></span>
+				<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 }}		
 		
diff --git a/view/theme/diabook/photo_view.tpl b/view/theme/diabook/photo_view.tpl
index 511fc73ac..511fc73ac 100755..100644
--- a/view/theme/diabook/photo_view.tpl
+++ b/view/theme/diabook/photo_view.tpl
diff --git a/view/theme/diabook/profile_side.tpl b/view/theme/diabook/profile_side.tpl
index a65677696..0762dbe44 100644
--- a/view/theme/diabook/profile_side.tpl
+++ b/view/theme/diabook/profile_side.tpl
@@ -9,12 +9,13 @@
 <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="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</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>
 
-				
\ No newline at end of file
+				
diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl
index 3a545f9ba..e28ec2909 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="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
 
+	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 
 
 	{{ if $location }}
diff --git a/view/theme/diabook/right_aside.tpl b/view/theme/diabook/right_aside.tpl
new file mode 100644
index 000000000..a65677696
--- /dev/null
+++ b/view/theme/diabook/right_aside.tpl
@@ -0,0 +1,20 @@
+<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/rs_common_tabs.tpl b/view/theme/diabook/rs_common_tabs.tpl
new file mode 100644
index 000000000..6a1c5c71b
--- /dev/null
+++ b/view/theme/diabook/rs_common_tabs.tpl
@@ -0,0 +1,6 @@
+<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
new file mode 100644
index 000000000..2826f4261
--- /dev/null
+++ b/view/theme/diabook/screenshot.png
diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl
new file mode 100644
index 000000000..123834064
--- /dev/null
+++ b/view/theme/diabook/search_item.tpl
@@ -0,0 +1,100 @@
+{{ 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/style-network.css b/view/theme/diabook/style-network.css
new file mode 100644
index 000000000..c4f0b54b1
--- /dev/null
+++ b/view/theme/diabook/style-network.css
@@ -0,0 +1,2546 @@
+/**
+ * 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("../../../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: 28px; 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;}
+			  
+			  
+
+
+.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("../../../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: 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: #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;
+}
+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: #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 {
+position: absolute;
+top: 30px;
+}
+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: #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;
+}
+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/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;
+  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("../../../view/theme/diabook/icons/home.png") no-repeat;
+	}
+.menu-profile-list.photos{
+	background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
+	}
+.menu-profile-list.events{
+	background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
+	}
+.menu-profile-list.notes{
+	background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
+	}
+.menu-profile-list.foren{
+	background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
+	}
+.menu-profile-list.com_side{
+	background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
+	}
+.menu-profile-list.pscontacts{
+	background: url("../../../view/theme/diabook/icons/pscontacts.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 #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: 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;
+}
+.widget .tool.selected {
+  background: url("../../../view/theme/diabook/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;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../../../view/theme/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;
+	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-right: 5px; 
+    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 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("../../../view/theme/diabook-blue/icons/close_box.png");
+		float: right;
+		opacity: 0.1;
+		}
+.close_box:hover	{ 
+		background-image: url("../../../view/theme/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;
+}
+.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 {
+  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;
+  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 1px 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: 710px;
+  border: 1px solid #2d2d2d;
+  margin-top: 10px;
+}
+.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: #3465A4;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #3465A4;
+}
+.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 #ffffff;
+}
+#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: #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"] {
+    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 {
+  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 **/
+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: #333333;
+    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 */
+.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;
+}
+.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;}
+*/
+
+#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 {
+        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-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;
+	}
+.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 {
+  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-profile.css b/view/theme/diabook/style-profile.css
new file mode 100644
index 000000000..5ac152252
--- /dev/null
+++ b/view/theme/diabook/style-profile.css
@@ -0,0 +1,2541 @@
+/**
+ * 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("../../../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: 28px; 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;}
+			  
+			  
+
+
+.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("../../../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: 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: #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;
+}
+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: #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%;
+}
+/* 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;
+}
+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/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;
+  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("../../../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;
+	}
+
+/* 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;
+}
+.widget .tool.selected {
+  background: url("../../../view/theme/diabook/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;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../../../view/theme/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;
+	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: 610px;
+  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-right: 5px; 
+    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 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("../../../view/theme/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");
+		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;
+}
+.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 {
+  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;
+  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 1px 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: 710px;
+  border: 1px solid #2d2d2d;
+  margin-top: 10px;
+}
+.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: #3465A4;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #3465A4;
+}
+.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 #ffffff;
+}
+#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: #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 **/
+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: #333333;
+    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 {
+border-radius: 10px;	
+	}
+.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;
+}
+.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;}
+*/
+
+#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 {
+        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-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;
+	}
+.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 {
+  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-settings.css b/view/theme/diabook/style-settings.css
new file mode 100644
index 000000000..fdb4f24c7
--- /dev/null
+++ b/view/theme/diabook/style-settings.css
@@ -0,0 +1,2529 @@
+/**
+ * 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("../../../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: 28px; 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;}
+			  
+			  
+
+
+.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("../../../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: 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: #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;
+}
+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: #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%;
+}
+/* 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;
+}
+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/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;
+  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("../../../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;
+	}
+
+/* aside */
+aside {
+  display: table-cell;
+  vertical-align: top;
+  width: 200px;
+  padding: 0px 10px 0px 10px;
+  border-right: 1px solid #D2D2D2;
+  float: left;
+  /* background: #F1F1F1; */
+}
+
+aside .vcard  {
+  display: none;
+}
+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;
+	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 {
+  display: none;
+}
+#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;
+}
+.widget .tool.selected {
+  background: url("../../../view/theme/diabook/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;
+	float: left;
+	width: 19px; height: 19px;
+	margin-left: 10px;
+	margin-top: 5px;
+	
+}
+
+span.sbox_r  {
+	background: white url('../../../view/theme/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;
+	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: 650px;
+  padding: 0px 0px 0px 20px;
+}
+
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  max-width: 575px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+
+#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 {display: none;}
+.tab.button{display: none;}
+.rs_tabs {
+    
+    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;
+	}
+	
+#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 h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; 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("../../../view/theme/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");
+		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;
+}
+.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 {
+  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;
+  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 1px 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: 710px;
+  border: 1px solid #2d2d2d;
+  margin-top: 10px;
+}
+.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: #3465A4;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #3465A4;
+}
+.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;
+}
+#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 #ffffff;
+}
+#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: #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 **/
+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 .active {
+    background-color: #333;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 2px 2px 2px #CFCFCF;
+    font-size: 13px;
+}
+/**
+ * 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 */
+.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: -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;
+}
+.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;}
+*/
+
+#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 {
+        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-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;
+	}
+.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: -2px;
+  top: -20px;
+}
+.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 5841a96b3..5f60c0bff 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -102,7 +102,6 @@
 .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");}
@@ -395,7 +394,7 @@
 /* global */
 body {
   font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
+  font-size: 12.5px;
   background-color: #ffffff;
   color: #2d2d2d;
   margin: 50px auto auto;
@@ -543,15 +542,97 @@ 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 {
+  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 {
@@ -630,7 +711,7 @@ nav #logo-text {
 nav .nav-menu-search {
   position: relative;
 
-  margin: 3px 17px;
+  margin: 4px 17px;
   margin-right: 0px;
   height: 17px;
   width: 180px;
@@ -641,6 +722,10 @@ 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;
 	}
 
 
@@ -877,6 +962,8 @@ ul.menu-popup .empty {
   padding-top: 4px;
   padding-left: 5px;	
   color: #2D2D2D;
+  word-wrap: break-word;
+  width: 130px;
 	}
 #ps-username:hover{
   text-decoration: none;	
@@ -923,6 +1010,9 @@ ul.menu-popup .empty {
 .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/icons/pscontacts.png") no-repeat;
+	}
 
 /* aside */
 aside {
@@ -934,7 +1024,7 @@ aside {
   float: left;
   /* background: #F1F1F1; */
 }
-
+aside #page-sidebar{display: none;}
 aside .vcard .fn {
   font-size: 18px;
   font-weight: bold;
@@ -988,7 +1078,13 @@ 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;
 }
 aside #side-follow-url {
 	width: 173px;
@@ -1102,10 +1198,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;	
 	}
@@ -1153,6 +1253,7 @@ body .pageheader{
   margin-bottom: 0px;
   width: 775px;
 }
+
 .wall-item-decor {
   position: absolute;
   left: 790px;
@@ -1165,7 +1266,6 @@ body .pageheader{
   width: 780px;
 }
 
-
 .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
   display: table-row;
 }
@@ -1213,10 +1313,10 @@ body .pageheader{
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 13px;
+  font-size: 12.5px;
   max-width: 720px;
   word-wrap: break-word;
-  line-height: 1.4;
+  line-height: 1.2;
 }
 
 .wall-item-container .wall-item-content img {
@@ -1462,6 +1562,11 @@ body .pageheader{
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -1602,7 +1707,7 @@ body .pageheader{
 #profile-jot-submit {
 	float: right;
 	margin-top: 2px;
-	
+	font-size: 14px;
 }
 #profile-upload-wrapper {
 	float: left;
@@ -1654,7 +1759,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;
@@ -1665,9 +1772,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;
@@ -1677,6 +1785,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;
@@ -1867,6 +1977,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;
 	}
@@ -1926,6 +2044,9 @@ ul.tabs li .active {
   float: left;
 }
 /* photo */
+.photo {
+border-radius: 10px;	
+	}
 .lframe {
   float: left;
 }
@@ -1958,7 +2079,7 @@ ul.tabs li .active {
 	padding: 0px;
         width: 16px;
         height: 16px;
-        top: -20px; left:0px;
+        top: -16px; left:0px;
         overflow: hidden;
         text-indent: 40px;
         display: none;
@@ -2332,8 +2453,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/theme.php b/view/theme/diabook/theme.php
index 39479ce52..50a7c6974 100755..100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,117 +3,462 @@
 /*
  * 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.012)
  * Author: 
  */
 
-$a->theme_info = array(
-  'extends' => 'diabook',
-);
 
-//profile_side
+
+//change css on network and profilepages
+$cssFile = null;
+
+
+/**
+ * prints last community activity
+ */
 
 
+ 
+function diabook_community_info(){
+	$a = get_app();
+	//right_aside at networkpages
 
-$nav['usermenu']=array();
-$userinfo = null;
+	// 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 ";
 
-if(local_user()) {
+	$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>';
 
-$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
+		$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
 		
-$userinfo = array(
-			'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
-			'name' => $a->user['username'],
-		);	
-	
-$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'][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'), "", "");
-
-if($is_url = preg_match ("/\bnetwork\b/i", $_SERVER['REQUEST_URI'])) {
-$tpl = get_markup_template('profile_side.tpl');
-
-$a->page['aside'] .= replace_macros($tpl, array(
-		'$userinfo' => $userinfo,
-		'$ps' => $ps,
-	));
+	}
+	
+	
+	// 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/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['title'] = Array("", t('Find Friends'), "", "");
+	$nv['directory'] = Array('directory', t('Local Directory'), "", "");
+	$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
+	$nv['match'] = Array('match', t('Similar Interests'), "", "");
+	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
+	$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
+	
+	$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
+						<span class="sbox_l"></span>
+						<span class="sbox">
+						<input type="text" name="search" size="13" maxlength="50">
+						</span>
+						<span class="sbox_r" id="srch_clear"></span>';
+	
+	$aside['$nv'] = $nv;
+	};
+   
+   //Community Page
+   if(local_user()) {
+   $page = '<div id="page-sidebar-right_aside" class="widget">
+			<div class="title tool">
+			<h3>'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
+			<div id="sidebar-page-list"><ul>';
+
+	$pagelist = array();
+
+	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
+			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
+			ORDER BY `name` ASC",
+			intval($a->user['uid'])
+	);
+
+	$pageD = array();
+
+	// Look if the profile is a community page
+	foreach($contacts as $contact) {
+		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
+	};
+	
+
+	$contacts = $pageD;
+
+	foreach($contacts as $contact) {
+		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
+				$contact["name"]."</a></li>";
+	}
+	$page .= '</ul></div></div>';
+	//if (sizeof($contacts) > 0)
+		
+		$aside['$page'] = $page;	
+	}
+  //END Community Page	
+  //helpers
+   $helpers = array();
+	$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
+	
+	$aside['$helpers'] = $helpers;
+   //end helpers
+   //connectable services
+   $con_services = array();
+	$con_services['title'] = Array("", t('Connect Services'), "", "");
+	
+	$aside['$con_services'] = $con_services;
+   //end connectable services
+   //postit
+   $postit = array();
+	$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
+	$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
+	
+	$aside['$postit'] = $postit;
+   //end postit
+  
+   //get_baseurl
+   $url = $a->get_baseurl($ssl_state);   
+   $aside['$url'] = $url;
+
+	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
+	$a->page['right_aside'] = replace_macros($tpl, $aside);
+	
+	
+	
+	
 }
+
+
+//profile_side at networkpages
+if ($a->argv[0] === "network" && local_user()){
+
+	// USER MENU
+	if(local_user()) {
+		
+		$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
+				
+		$userinfo = array(
+					'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
+					'name' => $a->user['username'],
+				);	
+		$ps = array('usermenu'=>array());
+		$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
+		$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
+		$ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));				
+		$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
+		$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
+		$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
+		$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
+		$ps['usermenu']['pgroups'] = Array('http://dir.friendica.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_community_info();
+	
+	// CUSTOM CSS
+	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-network.css";
+	}
 }
 
+
+
+//right_aside at profile pages
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
+	if($ccCookie != "8") {
+	// COMMUNITY
+	diabook_community_info();
+	
+	// CUSTOM CSS
+	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile.css";
+	
+	
+	}
+}
+
+//tabs at 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);
+
+//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>
+$a->page['htmlhead'] .= '
 
-//contacts
-$('html').click(function() {
- $('#nav-contacts-linkmenu').removeClass('selected');
- document.getElementById( "nav-contacts-menu" ).style.display = "none";
+<script>
+ $(function() {
+	$("a.lightbox").fancybox(); // Select all links with lightbox class
  });
  
- $('#nav-contacts-linkmenu').click(function(event){
-     event.stopPropagation();
- });
+ $(document).ready(function (){
+	$("iframe").each(function(){
+		var url = $(this).attr("src");
+		$(this).attr("src",url+"?wmode=transparent"); });
+    });
+  
+ </script>';
 
-//messages
-$('html').click(function() {
- $('#nav-messages-linkmenu').removeClass('selected');
- document.getElementById( "nav-messages-menu" ).style.display = "none";
- });
 
- $('#nav-messages-linkmenu').click(function(event){
-     event.stopPropagation();
- });
-
-//notifications
-$('html').click(function() {
- $('#nav-notifications-linkmenu').removeClass('selected');
- document.getElementById( "nav-notifications-menu" ).style.display = "none";
- });
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
+$a->page['htmlhead'] .= '
+<script>
 
- $('#nav-notifications-linkmenu').click(function(event){
-     event.stopPropagation();
- });
+$("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";
+			};}
 
-//usermenu
-$('html').click(function() {
- $('#nav-user-linkmenu').removeClass('selected');
- document.getElementById( "nav-user-menu" ).style.display = "none";
- });
+);
 
- $('#nav-user-linkmenu').click(function(event){
-     event.stopPropagation();
- });
+function close_pages(){
+ document.getElementById( "close_pages" ).style.display = "none";
+ $.cookie("close_pages","1", { expires: 365, path: "/" });
+ };
  
- //settingsmenu
- $('html').click(function() {
- $('#nav-site-linkmenu').removeClass('selected');
- document.getElementById( "nav-site-menu" ).style.display = "none";
- });
+function close_helpers(){
+ document.getElementById( "close_helpers" ).style.display = "none";
+  $.cookie("close_helpers","1", { expires: 365, path: "/" });
+ };
 
- $('#nav-site-linkmenu').click(function(event){
-     event.stopPropagation();
- });
- //appsmenu
- $('html').click(function() {
- $('#nav-apps-link').removeClass('selected');
- document.getElementById( "nav-apps-menu" ).style.display = "none";
- });
+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: "/" });
+ };
 
- $('#nav-apps-link').click(function(event){
-     event.stopPropagation();
- });
+function close_postit(){
+ document.getElementById( "close_postit" ).style.display = "none";
+ $.cookie("close_postit","1", { expires: 365, path: "/" });
+ };
  
- $(function() {
-	$('a.lightbox').fancybox(); // Select all links with lightbox class
-});
+function close_lastusers(){
+ document.getElementById( "close_lastusers" ).style.display = "none";
+ $.cookie("close_lastusers","1", { expires: 365, path: "/" });
+ };
 
+function close_lastphotos(){
+ document.getElementById( "close_lastphotos" ).style.display = "none";
+ $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
+ };
+ 
+function close_lastlikes(){
+ document.getElementById( "close_lastlikes" ).style.display = "none";
+ $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
+ };
  
- </script>
-EOT;
+ 
+
+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>';}
\ No newline at end of file
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index 20d24702b..123834064 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -1,6 +1,5 @@
 {{ if $item.indent }}{{ else }}
 <div class="wall-item-decor">
-	{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ 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 }}
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index e02e5a8be..bee75ad99 100644
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -1,6 +1,5 @@
 {{ if $item.indent }}{{ else }}
 <div class="wall-item-decor">
-	{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ 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 }}
@@ -72,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/comment_item.tpl b/view/theme/dispy-dark/comment_item.tpl
index 85176732b..adf2772af 100644
--- a/view/theme/dispy-dark/comment_item.tpl
+++ b/view/theme/dispy-dark/comment_item.tpl
@@ -12,14 +12,15 @@
 				</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>
-
 				{{ if $qcomment }}
-                <ul class="qcomment-wrapper">
-				{{ for $qcomment as $qc }}				
-					<li class="fakelink qcomment"
-                    onclick="commentInsert(this,$id); return false;">$qc</li>
+                <div class="qcomment-wrapper">
+					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);">
+					<option value=""></option>
+				{{ for $qcomment as $qc }}
+					<option value="$qc">$qc</option>
 				{{ endfor }}
-                </ul>
+					</select>
+				</div>
 				{{ endif }}
 
 				<div class="comment-edit-text-end"></div>
diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl
new file mode 100644
index 000000000..340b7216c
--- /dev/null
+++ b/view/theme/dispy-dark/communityhome.tpl
@@ -0,0 +1,46 @@
+{{ if $page }}
+<div>$page</div>
+{{ endif }}
+
+{{ if $lastusers_title }}
+<h3 id="extra-help-header">Help or '@NewHere'?</h3>
+<div id="extra-help">
+<a href="https://helpers.pyxis.uberspace.de/profile/helpers"
+	title="Friendica Support" target="_blank">Friendica Support</a><br />
+<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk"
+	title="Let's talk" target="_blank">Let's talk</a><br />
+<a href="http://newzot.hydra.uberspace.de/profile/newzot"
+	title="Local Friendica" target="_blank">Local Friendica</a><br />
+<a href="http://kakste.com/profile/newhere" title="@NewHere" target="_blank">NewHere</a>
+</div>
+{{ endif }}
+
+{{ if $lastusers_title }}
+<h3 id="connect-services-header">Connectable Services</h3>
+<div id="connect-services">
+<a href="$url/facebook"><img alt="Facebook"
+	src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a>
+<a href="$url/settings/connectors"><img
+	alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png?" title="StatusNet" /></a>
+<a href="$url/settings/connectors"><img
+	alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png?" title="LiveJournal" /></a>
+<a href="$url/settings/connectors"><img
+	alt="Posterous" src="view/theme/dispy/icons/posterous.png?" title="Posterous" /></a><br />
+<a href="$url/settings/connectors"><img
+	alt="Tumblr" src="view/theme/dispy/icons/tumblr.png?" title="Tumblr" /></a>
+<a href="$url/settings/connectors"><img
+	alt="Twitter" src="view/theme/dispy/icons/twitter.png?" title="Twitter" /></a>
+<a href="$url/settings/connectors"><img
+	alt="WordPress" src="view/theme/dispy/icons/wordpress.png?" title="WordPress" /></a>
+<a href="$url/settings/connectors"><img
+	alt="E-Mail" src="view/theme/dispy/icons/email.png?" title="E-Mail" /></a>
+</div>
+{{ endif }}
+
+{{ 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
new file mode 100644
index 000000000..e74ec1a4f
--- /dev/null
+++ b/view/theme/dispy-dark/default.php
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+</head>
+<body>
+	<?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>
+</body>
+</html>
+
diff --git a/view/theme/dispy-dark/experimental b/view/theme/dispy-dark/experimental
deleted file mode 100644
index e69de29bb..000000000
--- a/view/theme/dispy-dark/experimental
+++ /dev/null
diff --git a/view/theme/dispy-dark/fpostit/README b/view/theme/dispy-dark/fpostit/README
new file mode 100644
index 000000000..39b7c5761
--- /dev/null
+++ b/view/theme/dispy-dark/fpostit/README
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 000000000..eb593d838
--- /dev/null
+++ b/view/theme/dispy-dark/fpostit/fpostit.js
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 000000000..d00182946
--- /dev/null
+++ b/view/theme/dispy-dark/fpostit/fpostit.php
@@ -0,0 +1,134 @@
+<?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
new file mode 100644
index 000000000..61764bf20
--- /dev/null
+++ b/view/theme/dispy-dark/fpostit/friendica-32.png
diff --git a/view/theme/dispy-dark/fpostit/friendika-32.png b/view/theme/dispy-dark/fpostit/friendika-32.png
new file mode 100644
index 000000000..61764bf20
--- /dev/null
+++ b/view/theme/dispy-dark/fpostit/friendika-32.png
diff --git a/view/theme/dispy-dark/head.tpl b/view/theme/dispy-dark/head.tpl
index f606f2f7e..cd6f5ca97 100644
--- a/view/theme/dispy-dark/head.tpl
+++ b/view/theme/dispy-dark/head.tpl
@@ -7,7 +7,7 @@
 
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
 
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
+<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
 <link rel="search"
          href="$baseurl/opensearch" 
          type="application/opensearchdescription+xml" 
@@ -34,14 +34,16 @@
 	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);
 		}
 	}
@@ -63,6 +65,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();
diff --git a/view/theme/dispy-dark/icons.png b/view/theme/dispy-dark/icons.png
index 648811373..203568135 100644
--- a/view/theme/dispy-dark/icons.png
+++ b/view/theme/dispy-dark/icons.png
diff --git a/view/theme/dispy-dark/icons.svg b/view/theme/dispy-dark/icons.svg
index 10f8cc667..2c4b3abd3 100644
--- a/view/theme/dispy-dark/icons.svg
+++ b/view/theme/dispy-dark/icons.svg
@@ -51,9 +51,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.3859292"
-     inkscape:cx="105.02551"
-     inkscape:cy="107.90767"
+     inkscape:zoom="1.9403009"
+     inkscape:cx="95.950174"
+     inkscape:cy="115.58345"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -63,7 +63,7 @@
      inkscape:window-width="1065"
      inkscape:window-height="742"
      inkscape:window-x="40"
-     inkscape:window-y="61"
+     inkscape:window-y="50"
      inkscape:window-maximized="0"
      width="0px"
      height="0px"
@@ -330,7 +330,7 @@
        sodipodi:cy="33.612183"
        sodipodi:rx="7.3214288"
        sodipodi:ry="7.3214288"
-       d="m 492.49999,33.612183 a 7.3214288,7.3214288 0 1 1 -14.64286,0 7.3214288,7.3214288 0 1 1 14.64286,0 z"
+       d="m 492.49999,33.612183 c 0,4.043513 -3.27792,7.321428 -7.32143,7.321428 -4.04352,0 -7.32143,-3.277915 -7.32143,-7.321428 0,-4.043514 3.27791,-7.321429 7.32143,-7.321429 4.04351,0 7.32143,3.277915 7.32143,7.321429 z"
        transform="matrix(0.43114968,0,0,0.43114968,-201.51175,889.48158)" />
     <rect
        style="fill:#2e2f2e;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
@@ -380,7 +380,7 @@
        transform="matrix(0.43114968,0,0,0.43114968,-179.41936,889.63556)" />
     <path
        transform="matrix(0.43114968,0,0,0.43114968,-179.51175,889.48158)"
-       d="m 492.49999,33.612183 a 7.3214288,7.3214288 0 1 1 -14.64286,0 7.3214288,7.3214288 0 1 1 14.64286,0 z"
+       d="m 492.49999,33.612183 c 0,4.043513 -3.27792,7.321428 -7.32143,7.321428 -4.04352,0 -7.32143,-3.277915 -7.32143,-7.321428 0,-4.043514 3.27791,-7.321429 7.32143,-7.321429 4.04351,0 7.32143,3.277915 7.32143,7.321429 z"
        sodipodi:ry="7.3214288"
        sodipodi:rx="7.3214288"
        sodipodi:cy="33.612183"
@@ -450,7 +450,7 @@
        id="path4110" />
     <path
        transform="matrix(1.2829201,1.9081591,-1.9081591,1.2829201,-436.65386,-211.76762)"
-       d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+       d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
        sodipodi:ry="0.88388348"
        sodipodi:rx="0.88388348"
        sodipodi:cy="21.754047"
@@ -466,11 +466,11 @@
        sodipodi:cy="21.754047"
        sodipodi:rx="0.88388348"
        sodipodi:ry="0.88388348"
-       d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+       d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
        transform="matrix(0.96219008,1.4311194,-1.4311194,0.96219008,-261.29289,65.614849)" />
     <path
        transform="matrix(1.0080086,1.4992679,-1.4992679,1.0080086,-291.03317,15.446827)"
-       d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+       d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
        sodipodi:ry="0.88388348"
        sodipodi:rx="0.88388348"
        sodipodi:cy="21.754047"
@@ -492,7 +492,7 @@
        sodipodi:cy="21.754047"
        sodipodi:rx="0.88388348"
        sodipodi:ry="0.88388348"
-       d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+       d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
        transform="matrix(1.0996458,1.635565,-1.635565,1.0996458,-346.37171,-55.312424)" />
     <path
        inkscape:connector-curvature="0"
@@ -510,7 +510,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <rect
-       style="fill:#999999;stroke:#ececec;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       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"
        id="rect4387-8"
        width="14.5"
        height="9"
@@ -523,7 +523,7 @@
        inkscape:export-ydpi="90" />
     <path
        sodipodi:type="arc"
-       style="fill:#333333;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       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"
        id="path4391-3"
        sodipodi:cx="408.8125"
        sodipodi:cy="220.26843"
@@ -1006,7 +1006,7 @@
        ry="0.42804927"
        transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,294.0656)" />
     <rect
-       style="fill:#333333;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"
+       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"
        id="rect4290"
        width="3.5355339"
        height="1.8561553"
@@ -1047,7 +1047,7 @@
          sodipodi:cy="220.62782"
          sodipodi:rx="7.4246211"
          sodipodi:ry="7.4246211"
-         d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
+         d="m 292.21188,220.62782 c 0,4.10051 -3.32411,7.42462 -7.42462,7.42462 -4.1005,0 -7.42462,-3.32411 -7.42462,-7.42462 0,-4.1005 3.32412,-7.42462 7.42462,-7.42462 4.10051,0 7.42462,3.32412 7.42462,7.42462 z"
          transform="translate(-204.73743,661.76269)" />
       <path
          inkscape:export-ydpi="90"
@@ -1559,7 +1559,7 @@
        sodipodi:cy="143.46553"
        sodipodi:rx="5.5219707"
        sodipodi:ry="5.2590199"
-       d="m 51.275442,143.46553 a 5.5219707,5.2590199 0 0 1 11.043942,0 l -5.521971,0 z"
+       d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
        transform="matrix(1.2380952,0,0,1.675,-15.523193,759.33575)"
        sodipodi:start="3.1415927"
        sodipodi:end="6.2831853" />
@@ -1567,7 +1567,7 @@
        sodipodi:end="6.2831853"
        sodipodi:start="3.1415927"
        transform="matrix(0.4523809,0,0,0.775,29.234821,888.45473)"
-       d="m 51.275442,143.46553 a 5.5219707,5.2590199 0 0 1 11.043942,0 l -5.521971,0 z"
+       d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
        sodipodi:ry="5.2590199"
        sodipodi:rx="5.5219707"
        sodipodi:cy="143.46553"
@@ -1579,7 +1579,7 @@
        sodipodi:end="6.2831853"
        sodipodi:start="3.1415927"
        transform="matrix(1.2380952,0,0,1.675,6.476807,759.33575)"
-       d="m 51.275442,143.46553 a 5.5219707,5.2590199 0 0 1 11.043942,0 l -5.521971,0 z"
+       d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
        sodipodi:ry="5.2590199"
        sodipodi:rx="5.5219707"
        sodipodi:cy="143.46553"
@@ -1595,7 +1595,7 @@
        sodipodi:cy="143.46553"
        sodipodi:rx="5.5219707"
        sodipodi:ry="5.2590199"
-       d="m 51.275442,143.46553 a 5.5219707,5.2590199 0 0 1 11.043942,0 l -5.521971,0 z"
+       d="m 51.275442,143.46553 c 0,-2.90448 2.472271,-5.25902 5.521971,-5.25902 3.0497,0 5.521971,2.35454 5.521971,5.25902 l -5.521971,0 z"
        transform="matrix(0.4523809,0,0,0.775,51.234821,888.45473)"
        sodipodi:start="3.1415927"
        sodipodi:end="6.2831853" />
@@ -1655,7 +1655,7 @@
        sodipodi:cy="194.45924"
        sodipodi:rx="2.0660436"
        sodipodi:ry="1.5964882"
-       d="m 7.3250635,194.45924 a 2.0660436,1.5964882 0 1 1 -4.1320873,0 2.0660436,1.5964882 0 1 1 4.1320873,0 z"
+       d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
        transform="matrix(0.93050058,0,0,0.90640134,0.75846434,870.02825)" />
     <use
        x="0"
@@ -1675,7 +1675,7 @@
        height="200" />
     <path
        transform="matrix(0.93050058,0,0,0.90640134,6.0478791,864.58985)"
-       d="m 7.3250635,194.45924 a 2.0660436,1.5964882 0 1 1 -4.1320873,0 2.0660436,1.5964882 0 1 1 4.1320873,0 z"
+       d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
        sodipodi:ry="1.5964882"
        sodipodi:rx="2.0660436"
        sodipodi:cy="194.45924"
@@ -1727,7 +1727,7 @@
        sodipodi:nodetypes="cc" />
     <path
        transform="matrix(0.93050058,0,0,0.90640134,22.758464,870.02825)"
-       d="m 7.3250635,194.45924 a 2.0660436,1.5964882 0 1 1 -4.1320873,0 2.0660436,1.5964882 0 1 1 4.1320873,0 z"
+       d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
        sodipodi:ry="1.5964882"
        sodipodi:rx="2.0660436"
        sodipodi:cy="194.45924"
@@ -1761,7 +1761,7 @@
        sodipodi:cy="194.45924"
        sodipodi:rx="2.0660436"
        sodipodi:ry="1.5964882"
-       d="m 7.3250635,194.45924 a 2.0660436,1.5964882 0 1 1 -4.1320873,0 2.0660436,1.5964882 0 1 1 4.1320873,0 z"
+       d="m 7.3250635,194.45924 c 0,0.88172 -0.9249993,1.59649 -2.0660436,1.59649 -1.1410444,0 -2.0660437,-0.71477 -2.0660437,-1.59649 0,-0.88171 0.9249993,-1.59648 2.0660437,-1.59648 1.1410443,0 2.0660436,0.71477 2.0660436,1.59648 z"
        transform="matrix(0.93050058,0,0,0.90640134,28.047879,864.58985)" />
     <path
        transform="matrix(0.93050058,0,0,0.90640134,22.758464,870.02825)"
@@ -1992,11 +1992,11 @@
        sodipodi:cy="21.754047"
        sodipodi:rx="0.88388348"
        sodipodi:ry="0.88388348"
-       d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+       d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
        transform="matrix(1.2829201,1.9081591,-1.9081591,1.2829201,-621.38007,-53.76762)" />
     <path
        transform="matrix(0.96219008,1.4311194,-1.4311194,0.96219008,-446.0191,223.61485)"
-       d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+       d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
        sodipodi:ry="0.88388348"
        sodipodi:rx="0.88388348"
        sodipodi:cy="21.754047"
@@ -2012,7 +2012,7 @@
        sodipodi:cy="21.754047"
        sodipodi:rx="0.88388348"
        sodipodi:ry="0.88388348"
-       d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+       d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
        transform="matrix(1.0080086,1.4992679,-1.4992679,1.0080086,-475.75938,173.44683)" />
     <path
        style="fill:none;stroke:#e6e6e6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -2022,7 +2022,7 @@
        transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-187.51596,643.71067)" />
     <path
        transform="matrix(1.0996458,1.635565,-1.635565,1.0996458,-531.09792,102.68758)"
-       d="m 560.55887,21.754047 a 0.88388348,0.88388348 0 1 1 -1.76777,0 0.88388348,0.88388348 0 1 1 1.76777,0 z"
+       d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
        sodipodi:ry="0.88388348"
        sodipodi:rx="0.88388348"
        sodipodi:cy="21.754047"
@@ -2092,5 +2092,22 @@
          inkscape:connector-curvature="0"
          transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-132.78975,635.71067)" />
     </g>
+    <g
+       id="g4823">
+      <path
+         style="fill:#e6e6e6"
+         d="m 12,16 -12.00914477,0 0,-13.6988082 2.83893857,-2.12898488 11.8211932,0 0,14.04031008 z"
+         id="path4821"
+         inkscape:connector-curvature="0"
+         transform="translate(232.52235,913.88168)"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         sodipodi:nodetypes="cccccccccccccszscc"
+         transform="translate(232.52235,913.88168)"
+         inkscape:connector-curvature="0"
+         id="path4819"
+         d="m -0.00914477,2.3011918 2.83893857,-2.12898488 11.8211932,0 0,14.04031008 L 13.73679,14.984131 13.640962,1.0093271 3.4856425,0.91349949 1.1272469,2.7572384 12,2.7572384 12,16 -0.00914477,16 z M 8.2958276,12.045759 c -1.8631354,-1.086398 0.045759,-2.6807932 0.045759,-3.6707932 0,-0.99 -0.6423808,-2.2112618 -2.2457592,-2.1833105 C 4.4924492,6.2196066 3.8500685,7.0875 3.8500685,8.4166667 c 0,1.3291666 2.1768916,1.6857063 -0.1958961,3.6876733 z"
+         style="fill:#1a1a1a" />
+    </g>
   </g>
 </svg>
diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl
index 4c8f59d79..5838729cc 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',
@@ -30,6 +31,7 @@ function initEditor(cb) {
 			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,
@@ -264,15 +266,36 @@ function enableOnUser(){
 	}
 
 	function itemFiler(id) {
-		reply = prompt("$fileas");
-		if(reply && reply.length) {
-			commentBusy = true;
-			$('body').css('cursor', 'wait');
-			$.get('filer/' + id + '?term=' + reply);
-			if(timer) clearTimeout(timer);
-			timer = setTimeout(NavUpdate,3000);
-			liking = 1;
-		}
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.fancybox(data);
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply);
+					if(timer) clearTimeout(timer);
+					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.fancybox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+		
 	}
 
 	function jotClearLocation() {
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/nav.tpl b/view/theme/dispy-dark/nav.tpl
index 11469dc66..e38b2bbe2 100644
--- a/view/theme/dispy-dark/nav.tpl
+++ b/view/theme/dispy-dark/nav.tpl
@@ -5,7 +5,7 @@
 <!-- yes, they're going the other way. seems that's how the template renderer
 works -->
 
-    <div id="nav-floater">
+<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>
@@ -33,19 +33,19 @@ works -->
     {{ 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>
+		href="$nav.network.0" title="$nav.network.1">$nav.network.1</a>
     {{ 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>
+		href="$nav.home.0" title="$nav.home.1">$nav.home.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>
+		href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
     {{ endif }}
-    </div>
+	</div>
 
-    <div id="user-menu">
+	<div id="user-menu">
         <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
         <ul id="user-menu-popup"
             onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
@@ -119,6 +119,12 @@ works -->
 $langselector
 </div>
 
+<div class="search-box">
+	<form method="get" action="$nav.search.0">
+		<input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
+	</form>
+</div>
+
 <ul id="nav-notifications-template" style="display:none;" rel="template">
 	<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
 </ul>
diff --git a/view/theme/dispy-dark/nets.tpl b/view/theme/dispy-dark/nets.tpl
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/profile_vcard.tpl b/view/theme/dispy-dark/profile_vcard.tpl
index 350a6ce4a..f14ea7915 100644
--- a/view/theme/dispy-dark/profile_vcard.tpl
+++ b/view/theme/dispy-dark/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-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/screenshot.jpg b/view/theme/dispy-dark/screenshot.jpg
new file mode 100644
index 000000000..ada60ca61
--- /dev/null
+++ b/view/theme/dispy-dark/screenshot.jpg
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 9883b2fd7..30d5cb8a9 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -48,17 +48,23 @@ body {
 body, button, input, select, textarea {
     font-family: sans-serif;
     color: #eec;
-	/*background-color: #2e3436;*/
-	background-color: #2e2f2e;
+    background-color: #2e2f2e;
 }
 select {
 	border: 1px #555 dotted;
 	padding: 3px;
 	margin: 2px;
+	color: #eec;
+	background: #2e2f2e;
 }
 option {
 	padding: 3px;
 	vertical-align: middle;
+	color: #eec;
+	background: #2e2f2e;
+}
+li {
+	padding: 0 0 0 2px;
 }
 /* remember to define focus styles! */
 :focus {
@@ -200,14 +206,61 @@ input[type=submit] {
 .action {
 	margin: 5px 0;
 }
+.tool {
+	margin: 5px 0;
+	list-style: none;
+}
 
 
 /**
  * 	login
  */
+aside .field {
+	overflow: hidden;
+	width: 200px;
+}
+#login-extra-links {
+    overflow: auto !important;
+    padding-top: 60px !important;
+    width: 100% !important;
+}
 #login-extra-links a {
     margin-right: 20px;
 }
+#login_standard {
+    display: block !important;
+    float: none !important;
+    height: 100% !important;
+    position: relative !important;
+	width: 100% !important;
+}
+#login_standard .field label {
+	width: 200px !important;
+}
+#login_standard input, #login_standard input[type="text"] {
+	margin: 0 0 8px !important;
+    width: 210px !important;
+}
+#login-submit-wrapper {
+	margin: 0 !important;
+}
+#login-submit-button {
+    margin-left: 0px !important;
+}
+aside #login_openid {
+	position: relative !important;
+	float: none !important;
+	margin-left: 0px !important;
+	height: auto !important;
+	width: 200px !important;
+}
+#login_openid #id_openid_url {
+	width: 180px !important;
+	overflow: hidden !important;
+}
+#login_openid label {
+	width: 180px !important;
+}
 
 
 /**
@@ -244,25 +297,6 @@ nav #banner #logo-text a {
 	font-weight: bold;
 	margin-left: 3px;
 }
-nav #user-menu {
-    display: block;	
-    width: auto;
-    float: right;
-    margin: 3px 68px 0 0;
-    position: relative;
-	background-color: #555753;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
-    clear: both;
-}
-nav #user-menu-label {
-	float: left;
-   	font-size: 12px;
-    padding: 3px 20px 9px 5px;
-    height: 10px;
-}
 ul#user-menu-popup {
 	display: none;
 	position: absolute;
@@ -291,14 +325,6 @@ ul#user-menu-popup li a:hover {
 ul#user-menu-popup li a.nav-sep {
 	border-top: 1px solid #eeeeec;
 }
-#nav-buttons {
-    clear: both;
-	list-style: none;
-	padding: 0px;
-}
-#nav-buttons li {
-	padding: 0;
-}
 nav .nav-link {
 	float: right;
 	display: block;
@@ -406,13 +432,6 @@ nav .nav-link {
 .icon, .hover, .focus, .pointer {
     cursor: pointer;
 }
-#notifications {
-	height: 20px;
-	width: 100%;
-	position: absolute;
-	top: -19px;
-	left: 0;
-}
 /* popup notifications */
 div.jGrowl div.notice {
     background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
@@ -425,10 +444,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 {
@@ -461,6 +480,13 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 .show {
     display: block;
 }
+#notifications {
+	height: 20px;
+	width: 170px;
+	position: absolute;
+	top: -19px;
+	left: 7px;
+}
 #nav-floater {
     position: fixed;
     top: 20px;
@@ -470,12 +496,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 	color: transparent;
     border-radius: 5px;
     z-index: 100;
+	width: 300px;
+	height: 60px;
+}
+#nav-buttons {
+    clear: both;
+	list-style: none;
+	padding: 0px;
+	margin: 0 7px 0 0;
+	height: 25px;
+}
+#nav-buttons li {
+	padding: 0;
 }
 .floaterflip {
 	display: block;
     position: fixed;
     z-index: 110;
-    top: 53px;
+    top: 56px;
     right: 19px;
 	width: 22px;
 	height: 22px;
@@ -483,6 +521,49 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 	margin: 0px;
 	background: transparent url(icons.png) -190px -60px no-repeat;
 }
+.search-box {
+	display: inline-block;
+	margin: 5px;
+	position: fixed;
+	right: 0px;
+	bottom: 0px;
+	z-index: 100;
+	background: #1d1f1d;
+	border-radius: 5px;
+}
+#search-text {
+	border: 1px #eec solid;
+	background: #2e2f2e;
+	color: #eec;
+}
+.search-box #search-text {
+	margin: 8px;
+	width: 10em;
+	color: #eec;
+}
+#user-menu {
+    display: block;	
+    width: 75%;
+    margin: 3px 0 0 0;
+    position: relative;
+	background-color: #555753;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
+    clear: both;
+	top: 4px;
+	left: 10px;
+	padding: 2px;
+}
+#user-menu > a {
+	vertical-align: top;
+}
+#user-menu-label {
+   	font-size: 12px;
+    padding: 3px 20px 9px 5px;
+    height: 10px;
+}
 .nav-ajax-update, .nav-ajax-left {
 	width: 30px;
 	height: 19px;
@@ -587,6 +668,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     background: #ddd;
 }
 
+
 /** sysmsg **/
 #sysmsg_info {
 	position: fixed;
@@ -680,20 +762,33 @@ aside #viewcontacts {
     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: 30px 0px;
+	margin: 20px 0px 30px;
+    width: 150px;
+}
+#netsearch-box #search-submit {
+    margin: 5px 5px 0px 0px;
 }
 .ttright {
 	margin: 0px 0px 0px 0px;
 }
 
+
 /**
 * contacts block
 */
@@ -761,6 +856,16 @@ aside #viewcontacts {
     border-radius: 5px;
 	vertical-align: middle;
 }
+#jot-category {
+	margin: 5px 0;
+	border-radius: 5px;
+	border: 1px #999 solid;
+	color: #aaa;
+	font-size: smaller;
+}
+#jot-category:focus {
+	color: #eee;
+}
 #jot #character-counter {
 	width: 6%;
 	float: right;
@@ -947,7 +1052,7 @@ aside #viewcontacts {
     background-color: #3e3f3e;
 	color: #eec;
     border: 1px #eec solid;
-    border-radius: 3px;
+    border-radius: 5px;
     padding: 3px 3px 6px 10px;
 }
 #jot-preview-content .wall-item-outside-wrapper {
@@ -960,10 +1065,11 @@ aside #viewcontacts {
  * section
  */
 section {
-    margin: 20px 8% 0 4%;
+    margin: 20px 9% 0 4%;
     font-size: 0.8em;
     padding-right: 230px;
 	min-width: 475px;
+	width: 65%;
 }
 
 /** tabs **/
@@ -974,12 +1080,14 @@ section {
 }
 .tabs li {
     display: inline;
+	font-size: smaller;
+	font-weight: bold;
 }
 .tab {
     border: 1px solid #729fcf;
 	padding: 4px;
 }
-.tab:hover {
+.tab:hover, .tab.active:hover {
     background: #88a9d2;
     color: #2e2f2e;
 }
@@ -991,11 +1099,15 @@ section {
 	background: #88a9d2;
     color: #2e2f2e;
 }
+.tab.active a {
+	color: #2e2f2e;
+}
 .tab a {
 	border: 0;
 	text-decoration: none;
 }
 
+
 /**
  * 	items
  */
@@ -1019,12 +1131,17 @@ section {
 }
 .shiny {
     background: #2e3436;
+	border-radius: 5px;
+}
+.wall-outside-wrapper .shiny {
+	border-radius: 5px;
 }
 .heart {
 	color: red;
 }
 .wall-item-content {
 	overflow-x: auto;
+	margin: 0px 15px 0px 5px;
 }
 /* removing it from here, vs. putting it in .wall-item-content
  * might break things for people. we shall see ;) */
@@ -1065,7 +1182,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;
@@ -1086,17 +1203,36 @@ section {
     -ms-transition: all 1s ease-in-out;
     transition: all 1s ease-in-out;
 }
+.wall-item-subtools1 {
+    height: 30px;
+    list-style: none outside none;
+    margin: 20px 0 30px -20px;
+    padding: 0;
+    width: 30px;
+}
+.wall-item-subtools2 {
+    height: 25px;
+    list-style: none outside none;
+    margin: -75px 0 0 5px;
+    padding: 0;
+    width: 25px;
+}
 .wall-item-title {
 	font-size: 1.2em;
 	font-weight: bold;
     margin-bottom: 1em;
 }
 .wall-item-body {
-	margin: 10px 10px 10px 0px;
+	margin: 20px 20px 10px 0px;
     text-align: left;
+	overflow-x: auto;
 }
 .wall-item-lock-wrapper {
 	float: right;
+    height: 22px;
+    margin: 0 -5px 0 0;
+    width: 22px;
+	opacity: 1;
 }
 .wall-item-dislike,
 .wall-item-like {
@@ -1196,6 +1332,24 @@ section {
     overflow: auto;
     width: 100%;
 }
+#connect-services-header {
+
+}
+#connect-services {
+	margin: 5px 0 0 0;
+}
+#extra-help-header {
+
+}
+#extra-help {
+	margin: 5px 0 0 0;
+}
+#postit-header {
+
+}
+#postit {
+	margin: 5px 0 0 0;
+}
 
 
 /**
@@ -1713,8 +1867,10 @@ div[id$="wrapper"] br {
 /**
  * 	register, settings & profile forms
  */
-#id_openid_url,
 .openid {
+
+}
+#id_openid_url {
     background:url(login-bg.gif) no-repeat;
     background-position:0 50%;
     padding-left:18px;
@@ -1756,16 +1912,7 @@ div[id$="wrapper"] br {
     margin: 30px 0px;
 }
 .profile-edit-side-div {
-	/*background: #111;
-	border-radius: 5px 5px 0px 0px;
-	margin: 0px 0px 0px 0px;
-	width: 100px;
-	height: 25px;
-	position: absolute;*/
 	display: none;
-	/*left: 35%;
-	top: 41%;
-	cursor: pointer;*/
 }
 /*.profile-edit-side-div:hover {
 	display: block;
@@ -1819,10 +1966,12 @@ div[id$="wrapper"] br {
  * 	contacts selector
  */
 .group-delete-wrapper {
-	margin: -31px 122px 0 0;
+	margin: -31px 50px 0 0;
     float: right;
 }
-
+/*.group-delete-icon {
+    margin: 0 0 0 10px;
+}*/
 #group-edit-submit-wrapper {
     margin: 0 0 10px 0;
     display: inline;
@@ -1862,6 +2011,7 @@ div[id$="wrapper"] br {
     display: none;
 }
 
+
 /**
  * profile
  */
@@ -1945,6 +2095,9 @@ div[id$="wrapper"] br {
     float:left;
     font-size:20px;
 }
+.event {
+	background: #2e2f2e;
+}
 .vevent {
     border:1px solid #ccc;
 }
@@ -1956,15 +2109,14 @@ div[id$="wrapper"] br {
 	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;
+	/*float: left;      */
+	/*margin-top: 4px;  */
+	/*margin-right: 4px;*/
+	/*margin-bottom: 15px;*/
 }
 .event-description:before {
 	content: url('../../../images/calendar.png');
@@ -1973,6 +2125,7 @@ div[id$="wrapper"] br {
 .event-start, .event-end {
 	margin-left: 10px;
 	width: 330px;
+	font-size: smaller;
 }
 .event-start .dtstart, .event-end .dtend {
 	float: right;
@@ -2033,12 +2186,21 @@ div[id$="wrapper"] br {
 	opacity: 1.0 !important;
 	filter:alpha(opacity=100) !important;
 }
+.filesavetags, .categorytags {
+	margin: 20px 0;
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+}
+.filesavetags:hover, .categorytags:hover {
+	margin: 20px 0;
+	opacity: 1.0 !important;
+	filter:alpha(opacity=100) !important;
+}
 .item-select {
 	opacity: 0.1;
 	filter:alpha(opacity=10);
 	float: right;
-	margin-right: 10px;
-
+	margin-right: 5px;
 }
 .item-select:hover, .checkeditem {
 	opacity: 1;
@@ -2064,6 +2226,10 @@ div[id$="wrapper"] br {
 #item-delete-selected-desc:hover {
 	text-decoration: underline;
 }
+.fc-state-highlight {
+    background: #eec;
+    color: #2e2f2e;
+}
 
 
 /**
@@ -2086,13 +2252,13 @@ div[id$="wrapper"] br {
 #group-sidebar {
     margin-bottom: 10px;
 }
-.group-selected, .nets-selected {
+.group-selected, .nets-selected, .fileas-selected {
     padding: 3px;
 	color: #2e2f2e;
     background: #88a9d2;
     font-weight: bold;
 }
-.group-selected:hover, .nets-selected:hover {
+.group-selected:hover, .nets-selected:hover, .fileas-selected:hover {
 	color: #2e2f2e;
 }
 .groupsideedit {
@@ -2170,6 +2336,7 @@ div[id$="wrapper"] br {
     margin: 5px 0px 0px 0px;
 }
 
+
 /**
  * ADMIN
  */
@@ -2257,7 +2424,7 @@ div[id$="wrapper"] br {
 .field {
 	/*margin-bottom: 10px;*/
 	/*padding-bottom: 10px;*/
-    overflow: auto;
+	overflow: auto;
     width: 100%;
 }
 .field label, label {
@@ -2265,7 +2432,6 @@ div[id$="wrapper"] br {
     width: 275px;
 	display: block;
 	font-size: 1.077em;
-	/*font-weight: bold;*/
 	margin: 0 10px 0.5em 0;
 	border: 1px #2e2f2e solid;
 	padding: 5px;
@@ -2484,6 +2650,9 @@ div[id$="wrapper"] br {
 .dislike {
 	background-position: -190px 0;
 }
+.file-as {
+	background-position: -230px -60px;
+}
 .like {
 	background-position: -211px 0;
 }
@@ -2570,9 +2739,9 @@ div[id$="wrapper"] br {
 }
 .border, .border:hover {
 	border: 1px solid #babdb6;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    border-radius: 3px;	
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;	
 }
 .attachtype {
     display: block;
@@ -2755,13 +2924,7 @@ footer {
 }
 .qcomment-wrapper {
     padding: 0px;
-    margin: 2px;
-    list-style-type: none;
-}
-.qcomment, .qcomment:hover {
-    display: inline;
-    padding: 5px;
-    margin: 5px;
+    margin: 5px 5px 5px 81%;
 }
 .qcomment {
 	opacity: 0.5;
@@ -2781,6 +2944,29 @@ footer {
 .network-star.icon.starred {
     display: inline-block;
 }
+#fileas-sidebar {
+	
+}
+.fileas-ul {
+	padding: 0;
+}
+
+
+
+/*
+ * ADDONS THEMING
+ */
+
+#sidebar-page-list {
+	
+}
+#sidebar-page-list ul {
+	padding: 0;
+	margin: 5px 0;
+}
+#sidebar-page-list li {
+	list-style: none;
+}
 
 
 @media handheld {
diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index 700136173..17d31feda 100644
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -3,16 +3,12 @@
 /*
  * Name: Dispy Dark
  * Description: Dispy Dark, Friendica theme
- * Version: 0.9
+ * Version: 1.0
  * Author: Simon <http://simon.kisikew.org/>
  * Maintainer: Simon <http://simon.kisikew.org/>
+ * Screenshot: <a href="screenshot.jpg">Screenshot</a>
  */
 
-
-$a->theme_info = array(
-	'extends' => 'dispy-dark'
-);
-
 $a->page['htmlhead'] .= <<< EOT
 <script>
 $(document).ready(function() {
@@ -90,11 +86,13 @@ $(document).ready(function() {
             $('.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
@@ -108,21 +106,43 @@ $(document).ready(function() {
 		$(this).css({color: '#eec'});
 	});
 
-/*	$('#profile-photo-wrapper').mouseover(function() {
-		$('.profile-edit-side-div').css({display: 'block'});
-	}).mouseout(function() {
-		$('.profile-edit-side-div').css({display: 'none'});
-		return false;
-	});
-
-	$('img.photo').mouseover(function() {
-		$('.profile-edit-side-div').css({display: 'block'});
-	}).mouseout(function() {
-		$('.profile-edit-side-div').css({display: 'none'});
-		return false;
-	});*/
-
 });
 </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();
+			}
+		})();";
+
+	$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);
+}
+
+// aside on profile page
+//if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
+	dispydark_community_info();
+//}
+
diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl
index c67a88635..8acaeaf02 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">
+				<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>
@@ -17,39 +17,45 @@
 			<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">
-			{{ 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 }}
-			{{ 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>
-			{{ endif }}
-			{{ if $item.edpost }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-			{{ endif }}
-		
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			<div 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>
-				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ 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 }}
+				<li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
+				{{ endif }}
+				{{ if $item.plink }}
+				<li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
+				{{ endif }}
+				{{ if $item.edpost }}
+				<li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
+				{{ endif }}
+				<li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id">
+				{{ if $item.drop.dropping }}<div><a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>{{ endif }}
+				{{ if $item.drop.dropping }}<div><input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" /></div>{{ endif }}
+				</li>
+			</ul>
 			<div class="wall-item-delete-end"></div>
-		
 		</div>
 		<div class="wall-item-content" id="wall-item-content-$item.id" >
 			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
@@ -65,7 +71,6 @@
 		<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 f251d7352..421cddadf 100644
--- a/view/theme/dispy-dark/wallwall_item.tpl
+++ b/view/theme/dispy-dark/wallwall_item.tpl
@@ -22,40 +22,46 @@
 			<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>
+			<ul class="wall-item-subtools1">
+				{{ if $item.star }}
+				<li>
+					<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+					<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+				</li>
+				{{ endif }}
+				{{ if $item.vote }}
+				<li class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+					<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+					<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+					{{ if $item.vote.share }}
+					<a href="#" id="share-$item.id"
+class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+					<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+				</li>
+				{{ endif }}
+			</ul><br style="clear:left;" />
+			<ul class="wall-item-subtools2">
+			{{ if $item.filer }}
+				<li class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
 			{{ endif }}
 			{{ if $item.plink }}
-				<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-title" id="wall-item-title-$item.id">$item.title</div>
@@ -67,7 +73,6 @@ class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick
 						{{ 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/comment_item.tpl b/view/theme/dispy/comment_item.tpl
index 85176732b..adf2772af 100644
--- a/view/theme/dispy/comment_item.tpl
+++ b/view/theme/dispy/comment_item.tpl
@@ -12,14 +12,15 @@
 				</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>
-
 				{{ if $qcomment }}
-                <ul class="qcomment-wrapper">
-				{{ for $qcomment as $qc }}				
-					<li class="fakelink qcomment"
-                    onclick="commentInsert(this,$id); return false;">$qc</li>
+                <div class="qcomment-wrapper">
+					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);">
+					<option value=""></option>
+				{{ for $qcomment as $qc }}
+					<option value="$qc">$qc</option>
 				{{ endfor }}
-                </ul>
+					</select>
+				</div>
 				{{ endif }}
 
 				<div class="comment-edit-text-end"></div>
diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl
new file mode 100644
index 000000000..340b7216c
--- /dev/null
+++ b/view/theme/dispy/communityhome.tpl
@@ -0,0 +1,46 @@
+{{ if $page }}
+<div>$page</div>
+{{ endif }}
+
+{{ if $lastusers_title }}
+<h3 id="extra-help-header">Help or '@NewHere'?</h3>
+<div id="extra-help">
+<a href="https://helpers.pyxis.uberspace.de/profile/helpers"
+	title="Friendica Support" target="_blank">Friendica Support</a><br />
+<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk"
+	title="Let's talk" target="_blank">Let's talk</a><br />
+<a href="http://newzot.hydra.uberspace.de/profile/newzot"
+	title="Local Friendica" target="_blank">Local Friendica</a><br />
+<a href="http://kakste.com/profile/newhere" title="@NewHere" target="_blank">NewHere</a>
+</div>
+{{ endif }}
+
+{{ if $lastusers_title }}
+<h3 id="connect-services-header">Connectable Services</h3>
+<div id="connect-services">
+<a href="$url/facebook"><img alt="Facebook"
+	src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a>
+<a href="$url/settings/connectors"><img
+	alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png?" title="StatusNet" /></a>
+<a href="$url/settings/connectors"><img
+	alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png?" title="LiveJournal" /></a>
+<a href="$url/settings/connectors"><img
+	alt="Posterous" src="view/theme/dispy/icons/posterous.png?" title="Posterous" /></a><br />
+<a href="$url/settings/connectors"><img
+	alt="Tumblr" src="view/theme/dispy/icons/tumblr.png?" title="Tumblr" /></a>
+<a href="$url/settings/connectors"><img
+	alt="Twitter" src="view/theme/dispy/icons/twitter.png?" title="Twitter" /></a>
+<a href="$url/settings/connectors"><img
+	alt="WordPress" src="view/theme/dispy/icons/wordpress.png?" title="WordPress" /></a>
+<a href="$url/settings/connectors"><img
+	alt="E-Mail" src="view/theme/dispy/icons/email.png?" title="E-Mail" /></a>
+</div>
+{{ endif }}
+
+{{ 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/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
new file mode 100644
index 000000000..e74ec1a4f
--- /dev/null
+++ b/view/theme/dispy/default.php
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+</head>
+<body>
+	<?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>
+</body>
+</html>
+
diff --git a/view/theme/dispy/fpostit/README b/view/theme/dispy/fpostit/README
new file mode 100644
index 000000000..39b7c5761
--- /dev/null
+++ b/view/theme/dispy/fpostit/README
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 000000000..d18f5d345
--- /dev/null
+++ b/view/theme/dispy/fpostit/fpostit.js
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 000000000..d00182946
--- /dev/null
+++ b/view/theme/dispy/fpostit/fpostit.php
@@ -0,0 +1,134 @@
+<?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
new file mode 100644
index 000000000..61764bf20
--- /dev/null
+++ b/view/theme/dispy/fpostit/friendica-32.png
diff --git a/view/theme/dispy/fpostit/friendika-32.png b/view/theme/dispy/fpostit/friendika-32.png
new file mode 100644
index 000000000..61764bf20
--- /dev/null
+++ b/view/theme/dispy/fpostit/friendika-32.png
diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl
index f606f2f7e..cd6f5ca97 100644
--- a/view/theme/dispy/head.tpl
+++ b/view/theme/dispy/head.tpl
@@ -7,7 +7,7 @@
 
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
 
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
+<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
 <link rel="search"
          href="$baseurl/opensearch" 
          type="application/opensearchdescription+xml" 
@@ -34,14 +34,16 @@
 	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);
 		}
 	}
@@ -63,6 +65,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();
diff --git a/view/theme/dispy/icons.png b/view/theme/dispy/icons.png
index 2f0459bd3..f42330d65 100644
--- a/view/theme/dispy/icons.png
+++ b/view/theme/dispy/icons.png
diff --git a/view/theme/dispy/icons.svg b/view/theme/dispy/icons.svg
index 998e2641f..7b82b94ea 100644
--- a/view/theme/dispy/icons.svg
+++ b/view/theme/dispy/icons.svg
@@ -52,7 +52,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.9403009"
-     inkscape:cx="73.744486"
+     inkscape:cx="64.725266"
      inkscape:cy="108.36719"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
      inkscape:window-width="1065"
      inkscape:window-height="742"
      inkscape:window-x="40"
-     inkscape:window-y="61"
+     inkscape:window-y="50"
      inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -2168,5 +2168,23 @@
        transform="translate(22,0)"
        width="250"
        height="200" />
+    <g
+       transform="translate(-2.0523e-4,-5e-4)"
+       id="g4823">
+      <path
+         style="fill:#e6e6e6"
+         d="m 12,16 -12.00914477,0 0,-13.6988082 2.83893857,-2.12898488 11.8211932,0 0,14.04031008 z"
+         id="path4821"
+         inkscape:connector-curvature="0"
+         transform="translate(232.52235,913.88168)"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         sodipodi:nodetypes="cccccccccccccszscc"
+         transform="translate(232.52235,913.88168)"
+         inkscape:connector-curvature="0"
+         id="path4819"
+         d="m -0.00914477,2.3011918 2.83893857,-2.12898488 11.8211932,0 0,14.04031008 L 13.73679,14.984131 13.640962,1.0093271 3.4856425,0.91349949 1.1272469,2.7572384 12,2.7572384 12,16 -0.00914477,16 z M 8.2958276,12.045759 c -1.8631354,-1.086398 0.045759,-2.6807932 0.045759,-3.6707932 0,-0.99 -0.6423808,-2.2112618 -2.2457592,-2.1833105 C 4.4924492,6.2196066 3.8500685,7.0875 3.8500685,8.4166667 c 0,1.3291666 2.1768916,1.6857063 -0.1958961,3.6876733 z"
+         style="fill:#1a1a1a" />
+    </g>
   </g>
 </svg>
diff --git a/view/theme/dispy/icons/StatusNet.png b/view/theme/dispy/icons/StatusNet.png
new file mode 100644
index 000000000..1b5f9a677
--- /dev/null
+++ b/view/theme/dispy/icons/StatusNet.png
diff --git a/view/theme/dispy/icons/email.png b/view/theme/dispy/icons/email.png
new file mode 100644
index 000000000..b9d64cb93
--- /dev/null
+++ b/view/theme/dispy/icons/email.png
diff --git a/view/theme/dispy/icons/facebook.png b/view/theme/dispy/icons/facebook.png
new file mode 100644
index 000000000..ff5129f94
--- /dev/null
+++ b/view/theme/dispy/icons/facebook.png
diff --git a/view/theme/dispy/icons/livejournal.png b/view/theme/dispy/icons/livejournal.png
new file mode 100644
index 000000000..5ba5f7f7d
--- /dev/null
+++ b/view/theme/dispy/icons/livejournal.png
diff --git a/view/theme/dispy/icons/posterous.png b/view/theme/dispy/icons/posterous.png
new file mode 100644
index 000000000..d0ae6face
--- /dev/null
+++ b/view/theme/dispy/icons/posterous.png
diff --git a/view/theme/dispy/icons/tumblr.png b/view/theme/dispy/icons/tumblr.png
new file mode 100644
index 000000000..9d5fcd045
--- /dev/null
+++ b/view/theme/dispy/icons/tumblr.png
diff --git a/view/theme/dispy/icons/twitter.png b/view/theme/dispy/icons/twitter.png
new file mode 100644
index 000000000..4a068451e
--- /dev/null
+++ b/view/theme/dispy/icons/twitter.png
diff --git a/view/theme/dispy/icons/wordpress.png b/view/theme/dispy/icons/wordpress.png
new file mode 100644
index 000000000..6a4e36d45
--- /dev/null
+++ b/view/theme/dispy/icons/wordpress.png
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 4c8f59d79..5838729cc 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',
@@ -30,6 +31,7 @@ function initEditor(cb) {
 			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,
@@ -264,15 +266,36 @@ function enableOnUser(){
 	}
 
 	function itemFiler(id) {
-		reply = prompt("$fileas");
-		if(reply && reply.length) {
-			commentBusy = true;
-			$('body').css('cursor', 'wait');
-			$.get('filer/' + id + '?term=' + reply);
-			if(timer) clearTimeout(timer);
-			timer = setTimeout(NavUpdate,3000);
-			liking = 1;
-		}
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.fancybox(data);
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply);
+					if(timer) clearTimeout(timer);
+					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.fancybox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+		
 	}
 
 	function jotClearLocation() {
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/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 11469dc66..e38b2bbe2 100644
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -5,7 +5,7 @@
 <!-- yes, they're going the other way. seems that's how the template renderer
 works -->
 
-    <div id="nav-floater">
+<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>
@@ -33,19 +33,19 @@ works -->
     {{ 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>
+		href="$nav.network.0" title="$nav.network.1">$nav.network.1</a>
     {{ 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>
+		href="$nav.home.0" title="$nav.home.1">$nav.home.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>
+		href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
     {{ endif }}
-    </div>
+	</div>
 
-    <div id="user-menu">
+	<div id="user-menu">
         <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
         <ul id="user-menu-popup"
             onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
@@ -119,6 +119,12 @@ works -->
 $langselector
 </div>
 
+<div class="search-box">
+	<form method="get" action="$nav.search.0">
+		<input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
+	</form>
+</div>
+
 <ul id="nav-notifications-template" style="display:none;" rel="template">
 	<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
 </ul>
diff --git a/view/theme/dispy/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/screenshot.jpg b/view/theme/dispy/screenshot.jpg
new file mode 100644
index 000000000..81ee35afb
--- /dev/null
+++ b/view/theme/dispy/screenshot.jpg
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 6547cf986..f8287c6ec 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -54,10 +54,17 @@ select {
 	border: 1px #555 dotted;
 	padding: 3px;
 	margin: 2px;
+	color: #222;
+	background: #efefef;
 }
 option {
 	padding: 3px;
 	vertical-align: middle;
+	color: #222;
+	background: #efefef;
+}
+li {
+	padding: 0 0 0 2px;
 }
 /* remember to define focus styles! */
 :focus {
@@ -139,7 +146,7 @@ a:hover {
 }
 .required {
     display: inline;
-    color: #ff0;
+    color: #f00;
     font-size: 16px;
     font-weight: bold;
     margin: 3px;
@@ -199,14 +206,61 @@ input[type=submit] {
 .action {
 	margin: 5px 0;
 }
+.tool {
+	margin: 5px 0;
+	list-style: none;
+}
 
 
 /**
  * 	login
  */
+aside .field {
+	overflow: hidden;
+	width: 200px;
+}
+#login-extra-links {
+    overflow: auto !important;
+    padding-top: 60px !important;
+    width: 100% !important;
+}
 #login-extra-links a {
     margin-right: 20px;
 }
+#login_standard {
+    display: block !important;
+    float: none !important;
+    height: 100% !important;
+    position: relative !important;
+	width: 100% !important;
+}
+#login_standard .field label {
+	width: 200px !important;
+}
+#login_standard input, #login_standard input[type="text"] {
+	margin: 0 0 8px !important;
+    width: 210px !important;
+}
+#login-submit-wrapper {
+	margin: 0 !important;
+}
+#login-submit-button {
+    margin-left: 0px !important;
+}
+aside #login_openid {
+	position: relative !important;
+	float: none !important;
+	margin-left: 0px !important;
+	height: auto !important;
+	width: 200px !important;
+}
+#login_openid #id_openid_url {
+	width: 180px !important;
+	overflow: hidden !important;
+}
+#login_openid label {
+	width: 180px !important;
+}
 
 
 /**
@@ -243,25 +297,6 @@ nav #banner #logo-text a {
 	font-weight: bold;
 	margin-left: 3px;
 }
-nav #user-menu {
-    display: block;	
-    width: auto;
-    float: right;
-    margin: 3px 68px 0 0;
-    position: relative;
-	background-color: #555753;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
-    clear: both;
-}
-nav #user-menu-label {
-	float: left;
-   	font-size: 12px;
-    padding: 3px 20px 9px 5px;
-    height: 10px;
-}
 ul#user-menu-popup {
 	display: none;
 	position: absolute;
@@ -290,14 +325,6 @@ ul#user-menu-popup li a:hover {
 ul#user-menu-popup li a.nav-sep {
 	border-top: 1px solid #eeeeec;
 }
-#nav-buttons {
-    clear: both;
-	list-style: none;
-	padding: 0px;
-}
-#nav-buttons li {
-	padding: 0;
-}
 nav .nav-link {
 	float: right;
 	display: block;
@@ -405,13 +432,6 @@ nav .nav-link {
 .icon, .hover, .focus, .pointer {
     cursor: pointer;
 }
-#notifications {
-	height: 20px;
-	width: 100%;
-	position: absolute;
-	top: -19px;
-	left: 0;
-}
 /* popup notifications */
 div.jGrowl div.notice {
     background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
@@ -424,10 +444,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 {
@@ -460,6 +480,13 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 .show {
     display: block;
 }
+#notifications {
+	height: 20px;
+	width: 170px;
+	position: absolute;
+	top: -19px;
+	left: 7px;
+}
 #nav-floater {
     position: fixed;
     top: 20px;
@@ -469,12 +496,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 	color: transparent;
     border-radius: 5px;
     z-index: 100;
+	width: 300px;
+	height: 60px;
+}
+#nav-buttons {
+    clear: both;
+	list-style: none;
+	padding: 0px;
+	margin: 0 7px 0 0;
+	height: 25px;
+}
+#nav-buttons li {
+	padding: 0;
 }
 .floaterflip {
 	display: block;
     position: fixed;
     z-index: 110;
-    top: 53px;
+    top: 56px;
     right: 19px;
 	width: 22px;
 	height: 22px;
@@ -482,6 +521,49 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 	margin: 0px;
 	background: transparent url(icons.png) -190px -60px no-repeat;
 }
+.search-box {
+	display: inline-block;
+	margin: 5px;
+	position: fixed;
+	right: 0px;
+	bottom: 0px;
+	z-index: 100;
+	background: #1d1f1d;
+	border-radius: 5px;
+}
+#search-text {
+	border: 1px #eec solid;
+	background: #2e3436;
+	color: #eec;
+}
+.search-box #search-text {
+	margin: 8px;
+	width: 10em;
+	color: #eec;
+}
+#user-menu {
+    display: block;	
+    width: 75%;
+    margin: 3px 0 0 0;
+    position: relative;
+	background-color: #555753;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
+    clear: both;
+	top: 4px;
+	left: 10px;
+	padding: 2px;
+}
+#user-menu > a {
+	vertical-align: top;
+}
+#user-menu-label {
+   	font-size: 12px;
+    padding: 3px 20px 9px 5px;
+    height: 10px;
+}
 .nav-ajax-update, .nav-ajax-left {
 	width: 30px;
 	height: 19px;
@@ -586,6 +668,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     background: #ddd;
 }
 
+
 /** sysmsg **/
 #sysmsg_info {
 	position: fixed;
@@ -679,20 +762,33 @@ aside #viewcontacts {
     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: 30px 0px;
+	margin: 20px 0px 30px;
+    width: 150px;
+}
+#netsearch-box #search-submit {
+    margin: 5px 5px 0px 0px;
 }
 .ttright {
 	margin: 0px 0px 0px 0px;
 }
 
+
 /**
 * contacts block
 */
@@ -760,6 +856,16 @@ aside #viewcontacts {
     border-radius: 5px;
 	vertical-align: middle;
 }
+#jot-category {
+	margin: 5px 0;
+	border-radius: 5px;
+	border: 1px #ccc solid;
+	color: #666;
+	font-size: small;
+}
+#jot-category:focus {
+	color: #111;
+}
 #jot #character-counter {
 	width: 6%;
 	float: right;
@@ -946,7 +1052,7 @@ aside #viewcontacts {
     background-color: #ffffe0;
 	color: #111;
     border: 1px #aa0 solid;
-    border-radius: 3px;
+    border-radius: 5px;
     padding: 3px 3px 6px 10px;
 }
 #jot-preview-content .wall-item-outside-wrapper {
@@ -959,10 +1065,11 @@ aside #viewcontacts {
  * section
  */
 section {
-    margin: 20px 8% 0 4%;
+    margin: 20px 9% 0 4%;
     font-size: 0.8em;
     padding-right: 230px;
 	min-width: 475px;
+	width: 65%;
 }
 
 /** tabs **/
@@ -973,12 +1080,14 @@ section {
 }
 .tabs li {
     display: inline;
+	font-size: smaller;
+	font-weight: bold;
 }
 .tab {
     border: 1px solid #729fcf;
 	padding: 4px;
 }
-.tab:hover {
+.tab:hover, .tab.active:hover {
     background: #729fcf;
     color: #eeeeec;
 }
@@ -990,11 +1099,15 @@ section {
 	background: #729fcf;
     color: #eeeeec;
 }
+.tab.active a {
+	color: #729fcf;
+}
 .tab a {
 	border: 0;
 	text-decoration: none;
 }
 
+
 /**
  * 	items
  */
@@ -1018,12 +1131,17 @@ section {
 }
 .shiny {
     background: #efefdf;
+	border-radius: 5px;
+}
+.wall-outside-wrapper .shiny {
+	border-radius: 5px;
 }
 .heart {
 	color: red;
 }
 .wall-item-content {
 	overflow-x: auto;
+	margin: 0px 15px 0px 5px;
 }
 /* removing it from here, vs. putting it in .wall-item-content
  * might break things for people. we shall see ;) */
@@ -1064,7 +1182,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;
@@ -1085,17 +1203,36 @@ section {
     -ms-transition: all 1s ease-in-out;
     transition: all 1s ease-in-out;
 }
+.wall-item-subtools1 {
+    height: 30px;
+    list-style: none outside none;
+    margin: 20px 0 30px -20px;
+    padding: 0;
+    width: 30px;
+}
+.wall-item-subtools2 {
+    height: 25px;
+    list-style: none outside none;
+    margin: -75px 0 0 5px;
+    padding: 0;
+    width: 25px;
+}
 .wall-item-title {
 	font-size: 1.2em;
 	font-weight: bold;
     margin-bottom: 1em;
 }
 .wall-item-body {
-	margin: 10px 10px 10px 0px;
+	margin: 20px 20px 10px 0px;
     text-align: left;
+	overflow-x: auto;
 }
 .wall-item-lock-wrapper {
 	float: right;
+    height: 22px;
+    margin: 0 -5px 0 0;
+    width: 22px;
+	opacity: 1;
 }
 .wall-item-dislike,
 .wall-item-like {
@@ -1195,6 +1332,24 @@ section {
     overflow: auto;
     width: 100%;
 }
+#connect-services-header {
+
+}
+#connect-services {
+	margin: 5px 0 0 0;
+}
+#extra-help-header {
+
+}
+#extra-help {
+	margin: 5px 0 0 0;
+}
+#postit-header {
+
+}
+#postit {
+	margin: 5px 0 0 0;
+}
 
 
 /**
@@ -1712,8 +1867,10 @@ div[id$="wrapper"] br {
 /**
  * 	register, settings & profile forms
  */
-#id_openid_url,
 .openid {
+
+}
+#id_openid_url {
     background:url(login-bg.gif) no-repeat;
     background-position:0 50%;
     padding-left:18px;
@@ -1809,10 +1966,12 @@ div[id$="wrapper"] br {
  * 	contacts selector
  */
 .group-delete-wrapper {
-	margin: -31px 122px 0 0;
+	margin: -31px 50px 0 0;
     float: right;
 }
-
+/*.group-delete-icon {
+    margin: 0 0 0 10px;
+}*/
 #group-edit-submit-wrapper {
     margin: 0 0 10px 0;
     display: inline;
@@ -1852,6 +2011,7 @@ div[id$="wrapper"] br {
     display: none;
 }
 
+
 /**
  * profile
  */
@@ -1935,6 +2095,9 @@ div[id$="wrapper"] br {
     float:left;
     font-size:20px;
 }
+.event {
+	background: #2e2f2e;
+}
 .vevent {
     border:1px solid #ccc;
 }
@@ -1946,15 +2109,14 @@ div[id$="wrapper"] br {
 	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;
+	/*float: left;      */
+	/*margin-top: 4px;  */
+	/*margin-right: 4px;*/
+	/*margin-bottom: 15px;*/
 }
 .event-description:before {
 	content: url('../../../images/calendar.png');
@@ -1963,6 +2125,7 @@ div[id$="wrapper"] br {
 .event-start, .event-end {
 	margin-left: 10px;
 	width: 330px;
+	font-size: smaller;
 }
 .event-start .dtstart, .event-end .dtend {
 	float: right;
@@ -2023,12 +2186,21 @@ div[id$="wrapper"] br {
 	opacity: 1.0 !important;
 	filter:alpha(opacity=100) !important;
 }
+.filesavetags, .categorytags {
+	margin: 20px 0;
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+}
+.filesavetags:hover, .categorytags:hover {
+	margin: 20px 0;
+	opacity: 1.0 !important;
+	filter:alpha(opacity=100) !important;
+}
 .item-select {
 	opacity: 0.1;
 	filter:alpha(opacity=10);
 	float: right;
-	margin-right: 10px;
-
+	margin-right: 5px;
 }
 .item-select:hover, .checkeditem {
 	opacity: 1;
@@ -2054,6 +2226,10 @@ div[id$="wrapper"] br {
 #item-delete-selected-desc:hover {
 	text-decoration: underline;
 }
+.fc-state-highlight {
+    background: #eec;
+    color: #2e2f2e;
+}
 
 
 /**
@@ -2076,13 +2252,13 @@ div[id$="wrapper"] br {
 #group-sidebar {
     margin-bottom: 10px;
 }
-.group-selected, .nets-selected {
+.group-selected, .nets-selected, .fileas-selected {
     padding: 3px;
 	color: #111;
     background: #f8f8f8;
     font-weight: bold;
 }
-.group-selected:hover, .nets-selected:hover {
+.group-selected:hover, .nets-selected:hover, .fileas-selected:hover {
 	color: #111;
 }
 .groupsideedit {
@@ -2160,6 +2336,7 @@ div[id$="wrapper"] br {
     margin: 5px 0px 0px 0px;
 }
 
+
 /**
  * ADMIN
  */
@@ -2247,7 +2424,7 @@ div[id$="wrapper"] br {
 .field {
 	/*margin-bottom: 10px;*/
 	/*padding-bottom: 10px;*/
-    overflow: auto;
+	overflow: auto;
     width: 100%;
 }
 .field label, label {
@@ -2255,11 +2432,10 @@ div[id$="wrapper"] br {
     width: 275px;
 	display: block;
 	font-size: 1.077em;
-	/*font-weight: bold;*/
 	margin: 0 10px 0.5em 0;
 	border: 1px #999 solid;
 	padding: 5px;
-	background: #eee;
+	background: #ccc;
 	vertical-align: middle;
 	color: #111;
 }
@@ -2474,6 +2650,9 @@ div[id$="wrapper"] br {
 .dislike {
 	background-position: -190px 0;
 }
+.file-as {
+	background-position: -230px -60px;
+}
 .like {
 	background-position: -211px 0;
 }
@@ -2560,9 +2739,9 @@ div[id$="wrapper"] br {
 }
 .border, .border:hover {
 	border: 1px solid #babdb6;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    border-radius: 3px;	
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;	
 }
 .attachtype {
     display: block;
@@ -2689,7 +2868,7 @@ footer {
 	vertical-align: middle;
 }
 #acl-wrapper a:hover {
-    text-decoration:none;
+    text-decoration: none;
     color: #000;
 	border: 0;
 }
@@ -2745,13 +2924,7 @@ footer {
 }
 .qcomment-wrapper {
     padding: 0px;
-    margin: 2px;
-    list-style-type: none;
-}
-.qcomment, .qcomment:hover {
-    display: inline;
-    padding: 5px;
-    margin: 5px;
+    margin: 5px 5px 5px 81%;
 }
 .qcomment {
 	opacity: 0.5;
@@ -2771,6 +2944,29 @@ footer {
 .network-star.icon.starred {
     display: inline-block;
 }
+#fileas-sidebar {
+	
+}
+.fileas-ul {
+	padding: 0;
+}
+
+
+
+/*
+ * ADDONS THEMING
+ */
+
+#sidebar-page-list {
+	
+}
+#sidebar-page-list ul {
+	padding: 0;
+	margin: 5px 0;
+}
+#sidebar-page-list li {
+	list-style: none;
+}
 
 
 @media handheld {
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 26e07b1f7..f3c54caf9 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -3,16 +3,12 @@
 /*
  * Name: Dispy
  * Description: Dispy, Friendica theme
- * Version: 0.9
+ * Version: 1.0
  * Author: unknown
  * Maintainer: Simon <http://simon.kisikew.org/>
+ * Screenshot: <a href="screenshot.jpg">Screenshot</a>
  */
 
-
-$a->theme_info = array(
-	'extends' => 'dispy'
-);
-
 $a->page['htmlhead'] .= <<< EOT
 <script>
 $(document).ready(function() {
@@ -90,11 +86,13 @@ $(document).ready(function() {
             $('.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
@@ -108,21 +106,38 @@ $(document).ready(function() {
 		$(this).css({color: '#eec'});
 	});
 
-/*	$('#profile-photo-wrapper').mouseover(function() {
-		$('.profile-edit-side-div').css({display: 'block'});
-	}).mouseout(function() {
-		$('.profile-edit-side-div').css({display: 'none'});
-		return false;
-	});
-
-	$('img.photo').mouseover(function() {
-		$('.profile-edit-side-div').css({display: 'block'});
-	}).mouseout(function() {
-		$('.profile-edit-side-div').css({display: 'none'});
-		return false;
-	});*/
-
 });
 </script>
 EOT;
 
+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);
+}
+
+// aside on profile page
+if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
+	dispy_community_info();
+}
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index c67a88635..8acaeaf02 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">
+				<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>
@@ -17,39 +17,45 @@
 			<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">
-			{{ 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 }}
-			{{ 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>
-			{{ endif }}
-			{{ if $item.edpost }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-			{{ endif }}
-		
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			<div 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>
-				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ 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 }}
+				<li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
+				{{ endif }}
+				{{ if $item.plink }}
+				<li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
+				{{ endif }}
+				{{ if $item.edpost }}
+				<li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
+				{{ endif }}
+				<li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id">
+				{{ if $item.drop.dropping }}<div><a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>{{ endif }}
+				{{ if $item.drop.dropping }}<div><input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" /></div>{{ endif }}
+				</li>
+			</ul>
 			<div class="wall-item-delete-end"></div>
-		
 		</div>
 		<div class="wall-item-content" id="wall-item-content-$item.id" >
 			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
@@ -65,7 +71,6 @@
 		<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 f251d7352..421cddadf 100644
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -22,40 +22,46 @@
 			<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>
+			<ul class="wall-item-subtools1">
+				{{ if $item.star }}
+				<li>
+					<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+					<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+				</li>
+				{{ endif }}
+				{{ if $item.vote }}
+				<li class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+					<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+					<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+					{{ if $item.vote.share }}
+					<a href="#" id="share-$item.id"
+class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+					<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+				</li>
+				{{ endif }}
+			</ul><br style="clear:left;" />
+			<ul class="wall-item-subtools2">
+			{{ if $item.filer }}
+				<li class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
 			{{ endif }}
 			{{ if $item.plink }}
-				<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-title" id="wall-item-title-$item.id">$item.title</div>
@@ -67,7 +73,6 @@ class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick
 						{{ 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/group_side.tpl b/view/theme/duepuntozero/group_side.tpl
deleted file mode 100755
index 0353b1d2c..000000000
--- a/view/theme/duepuntozero/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" title="$edittext"><span id="edit-sidebar-group-element-$group.id" class="group-edit-icon iconspacer small-pencil"></span></a>
-				{{ endif }}
-				<a id="sidebar-group-element-$group.id" 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/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/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/nav.tpl b/view/theme/duepuntozero/nav.tpl
deleted file mode 100755
index 4675c3e5c..000000000
--- a/view/theme/duepuntozero/nav.tpl
+++ /dev/null
@@ -1,68 +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 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-		
-	{{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
-		
-	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-	{{ if $nav.network }}
-	<a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-	<span id="net-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.home }}
-	<a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-	<span id="home-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.community }}
-	<a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-	{{ endif }}
-	{{ if $nav.introductions }}
-	<a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
-	<span id="intro-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.messages }}
-	<a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	{{ endif }}
-
-
-
-	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-
-		{{ if $nav.notifications }}
-			<a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
-				<span id="notify-update" class="nav-ajax-left"></span>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-		{{ endif }}		
-
-	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
-	</span>
-	<span id="nav-end"></span>
-	<span id="banner">$banner</span>
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
diff --git a/view/theme/duepuntozero/nets.tpl b/view/theme/duepuntozero/nets.tpl
deleted file mode 100755
index b0cb8890c..000000000
--- a/view/theme/duepuntozero/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/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/saved_searches_aside.tpl b/view/theme/duepuntozero/saved_searches_aside.tpl
deleted file mode 100755
index e6a0d6278..000000000
--- a/view/theme/duepuntozero/saved_searches_aside.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="widget" id="saved-search-list">
-	<h3 id="search">$title</h3>
-	$searchbox
-	
-	<ul id="saved-search-ul">
-		{{ for $saved as $search }}
-		<li class="saved-search-li clear">
-			<a title="$search.delete" onclick="return confirmDelete();" id="drop-saved-search-term-$search.id" class="iconspacer savedsearchdrop " href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
-			<a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
-		</li>
-		{{ endfor }}
-	</ul>
-	<div class="clear"></div>
-</div>
diff --git a/view/theme/duepuntozero/screenshot.jpg b/view/theme/duepuntozero/screenshot.jpg
new file mode 100644
index 000000000..5f00ec39e
--- /dev/null
+++ b/view/theme/duepuntozero/screenshot.jpg
diff --git a/view/theme/duepuntozero/search_item.tpl b/view/theme/duepuntozero/search_item.tpl
deleted file mode 100755
index bfad1b7b7..000000000
--- a/view/theme/duepuntozero/search_item.tpl
+++ /dev/null
@@ -1,54 +0,0 @@
-<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info" id="wall-item-info-$item.id">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
-
-</div>
-
-
diff --git a/view/theme/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 b79b00ef4..c30e643ce 100755..100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -194,6 +194,16 @@ aside {
 	font-weight: bold;
 	background: #3465a4 url('friendika-16.png') no-repeat 95% center;
 }
+#wallmessage-link {
+	display: block;
+	color: #FFFFFF;
+	-webkit-border-radius: 5px ;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	padding: 5px;
+	font-weight: bold;
+	background-color: #3465a4;
+}
 
 /* section */
 section {
@@ -249,6 +259,10 @@ div.wall-item-content-wrapper.shiny {
 	background: #FFFFC8;
 }
 
+#theme-preview {
+	margin: 15px 0 15px 150px;
+}
+
 /* from default */
 #jot-perms-icon, 
 #profile-location,
@@ -271,8 +285,7 @@ div.wall-item-content-wrapper.shiny {
 	float: left;
 }
 
-
-#jot-title {
+#jot-title, #jot-category {
 	border: 0px;
 	margin: 0px;
 	height: 20px;
@@ -283,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; 
 }
 
@@ -309,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;	
@@ -1868,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;
 }
 
@@ -1883,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;
 }
 
@@ -2615,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;
 }
@@ -2970,15 +2987,28 @@ div.jGrowl div.info {
   color: #ffffff;
   padding-left: 58px;
 }
-
+#jGrowl.top-right {
+	top: 15px;
+	right: 15px;
+}
 .qcomment {
 	border: 1px solid #EEE;
 	padding: 3px;
+	margin-top: 15px;
+	margin-left: 25px;
+	width: 125px;
+	overflow-y: auto;
+}
+
+
+.qcomment option {
+	width: 125px;
+	overflow-x: hidden;
 }
 
 .qcomment {
-	opacity: 0;
-	filter:alpha(opacity=0);
+	opacity: 0.3;
+	filter:alpha(opacity=30);
 }
 .qcomment:hover {
 	opacity: 1.0;
@@ -3054,3 +3084,10 @@ ul.menu-popup {
 .notify-seen {
 	background: #DDDDDD;
 }
+
+#id_term_label {
+	width:75px;
+}
+#id_term {
+	width:100px;
+}
\ No newline at end of file
diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index 701fb1349..701fb1349 100755..100644
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl
deleted file mode 100755
index 9d1dd7d70..000000000
--- a/view/theme/duepuntozero/wall_item.tpl
+++ /dev/null
@@ -1,78 +0,0 @@
-<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info" id="wall-item-info-$item.id">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
-				</a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>				
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-				
-		</div>	
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-					<div class="body-tag">
-						{{ for $item.tags as $tag }}
-							<span class='tag'>$tag</span>
-						{{ endfor }}
-					</div>
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ 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="#" 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 }}
-			{{ 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>
-			{{ endif }}
-			{{ if $item.edpost }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></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"></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 filer-icon" title="$item.filer"></a>
-			{{ endif }}			
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
-	<div class="wall-item-comment-wrapper" >
-	$item.comment
-	</div>
-
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
-</div>
diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl
deleted file mode 100755
index bad5680c7..000000000
--- a/view/theme/duepuntozero/wallwall_item.tpl
+++ /dev/null
@@ -1,85 +0,0 @@
-<div class="wall-item-outside-wrapper$item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info wallwall" id="wall-item-info-$item.id">
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" 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" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                    <ul>
-                        $item.item_photo_menu
-                    </ul>
-                </div>
-
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> $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<br />
-				<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 class="body-tag">
-						{{ for $item.tags as $tag }}
-							<span class='tag'>$tag</span>
-						{{ endfor }}
-					</div>
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ 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="#" 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 }}
-			{{ 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>
-			{{ endif }}
-			{{ if $item.edpost }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></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"></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 filer-icon" title="$item.filer"></a>
-			{{ endif }}			
-			
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>	
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
-	<div class="wall-item-comment-separator"></div>
-	<div class="wall-item-comment-wrapper" >
-	$item.comment
-	</div>
-
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
-</div>
-
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/screenshot.jpg b/view/theme/easterbunny/screenshot.jpg
new file mode 100644
index 000000000..5ac613e78
--- /dev/null
+++ b/view/theme/easterbunny/screenshot.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/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/screenshot.jpg b/view/theme/greenzero/screenshot.jpg
new file mode 100644
index 000000000..692ad354b
--- /dev/null
+++ b/view/theme/greenzero/screenshot.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..ceec4dd97 100755..100644
--- a/view/theme/greenzero/theme.php
+++ b/view/theme/greenzero/theme.php
diff --git a/view/theme/loozah/comment_item.tpl b/view/theme/loozah/comment_item.tpl
deleted file mode 100755
index 3503c3843..000000000
--- a/view/theme/loozah/comment_item.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				<input type="hidden" name="return" value="$return_path" />
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
-				{{ if $qcomment }}
-				{{ for $qcomment as $qc }}				
-					<span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
-					&nbsp;
-				{{ endfor }}
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/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/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/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/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/screenshot.jpg b/view/theme/purplezero/screenshot.jpg
new file mode 100644
index 000000000..c1d346bb5
--- /dev/null
+++ b/view/theme/purplezero/screenshot.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..ceec4dd97 100755..100644
--- a/view/theme/purplezero/theme.php
+++ b/view/theme/purplezero/theme.php
diff --git a/view/theme/quattro-green/experimental b/view/theme/quattro-green/experimental
deleted file mode 100755
index e69de29bb..000000000
--- a/view/theme/quattro-green/experimental
+++ /dev/null
diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/quattro/comment_item.tpl
index 3503c3843..cde4ca3ca 100755..100644
--- a/view/theme/duepuntozero/comment_item.tpl
+++ b/view/theme/quattro/comment_item.tpl
@@ -11,13 +11,13 @@
 					<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>
 				{{ if $qcomment }}
 				{{ for $qcomment as $qc }}				
 					<span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
 					&nbsp;
 				{{ endfor }}
 				{{ endif }}
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
 
 				<div class="comment-edit-text-end"></div>
 				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php
new file mode 100644
index 000000000..c9ab3a4a1
--- /dev/null
+++ b/view/theme/quattro/config.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Theme settings
+ */
+
+
+
+function theme_content(&$a){
+	if(!local_user())
+		return;		
+	
+	$align = get_pconfig(local_user(), 'quattro', 'align' );
+	$color = get_pconfig(local_user(), 'quattro', 'color' );
+	$colors = array(
+		"dark"=>"Quattro", 
+		"green"=>"Green"
+	);
+	
+	$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"),
+		'$align' => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))),
+		'$color' => array('quattro_color', t('Color scheme'), $color, '', $colors),
+	));
+	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
new file mode 100644
index 000000000..b826acc65
--- /dev/null
+++ b/view/theme/quattro/contact_template.tpl
@@ -0,0 +1,26 @@
+
+<div class="contact-wrapper" id="contact-entry-wrapper-$id" >
+	<div class="contact-photo-wrapper" >
+		<div class="contact-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 }}
+			<a href="#" rel="#contact-photo-menu-$contact.id" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-$contact.id">menu</a>
+			<ul class="contact-photo-menu menu-popup" id="contact-photo-menu-$contact.id">
+				$contact.photo_menu
+			</ul>
+			{{ endif }}
+		</div>
+			
+	</div>
+	<div class="contact-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+	{{ if $contact.alt_text }}<div class="contact-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
+	<div class="contact-details" id="contact-entry-url-$contact.id" >$contact.itemurl</div>
+	<div class="contact-details" id="contact-entry-network-$contact.id" >$contact.network</div>
+
+
+</div>
+
diff --git a/view/theme/duepuntozero/conversation.tpl b/view/theme/quattro/conversation.tpl
index 43bb1dd47..ff202bbe4 100755..100644
--- a/view/theme/duepuntozero/conversation.tpl
+++ b/view/theme/quattro/conversation.tpl
@@ -17,9 +17,7 @@
 {{ 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>
+<a href="#" onclick="deleteCheckedItems();return false;">
+	<span class="icon s22 delete text">$dropping</span>
+</a>
 {{ endif }}
diff --git a/view/theme/quattro/dark/Makefile b/view/theme/quattro/dark/Makefile
new file mode 100644
index 000000000..989da60c7
--- /dev/null
+++ b/view/theme/quattro/dark/Makefile
@@ -0,0 +1,4 @@
+##
+
+style.css : style.less colors.less ../icons.less ../quattro.less
+	lessc style.less > style.css
diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/dark/colors.less
index 9183b2e77..b6d487f92 100755..100644
--- a/view/theme/quattro/colors.less
+++ b/view/theme/quattro/dark/colors.less
@@ -96,3 +96,12 @@
 @JotPermissionLockBackgroundColor: @Grey4;
 @JotLoadingBackgroundColor: @Grey1;
 @JotPreviewBackgroundColor: @Yellow1;
+
+@MessageNewBackgroundColor: @Blue1;
+@MessageNewBorderColor: @Blue3;
+@MessageNewColor: @Grey1;
+
+@MailListBackgroundColor: #f6f7f8;
+
+@MailDisplaySubjectColor: @Grey5;
+@MailDisplaySubjectBackgroundColor: #f6f7f8;
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/dark/style.css
index 6087e4cd1..1d951aba8 100755..100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -231,7 +231,8 @@ body {
 h4 {
   font-size: 1.1em;
 }
-a, a:link {
+a,
+a:link {
   color: #005c94;
   text-decoration: none;
 }
@@ -449,7 +450,8 @@ nav #nav-site-linkmenu .menu-popup {
   right: 0px;
   left: auto;
 }
-nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+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-apps-link.selected {
@@ -626,41 +628,16 @@ aside #profiles-menu {
   width: 48px;
   height: 48px;
 }
-/* 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;
-}
 /* group member */
-#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper {
+#contact-edit-drop-link,
+.mail-list-delete-wrapper,
+.group-delete-wrapper {
   float: right;
   margin-right: 50px;
 }
-#contact-edit-drop-link .drophide, .mail-list-delete-wrapper .drophide, .group-delete-wrapper .drophide {
+#contact-edit-drop-link .drophide,
+.mail-list-delete-wrapper .drophide,
+.group-delete-wrapper .drophide {
   background-image: url('../../../images/icons/22/delete.png');
   display: block;
   width: 22px;
@@ -669,7 +646,9 @@ aside #profiles-menu {
   position: relative;
   top: -50px;
 }
-#contact-edit-drop-link .drop, .mail-list-delete-wrapper .drop, .group-delete-wrapper .drop {
+#contact-edit-drop-link .drop,
+.mail-list-delete-wrapper .drop,
+.group-delete-wrapper .drop {
   background-image: url('../../../images/icons/22/delete.png');
   display: block;
   width: 22px;
@@ -787,7 +766,7 @@ section {
 }
 .wall-item-decor {
   position: absolute;
-  left: 790px;
+  left: 97%;
   top: -10px;
   width: 16px;
 }
@@ -798,7 +777,8 @@ section {
   display: table;
   width: 780px;
 }
-.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+.wall-item-container .wall-item-item,
+.wall-item-container .wall-item-bottom {
   display: table-row;
 }
 .wall-item-container .wall-item-bottom {
@@ -836,11 +816,13 @@ section {
 .wall-item-container .wall-item-content img {
   max-width: 710px;
 }
-.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+.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 {
+.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;
@@ -848,7 +830,8 @@ section {
   -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 {
+.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;
@@ -968,10 +951,11 @@ section {
   background: url("../../../images/tag.png") no-repeat center right;
   color: #ffffff;
 }
+.filesavetags {
+  padding: 3px 0px 3px 0px;
+  opacity: 0.5;
+}
 .wwto {
-  position: absolute !important;
-  width: 25px;
-  height: 25px;
   background: #FFFFFF;
   border: 2px solid #364e59;
   height: 25px;
@@ -1189,7 +1173,9 @@ section {
     height: 18px;
 }*/
 /** acl **/
-#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+#photo-edit-perms-select,
+#photos-upload-permissions-wrapper,
+#profile-jot-acl-wrapper {
   display: block!important;
 }
 #acl-wrapper {
@@ -1348,9 +1334,14 @@ ul.tabs li .active {
   float: left;
   width: 200px;
 }
-.field input, .field textarea {
+.field input,
+.field textarea {
   width: 400px;
 }
+.field input[type="checkbox"],
+.field input[type="radio"] {
+  width: auto;
+}
 .field textarea {
   height: 100px;
 }
@@ -1499,6 +1490,123 @@ ul.tabs li .active {
   left: 0px;
   top: 63px;
 }
+/* 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;
+}
+.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;
+}
+/* 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;
+}
+
+*/
 /* page footer */
 footer {
   height: 100px;
diff --git a/view/theme/quattro/style.less b/view/theme/quattro/dark/style.less
index c3dbae777..7d81e788a 100755..100644
--- a/view/theme/quattro/style.less
+++ b/view/theme/quattro/dark/style.less
@@ -6,8 +6,8 @@
 // $ lessc style.less > style.css
 
 @import "colors";
-@import "icons";
-@import "quattro";
+@import "../icons";
+@import "../quattro";
 
 
 
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/fileas_widget.tpl b/view/theme/quattro/fileas_widget.tpl
new file mode 100644
index 000000000..1e5a76044
--- /dev/null
+++ b/view/theme/quattro/fileas_widget.tpl
@@ -0,0 +1,12 @@
+<div id="fileas-sidebar" class="widget">
+	<h3>$title</h3>
+	<div id="nets-desc">$desc</div>
+	
+	<ul class="fileas-ul">
+		<li class="tool {{ if $sel_all }}selected{{ endif }}"><a href="$base" class="fileas-link fileas-all">$all</a></li>
+		{{ for $terms as $term }}
+			<li class="tool {{ if $term.selected }}selected{{ endif }}"><a href="$base?f=&file=$term.name" class="fileas-link">$term.name</a></li>
+		{{ endfor }}
+	</ul>
+	
+</div>
diff --git a/view/theme/quattro/green/Makefile b/view/theme/quattro/green/Makefile
new file mode 100644
index 000000000..989da60c7
--- /dev/null
+++ b/view/theme/quattro/green/Makefile
@@ -0,0 +1,4 @@
+##
+
+style.css : style.less colors.less ../icons.less ../quattro.less
+	lessc style.less > style.css
diff --git a/view/theme/quattro-green/colors.less b/view/theme/quattro/green/colors.less
index 57fd2ef60..bc78c3fda 100755..100644
--- a/view/theme/quattro-green/colors.less
+++ b/view/theme/quattro/green/colors.less
@@ -72,6 +72,8 @@
 @NoticeColor: @Grey1;
 @NoticeBackgroundColor: #511919;
 
+@FieldHelpColor: @Grey3;
+
 @ThreadBackgroundColor: #f6f7f8;
 @ShinyBorderColor: @Green4;
 
@@ -96,3 +98,11 @@
 @JotLoadingBackgroundColor: @Grey1;
 @JotPreviewBackgroundColor: @Green4;
 
+@MessageNewBackgroundColor: @Blue1;
+@MessageNewBorderColor: @Blue3;
+@MessageNewColor: @Grey1;
+
+@MailListBackgroundColor: #f6f7f8;
+
+@MailDisplaySubjectColor: @Grey5;
+@MailDisplaySubjectBackgroundColor: #f6f7f8;
diff --git a/view/theme/quattro-green/style.css b/view/theme/quattro/green/style.css
index 301477679..e7cc549d0 100755..100644
--- a/view/theme/quattro-green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -231,7 +231,8 @@ body {
 h4 {
   font-size: 1.1em;
 }
-a, a:link {
+a,
+a:link {
   color: #009100;
   text-decoration: none;
 }
@@ -449,7 +450,8 @@ nav #nav-site-linkmenu .menu-popup {
   right: 0px;
   left: auto;
 }
-nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+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-apps-link.selected {
@@ -615,7 +617,7 @@ aside #profiles-menu {
 }
 #contact-block .contact-block-content {
   clear: both;
-  overflow: idden;
+  overflow: hidden;
   height: auto;
 }
 #contact-block .contact-block-link {
@@ -623,44 +625,19 @@ aside #profiles-menu {
   margin: 0px 2px 2px 0px;
 }
 #contact-block .contact-block-link img {
-  widht: 48px;
+  width: 48px;
   height: 48px;
 }
-/* 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;
-}
 /* group member */
-#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper {
+#contact-edit-drop-link,
+.mail-list-delete-wrapper,
+.group-delete-wrapper {
   float: right;
   margin-right: 50px;
 }
-#contact-edit-drop-link .drophide, .mail-list-delete-wrapper .drophide, .group-delete-wrapper .drophide {
+#contact-edit-drop-link .drophide,
+.mail-list-delete-wrapper .drophide,
+.group-delete-wrapper .drophide {
   background-image: url('../../../images/icons/22/delete.png');
   display: block;
   width: 22px;
@@ -669,7 +646,9 @@ aside #profiles-menu {
   position: relative;
   top: -50px;
 }
-#contact-edit-drop-link .drop, .mail-list-delete-wrapper .drop, .group-delete-wrapper .drop {
+#contact-edit-drop-link .drop,
+.mail-list-delete-wrapper .drop,
+.group-delete-wrapper .drop {
   background-image: url('../../../images/icons/22/delete.png');
   display: block;
   width: 22px;
@@ -787,7 +766,7 @@ section {
 }
 .wall-item-decor {
   position: absolute;
-  left: 790px;
+  left: 97%;
   top: -10px;
   width: 16px;
 }
@@ -798,7 +777,8 @@ section {
   display: table;
   width: 780px;
 }
-.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+.wall-item-container .wall-item-item,
+.wall-item-container .wall-item-bottom {
   display: table-row;
 }
 .wall-item-container .wall-item-bottom {
@@ -836,11 +816,13 @@ section {
 .wall-item-container .wall-item-content img {
   max-width: 710px;
 }
-.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+.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 {
+.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;
@@ -848,7 +830,8 @@ section {
   -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 {
+.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;
@@ -968,10 +951,11 @@ section {
   background: url("../../../images/tag.png") no-repeat center right;
   color: #ffffff;
 }
+.filesavetags {
+  padding: 3px 0px 3px 0px;
+  opacity: 0.5;
+}
 .wwto {
-  position: absolute !important;
-  width: 25px;
-  height: 25px;
   background: #FFFFFF;
   border: 2px solid #364e59;
   height: 25px;
@@ -1189,7 +1173,9 @@ section {
     height: 18px;
 }*/
 /** acl **/
-#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+#photo-edit-perms-select,
+#photos-upload-permissions-wrapper,
+#profile-jot-acl-wrapper {
   display: block!important;
 }
 #acl-wrapper {
@@ -1304,6 +1290,37 @@ ul.tabs li {
 ul.tabs li .active {
   border-bottom: 1px solid #009100;
 }
+/** group editor **/
+#group-edit-desc {
+  margin-top: 1em;
+  color: #999999;
+}
+#group-update-wrapper {
+  height: auto;
+  overflow: auto;
+}
+#group-update-wrapper #group {
+  width: 300px;
+  float: left;
+  margin-right: 20px;
+}
+#group-update-wrapper #contacts {
+  width: 300px;
+  float: left;
+}
+#group-update-wrapper #group-separator {
+  display: none;
+}
+#group-update-wrapper .contact_list {
+  height: 300px;
+  border: 1px solid #364e59;
+  overflow: auto;
+}
+#group-update-wrapper .contact_list .contact-block-div {
+  width: 50px;
+  height: 50px;
+  float: left;
+}
 /**
  * Form fields
  */
@@ -1317,16 +1334,21 @@ ul.tabs li .active {
   float: left;
   width: 200px;
 }
-.field input, .field textarea {
+.field input,
+.field textarea {
   width: 400px;
 }
+.field input[type="checkbox"],
+.field input[type="radio"] {
+  width: auto;
+}
 .field textarea {
   height: 100px;
 }
 .field .field_help {
   display: block;
   margin-left: 200px;
-  color: #666666;
+  color: #999999;
 }
 .field .onoff {
   float: left;
@@ -1468,6 +1490,123 @@ ul.tabs li .active {
   left: 0px;
   top: 63px;
 }
+/* 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;
+}
+.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;
+}
+/* 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;
+}
+
+*/
 /* page footer */
 footer {
   height: 100px;
diff --git a/view/theme/quattro-green/style.less b/view/theme/quattro/green/style.less
index f8b0bb31c..7d81e788a 100755..100644
--- a/view/theme/quattro-green/style.less
+++ b/view/theme/quattro/green/style.less
@@ -6,8 +6,8 @@
 // $ lessc style.less > style.css
 
 @import "colors";
-@import "../quattro/icons";
-@import "../quattro/quattro";
+@import "../icons";
+@import "../quattro";
 
 
 
diff --git a/view/theme/quattro/group_side.tpl b/view/theme/quattro/group_side.tpl
new file mode 100644
index 000000000..596a8d13f
--- /dev/null
+++ b/view/theme/quattro/group_side.tpl
@@ -0,0 +1,29 @@
+<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"> $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">$group.edit.title</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/quattro/icons.less b/view/theme/quattro/icons.less
index e314fba1f..e314fba1f 100755..100644
--- a/view/theme/quattro/icons.less
+++ b/view/theme/quattro/icons.less
diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl
new file mode 100644
index 000000000..2f89d4372
--- /dev/null
+++ b/view/theme/quattro/jot.tpl
@@ -0,0 +1,48 @@
+<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" />
+		<div id="character-counter" class="grey jothidden"></div>
+
+		<input type="hidden" name="type" value="$ptyp" />
+		<input type="hidden" name="profile_uid" value="$profile_uid" />
+		<input type="hidden" name="return" value="$return_path" />
+		<input type="hidden" name="location" id="jot-location" value="$defloc" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="$post_id" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+
+		<ul id="jot-tools" class="jothidden" style="display:none">
+			<li><a href="#" onclick="return false;" id="wall-image-upload" title="$upload">$shortupload</a></a></li>
+			<li><a href="#" onclick="return false;" id="wall-file-upload"  title="$attach">$shortattach</a></li>
+			<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>
+			<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
+
+			<li class="perms"><a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon s22 $lockstate $bang"  title="$permset" ></a></li>
+			<li class="submit"><input type="submit" id="profile-jot-submit" name="submit" value="$share" /></li>
+			<li id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait"  /></li>
+		</ul>
+	</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>
+
+{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/quattro/mail_conv.tpl b/view/theme/quattro/mail_conv.tpl
new file mode 100644
index 000000000..989f17878
--- /dev/null
+++ b/view/theme/quattro/mail_conv.tpl
@@ -0,0 +1,60 @@
+<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/quattro/mail_display.tpl b/view/theme/quattro/mail_display.tpl
new file mode 100644
index 000000000..8b82e95c6
--- /dev/null
+++ b/view/theme/quattro/mail_display.tpl
@@ -0,0 +1,12 @@
+<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/quattro/mail_list.tpl b/view/theme/quattro/mail_list.tpl
new file mode 100644
index 000000000..6bc6c84f6
--- /dev/null
+++ b/view/theme/quattro/mail_list.tpl
@@ -0,0 +1,8 @@
+<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/quattro/message_side.tpl b/view/theme/quattro/message_side.tpl
new file mode 100644
index 000000000..9f1587096
--- /dev/null
+++ b/view/theme/quattro/message_side.tpl
@@ -0,0 +1,10 @@
+<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/quattro/msg-header.tpl b/view/theme/quattro/msg-header.tpl
new file mode 100644
index 000000000..2d1ea7a61
--- /dev/null
+++ b/view/theme/quattro/msg-header.tpl
@@ -0,0 +1,97 @@
+
+<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript">
+
+var plaintext = '$editselect';
+
+if(plaintext != 'none') {
+	tinyMCE.init({
+		theme : "advanced",
+		mode : "specific_textareas",
+		editor_selector: /(profile-jot-text|prvmail-text)/,
+		plugins : "bbcode,paste",
+		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+		theme_advanced_buttons2 : "",
+		theme_advanced_buttons3 : "",
+		theme_advanced_toolbar_location : "top",
+		theme_advanced_toolbar_align : "center",
+		theme_advanced_blockformats : "blockquote,code",
+		gecko_spellcheck : true,
+		paste_text_sticky : true,
+		entity_encoding : "raw",
+		add_unload_trigger : false,
+		remove_linebreaks : false,
+		force_p_newlines : false,
+		force_br_newlines : true,
+		forced_root_block : '',
+		convert_urls: false,
+		content_css: "$baseurl/view/custom_tinymce.css",
+		     //Character count
+		theme_advanced_path : false,
+		setup : function(ed) {
+			ed.onInit.add(function(ed) {
+				ed.pasteAsPlainText = true;
+				var editorId = ed.editorId;
+				var textarea = $('#'+editorId);
+				if (typeof(textarea.attr('tabindex')) != "undefined") {
+					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
+					textarea.attr('tabindex', null);
+				}
+			});
+		}
+	});
+}
+else
+	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+
+
+</script>
+<script type="text/javascript" src="js/ajaxupload.js" ></script>
+<script>
+	$(document).ready(function() {
+		var uploader = new window.AjaxUpload(
+			'prvmail-upload',
+			{ action: 'wall_upload/$nickname',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					tinyMCE.execCommand('mceInsertRawHTML',false,response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+
+	});
+
+	function jotGetLink() {
+		reply = prompt("$linkurl");
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+</script>
+
diff --git a/view/theme/quattro/nav.tpl b/view/theme/quattro/nav.tpl
new file mode 100644
index 000000000..8c872864c
--- /dev/null
+++ b/view/theme/quattro/nav.tpl
@@ -0,0 +1,131 @@
+<header>
+	{# $langselector #}
+
+	<div id="site-location">$sitelocation</div>
+	<div id="banner">$banner</div>
+</header>
+<nav>
+	<ul>
+		{{ 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.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.community }}
+			<li id="nav-community-link" class="nav-menu $sel.community">
+				<a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+			</li>
+		{{ endif }}
+		
+		{{ if $nav.network }}
+			<li id="nav-network-link" class="nav-menu $sel.network">
+				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+				<span id="net-update" class="nav-notify"></span>
+			</li>
+		{{ endif }}
+		{{ if $nav.home }}
+			<li id="nav-home-link" class="nav-menu $sel.home">
+				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+				<span id="home-update" class="nav-notify"></span>
+			</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 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>
+					<li class="empty">$emptynotifications</li>
+				</ul>
+			</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.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 }}
+				{{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
+			</ul>		
+		</li>
+		
+		{{ if $nav.help }} 
+		<li id="nav-help-link" class="nav-menu $sel.help">
+			<a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+		</li>
+		{{ endif }}
+
+		<li id="nav-search-link" class="nav-menu $sel.search">
+			<a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+		</li>
+		<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>
+		
+		{{ 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 }}
+	</ul>
+
+</nav>
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<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>
+#}
diff --git a/view/theme/quattro/nets.tpl b/view/theme/quattro/nets.tpl
new file mode 100644
index 000000000..cbadf1361
--- /dev/null
+++ b/view/theme/quattro/nets.tpl
@@ -0,0 +1,12 @@
+<div id="nets-sidebar" class="widget">
+	<h3>$title</h3>
+	<div id="nets-desc">$desc</div>
+	
+	<ul class="nets-ul">
+		<li class="tool {{ if $sel_all }}selected{{ endif }}"><a href="$base" class="nets-link nets-all">$all</a>
+		{{ for $nets as $net }}
+			<li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?f=&nets=$net.ref" class="nets-link">$net.name</a></li>
+		{{ endfor }}
+	</ul>
+	
+</div>
diff --git a/view/theme/duepuntozero/profile_vcard.tpl b/view/theme/quattro/profile_vcard.tpl
index 154f22363..7cd02f164 100755..100644
--- a/view/theme/duepuntozero/profile_vcard.tpl
+++ b/view/theme/quattro/profile_vcard.tpl
@@ -1,11 +1,27 @@
 <div class="vcard">
 
-	<div class="fn label">$profile.name</div>
-	
+	<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>
 				
-	
+			</ul>
+			</div>
+		{{ endif }}
+	</div>
+
+
 	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
 
 
 
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 27c48f195..c6352cfe9 100755..100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -113,7 +113,7 @@ header {
 	
 	#banner {
 		overflow: hidden;
-	    text-align: center;
+                text-align: center;
 		width: 100%;
 		a, a:active, a:visited, a:link, a:hover { color: @Grey1; text-decoration: none; outline: none; vertical-align: bottom; }
 		#logo-img { height: 22px; margin-top:5px;}
@@ -319,41 +319,6 @@ aside {
 		img { width: 48px; height: 48px; }
 	}
 }
-/* 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;
-}
 
 /* group member */
 #contact-edit-drop-link,
@@ -448,7 +413,7 @@ section {
 	margin-bottom: 20px;
 	width: 780px;
 }
-.wall-item-decor { position: absolute; left: 790px; top: -10px;  width: 16px;}
+.wall-item-decor { position: absolute; left: 97%; top: -10px;  width: 16px;}
 .unstarred { display: none; }
 
 .wall-item-container {
@@ -570,6 +535,10 @@ section {
 		color: @TagColor;
 	}
 }
+.filesavetags {
+    padding: 3px 0px 3px 0px;
+    opacity: 0.5;
+}
 
 .wwto { 
 	position: absolute !important; 
@@ -934,6 +903,10 @@ ul.tabs {
 	textarea {
 		width: 400px;
 	}
+	input[type="checkbox"], input[type="radio"]{
+		width: auto;
+	}
+	
 	textarea { height: 100px; }
 	.field_help {
 		display: block;
@@ -977,6 +950,7 @@ ul.tabs {
 	&.radio .field_help { margin-left: 0px; }
 }
 
+
 #profile-edit-links li {
 	list-style: none;
         margin-top: 10px;
@@ -1081,6 +1055,90 @@ ul.tabs {
 	}	
 }
 
+/* messages */
+#message-new {
+	background: @MessageNewBackgroundColor;
+	border: 1px solid @MessageNewBorderColor;
+	width: 150px;
+	a {
+		color: @MessageNewColor;
+		text-align: center;
+		display: block;
+		font-weight: bold;
+		padding: 1em 0px;
+	}
+}
+
+.mail-list-wrapper {
+	background-color: @MailListBackgroundColor;
+	margin-bottom: 5px;
+	width: 100%; height: auto; overflow: hidden;
+	
+	span { display: block; float: left; width: 20%; overflow: hidden;}
+	
+	.mail-subject { 
+		width: 30%;
+		padding:4px 0px 0px 4px;
+		a { display: block; }
+		&.unseen a { font-weight: bold; }
+	}
+	.mail-date { padding: 4px 4px 0px 4px; }
+	.mail-from { padding: 4px 4px 0px 4px; }
+	.mail-count { padding: 4px 4px 0px 4px; text-align: right;}
+	
+	.mail-delete { float: right; }
+}
+
+#mail-display-subject {
+	background-color: @MailDisplaySubjectBackgroundColor;
+	color: @MailDisplaySubjectColor;
+	margin-bottom: 10px;
+	width: 100%; height: auto; overflow: hidden;
+	span { float: left; overflow: hidden; padding: 4px 0px 0px 10px;}
+	.mail-delete { float: right;  .opaque(0.5);}
+	&:hover .mail-delete { .opaque(1); }
+	
+}
+
+/* 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;
+}
+
+*/
+
 
 /* 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
new file mode 100644
index 000000000..9c10a26de
--- /dev/null
+++ b/view/theme/quattro/saved_searches_aside.tpl
@@ -0,0 +1,15 @@
+<div id="saved-search-list" class="widget">
+	<h3 class="title">$title</h3>
+
+	<ul id="saved-search-ul">
+		{{ for $saved as $search }}
+			<li class="tool {{if $search.selected}}selected{{endif}}">
+					<a href="network/?f=&search=$search.encodedterm" class="label" >$search.term</a>
+					<a href="network/?f=&remove=1&search=$search.encodedterm" class="action icon s10 delete" title="$search.delete" onclick="return confirmDelete();"></a>
+			</li>
+		{{ endfor }}
+	</ul>
+	
+	$searchbox
+	
+</div>
diff --git a/view/theme/quattro/screenshot.jpg b/view/theme/quattro/screenshot.jpg
new file mode 100644
index 000000000..98fbfe2ea
--- /dev/null
+++ b/view/theme/quattro/screenshot.jpg
diff --git a/view/theme/quattro/search_item.tpl b/view/theme/quattro/search_item.tpl
new file mode 100644
index 000000000..80d6678fb
--- /dev/null
+++ b/view/theme/quattro/search_item.tpl
@@ -0,0 +1,91 @@
+
+<div class="wall-item-decor">
+	<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+	{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+
+<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="wall-item-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="wall-item-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">
+			{{ 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="">
+			{{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+		</div>
+		<div class="wall-item-actions">
+			<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">$item.ago</span>
+			</div>
+			
+			<div class="wall-item-actions-social">
+			{{ if $item.star }}
+				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
+				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
+			{{ endif }}
+			
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
+			{{ endif }}
+						
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</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 delete s16" title="$item.drop.delete">$item.drop.delete</a>
+				{{ endif }}
+				{{ if $item.edpost }}
+					<a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
+				{{ endif }}
+			</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>
+		{{ if $item.conv }}
+		<div class="wall-item-conv" id="wall-item-conv-$item.id" >
+			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
+		{{ endif }}
+		</div>
+	</div>
+	
+	
+</div>
+
diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php
new file mode 100644
index 000000000..889ec1530
--- /dev/null
+++ b/view/theme/quattro/style.php
@@ -0,0 +1,9 @@
+<?php
+	$color = get_pconfig(local_user(), "quattro","color");
+	
+	if ($color===false) $color="dark";
+		
+	if (file_exists("$THEMEPATH/$color/style.css")){
+		echo file_get_contents("$THEMEPATH/$color/style.css");
+	}
+
diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php
index 7e5ab1e62..be47a401c 100644
--- a/view/theme/quattro/theme.php
+++ b/view/theme/quattro/theme.php
@@ -1,33 +1,7 @@
 <?php
 
-$a->hooks[] = array('plugin_settings', 'view/theme/quattro/theme.php', 'quattro_settings');
-$a->hooks[] = array('plugin_settings_post', 'view/theme/quattro/theme.php', 'quattro_settings_post');
 
 
-function quattro_settings(&$a, &$o){
-	if(!local_user())
-		return;		
-	
-	$align = get_pconfig(local_user(), 'quattro', 'align' );
-	
-	$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"),
-		'$align' => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))),
-	));
-}
-
-function quattro_settings_post(&$a){
-	if(! local_user())
-		return;
-	if (isset($_POST['quattro-settings-submit'])){
-		set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']);
-	}
-	goaway($a->get_baseurl()."/settings/addon");
-}
-
 
 $quattro_align = get_pconfig(local_user(), 'quattro', 'align' );
 
diff --git a/view/theme/quattro/theme_settings.tpl b/view/theme/quattro/theme_settings.tpl
index 25af04253..9771ae162 100644
--- a/view/theme/quattro/theme_settings.tpl
+++ b/view/theme/quattro/theme_settings.tpl
@@ -1,11 +1,8 @@
-<div class="settings-block">
-	<h3 class="settings-heading">$title</h3>
-	
-	{{inc field_select.tpl with $field=$align}}{{endinc}}
-	
-	<div class="settings-submit-wrapper">
-		<input type="submit" value="$submit" class="settings-submit" name="quattro-settings-submit" />
-	</div>
+{{inc field_select.tpl with $field=$color}}{{endinc}}
 
-	
+{{inc field_select.tpl with $field=$align}}{{endinc}}
+
+<div class="settings-submit-wrapper">
+	<input type="submit" value="$submit" class="settings-submit" name="quattro-settings-submit" />
 </div>
+
diff --git a/view/theme/quattro/wall_item.tpl b/view/theme/quattro/wall_item.tpl
new file mode 100644
index 000000000..e771db068
--- /dev/null
+++ b/view/theme/quattro/wall_item.tpl
@@ -0,0 +1,90 @@
+
+<div class="wall-item-decor">
+	<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+	{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+
+<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 class="wall-item-location">$item.location</div>	
+		</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="">
+			{{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+		</div>
+		<div class="wall-item-actions">
+			<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">$item.ago</span>
+			</div>
+			
+			<div class="wall-item-actions-social">
+			{{ if $item.star }}
+				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
+				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
+			{{ endif }}
+			{{ if $item.filer }}
+                                <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer">$item.filer</a>
+			{{ endif }}			
+			
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
+			{{ endif }}
+						
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</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 delete s16" title="$item.drop.delete">$item.drop.delete</a>
+				{{ endif }}
+				{{ if $item.edpost }}
+					<a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
+				{{ endif }}
+			</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/quattro/wallwall_item.tpl b/view/theme/quattro/wallwall_item.tpl
new file mode 100644
index 000000000..693ebaba6
--- /dev/null
+++ b/view/theme/quattro/wallwall_item.tpl
@@ -0,0 +1,96 @@
+<div class="wall-item-decor">
+	<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+	{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+
+<div class="wall-item-container $item.indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<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 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="wall-item-location">$item.location</div>	
+		</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="wall-item-links">
+			{{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+		</div>
+		<div class="wall-item-actions">
+			<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">$item.ago</span>
+				 <br/>$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
+				 
+			</div>
+			
+			<div class="wall-item-actions-social">
+			{{ if $item.star }}
+				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
+				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
+
+			{{ endif }}
+			{{ if $item.filer }}
+                                <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer">$item.filer</a>
+			{{ endif }}			
+			
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
+			{{ endif }}
+						
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</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 delete s16" title="$item.drop.delete">$item.drop.delete</a>
+				{{ endif }}
+				{{ if $item.edpost }}
+					<a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
+				{{ endif }}
+			</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/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..ceec4dd97 100755..100644
--- a/view/theme/slack-NS/theme.php
+++ b/view/theme/slack-NS/theme.php
diff --git a/view/theme/slackr/screenshot.jpg b/view/theme/slackr/screenshot.jpg
new file mode 100644
index 000000000..eb1586d5d
--- /dev/null
+++ b/view/theme/slackr/screenshot.jpg
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..ceec4dd97 100755..100644
--- a/view/theme/slackr/theme.php
+++ b/view/theme/slackr/theme.php
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 b44ea78fd..0d11da271 100755..100644
--- a/view/theme/testbubble/jot-header.tpl
+++ b/view/theme/testbubble/jot-header.tpl
@@ -304,6 +304,41 @@ function initEditor(cb) {
 			}
 		}
 	}
+	
+	function itemFiler(id) {
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.fancybox(data);
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply);
+					if(timer) clearTimeout(timer);
+					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.fancybox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+		
+	}
+
+	
 
 	function jotClearLocation() {
 		$('#jot-coord').val('');
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/screenshot.jpg b/view/theme/testbubble/screenshot.jpg
new file mode 100644
index 000000000..ac9136a25
--- /dev/null
+++ b/view/theme/testbubble/screenshot.jpg
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/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
new file mode 100644
index 000000000..8c872864c
--- /dev/null
+++ b/view/theme/vier/nav.tpl
@@ -0,0 +1,131 @@
+<header>
+	{# $langselector #}
+
+	<div id="site-location">$sitelocation</div>
+	<div id="banner">$banner</div>
+</header>
+<nav>
+	<ul>
+		{{ 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.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.community }}
+			<li id="nav-community-link" class="nav-menu $sel.community">
+				<a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+			</li>
+		{{ endif }}
+		
+		{{ if $nav.network }}
+			<li id="nav-network-link" class="nav-menu $sel.network">
+				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+				<span id="net-update" class="nav-notify"></span>
+			</li>
+		{{ endif }}
+		{{ if $nav.home }}
+			<li id="nav-home-link" class="nav-menu $sel.home">
+				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+				<span id="home-update" class="nav-notify"></span>
+			</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 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>
+					<li class="empty">$emptynotifications</li>
+				</ul>
+			</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.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 }}
+				{{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
+			</ul>		
+		</li>
+		
+		{{ if $nav.help }} 
+		<li id="nav-help-link" class="nav-menu $sel.help">
+			<a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+		</li>
+		{{ endif }}
+
+		<li id="nav-search-link" class="nav-menu $sel.search">
+			<a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+		</li>
+		<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>
+		
+		{{ 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 }}
+	</ul>
+
+</nav>
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<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>
+#}
diff --git a/view/theme/vier/screenshot.jpg b/view/theme/vier/screenshot.jpg
new file mode 100644
index 000000000..f8e0bf8e6
--- /dev/null
+++ b/view/theme/vier/screenshot.jpg
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/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 c99077510..9d1dd7d70 100755..100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -1,87 +1,78 @@
-
-<div class="wall-item-decor">
-	<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
-	{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-
-<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" />
+<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info" id="wall-item-info-$item.id">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
+				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
 				</a>
-				<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>
-				
+				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+					<ul>
+						$item.item_photo_menu
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>
+			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
+				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>				
 			</div>
-			<div class="wall-item-location">$item.location</div>	
-		</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="">
-			{{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ 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 class="body-tag">
+						{{ for $item.tags as $tag }}
+							<span class='tag'>$tag</span>
+						{{ endfor }}
+					</div>
+			</div>
 		</div>
-		<div class="wall-item-actions">
-			<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">$item.ago</span>
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			{{ 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="#" 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>
-			
-			<div class="wall-item-actions-social">
-			{{ if $item.star }}
-				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
-				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
 			{{ endif }}
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
+			{{ 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>
+			{{ endif }}
+			{{ if $item.edpost }}
+				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></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"></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.share }}
-				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
+			{{ if $item.filer }}
+			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
 			{{ endif }}			
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
-			
-			<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 delete s16" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			
+				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+			<div class="wall-item-delete-end"></div>
 		</div>
 	</div>
-	<div class="wall-item-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 class="wall-item-wrapper-end"></div>
+	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+	<div class="wall-item-comment-wrapper" >
+	$item.comment
 	</div>
-</div>
 
-<div class="wall-item-comment-wrapper" >
-	$item.comment
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
 </div>
diff --git a/view/wallmessage.tpl b/view/wallmessage.tpl
new file mode 100644
index 000000000..66b2bc3a0
--- /dev/null
+++ b/view/wallmessage.tpl
@@ -0,0 +1,32 @@
+
+<h3>$header</h3>
+
+<h4>$subheader</h4>
+
+<div id="prvmail-wrapper" >
+<form id="prvmail-form" action="wallmessage/$nickname" method="post" >
+
+$parent
+
+<div id="prvmail-to-label">$to</div>
+$recipname
+
+<div id="prvmail-subject-label">$subject</div>
+<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
+
+<div id="prvmail-message-label">$yourmessage</div>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
+
+
+<div id="prvmail-submit-wrapper" >
+	<input type="submit" id="prvmail-submit" name="submit" value="Submit" tabindex="13" />
+	<div id="prvmail-link-wrapper" >
+		<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
+	</div> 
+	<div id="prvmail-rotator-wrapper" >
+		<img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+	</div> 
+</div>
+<div id="prvmail-end"></div>
+</form>
+</div>
diff --git a/view/wallmsg-header.tpl b/view/wallmsg-header.tpl
new file mode 100644
index 000000000..cb3922572
--- /dev/null
+++ b/view/wallmsg-header.tpl
@@ -0,0 +1,82 @@
+
+<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript">
+
+var plaintext = '$editselect';
+
+if(plaintext != 'none') {
+	tinyMCE.init({
+		theme : "advanced",
+		mode : "specific_textareas",
+		editor_selector: /(profile-jot-text|prvmail-text)/,
+		plugins : "bbcode,paste",
+		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+		theme_advanced_buttons2 : "",
+		theme_advanced_buttons3 : "",
+		theme_advanced_toolbar_location : "top",
+		theme_advanced_toolbar_align : "center",
+		theme_advanced_blockformats : "blockquote,code",
+		gecko_spellcheck : true,
+		paste_text_sticky : true,
+		entity_encoding : "raw",
+		add_unload_trigger : false,
+		remove_linebreaks : false,
+		force_p_newlines : false,
+		force_br_newlines : true,
+		forced_root_block : '',
+		convert_urls: false,
+		content_css: "$baseurl/view/custom_tinymce.css",
+		     //Character count
+		theme_advanced_path : false,
+		setup : function(ed) {
+			ed.onInit.add(function(ed) {
+				ed.pasteAsPlainText = true;
+				var editorId = ed.editorId;
+				var textarea = $('#'+editorId);
+				if (typeof(textarea.attr('tabindex')) != "undefined") {
+					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
+					textarea.attr('tabindex', null);
+				}
+			});
+		}
+	});
+}
+else
+	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+
+
+</script>
+<script>
+
+	function jotGetLink() {
+		reply = prompt("$linkurl");
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+</script>
+
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index be942f261..bad5680c7 100755..100644
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -1,93 +1,85 @@
-<div class="wall-item-decor">
-	<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
-	{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
+<div class="wall-item-outside-wrapper$item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info wallwall" id="wall-item-info-$item.id">
+			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+				<a href="$item.owner_url" target="redir" 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" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+                    <ul>
+                        $item.item_photo_menu
+                    </ul>
+                </div>
 
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<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 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="wall-item-location">$item.location</div>	
-		</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 class="wall-item-photo-end"></div>
+			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
+				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
+			</div>
 		</div>
-	</div>	
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-			{{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ 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> $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<br />
+				<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 class="body-tag">
+						{{ for $item.tags as $tag }}
+							<span class='tag'>$tag</span>
+						{{ endfor }}
+					</div>
+			</div>
 		</div>
-		<div class="wall-item-actions">
-			<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">$item.ago</span>
-				 <br/>$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
-				 
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			{{ 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="#" 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>
-			
-			<div class="wall-item-actions-social">
-			{{ if $item.star }}
-				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
-				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
-
 			{{ endif }}
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
+			{{ 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>
 			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
+			{{ if $item.edpost }}
+				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></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"></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 filer-icon" title="$item.filer"></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 delete s16" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
-			
+				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+			<div class="wall-item-delete-end"></div>
 		</div>
-	</div>
-	<div class="wall-item-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" >
+	<div class="wall-item-wrapper-end"></div>
+	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+	<div class="wall-item-comment-separator"></div>
+	<div class="wall-item-comment-wrapper" >
 	$item.comment
+	</div>
+
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
 </div>
+
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