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

2186 files changed, 97640 insertions, 18156 deletions

diff --git a/.gitignore b/.gitignore
index 6302bc1c8..2531fe4cd 100755..100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,9 @@ addon
 #ignore documentation, it should be newly built 
 doc/api
 
+#ignore reports, should be generted with every build
+report/
+
 #ignore config files from eclipse, we don't want IDE files in our repository
 .project
 .buildpath
diff --git a/.htaccess b/.htaccess
index 1df509670..6cb3a0749 100755..100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,4 +1,4 @@
-#Options -Indexes
+Options -Indexes
 AddType application/x-java-archive .jar
 AddType audio/ogg .oga
 
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/README b/README
index 152d481ea..d85d98aad 100644
--- a/README
+++ b/README
@@ -1,4 +1,11 @@
 Friendica Social Communications Server
 ======================================
 
+http://friendica.com
+
 Welcome to the free social web.
+
+
+Friendica is a communications platform for integrated social communications utilising decentralised communications and linkage to several indie social projects - as well as popular mainstream providers.
+
+Our mission is to free our friends and families from the clutches of data-harvesting corporations, and pave the way to a future where social communications are free and open and flow between alternate providers as easily as email does today.  
\ No newline at end of file
diff --git a/boot.php b/boot.php
index b464d2525..576cad6b6 100755..100644
--- a/boot.php
+++ b/boot.php
@@ -9,9 +9,9 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1269' );
-define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
-define ( 'DB_UPDATE_VERSION',      1131      );
+define ( 'FRIENDICA_VERSION',      '2.3.1304' );
+define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
+define ( 'DB_UPDATE_VERSION',      1137      );
 
 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;
@@ -286,7 +314,12 @@ class App {
 
 		startup();
 
-		$this->scheme = ((isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS']))	?  'https' : 'http' );
+		$this->scheme = 'http';
+		if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS'])
+			$this->scheme = 'https';
+		elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) 
+			$this->scheme = 'https';
+
 
 		if(x($_SERVER,'SERVER_NAME')) {
 			$this->hostname = $_SERVER['SERVER_NAME'];
@@ -347,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;
@@ -379,11 +415,22 @@ class App {
 
 		$scheme = $this->scheme;
 
-		if(x($this->config,'ssl_policy')) {
-			if(($ssl) || ($this->config['ssl_policy'] == SSL_POLICY_FULL)) 
-				$scheme = 'https';
-			if(($this->config['ssl_policy'] == SSL_POLICY_SELFSIGN) && (local_user() || x($_POST,'auth-params')))
+		if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) {
+			if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL)) 
 				$scheme = 'https';
+
+//			We need to populate the $ssl flag across the entire program before turning this on.
+//			Basically, we'll have $ssl = true on any links which can only be seen by a logged in user
+//			(and also the login link). Anything seen by an outsider will have it turned off.
+//			At present, setting SSL_POLICY_SELFSIGN will only force remote contacts to update their 
+//			contact links to this site with "http:" if they are currently using "https:"
+
+//			if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
+//				if($ssl)
+//					$scheme = 'https';
+//				else
+//					$scheme = 'http';
+//			}
 		}
 
 		$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
@@ -544,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
@@ -685,6 +736,7 @@ function get_guid($size=16) {
 
 if(! function_exists('login')) {
 function login($register = false, $hiddens=false) {
+	$a = get_app();
 	$o = "";
 	$reg = false;
 	if ($register) {
@@ -696,31 +748,35 @@ function login($register = false, $hiddens=false) {
 
 	$noid = get_config('system','no_openid');
 	
+	$dest_url = $a->get_baseurl(true) . '/' . $a->query_string;
+
 	if(local_user()) {
 		$tpl = get_markup_template("logout.tpl");
 	}
 	else {
 		$tpl = get_markup_template("login.tpl");
-
+		$_SESSION['return_url'] = $a->query_string;
 	}
 
 
 	$o .= replace_macros($tpl,array(
-		'$logout'        => t('Logout'),
-		'$login'		 => t('Login'),
+
+		'$dest_url'     => $dest_url,
+		'$logout'       => t('Logout'),
+		'$login'        => t('Login'),
 		
 		'$lname'	 	=> array('username', t('Nickname or Email address: ') , '', ''),
 		'$lpassword' 	=> array('password', t('Password: '), '', ''),
 		
 		'$openid'		=> !$noid,
-		'$lopenid'	=> array('openid_url', t('Or login using OpenID: '),'',''),
+		'$lopenid'      => array('openid_url', t('Or login using OpenID: '),'',''),
 		
-		'$hiddens'	=> $hiddens,
+		'$hiddens'      => $hiddens,
 		
-		'$register'		=> $reg,
+		'$register'     => $reg,
 		
-		'$lostpass'      => t('Forgot your password?'),
-		'$lostlink'      => t('Password Reset'),
+		'$lostpass'     => t('Forgot your password?'),
+		'$lostlink'     => t('Password Reset'),
 	));
 
 	call_hooks('login_hook',$o);
@@ -934,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()) {
@@ -1016,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,
@@ -1209,19 +1272,22 @@ function current_theme(){
 	$a = get_app();
 	
 	$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
-	$theme_name = ((is_array($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $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)));
 
 }}
 
@@ -1233,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');
 }}
 
@@ -1258,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)
 	);
@@ -1335,7 +1407,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 		array(
 			'label' => t('Profile'),
 			'url' 	=> $url.'/?tab=profile',
-			'sel'	=> (($tab=='profile')?'active':''),
+			'sel'	=> ((isset($tab) && $tab=='profile')?'active':''),
 		),
 		array(
 			'label' => t('Photos'),
@@ -1357,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/build.xml b/build.xml
index 83c530026..a61a5123d 100644
--- a/build.xml
+++ b/build.xml
@@ -1,14 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project name="friendica" default="test">
-
+	<!-- ====================================================== -->
+	<!-- Target: clean-test -->
+	<!-- deletes directories with old test reports -->
+	<!-- ====================================================== -->
+	<target name="clean-test">
+		<delete dir="report" />
+	</target>
+	
+	<!-- ====================================================== -->
+	<!-- Target: prepare-test -->
+	<!-- creates directories for test reports -->
+	<!-- ====================================================== -->
+	<target name="prepare-test" depends="clean-test">
+		<mkdir dir="report" />
+	</target>
+	
 	<!-- =================================== -->
 	<!-- Target: test -->
 	<!-- this target runs all test files -->
 	<!-- =================================== -->
-
-	<target name="test">
-		<!-- there are no tests by now, so, nothing to do -->
+	<target name="test" depends="prepare-test">
+		<!-- coverage-setup database="./report/coverage-database">
+			<fileset dir=".">
+				<include name="**/*.php" />
+				<exclude name="*test.php"/>
+				<exclude name="index.php"/>
+				<exclude name="library/**"/>
+				<exclude name="doc/**"/>
+				<exclude name=".."/>
+			</fileset>
+		</coverage-setup -->
+		<phpunit printsummary="true">
+			<batchtest>
+				<fileset dir="tests">
+					<include name="*test.php" />
+				</fileset>
+			</batchtest>
+			<formatter type="xml" todir="report" outfile="testlog.xml" />
+		</phpunit>
+		<phpunitreport infile="report/testlog.xml" todir="report" />
+		<!-- coverage-report outfile="report/coverage-database">
+		      <report todir="report" styledir="/home/phing/etc" />
+		    </coverage-report -->
 	</target>
 
 	<!-- ===================================================== -->
@@ -31,6 +66,9 @@
 		<docblox title="Friendica API" destdir="./doc/api">
 			<fileset dir=".">
 				<include name="**/*.php" />
+				<include name="README"/>
+				<include name="INSTALL.txt"/>
+				<include name="LICENSE"/>
 			</fileset>
 		</docblox>
 	</target>
diff --git a/database.sql b/database.sql
index 35c257f02..010c63bb2 100755..100644
--- a/database.sql
+++ b/database.sql
@@ -34,10 +34,11 @@ CREATE TABLE IF NOT EXISTS `challenge` (
 
 CREATE TABLE IF NOT EXISTS `config` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `cat` char(255) NOT NULL,
-  `k` char(255) NOT NULL,
+  `cat` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL,
+  `k` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL,
   `v` text NOT NULL,
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`id`), 
+  UNIQUE KEY `access`(`cat`,`k`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
@@ -92,6 +93,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
   `blocked` tinyint(1) NOT NULL DEFAULT '1',
   `readonly` tinyint(1) NOT NULL DEFAULT '0',
   `writable` tinyint(1) NOT NULL DEFAULT '0',
+  `forum` tinyint(1) NOT NULL DEFAULT '0',
   `hidden` tinyint(1) NOT NULL DEFAULT '0',
   `pending` tinyint(1) NOT NULL DEFAULT '1',
   `rating` tinyint(1) NOT NULL DEFAULT '0',
@@ -116,6 +118,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
   KEY `dfrn-id` (`dfrn-id`),
   KEY `blocked` (`blocked`),
   KEY `readonly` (`readonly`),
+  KEY `forum` (`forum`),
   KEY `hidden` (`hidden`),
   KEY `pending` (`pending`),
   KEY `closeness` (`closeness`)  
@@ -287,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',
@@ -298,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`)
@@ -451,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',
@@ -470,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`)
@@ -534,9 +543,10 @@ INDEX ( `batch` )
 CREATE TABLE IF NOT EXISTS `pconfig` (
 `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
 `uid` INT NOT NULL DEFAULT '0',
-`cat` CHAR( 255 ) NOT NULL ,
-`k` CHAR( 255 ) NOT NULL ,
-`v` MEDIUMTEXT NOT NULL
+`cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
+`k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
+`v` MEDIUMTEXT NOT NULL, 
+UNIQUE KEY `access`(`cat`, `k`)
 ) ENGINE = MyISAM DEFAULT CHARSET=utf8;
 
 
@@ -636,6 +646,7 @@ CREATE TABLE IF NOT EXISTS `mailacct` (
 `mailbox` CHAR( 255 ) NOT NULL,
 `user` CHAR( 255 ) NOT NULL ,
 `pass` TEXT NOT NULL ,
+`reply_to` CHAR( 255 ) NOT NULL ,
 `action` INT NOT NULL ,
 `movetofolder` CHAR(255) NOT NULL ,
 `pubmail` TINYINT(1) NOT NULL DEFAULT '0',
@@ -858,3 +869,9 @@ INDEX ( `term` )
 ) ENGINE = MyISAM DEFAULT CHARSET=utf8;
 
 
+CREATE TABLE IF NOT EXISTS `userd` (
+`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`username` CHAR( 255 ) NOT NULL,
+INDEX ( `username` )
+) ENGINE = MyISAM DEFAULT CHARSET=utf8;
+
diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md
index b5e757dbc..164a6be46 100755..100644
--- a/doc/Account-Basics.md
+++ b/doc/Account-Basics.md
@@ -6,7 +6,9 @@ Account Basics
 
 **Registration**
 
-Not all Friendica sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site Registration page.
+Not all Friendica sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site registration page.  The strength of our network is that lots of different sites are all completely compatible with each other.  If the site you're visting doesn't allow registration, or you think you might prefer another one, you can find a <a href ="http://dir.friendica.com/siteinfo">list of public servers here</a>, and find one that meets your needs.  
+
+If you'd like to have your own server, you can do that too.  Visit <a href = "http://friendica.com/download">the Friendica website</a> to download the code with setup instructions.  It's a very simple install process that anybody experienced in hosting websites, or with basic Linux experience can handle easily.
 
 *OpenID*
 
@@ -14,11 +16,11 @@ The first field on the Registration page is for an OpenID address. If you do not
 
 *Your Full Name*
 
-Please provide your full name as you would like it to be displayed on this system.
+Please provide your full name **as you would like it to be displayed on this system**.  Most people use their real name for this, but you're under no obligation to do so yourself.
 
 *Email Address*
 
-Please provide a valid email address. Your email address is **never** published. We need this to send you account information and your login details. You may also occasionally receive notifications of incoming messages or items requiring your attention, but you have the ability to completely disable these from your Settings page once you have logged in.     
+Please provide a valid email address. Your email address is **never** published. We need this to send you account information and your login details. You may also occasionally receive notifications of incoming messages or items requiring your attention, but you have the ability to completely disable these from your Settings page once you have logged in.  This doesn't have to be your primary email address, but it does need to be a real email address.  You can't get your initial password, or reset a lost password later without it.  This is the only bit of personal information that has to be accurate.
 
 *Nickname*
 
@@ -28,12 +30,12 @@ A nickname is used to generate web addresses for many of your personal pages, an
 
 *Directory Publishing*
 
-The Registration form also allows you to choose whether or not to list your account in the online directory. This is like a "phone book" and you may choose to be unlisted. We recommend that you select 'Yes' so that other people (friends, family, etc.) will be able to find you. If you choose 'No', you will essentially be invisible and have few opportunities for interaction. Whichever you choose, this can be changed any time from your Settings page after you login.  
-
+The Registration form also allows you to choose whether or not to list your account in the online directory. This is like a "phone book" and you may choose to be unlisted. We recommend that you select 'Yes' so that other people (friends, family, etc.) will be able to find you. If you choose 'No', you will essentially be invisible and have few opportunities for interaction. Whichever you choose, this can be changed any time from your Settings page after you login. 
 
 *Register*
 
-Once you have provided the necessary details, click the 'Register' button. An email will be sent to you providing your account login details. Some sites may require administrator approval before the registration is processed, and you will be alerted if this is the case. Please watch your email (including spam folders) for your registration approval. 
+Once you have provided the necessary details, click the 'Register' button. An email will be sent to you providing your account login details. Please watch your email (including spam folders) for your registration details and initial password. 
+
 
 
 
@@ -58,6 +60,11 @@ After your first login, please visit the 'Settings' page from the top menu bar a
 A ['Tips for New Members'](newmember) link will show up on your home page for two weeks to provide some important Getting Started information.
 
 
+**Retrieving Personal Data**
+
+You can export a copy of your personal data in XML format from the "Export personal data" link at the top of your settings  page.
+
+
 **See Also**
 
 * [Profiles](help/Profiles)
@@ -66,4 +73,3 @@ A ['Tips for New Members'](newmember) link will show up on your home page for tw
 
 * [Remove Account](help/Remove-Account)
 
- 
\ No newline at end of file
diff --git a/doc/Bugs-and-Issues.md b/doc/Bugs-and-Issues.md
index c119b9968..46abea9a3 100755..100644
--- a/doc/Bugs-and-Issues.md
+++ b/doc/Bugs-and-Issues.md
@@ -4,18 +4,19 @@ Bugs and Issues
 * [Home](help)
 
 
-Please report any bugs/issues you encounter using our bug tracker at [[http://bugs.friendica.com]]
+If your server has a support page, you should report any bugs/issues you encounter there first.  Reporting to your support page before reporting to the developers makes their job easier, as they don't have to deal with bug reports that might not have anything to do with them, and that helps us get new features faster.
 
-Try to provide as much information as you can about the bug (including the full text of any error messages or notices), and if possible your Friendica version.
+If you're a technical user, or your site doesn't have a support page, you'll need to use the <a href = "http://bugs.friendica.com/">Bug Tracker</a>.  Please perform a search to see if there's already an open bug that matches yours before submitting anything.
 
-Your Friendica version may be found in newer releases by visiting http://YOURFRIENDICASITE/friendica
+Try to provide as much information as you can about the bug, including the **full** text of any error messages or notices, and any steps required to replicate the problem in as much detail as possible.  It's generally better to provide too much information than not enough.
 
-For older versions, view the HTML source of your profile page. The Friendica version is in the HTML header, 5-10 lines from the top of the page.
+<a href = "http://www.chiark.greenend.org.uk/~sgtatham/bugs.html">See this article</a> to learn more about submitting **good** bug reports.
 
-For really old versions which don't have a version number in the HTML header - please upgrade. Your bug was probably fixed a long time ago. 
 
 **Bug Sponsorship**
 
+If you find a bug, and it is caused by a problem in main branch (ie, is not specific to our site), you may sponsor it.
+
 The bug/issue database allows you to sponsor issues. This provides an incentive for developers to work on your issue. This isn't necessary - we don't like bugs and will try to fix them. This has more importance for future development projects and feature requests.
 
 Bug sponsorship works on the honour system. If you agree to pay $10 to fix a bug, when the fix has been checked in and verified you should send a paypal payment to the developer assigned to the bug. Don't ever think you can get away with not paying a developer for work performed. Some of these guys could hack into your credit card account if you make them mad.
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 1a9c8d898..3f1a24c8d 100755..100644
--- a/doc/Making-Friends.md
+++ b/doc/Making-Friends.md
@@ -5,7 +5,13 @@ Making Friends
 
 Friendship in Friendica can take on a great many different meanings. But let's keep it simple, you want to be friends with somebody. How do you do it?
 
-The first thing you can do is look at the Directory for somebody you would like to connect with. Visit their profile. Just beneath their profile picture will be the word 'Connect' (we're assuming this is an English language profile).
+The easiest thing to do is to join the <a href = "http://kakste.com/profile/newhere">New Here</a> group.  This group is especially for people new to the Friendica network.  Simply connect to the group, post to the wall, and make new friends.  You don't even have to like us - comment on a few of our posts, and other people will start to add you too.
+
+The next thing you can do is look at the Directory.  The directory is split up into two parts.  If you click the directory button, you will be presented with a list of all members (who chose to be listed) on your server.  You'll also see a link to the Global Directory.  If you click through to the global directory, you will be presented with a list of everybody who chose to be listed across all instances of Friendica.  You will also see a "Show Community Forums" link, which will direct you to Groups, Forums and Fanpages.  You connect to people, groups and forums in the same way, except groups and forums will automatically accept your introduction request, whereas a human will approve you manually.
+
+To connect with other Friendica user
+
+Visit their profile. Just beneath their profile picture will be the word 'Connect' (we're assuming this is an English language profile).
 
 Click that. It will take you to a "Connect" form.
 
@@ -23,6 +29,7 @@ When you've submitted the connection page, it will take you back to your own sit
 
 If you already know somebody's Identity Address, you can enter it in the "connect" box on your "Contacts" page. This will take you through a similar process.
 
+
 **Alternate Networks**
 
 You can also use your Identity Address or other people's Identity Addresses to become friends across networks. The list of possible networks is growing all the time. If you know (for instance) "bob" on identi.ca (a Status.Net site) you could put bob@identi.ca into your Contact page and become friends across networks.  (Or you can put in the URL to Bob's identi.ca page if you wish).  You can also be "partial" friends with somebody on Google Buzz by putting in their gmail address. Google Buzz does not yet support all the protocols we need for direct messaging, but you should be able to follow status updates from within Friendica. You can do the same for Twitter accounts and Diaspora accounts. In fact you can "follow" most anybody or any website that produces a syndication feed (RSS/Atom,etc.). If we can find an information stream and a name to attach to the contact, we'll try to connect with them. 
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 f526b78a8..ae5de2cb6 100755..100644
--- a/doc/Remove-Account.md
+++ b/doc/Remove-Account.md
@@ -5,9 +5,20 @@ Remove Account
 
 We don't like to see people leave Friendica, but if you need to remove your account, you should visit the URL
 
-http://friendica-site/removeme
+http://sitename/removeme
 
-with your web browser. You will need to be logged in at the time.  (Replace "friendica-site" with the hostname of your Friendica server)
+with your web browser. You will need to be logged in at the time.
 
 You will be asked for your password to confirm the request. If this matches your stored password, your account will immediately be removed. Unlike some social networks we do **not** hold onto it for a grace period in case you change your mind. Your user details, your conversations, your photos, your friends - everything; will be removed immediately and you will be logged out. 
 
+When we expire posts we send notifications out to Friendica to remove the posts. Diaspora doesn't have a bulk delete so this step is skipped on that network - and hopefully it will be obvious that deletion doesn't work on any other networks. If you manually delete a post or a range of posts we send individual delete notifications to Friendica and Diaspora for each deleted post.
+
+Diaspora often loses these.
+
+If you delete a post but somebody else has starred it, it is still removed. Your wishes take priority.
+
+When you remove your account we physically remove all your posts and your profile and user data, etc. immediately.
+
+In order to send out a bulk remove we would need to keep your account around to do this, as we would need to prove to your friends who it is that is submitting the request. We can't do this if you don't have an account.
+
+Your friends may still see your posts if your account is gone, but there is no public place within Friendica where they can be viewed. If you had friends on Diaspora, your public posts may stick around and be visible to others from that network.
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/docblox.dist.xml b/docblox.dist.xml
new file mode 100644
index 000000000..a2ea8e2cb
--- /dev/null
+++ b/docblox.dist.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<docblox>
+  <parser>
+    <target>data/output</target>
+  </parser>
+  <transformer>
+    <target>data/output</target>
+  </transformer>
+  <files>
+    <directory>.</directory>
+  </files>
+</docblox>
+
diff --git a/htconfig.php b/htconfig.php
index 423d5d369..63a40c809 100755..100644
--- a/htconfig.php
+++ b/htconfig.php
@@ -69,7 +69,7 @@ $a->config['system']['rino_encrypt'] = true;
 
 // allowed themes (change this from admin panel after installation)
 
-$a->config['system']['allowed_themes'] = 'dispy,quattro,testbubble,vier,darkbubble,darkzero,duepuntozero,greenzero,purplezero,quattro-green,slackr,diabook';
+$a->config['system']['allowed_themes'] = 'dispy,quattro,testbubble,vier,darkbubble,darkzero,duepuntozero,greenzero,purplezero,quattro-green,slackr,diabook,diabook-blue';
 
 // default system theme
 
@@ -79,3 +79,12 @@ $a->config['system']['theme'] = 'duepuntozero';
 // By default allow pseudonyms
 
 $a->config['system']['no_regfullname'] = true;
+
+// If set to true the priority settings of ostatus contacts are used
+$a->config['system']['ostatus_use_priority'] = false;
+
+// If enabled, all items are cached in the given directory
+$a->config['system']['itemcache'] = "";
+
+// If enabled, the lockpath is used for a lockfile to check if the poller is running
+$a->config['system']['lockpath'] = "";
diff --git a/images/article.gif b/images/article.gif
index 91aeef000..91aeef000 100755..100644
--- a/images/article.gif
+++ b/images/article.gif
diff --git a/images/audio.gif b/images/audio.gif
index 4be977116..4be977116 100755..100644
--- a/images/audio.gif
+++ b/images/audio.gif
diff --git a/images/b_block.gif b/images/b_block.gif
index 3bc7c056b..3bc7c056b 100755..100644
--- a/images/b_block.gif
+++ b/images/b_block.gif
diff --git a/images/b_drop.gif b/images/b_drop.gif
index b08c68b62..b08c68b62 100755..100644
--- a/images/b_drop.gif
+++ b/images/b_drop.gif
diff --git a/images/b_drop.png b/images/b_drop.png
index 6fc4d3b20..6fc4d3b20 100755..100644
--- a/images/b_drop.png
+++ b/images/b_drop.png
diff --git a/images/b_drophide.gif b/images/b_drophide.gif
index 1207a935b..1207a935b 100755..100644
--- a/images/b_drophide.gif
+++ b/images/b_drophide.gif
diff --git a/images/b_dropshow.gif b/images/b_dropshow.gif
index b08c68b62..b08c68b62 100755..100644
--- a/images/b_dropshow.gif
+++ b/images/b_dropshow.gif
diff --git a/images/b_edit.gif b/images/b_edit.gif
index 79cb3c144..79cb3c144 100755..100644
--- a/images/b_edit.gif
+++ b/images/b_edit.gif
diff --git a/images/b_edit.png b/images/b_edit.png
index 05711a094..05711a094 100755..100644
--- a/images/b_edit.png
+++ b/images/b_edit.png
diff --git a/images/beer_mug.gif b/images/beer_mug.gif
index a047d1987..9a3e05192 100644
--- a/images/beer_mug.gif
+++ b/images/beer_mug.gif
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/bug-x.gif b/images/bug-x.gif
new file mode 100644
index 000000000..10936caa7
--- /dev/null
+++ b/images/bug-x.gif
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/person-175.jpg b/images/person-175.jpg
new file mode 100644
index 000000000..fc0ec3d77
--- /dev/null
+++ b/images/person-175.jpg
diff --git a/images/person-48.jpg b/images/person-48.jpg
new file mode 100644
index 000000000..dc5eb6e69
--- /dev/null
+++ b/images/person-48.jpg
diff --git a/images/person-80.jpg b/images/person-80.jpg
new file mode 100644
index 000000000..75b8faf92
--- /dev/null
+++ b/images/person-80.jpg
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 a125d0ff2..a15d97427 100755..100644
--- a/images/smiley-Oo.gif
+++ b/images/smiley-Oo.gif
diff --git a/images/smiley-beard.png b/images/smiley-beard.png
new file mode 100644
index 000000000..5d4b28463
--- /dev/null
+++ b/images/smiley-beard.png
diff --git a/images/smiley-brokenheart.gif b/images/smiley-brokenheart.gif
index 79ca0c31b..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 ba90cc36f..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 74d897a4f..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 963a96b8a..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 16f68cc1e..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 716f55e16..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 21c0c6530..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 334d49e0e..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 4efd549ed..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 1606c119e..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 ca2451e10..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 b33d3cca1..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 e6a9e60d5..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 cb99cdd91..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 2075dc160..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 bef7e2573..28029794f 100755..100644
--- a/images/smiley-undecided.gif
+++ b/images/smiley-undecided.gif
diff --git a/images/smiley-whitebeard.png b/images/smiley-whitebeard.png
new file mode 100644
index 000000000..2a1fccbb7
--- /dev/null
+++ b/images/smiley-whitebeard.png
diff --git a/images/smiley-wink.gif b/images/smiley-wink.gif
index 9faf1aff8..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 648e6e879..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
new file mode 100644
index 000000000..0b00cb189
--- /dev/null
+++ b/images/star.png
diff --git a/images/star_dummy.png b/images/star_dummy.png
new file mode 100644
index 000000000..ce11f30d4
--- /dev/null
+++ b/images/star_dummy.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 baccea305..d9949b1ef 100755..100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -15,6 +15,12 @@ function user_remove($uid) {
 
 	call_hooks('remove_user',$r[0]);
 
+	// save username (actually the nickname as it is guaranteed 
+	// unique), so it cannot be re-registered in the future.
+
+	q("insert into userd ( username ) values ( '%s' )",
+		$r[0]['nickname']
+	);
 
 	q("DELETE FROM `contact` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `group` WHERE `uid` = %d", intval($uid));
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 1450374ff..4d02b5c65 100755..100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -268,9 +268,9 @@ function import_profile_photo($photo,$uid,$cid) {
 		$photo_failure = true;
 
 	if($photo_failure) {
-		$photo = $a->get_baseurl() . '/images/default-profile.jpg';
-		$thumb = $a->get_baseurl() . '/images/default-profile-sm.jpg';
-		$micro = $a->get_baseurl() . '/images/default-profile-mm.jpg';
+		$photo = $a->get_baseurl() . '/images/person-175.jpg';
+		$thumb = $a->get_baseurl() . '/images/person-80.jpg';
+		$micro = $a->get_baseurl() . '/images/person-48.jpg';
 	}
 
 	return(array($photo,$thumb,$micro));
diff --git a/include/Scrape.php b/include/Scrape.php
index 8344aa737..9c237916b 100755..100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -684,7 +684,7 @@ function probe_url($url, $mode = PROBE_NORMAL) {
 
 	if(! x($vcard,'photo')) {
 		$a = get_app();
-		$vcard['photo'] = $a->get_baseurl() . '/images/default-profile.jpg' ; 
+		$vcard['photo'] = $a->get_baseurl() . '/images/person-175.jpg' ; 
 	}
 
 	if(! $profile)
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 67d8cebde..a5f5aff53 100755..100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -113,11 +113,13 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
 		$str_nets = implode(',',$x['networks']);
 		$sql_extra .= " AND `network` IN ( $str_nets ) ";
 	}
+	
+	$tabindex = (x($options, 'tabindex') ? "tabindex=\"" . $options["tabindex"] . "\"" : "");
 
 	if($x['single'])
-		$o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"" . $x['size'] . "\" >\r\n";
+		$o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"" . $x['size'] . "\" $tabindex >\r\n";
 	else 
-		$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"" . $x['size'] . "$\" >\r\n";
+		$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"" . $x['size'] . "$\" $tabindex >\r\n";
 
 	$r = q("SELECT `id`, `name`, `url`, `network` FROM `contact` 
 		WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != ''
@@ -156,7 +158,7 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
 
 
 
-function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false, $privatenet = false) {
+function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false, $privatenet = false, $tabindex = null) {
 
 	$a = get_app();
 
@@ -178,12 +180,12 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 		$sql_extra .= " AND `network` IN ( 'dfrn', 'mail', 'face', 'dspr' ) ";
 	}
 
-
+	$tabindex = ($tabindex > 0 ? "tabindex=\"$tabindex\"" : "");
 
 	if($privmail)
-		$o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" >\r\n";
+		$o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" $tabindex >\r\n";
 	else 
-		$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" >\r\n";
+		$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" $tabindex >\r\n";
 
 	$r = q("SELECT `id`, `name`, `url`, `network` FROM `contact` 
 		WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != ''
diff --git a/include/api.php b/include/api.php
index 013f4b97a..ab83d63be 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');
 		}
@@ -120,6 +121,7 @@
 				if (strpos($a->query_string, ".json")>0) $type="json";
 				if (strpos($a->query_string, ".rss")>0) $type="rss";
 				if (strpos($a->query_string, ".atom")>0) $type="atom";
+				if (strpos($a->query_string, ".as")>0) $type="as";
 
 				$r = call_user_func($info['func'], $a, $type);
 				if ($r===false) return;
@@ -143,6 +145,12 @@
 						header ("Content-Type: application/atom+xml");
 						return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
 						break;
+					case "as":
+						//header ("Content-Type: application/json");
+						//foreach($r as $rr)
+						//    return json_encode($rr);
+						return json_encode($r);
+						break;
 
 				}
 				//echo "<pre>"; var_dump($r); die();
@@ -306,10 +314,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 +355,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 +372,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 +416,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 +613,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 +672,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 +708,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`,
@@ -715,6 +744,13 @@
 			case "atom":
 			case "rss":
 				$data = api_rss_extra($a, $data, $user_info);
+				break;
+			case "as":
+				$as = api_format_as($a, $ret, $user_info);
+				$as['title'] = $a->config['sitename']." Home Timeline";
+				$as['link']['url'] = $a->get_baseurl()."/".$user_info["screen_name"]."/all";
+				return($as);
+				break;
 		}
 				
 		return  api_apply_template("timeline", $type, $data);
@@ -722,6 +758,271 @@
 	api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
 	api_register_func('api/statuses/friends_timeline','api_statuses_home_timeline', true);
 
+	function api_statuses_public_timeline(&$a, $type){
+		if (local_user()===false) return false;
+				
+		$user_info = api_get_user($a);
+		// get last newtork messages
+
+
+		// params
+		$count = (x($_REQUEST,'count')?$_REQUEST['count']:20);
+		$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
+		if ($page<0) $page=0;
+		$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+		$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
+		//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+		
+		$start = $page*$count;
+
+		//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
+
+		if ($max_id > 0)
+			$sql_extra = 'AND `item`.`id` <= '.intval($max_id);
+
+		/*$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+			FROM `item`, `contact`
+			WHERE `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
+			AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
+			AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
+			AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0
+			AND `contact`.`id` = `item`.`contact-id`
+			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			$sql_extra
+			AND `item`.`id`>%d
+			ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
+			intval($since_id),
+			intval($start),	intval($count)
+		);*/
+	        $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+	                `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+        	        `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
+                	`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
+                	`user`.`nickname`, `user`.`hidewall`
+                	FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+                	LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
+                	WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+                	AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
+                	AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
+                	AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
+                	AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			$sql_extra
+			AND `item`.`id`>%d
+                	ORDER BY `received` DESC LIMIT %d, %d ",
+			intval($since_id),
+                	intval($start),
+                	intval($count));
+
+		$ret = api_format_items($r,$user_info);
+
+		
+		$data = array('$statuses' => $ret);
+		switch($type){
+			case "atom":
+			case "rss":
+				$data = api_rss_extra($a, $data, $user_info);
+				break;
+			case "as":
+				$as = api_format_as($a, $ret, $user_info);
+				$as['title'] = $a->config['sitename']." Public Timeline";
+				$as['link']['url'] = $a->get_baseurl()."/";
+				return($as);
+				break;
+		}
+				
+		return  api_apply_template("timeline", $type, $data);
+	}
+	api_register_func('api/statuses/public_timeline','api_statuses_public_timeline', true);
+
+	/**
+	 * 
+	 */
+	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);
+
+
+	/**
+	 * 
+	 */
+	function api_statuses_repeat(&$a, $type){
+		if (local_user()===false) return false;
+
+		$user_info = api_get_user($a);
+
+		// params
+		$id = intval($a->argv[3]);
+
+		logger('API: api_statuses_repeat: '.$id);		
+
+		//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
+
+		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`nick` as `reply_author`,
+			`contact`.`name`, `contact`.`photo`, `contact`.`url` as `reply_url`, `contact`.`rel`,
+			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+			FROM `item`, `contact`
+			WHERE `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
+			AND `contact`.`id` = `item`.`contact-id`
+			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			$sql_extra
+			AND `item`.`id`=%d",
+			intval($id)
+		);
+
+		$_REQUEST['body'] = html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body'];
+		$_REQUEST['profile_uid'] = local_user();
+		$_REQUEST['type'] = 'wall';
+		$_REQUEST['api_source'] = true;
+
+		require_once('mod/item.php');
+		item_post($a);
+
+		if ($type == 'xml')
+			$ok = "true";
+		else
+			$ok = "ok";
+
+		return api_apply_template('test', $type, array('$ok' => $ok));
+	}
+	api_register_func('api/statuses/retweet','api_statuses_repeat', true);
+
+	/**
+	 * 
+	 */
+	function api_statuses_destroy(&$a, $type){
+		if (local_user()===false) return false;
+
+		$user_info = api_get_user($a);
+
+		// params
+		$id = intval($a->argv[3]);
+
+		logger('API: api_statuses_destroy: '.$id);	
+
+		require_once('include/items.php');
+		drop_item($id, false);
+
+		if ($type == 'xml')
+			$ok = "true";
+		else
+			$ok = "ok";
+
+		return api_apply_template('test', $type, array('$ok' => $ok));
+	}
+	api_register_func('api/statuses/destroy','api_statuses_destroy', true);
+
+	/**
+	 * 
+	 * http://developer.twitter.com/doc/get/statuses/mentions
+	 * 
+	 */
+	function api_statuses_mentions(&$a, $type){
+		if (local_user()===false) return false;
+				
+		$user_info = api_get_user($a);
+		// get last newtork messages
+
+
+		// params
+		$count = (x($_REQUEST,'count')?$_REQUEST['count']:20);
+		$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
+		if ($page<0) $page=0;
+		$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+		$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
+		//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+		
+		$start = $page*$count;
+
+		//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
+
+		$myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
+		$myurl = substr($myurl,strpos($myurl,'://')+3);
+		$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
+		$diasp_url = str_replace('/profile/','/u/',$myurl);
+		$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` regexp '%s' or `tag` regexp '%s' or tag regexp '%s' )) ",
+			dbesc($myurl . '$'),
+			dbesc($myurl . '\\]'),
+			dbesc($diasp_url . '\\]')
+		);
+
+		if ($max_id > 0)
+			$sql_extra .= ' AND `item`.`id` <= '.intval($max_id);
+
+		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+			FROM `item`, `contact`
+			WHERE `item`.`uid` = %d
+			AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
+			AND `contact`.`id` = `item`.`contact-id`
+			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			$sql_extra
+			AND `item`.`id`>%d
+			ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
+			intval($user_info['uid']),
+			intval($since_id),
+			intval($start),	intval($count)
+		);
+
+		$ret = api_format_items($r,$user_info);
+
+		
+		$data = array('$statuses' => $ret);
+		switch($type){
+			case "atom":
+			case "rss":
+				$data = api_rss_extra($a, $data, $user_info);
+				break;
+			case "as":
+				$as = api_format_as($a, $ret, $user_info);
+				$as["title"] = $a->config['sitename']." Mentions";
+				$as['link']['url'] = $a->get_baseurl()."/";
+				return($as);
+				break;
+		}
+				
+		return  api_apply_template("timeline", $type, $data);
+	}
+	api_register_func('api/statuses/mentions','api_statuses_mentions', true);
+	api_register_func('api/statuses/replies','api_statuses_mentions', true);
 
 
 	function api_statuses_user_timeline(&$a, $type){
@@ -740,7 +1041,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;
 
@@ -833,6 +1135,70 @@
 
 	api_register_func('api/favorites','api_favorites', true);
 
+	function api_format_as($a, $ret, $user_info) {
+
+		$as = array();
+		$as['title'] = $a->config['sitename']." Public Timeline";
+		$items = array();
+		foreach ($ret as $item) {
+			$singleitem["actor"]["displayName"] = $item["user"]["name"];
+			$singleitem["actor"]["id"] = $item["user"]["contact_url"];
+			$avatar[0]["url"] = $item["user"]["profile_image_url"];
+			$avatar[0]["rel"] = "avatar";
+			$avatar[0]["type"] = "";
+			$avatar[0]["width"] = 96;
+			$avatar[0]["height"] = 96;
+			$avatar[1]["url"] = $item["user"]["profile_image_url"];
+			$avatar[1]["rel"] = "avatar";
+			$avatar[1]["type"] = "";
+			$avatar[1]["width"] = 48;
+			$avatar[1]["height"] = 48;
+			$avatar[2]["url"] = $item["user"]["profile_image_url"];
+			$avatar[2]["rel"] = "avatar";
+			$avatar[2]["type"] = "";
+			$avatar[2]["width"] = 24;
+			$avatar[2]["height"] = 24;
+			$singleitem["actor"]["avatarLinks"] = $avatar;
+
+			$singleitem["actor"]["image"]["url"] = $item["user"]["profile_image_url"];
+			$singleitem["actor"]["image"]["rel"] = "avatar";
+			$singleitem["actor"]["image"]["type"] = "";
+			$singleitem["actor"]["image"]["width"] = 96;
+			$singleitem["actor"]["image"]["height"] = 96;
+			$singleitem["actor"]["type"] = "person";
+			$singleitem["actor"]["url"] = $item["person"]["contact_url"];
+			$singleitem["actor"]["statusnet:profile_info"]["local_id"] = $item["user"]["id"];
+			$singleitem["actor"]["statusnet:profile_info"]["following"] = $item["user"]["following"] ? "true" : "false";
+			$singleitem["actor"]["statusnet:profile_info"]["blocking"] = "false";
+			$singleitem["actor"]["contact"]["preferredUsername"] = $item["user"]["screen_name"];
+			$singleitem["actor"]["contact"]["displayName"] = $item["user"]["name"];
+			$singleitem["actor"]["contact"]["addresses"] = "";
+
+			$singleitem["body"] = $item["text"];
+			$singleitem["object"]["displayName"] = $item["text"];
+			$singleitem["object"]["id"] = $item["url"];
+			$singleitem["object"]["type"] = "note";
+			$singleitem["object"]["url"] = $item["url"];
+			//$singleitem["context"] =;
+			$singleitem["postedTime"] = date("c", strtotime($item["published"]));
+			$singleitem["provider"]["objectType"] = "service";
+			$singleitem["provider"]["displayName"] = "Test";
+			$singleitem["provider"]["url"] = "http://test.tld";
+			$singleitem["title"] = $item["text"];
+			$singleitem["verb"] = "post";
+			$singleitem["statusnet:notice_info"]["local_id"] = $item["id"];
+				$singleitem["statusnet:notice_info"]["source"] = $item["source"];
+				$singleitem["statusnet:notice_info"]["favorite"] = "false";
+				$singleitem["statusnet:notice_info"]["repeated"] = "false";
+				//$singleitem["original"] = $item;
+				$items[] = $singleitem;
+		}
+		$as['items'] = $items;
+		$as['link']['url'] = $a->get_baseurl()."/".$user_info["screen_name"]."/all";
+		$as['link']['rel'] = "alternate";
+		$as['link']['type'] = "text/html";
+		return($as);
+	}
 	
 	function api_format_items($r,$user_info) {
 
@@ -846,33 +1212,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 +1279,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 +1486,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 +1555,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 +1608,31 @@
 	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:
+favorites
+favorites/create
+favorites/destroy
+statuses/retweets_of_me
+friendships/create
+friendships/destroy
+friendships/exists
+friendships/show
+account/update_location
+account/update_profile_background_image
+account/update_profile_image
+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 fc52684e6..1341f3bb8 100755..100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -24,7 +24,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 	if(((x($_POST,'auth-params')) && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) {
 	
 		// process logout request
-
+		call_hooks("logging_out");
 		nuke_session();
 		info( t('Logged out.') . EOL);
 		goaway(z_root());
@@ -77,7 +77,7 @@ else {
 
 			$noid = get_config('system','no_openid');
 
-			$openid_url = trim(  (strlen($_POST['openid_url'])?$_POST['openid_url']:$_POST['username']) );
+			$openid_url = trim((strlen($_POST['openid_url'])?$_POST['openid_url']:$_POST['username']) );
 
 			// validate_url alters the calling parameter
 
@@ -94,37 +94,21 @@ 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() . '/openid'; 
-
-			$r = q("SELECT `uid` FROM `user` WHERE `openid` = '%s' LIMIT 1",
-				dbesc($openid_url)
-			);
-			if(count($r)) { 
-				// existing account
-				goaway($openid->authUrl());
-				// NOTREACHED	
-			}
-			else {
-				if($a->config['register_policy'] == REGISTER_CLOSED) {
-					$a = get_app();
-					notice( t('Login failed.') . EOL);
-					goaway(z_root());
-					// NOTREACHED
-				}
-				// new account
-				$_SESSION['register'] = 1;
-				$openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
-				$openid->optional = array('namePerson/first','media/image/aspect11','media/image/default');
-				goaway($openid->authUrl());
-				// NOTREACHED	
-			}
+			$openid->returnUrl = $a->get_baseurl(true) . '/openid'; 
+                        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
 		}
 	}
+
 	if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') {
 
 		$record = null;
@@ -165,7 +149,7 @@ else {
 		}
 
 		if((! $record) || (! count($record))) {
-			logger('authenticate: failed login attempt: ' . notags(trim($_POST['username']))); 
+			logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']); 
 			notice( t('Login failed.') . EOL );
 			goaway(z_root());
   		}
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 cff26f5c8..3697f1fc5 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,17 +226,21 @@ 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]
-	$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '<img src="$3" style="height: $2px; width: $1px;" >', $Text);
+	//$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '<img src="$3" style="height: $2px; width: $1px;" >', $Text);
+	$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '<img src="$3" style="width: $1px;" >', $Text);
 
 	// Images
 	// [img]pathtoimage[/img]
 	$Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text);
 
 
+	$Text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", '<video src="$1" controls="controls" width="425" height="350"><a href="$1">$1</a></video>', $Text);
+
+	$Text = preg_replace("/\[audio\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mp3))\[\/audio\]/ism", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text);
 
 	// Try to Oembed
 	$Text = preg_replace_callback("/\[video\](.*?)\[\/video\]/ism", 'tryoembed', $Text);
@@ -224,9 +249,6 @@ function bbcode($Text,$preserve_nl = false) {
 
 	// html5 video and audio
 
-	$Text = preg_replace("/\[video\](.*?)\[\/video\]/ism", '<video src="$1" controls="controls" width="425" height="350"><a href="$1">$1</a></video>', $Text);
-
-	$Text = preg_replace("/\[audio\](.*?)\[\/audio\]/ism", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text);
 
 	$Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<iframe src="$1" width="425" height="350"><a href="$1">$1</a></iframe>', $Text);
          
diff --git a/include/cache.php b/include/cache.php
index 3c8a3f713..3c8a3f713 100755..100644
--- a/include/cache.php
+++ b/include/cache.php
diff --git a/include/config.php b/include/config.php
index 2cddda0b8..4cff38090 100755
--- a/include/config.php
+++ b/include/config.php
@@ -80,6 +80,7 @@ function set_config($family,$key,$value) {
 	
 	// manage array value
 	$dbvalue = (is_array($value)?serialize($value):$value);
+	$dbvalue = (is_bool($value) ? intval($value) : $value);
 
 	if(get_config($family,$key,true) === false) {
 		$a->config[$family][$key] = $value;
diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 4b3ca987a..4b3ca987a 100755..100644
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index caa0572d2..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())
 	);
 
@@ -75,4 +73,61 @@ function networks_widget($baseurl,$selected = '') {
 	));
 }
 
+function fileas_widget($baseurl,$selected = '') {
+	$a = get_app();
+	if(! local_user())
+		return '';
+
+	$saved = get_pconfig(local_user(),'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('fileas_widget.tpl'),array(
+		'$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'),
+		'$terms' => $terms,
+		'$base' => $baseurl,
+
+	));
+}
 
diff --git a/include/conversation.php b/include/conversation.php
index f4740688c..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']);
+		}
+	}
 
 }
 
@@ -179,11 +186,15 @@ function localize_item(&$item){
  * that are based on unique features of the calling module.
  *
  */
- if(!function_exists('conversation')){
+
+if(!function_exists('conversation')) {
 function conversation(&$a, $items, $mode, $update, $preview = false) {
 
+
 	require_once('bbcode.php');
 
+	$ssl_state = ((local_user()) ? true : false);
+
 	$profile_owner = 0;
 	$page_writeable      = false;
 
@@ -217,7 +228,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 	if($update)
 		$return_url = $_SESSION['return_url'];
 	else
-		$return_url = $_SESSION['return_url'] = $a->cmd;
+		$return_url = $_SESSION['return_url'] = $a->query_string;
 
 	load_contact_links(local_user());
 
@@ -239,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') {
 
@@ -272,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])))
@@ -343,7 +357,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					'like' => '',
 					'dislike' => '',
 					'comment' => '',
-					'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl() . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
+					'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state) . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
 					'previewing' => $previewing,
 					'wait' => t('Please wait'),
 				);
@@ -373,7 +387,8 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 						$comments[$item['parent']] = 1;
 					else
 						$comments[$item['parent']] += 1;
-				}
+				} elseif(! x($comments,$item['parent'])) 
+					$comments[$item['parent']] = 0; // avoid notices later on
 			}
 
 			// map all the like/dislike activities for each parent item 
@@ -418,26 +433,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					$toplevelprivate = (($toplevelpost && $item['private']) ? true : false);
 					$item_writeable = (($item['writable'] || $item['self']) ? true : false);
 
-					// DISABLED
-					/*
-					if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
-						$blowhard_count ++;
-						if($blowhard_count == 3) {
-							$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent'] 
-								. '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\'); $(\'#icollapse-wrapper-' . $item['parent'] . '\').hide();" >' 
-								. t('See more posts like this') . '</div>' . '<div class="icollapse" id="icollapse-' 
-								. $item['parent'] . '" style="display: none;" >';
-						}
-					}
-					else {
-						$blowhard = $item['cid'];					
-						if($blowhard_count >= 3)
-							$o .= '</div>';
-						$blowhard_count = 0;
-					}
-					// END DISABLED
-					*/
-
 					$comments_seen = 0;
 					$comments_collapsed = false;
 					$comment_lastcollapsed  = false;
@@ -445,13 +440,16 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					
 					$threadsid++;
 					$threads[$threadsid]['id'] = $item['item_id'];
+					$threads[$threadsid]['private'] = $item['private'];
 					$threads[$threadsid]['items'] = array();
 
 				}
 				else {
-					// prevent private email from leaking into public conversation
-					if((! $toplevelpost) && (! $toplevelprivate) && ($item['private']) && ($profile_owner != local_user()))
+
+					// prevent private email reply to public conversation from leaking.
+					if($item['private'] && ! $threads[$threadsid]['private'])
 						continue;
+
 					$comments_seen ++;
 					$comment_lastcollapsed  = false;
 					$comment_firstcollapsed = false;
@@ -475,7 +473,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					$comment_lastcollapsed = true;
 				}
 
-				$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+				$redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $item['cid'] ;
 
 				$lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
 					|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
@@ -496,13 +494,13 @@ 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;
 						$commentww = 'ww';	
 					}
-					if((! $item['wall']) && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
+					if((! $item['wall']) && (strlen($item['owner-link'])) && (! link_compare($item['owner-link'],$item['author-link']))) {
 
 						// Could be anybody. 
 
@@ -513,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);
 					}
 				}
 
@@ -532,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(
@@ -557,7 +560,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				}
 
 				$edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
-						? array($a->get_baseurl()."/editpost/".$item['id'], t("Edit"))
+						? array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"))
 						: False);
 
 
@@ -574,24 +577,28 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				);
 
 				$star = false;
+				$filer = false;
+
 				$isstarred = "unstarred";
-				if ($profile_owner == local_user() && $toplevelpost) {
-					$isstarred = (($item['starred']) ? "starred" : "unstarred");
-
-					$star = array(
-						'do' => t("add star"),
-						'undo' => t("remove star"),
-						'toggle' => t("toggle star status"),
-						'classdo' => (($item['starred']) ? "hidden" : ""),
-						'classundo' => (($item['starred']) ? "" : "hidden"),
-						'starred' =>  t('starred'),
-						'tagger' => t("add tag"),
-						'classtagger' => "",
-					);
+				if ($profile_owner == local_user()) {
+					if($toplevelpost) {
+						$isstarred = (($item['starred']) ? "starred" : "unstarred");
+
+						$star = array(
+							'do' => t("add star"),
+							'undo' => t("remove star"),
+							'toggle' => t("toggle star status"),
+							'classdo' => (($item['starred']) ? "hidden" : ""),
+							'classundo' => (($item['starred']) ? "" : "hidden"),
+							'starred' =>  t('starred'),
+							'tagger' => t("add tag"),
+							'classtagger' => "",
+						);
+					}
+					$filer = t("save to folder");
 				}
 
 
-
 				$photo = $item['photo'];
 				$thumb = $item['thumb'];
 
@@ -604,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)))
@@ -657,7 +664,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					// template to use to render item (wall, walltowall, search)
 					'template' => $template,
 					
-					'type' => implode("",array_slice(split("/",$item['verb']),-1)),
+					'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
 					'tags' => $tags,
 					'body' => template_escape($body),
 					'text' => strip_tags(template_escape($body)),
@@ -685,6 +692,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					'edpost' => $edpost,
 					'isstarred' => $isstarred,
 					'star' => $star,
+					'filer' => $filer,
 					'drop' => $drop,
 					'vote' => $likebuttons,
 					'like' => $like,
@@ -706,7 +714,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 
 	$page_template = get_markup_template("conversation.tpl");
 	$o .= replace_macros($page_template, array(
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => $a->get_baseurl($ssl_state),
 		'$mode' => $mode,
 		'$user' => $a->user,
 		'$threads' => $threads,
@@ -716,7 +724,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 	return $o;
 }}
 
-function best_link_url($item,&$sparkle) {
+function best_link_url($item,&$sparkle,$ssl_state = false) {
 
 	$a = get_app();
 
@@ -728,7 +736,7 @@ function best_link_url($item,&$sparkle) {
 	if((local_user()) && (local_user() == $item['uid'])) {
 		if(isset($a->contacts) && x($a->contacts,$clean_url)) {
 			if($a->contacts[$clean_url]['network'] === NETWORK_DFRN) {
-				$best_url = $a->get_baseurl() . '/redir/' . $a->contacts[$clean_url]['id'];
+				$best_url = $a->get_baseurl($ssl_state) . '/redir/' . $a->contacts[$clean_url]['id'];
 				$sparkle = true;
 			}
 			else
@@ -749,10 +757,14 @@ function best_link_url($item,&$sparkle) {
 if(! function_exists('item_photo_menu')){
 function item_photo_menu($item){
 	$a = get_app();
-	
-	if (local_user() && (! count($a->contacts)))
-		load_contact_links(local_user());
 
+	$ssl_state = false;
+
+	if(local_user()) {
+		$ssl_state = true;
+		 if(! count($a->contacts))
+			load_contact_links(local_user());
+	}
 	$contact_url="";
 	$pm_url="";
 	$status_link="";
@@ -760,7 +772,7 @@ function item_photo_menu($item){
 	$posts_link="";
 
 	$sparkle = false;
-    $profile_link = best_link_url($item,$sparkle);
+    $profile_link = best_link_url($item,$sparkle,$ssl_state);
 	if($profile_link === 'mailbox')
 		$profile_link = '';
 
@@ -769,9 +781,11 @@ function item_photo_menu($item){
 		$status_link = $profile_link . "?url=status";
 		$photos_link = $profile_link . "?url=photos";
 		$profile_link = $profile_link . "?url=profile";
-		$pm_url = $a->get_baseurl() . '/message/new/' . $cid;
+		$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'];
 		}		
@@ -780,14 +794,25 @@ function item_photo_menu($item){
 		}
 	}
 	if(($cid) && (! $item['self'])) {
-		$contact_url = $a->get_baseurl() . '/contacts/' . $cid;
-		$posts_link = $a->get_baseurl() . '/network/?cid=' . $cid;
+		$contact_url = $a->get_baseurl($ssl_state) . '/contacts/' . $cid;
+		$posts_link = $a->get_baseurl($ssl_state) . '/network/?cid=' . $cid;
+
+		$clean_url = normalise_link($item['author-link']);
+
+		if((local_user()) && (local_user() == $item['uid'])) {
+			if(isset($a->contacts) && x($a->contacts,$clean_url)) {
+				if($a->contacts[$clean_url]['network'] === NETWORK_DIASPORA) {
+					$pm_url = $a->get_baseurl($ssl_state) . '/message/new/' . $cid;
+				}
+			}
+		}
+
 	}
 
 	$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,
@@ -817,9 +842,11 @@ function like_puller($a,$item,&$arr,$mode) {
 	if((activity_match($item['verb'],$verb)) && ($item['id'] != $item['parent'])) {
 		$url = $item['author-link'];
 		if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === 'dfrn') && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) {
-			$url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
+			$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']]))
@@ -879,7 +906,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 	
 	$a->page['htmlhead'] .= replace_macros($tpl, array(
 		'$newpost' => 'true',
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => $a->get_baseurl(true),
 		'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 		'$geotag' => $geotag,
 		'$nickname' => $x['nickname'],
@@ -888,8 +915,8 @@ 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:'),
-		'$whereareu' => t('Where are you right now?'),
-		'$title' => t('Enter a title for this item') 
+		'$fileas' => t('Save to Folder:'),
+		'$whereareu' => t('Where are you right now?')
 	));
 
 
@@ -929,8 +956,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 
 	$o .= replace_macros($tpl,array(
 		'$return_path' => $a->cmd,
-		'$action' =>  $a->get_baseurl().'/item',
-		'$share' => (($x['button']) ? $x['button'] : t('Share')),
+		'$action' =>  $a->get_baseurl(true) . '/item',
+		'$share' => (x($x,'button') ? $x['button'] : t('Share')),
 		'$upload' => t('Upload photo'),
 		'$shortupload' => t('upload photo'),
 		'$attach' => t('Attach file'),
@@ -947,13 +974,15 @@ 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'),
 		'$ptyp' => (($notes_cid) ? 'note' : 'wall'),
 		'$content' => '',
 		'$post_id' => '',
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => $a->get_baseurl(true),
 		'$defloc' => $x['default_location'],
 		'$visitor' => $x['visitor'],
 		'$pvisit' => (($notes_cid) ? 'none' : $x['visitor']),
@@ -995,8 +1024,8 @@ function conv_sort($arr,$order) {
 		usort($parents,'sort_thr_commented');
 
 	if(count($parents))
-		foreach($parents as $x) 
-			$x['children'] = array();
+		foreach($parents as $i=>$_x) 
+			$parents[$i]['children'] = array();
 
 	foreach($arr as $x) {
 		if($x['id'] != $x['parent']) {
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 7455b6b3e..76cc0bc7b 100755..100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once('include/datetime.php');
+
 /**
  *
  * MySQL database class
@@ -104,19 +106,17 @@ class dba {
 
 			logger('dba: ' . $str );
 		}
-		else {
 
-			/**
-			 * If dbfail.out exists, we will write any failed calls directly to it,
-			 * regardless of any logging that may or may nor be in effect.
-			 * These usually indicate SQL syntax errors that need to be resolved.
-			 */
+		/**
+		 * If dbfail.out exists, we will write any failed calls directly to it,
+		 * regardless of any logging that may or may nor be in effect.
+		 * These usually indicate SQL syntax errors that need to be resolved.
+		 */
 
-			if($result === false) {
-				logger('dba: ' . printable($sql) . ' returned false.');
-				if(file_exists('dbfail.out'))
-					file_put_contents('dbfail.out', printable($sql) . ' returned false' . "\n", FILE_APPEND);
-			}
+		if($result === false) {
+			logger('dba: ' . printable($sql) . ' returned false.');
+			if(file_exists('dbfail.out'))
+				file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n", FILE_APPEND);
 		}
 
 		if(($result === true) || ($result === false))
@@ -140,7 +140,7 @@ class dba {
 
     
 		if($this->debug)
-			logger('dba: ' . printable(print_r($r, true)), LOGGER_DATA);
+			logger('dba: ' . printable(print_r($r, true)));
 		return($r);
 	}
 
@@ -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 c1ff07bd5..794b8f27a 100755..100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -256,7 +256,8 @@ function delivery_run($argv, $argc){
 					'$picdate'      => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , ATOM_TIME)) ,
 					'$uridate'      => xmlify(datetime_convert('UTC','UTC',$owner['uri-date']    . '+00:00' , ATOM_TIME)) ,
 					'$namdate'      => xmlify(datetime_convert('UTC','UTC',$owner['name-date']   . '+00:00' , ATOM_TIME)) ,
-					'$birthday'     => $birthday
+					'$birthday'     => $birthday,
+					'$community'    => (($owner['page-flags'] == PAGE_COMMUNITY) ? '<dfrn:community>1</dfrn:community>' : '')
 			));
 
 			foreach($items as $item) {
@@ -320,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);
@@ -435,8 +444,8 @@ function delivery_run($argv, $argc){
 					$headers .= 'Reply-to: ' . $reply_to . "\n";
 
 				// for testing purposes: Collect exported mails
-				$file = tempnam("/tmp/friendica/", "mail-out-");
-				file_put_contents($file, json_encode($it));
+				// $file = tempnam("/tmp/friendica/", "mail-out-");
+				// file_put_contents($file, json_encode($it));
 
 				$headers .= 'Message-Id: <' . iri2msgid($it['uri']). '>' . "\n";
 
@@ -446,30 +455,16 @@ function delivery_run($argv, $argc){
 
 				if($it['uri'] !== $it['parent-uri']) {
 					$headers .= 'References: <' . iri2msgid($it['parent-uri']) . '>' . "\n";
-					if(! strlen($it['title'])) {
+					if(!strlen($it['title'])) {
 						$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1",
-							dbesc($it['parent-uri'])
-						);
-						if(count($r)) {
-							$subtitle = $r[0]['title'];
-							if($subtitle) {
-								if(strncasecmp($subtitle,'RE:',3))
-									$subject = $subtitle;
-								else
-									$subject = 'Re: ' . $subtitle;
-							}
-						}
+							dbesc($it['parent-uri']));
+
+						if(count($r) AND ($r[0]['title'] != ''))
+							$subject = $r[0]['title'];
 					}
+					if(strncasecmp($subject,'RE:',3))
+						$subject = 'Re: '.$subject;
 				}
-				/*$headers .= 'MIME-Version: 1.0' . "\n";
-				//$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
-				$headers .= 'Content-Type: text/plain; charset=UTF-8' . "\n";
-				$headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
-				$html    = prepare_body($it);
-				//$message = '<html><body>' . $html . '</body></html>';
-				$message = html2plain($html);
-				logger('notifier: email delivery to ' . $addr);
-				mail($addr, $subject, $message, $headers);*/
 				email_send($addr, $subject, $headers, $it);
 			}
 			break;
diff --git a/include/diaspora.php b/include/diaspora.php
index dca857a19..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;
 
 
@@ -1159,6 +1171,48 @@ function diaspora_comment($importer,$xml,$msg) {
 
 		proc_run('php','include/notifier.php','comment',$message_id);
 	}
+
+	$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
+		dbesc($parent_item['uri']),
+		intval($importer['uid'])
+	);
+
+	if(count($myconv)) {
+		$importer_url = $a->get_baseurl() . '/profile/' . $importer['nickname'];
+
+		foreach($myconv as $conv) {
+
+			// now if we find a match, it means we're in this conversation
+	
+			if(! link_compare($conv['author-link'],$importer_url))
+				continue;
+
+			require_once('include/enotify.php');
+								
+			$conv_parent = $conv['parent'];
+
+			notification(array(
+				'type'         => NOTIFY_COMMENT,
+				'notify_flags' => $importer['notify-flags'],
+				'language'     => $importer['language'],
+				'to_name'      => $importer['username'],
+				'to_email'     => $importer['email'],
+				'uid'          => $importer['uid'],
+				'item'         => $datarray,
+				'link'		   => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id,
+				'source_name'  => $datarray['author-name'],
+				'source_link'  => $datarray['author-link'],
+				'source_photo' => $datarray['author-avatar'],
+				'verb'         => ACTIVITY_POST,
+				'otype'        => 'item',
+				'parent'       => $conv_parent,
+
+			));
+
+			// only send one notification
+			break;
+		}
+	}
 	return;
 }
 
@@ -1695,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'])
 		);
@@ -1743,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'])
 		);
@@ -1878,6 +1932,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
 
 	$images = array();
 
+	$title = $item['title'];
 	$body = $item['body'];
 
 /*
@@ -1902,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) {
@@ -2225,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 659978b6e..b43ae0dc1 100755..100644
--- a/include/email.php
+++ b/include/email.php
@@ -1,5 +1,7 @@
 <?php
 require_once('include/html2plain.php');
+require_once('include/msgclean.php');
+require_once('include/quoteconvert.php');
 
 function email_connect($mailbox,$username,$password) {
 	if(! function_exists('imap_open'))
@@ -54,7 +56,7 @@ function email_msg_headers($mbox,$uid) {
 	$raw_header = (($mbox && $uid) ? @imap_fetchheader($mbox,$uid,FT_UID) : '');
 	$raw_header = str_replace("\r",'',$raw_header);
 	$ret = array();
-	$h = split("\n",$raw_header);
+	$h = explode("\n",$raw_header);
 	if(count($h))
 	foreach($h as $line ) {
 	    if (preg_match("/^[a-zA-Z]/", $line)) {
@@ -72,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);
@@ -86,6 +88,7 @@ function email_get_msg($mbox,$uid) {
 
 	if(! $struc->parts) {
 		$ret['body'] = email_get_part($mbox,$uid,$struc,0, 'html');
+		$html = $ret['body'];
 
 		if (trim($ret['body']) == '')
 			$ret['body'] = email_get_part($mbox,$uid,$struc,0, 'plain');
@@ -107,6 +110,17 @@ function email_get_msg($mbox,$uid) {
 		else
 			$ret['body'] = $text;
 	}
+
+	$ret['body'] = removegpg($ret['body']);
+	$msg = removesig($ret['body']);
+	$ret['body'] = $msg['body'];
+	$ret['body'] = convertquote($ret['body'], $reply);
+
+	if (trim($html) != '')
+		$ret['body'] = removelinebreak($ret['body']);
+
+	$ret['body'] = unifyattributionline($ret['body']);
+
 	return $ret;
 }
 
@@ -236,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 4a9a9a004..29202badd 100755..100644
--- a/include/event.php
+++ b/include/event.php
@@ -163,7 +163,7 @@ function bbtoevent($s) {
 	if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match))
 		$ev['adjust'] = $match[1];
 	$match = '';
-	$ev['nofinish'] = (($ev['start'] && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
+	$ev['nofinish'] = (((x($ev, 'start') && $ev['start']) && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
 	return $ev;
 
 }
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 442e38691..69ccf41b7 100755..100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -142,14 +142,14 @@ function html2bbcode($message)
 	node2bbcode($doc, 'span', array('style'=>'font-style: italic;'), '[i]', '[/i]');
 	node2bbcode($doc, 'span', array('style'=>'font-weight: bold;'), '[b]', '[/b]');
 
-	node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/', 'size'=>'/(\d+)/', 'color'=>'/(.+)/'), '[font=$1][size=$2][color=$3]', '[/color][/size][/font]');
+	/*node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/', 'size'=>'/(\d+)/', 'color'=>'/(.+)/'), '[font=$1][size=$2][color=$3]', '[/color][/size][/font]');
 	node2bbcode($doc, 'font', array('size'=>'/(\d+)/', 'color'=>'/(.+)/'), '[size=$1][color=$2]', '[/color][/size]');
 	node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/', 'size'=>'/(.+)/'), '[font=$1][size=$2]', '[/size][/font]');
 	node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/', 'color'=>'/(.+)/'), '[font=$1][color=$3]', '[/color][/font]');
 	node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/'), '[font=$1]', '[/font]');
 	node2bbcode($doc, 'font', array('size'=>'/(\d+)/'), '[size=$1]', '[/size]');
 	node2bbcode($doc, 'font', array('color'=>'/(.+)/'), '[color=$1]', '[/color]');
-
+*/
 	// Untested
 	//node2bbcode($doc, 'span', array('style'=>'/.*font-size:\s*(.+?)[,;].*font-family:\s*(.+?)[,;].*color:\s*(.+?)[,;].*/'), '[size=$1][font=$2][color=$3]', '[/color][/font][/size]');
 	//node2bbcode($doc, 'span', array('style'=>'/.*font-size:\s*(\d+)[,;].*/'), '[size=$1]', '[/size]');
@@ -191,13 +191,13 @@ function html2bbcode($message)
 
 	node2bbcode($doc, 'hr', array(), "[hr]", "");
 
-	//node2bbcode($doc, 'table', array(), "", "");
-	//node2bbcode($doc, 'tr', array(), "\n", "");
-	//node2bbcode($doc, 'td', array(), "\t", "");
-	node2bbcode($doc, 'table', array(), "[table]", "[/table]");
-	node2bbcode($doc, 'th', array(), "[th]", "[/th]");
-	node2bbcode($doc, 'tr', array(), "[tr]", "[/tr]");
-	node2bbcode($doc, 'td', array(), "[td]", "[/td]");
+	node2bbcode($doc, 'table', array(), "", "");
+	node2bbcode($doc, 'tr', array(), "\n", "");
+	node2bbcode($doc, 'td', array(), "\t", "");
+	//node2bbcode($doc, 'table', array(), "[table]", "[/table]");
+	//node2bbcode($doc, 'th', array(), "[th]", "[/th]");
+	//node2bbcode($doc, 'tr', array(), "[tr]", "[/tr]");
+	//node2bbcode($doc, 'td', array(), "[td]", "[/td]");
 
 	node2bbcode($doc, 'h1', array(), "\n\n[size=xx-large][b]", "[/b][/size]\n");
 	node2bbcode($doc, 'h2', array(), "\n\n[size=x-large][b]", "[/b][/size]\n");
@@ -216,7 +216,7 @@ function html2bbcode($message)
 	node2bbcode($doc, 'audio', array('src'=>'/(.+)/'), '[audio]$1', '[/audio]');
 	node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]');
 
-	node2bbcode($doc, 'code', array(), '[code]$1', '[/code]');
+	node2bbcode($doc, 'code', array(), '[code]', '[/code]');
 
 	$message = $doc->saveHTML();
 
diff --git a/include/html2plain.php b/include/html2plain.php
index 2a4cf6639..21261327d 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,34 @@ 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/", "/group/", "/profile/", "/search?search=", "mailto:", "/u/", "/node/",
+				"//facebook.com/profile.php?id=", "//plus.google.com/");
+		foreach ($list as $listitem)
+			if (strpos($treffer[1], $listitem) !== false)
+				$ignore = true;
+
+		if ((strpos($treffer[1], "//plus.google.com/") !== false) and (strpos($treffer[1], "/posts") !== false))
+				$ignore = false;
+
+		if (!$ignore)
+			$urls[$treffer[1]] = $treffer[1];
+	}
+	return($urls);
+}
+
+function html2plain($html, $wraplength = 75, $compact = false)
 {
 	global $lang;
 
@@ -93,22 +121,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 +139,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", '');
 
@@ -131,7 +157,7 @@ function html2plain($html)
 	//node2bbcode($doc, 'ol', array(), "\n[list=1]", "[/list]\n");
 	node2bbcode($doc, 'li', array(), "\n* ", "\n");
 
-	node2bbcode($doc, 'hr', array(), str_repeat("-", 70), "");
+	node2bbcode($doc, 'hr', array(), "\n".str_repeat("-", 70)."\n", "");
 
 	node2bbcode($doc, 'tr', array(), "\n", "");
 	node2bbcode($doc, 'td', array(), "\t", "");
@@ -143,16 +169,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 +203,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 a1254e165..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,10 +22,11 @@ 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`  = '' ";
 
-	$r = q("SELECT `contact`.*, `user`.`uid` AS `user_uid`, `user`.`nickname`, `user`.`timezone`
+	$r = q("SELECT `contact`.*, `user`.`uid` AS `user_uid`, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`
 		FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
 		WHERE `contact`.`self` = 1 AND `user`.`nickname` = '%s' LIMIT 1",
 		dbesc($owner_nick)
@@ -156,7 +154,8 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 		'$picdate'      => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , ATOM_TIME)) ,
 		'$uridate'      => xmlify(datetime_convert('UTC','UTC',$owner['uri-date']    . '+00:00' , ATOM_TIME)) ,
 		'$namdate'      => xmlify(datetime_convert('UTC','UTC',$owner['name-date']   . '+00:00' , ATOM_TIME)) , 
-		'$birthday'     => ((strlen($birthday)) ? '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>' : '')
+		'$birthday'     => ((strlen($birthday)) ? '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>' : ''),
+		'$community'    => (($owner['page-flags'] == PAGE_COMMUNITY) ? '<dfrn:community>1</dfrn:community>' : '')
 	));
 
 	call_hooks('atom_feed', $atom);
@@ -417,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);
 
@@ -430,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;
@@ -682,7 +689,7 @@ function item_store($arr,$force_parent = false) {
 		unset($arr['dsprsig']);
 	}
 
-	if($arr['gravity'])
+	if(x($arr, 'gravity'))
 		$arr['gravity'] = intval($arr['gravity']);
 	elseif($arr['parent-uri'] === $arr['uri'])
 		$arr['gravity'] = 0;
@@ -742,6 +749,7 @@ function item_store($arr,$force_parent = false) {
 
 	if($arr['parent-uri'] === $arr['uri']) {
 		$parent_id = 0;
+		$parent_deleted = 0;
 		$allow_cid = $arr['allow_cid'];
 		$allow_gid = $arr['allow_gid'];
 		$deny_cid  = $arr['deny_cid'];
@@ -800,6 +808,8 @@ function item_store($arr,$force_parent = false) {
 				logger('item_store: item parent was not found - ignoring item');
 				return 0;
 			}
+			
+			$parent_deleted = 0;
 		}
 	}
 
@@ -1043,6 +1053,22 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	if(! $rino_enable)
 		$rino = 0;
 
+	$ssl_val = intval(get_config('system','ssl_policy'));
+	$ssl_policy = '';
+
+	switch($ssl_val){
+		case SSL_POLICY_FULL:
+			$ssl_policy = 'full';
+			break;
+		case SSL_POLICY_SELFSIGN:
+			$ssl_policy = 'self';
+			break;			
+		case SSL_POLICY_NONE:
+		default:
+			$ssl_policy = 'none';
+			break;
+	}
+
 	$url = $contact['notify'] . '&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : '');
 
 	logger('dfrn_deliver: ' . $url);
@@ -1072,11 +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']))
@@ -1115,6 +1153,11 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 		$postvars['perm'] = 'r';
 	}
 
+	$postvars['ssl_policy'] = $ssl_policy;
+
+	if($page)
+		$postvars['page'] = '1';
+	
 	if($rino && $rino_allowed && (! $dissolve)) {
 		$key = substr(random_string(),0,16);
 		$data = bin2hex(aes_encrypt($postvars['data'],$key));
@@ -1379,6 +1422,19 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 
 	}
 
+	$community_page = 0;
+	$rawtags = $feed->get_feed_tags( NAMESPACE_DFRN, 'community');
+	if($rawtags) {
+		$community_page = intval($rawtags[0]['data']);
+	}
+	if(is_array($contact) && intval($contact['forum']) != $community_page) {
+		q("update contact set forum = %d where id = %d limit 1",
+			intval($community_page),
+			intval($contact['id'])
+		);
+		$contact['forum'] = (string) $community_page;
+	}
+
 
 	// process any deleted entries
 
@@ -1398,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'])
@@ -1543,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'])
@@ -1595,6 +1652,14 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 				if((activity_match($datarray['verb'],ACTIVITY_LIKE)) || (activity_match($datarray['verb'],ACTIVITY_DISLIKE))) {
 					$datarray['type'] = 'activity';
 					$datarray['gravity'] = GRAVITY_LIKE;
+					// only one like or dislike per person
+					$r = q("select id from item where uid = %d and `contact-id` = %d and verb ='%s' and deleted = 0 limit 1",
+						intval($datarray['uid']),
+						intval($datarray['contact-id']),
+						dbesc($datarray['verb'])
+					);
+					if($r && count($r))
+						continue; 
 				}
 
 				if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
@@ -1680,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'])
@@ -1747,6 +1813,18 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 				$datarray['parent-uri'] = $item_id;
 				$datarray['uid'] = $importer['uid'];
 				$datarray['contact-id'] = $contact['id'];
+
+				if(! link_compare($datarray['owner-link'],$contact['url'])) {
+					// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery, 
+					// 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('consume_feed: Correcting item owner.', LOGGER_DEBUG);
+					$datarray['owner-name']   = $contact['name'];
+					$datarray['owner-link']   = $contact['url'];
+					$datarray['owner-avatar'] = $contact['thumb'];
+				}
+
 				$r = item_store($datarray);
 				continue;
 
@@ -1837,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' ) ",
@@ -1857,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` )
@@ -1942,6 +2029,19 @@ function local_delivery($importer,$data) {
 
 		// NOTREACHED
 	}	
+
+	$community_page = 0;
+	$rawtags = $feed->get_feed_tags( NAMESPACE_DFRN, 'community');
+	if($rawtags) {
+		$community_page = intval($rawtags[0]['data']);
+	}
+	if(intval($importer['forum']) != $community_page) {
+		q("update contact set forum = %d where id = %d limit 1",
+			intval($community_page),
+			intval($importer['id'])
+		);
+		$importer['forum'] = (string) $community_page;
+	}
 	
 	logger('local_delivery: feed item count = ' . $feed->get_item_quantity());
 
@@ -1964,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'])
@@ -1981,6 +2081,7 @@ function local_delivery($importer,$data) {
 					if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) {
 						$xo = parse_xml_string($item['object'],false);
 						$xt = parse_xml_string($item['target'],false);
+
 						if($xt->type === ACTIVITY_OBJ_NOTE) {
 							$i = q("select * from `item` where uri = '%s' and uid = %d limit 1",
 								dbesc($xt->id),
@@ -2136,6 +2237,14 @@ function local_delivery($importer,$data) {
 					$datarray['type'] = 'activity';
 					$datarray['gravity'] = GRAVITY_LIKE;
 					$datarray['last-child'] = 0;
+					// only one like or dislike per person
+					$r = q("select id from item where uid = %d and `contact-id` = %d and verb ='%s' and deleted = 0 limit 1",
+						intval($datarray['uid']),
+						intval($datarray['contact-id']),
+						dbesc($datarray['verb'])
+					);
+					if($r && count($r))
+						continue; 
 				}
 
 				if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
@@ -2251,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'])
@@ -2285,6 +2395,15 @@ function local_delivery($importer,$data) {
 				if(($datarray['verb'] == ACTIVITY_LIKE) || ($datarray['verb'] == ACTIVITY_DISLIKE)) {
 					$datarray['type'] = 'activity';
 					$datarray['gravity'] = GRAVITY_LIKE;
+					// only one like or dislike per person
+					$r = q("select id from item where uid = %d and `contact-id` = %d and verb ='%s' and deleted = 0 limit 1",
+						intval($datarray['uid']),
+						intval($datarray['contact-id']),
+						dbesc($datarray['verb'])
+					);
+					if($r && count($r))
+						continue; 
+
 				}
 
 				if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
@@ -2407,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'])
@@ -2439,6 +2559,18 @@ function local_delivery($importer,$data) {
 			$datarray['parent-uri'] = $item_id;
 			$datarray['uid'] = $importer['importer_uid'];
 			$datarray['contact-id'] = $importer['id'];
+
+			if(! link_compare($datarray['owner-link'],$contact['url'])) {
+				// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery, 
+				// 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);
+				$datarray['owner-name']   = $importer['senderName'];
+				$datarray['owner-link']   = $importer['url'];
+				$datarray['owner-avatar'] = $importer['thumb'];
+			}
+
 			$r = item_store($datarray);
 			continue;
 		}
@@ -2823,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
new file mode 100644
index 000000000..eabb47788
--- /dev/null
+++ b/include/msgclean.php
@@ -0,0 +1,225 @@
+<?php
+
+function savereplace($pattern, $replace, $text)
+{
+	$save = $text;
+
+	$text = preg_replace($pattern, $replace, $text);
+
+	if ($text == '')
+		$text = $save;
+	return($text);
+}
+
+function unifyattributionline($message)
+{
+	$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);
+		$message = savereplace('/----- Original Message -----\s.*?From: "([^<"].*?)" <(.*?)>\s.*?To: (.*?)\s*?Sent: (.*?)\s.*?Subject: ([^\n].*)\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/-------- Original-Nachricht --------\s*\['.$quote.'\]\nDatum: (.*?)\nVon: (.*?) <(.*?)>\nAn: (.*?)\nBetreff: (.*?)\n/i', "[".$quote."='$2']\n", $message);
+		$message = savereplace('/-------- Original-Nachricht --------\s*\['.$quote.'\]\sDatum: (.*?)\s.*Von: "([^<"].*?)" <(.*?)>\s.*An: (.*?)\n.*/i', "[".$quote."='$2']\n", $message);
+		$message = savereplace('/-------- Original-Nachricht --------\s*\['.$quote.'\]\nDatum: (.*?)\nVon: (.*?)\nAn: (.*?)\nBetreff: (.*?)\n/i', "[".$quote."='$2']\n", $message);
+
+		$message = savereplace('/-----Urspr.*?ngliche Nachricht-----\sVon: "([^<"].*?)" <(.*?)>\s.*Gesendet: (.*?)\s.*An: (.*?)\s.*Betreff: ([^\n].*?).*:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/-----Urspr.*?ngliche Nachricht-----\sVon: "([^<"].*?)" <(.*?)>\s.*Gesendet: (.*?)\s.*An: (.*?)\s.*Betreff: ([^\n].*?)\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/Am (.*?), schrieb (.*?):\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+
+		$message = savereplace('/Am .*?, \d+ .*? \d+ \d+:\d+:\d+ \+\d+\sschrieb\s(.*?)\s<(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/Am (.*?) schrieb (.*?) <(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+		$message = savereplace('/Am (.*?) schrieb <(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+		$message = savereplace('/Am (.*?) schrieb (.*?):\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+		$message = savereplace('/Am (.*?) schrieb (.*?)\n(.*?):\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+
+		$message = savereplace('/(\d+)\/(\d+)\/(\d+) ([^<"].*?) <(.*?)>\s*\['.$quote.'\]/i', "[".$quote."='$4']\n", $message);
+
+		$message = savereplace('/On .*?, \d+ .*? \d+ \d+:\d+:\d+ \+\d+\s(.*?)\s<(.*?)>\swrote:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/On (.*?) at (.*?), (.*?)\s<(.*?)>\swrote:\s*\['.$quote.'\]/i', "[".$quote."='$3']\n", $message);
+		$message = savereplace('/On (.*?)\n([^<].*?)\s<(.*?)>\swrote:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+		$message = savereplace('/On (.*?), (.*?), (.*?)\s<(.*?)>\swrote:\s*\['.$quote.'\]/i', "[".$quote."='$3']\n", $message);
+		$message = savereplace('/On ([^,].*?), (.*?)\swrote:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+		$message = savereplace('/On (.*?), (.*?)\swrote\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+
+		// Der loescht manchmal den Body - was eigentlich unmoeglich ist
+		$message = savereplace('/On (.*?),(.*?),(.*?),(.*?), (.*?) wrote:\s*\['.$quote.'\]/i', "[".$quote."='$5']\n", $message);
+
+		$message = savereplace('/Zitat von ([^<].*?) <(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/Quoting ([^<].*?) <(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/From: "([^<"].*?)" <(.*?)>\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/From: <(.*?)>\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/Du \(([^)].*?)\) schreibst:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/--- (.*?) <.*?> schrieb am (.*?):\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/--- (.*?) schrieb am (.*?):\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/\* (.*?) <(.*?)> hat geschrieben:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/(.*?) <(.*?)> schrieb (.*?)\):\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/(.*?) <(.*?)> schrieb am (.*?) um (.*):\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/(.*?) schrieb am (.*?) um (.*):\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/(.*?) \((.*?)\) schrieb:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+		$message = savereplace('/(.*?) schrieb:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/(.*?) <(.*?)> writes:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/(.*?) \((.*?)\) writes:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+		$message = savereplace('/(.*?) writes:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/\* (.*?) wrote:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/(.*?) wrote \(.*?\):\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/(.*?) wrote:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/([^<].*?) <.*?> hat am (.*?)\sum\s(.*)\sgeschrieben:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/(\d+)\/(\d+)\/(\d+) ([^<"].*?) <(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$4']\n", $message);
+		$message = savereplace('/(\d+)\/(\d+)\/(\d+) (.*?) <(.*?)>\s*\['.$quote.'\]/i', "[".$quote."='$4']\n", $message);
+		$message = savereplace('/(\d+)\/(\d+)\/(\d+) <(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$4']\n", $message);
+		$message = savereplace('/(\d+)\/(\d+)\/(\d+) <(.*?)>\s*\['.$quote.'\]/i', "[".$quote."='$4']\n", $message);
+
+		$message = savereplace('/(.*?) <(.*?)> schrubselte:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/(.*?) \((.*?)\) schrubselte:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+
+	}
+	return($message);
+}
+
+function removegpg($message)
+{
+
+	$pattern = '/(.*)\s*-----BEGIN PGP SIGNED MESSAGE-----\s*[\r\n].*Hash:.*?[\r\n](.*)'.
+		'[\r\n]\s*-----BEGIN PGP SIGNATURE-----\s*[\r\n].*'.
+		'[\r\n]\s*-----END PGP SIGNATURE-----(.*)/is';
+
+	preg_match($pattern, $message, $result);
+
+	$cleaned = trim($result[1].$result[2].$result[3]);
+
+	$cleaned = str_replace(array("\n- --\n", "\n- -"), array("\n-- \n", "\n-"), $cleaned);
+
+
+	if ($cleaned == '')
+		$cleaned = $message;
+
+	return($cleaned);
+}
+
+function removesig($message)
+{
+	$sigpos = strrpos($message, "\n-- \n");
+	$quotepos = strrpos($message, "[/quote]");
+
+	if ($sigpos == 0) {
+		// Speziell fuer web.de, die das als Trenner verwenden
+		$message = str_replace("\n___________________________________________________________\n", "\n-- \n", $message);
+		$sigpos = strrpos($message, "\n-- \n");
+		$quotepos = strrpos($message, "[/quote]");
+	}
+
+	// Sollte sich der Signaturtrenner innerhalb eines Quotes befinden
+	// wird keine Signaturtrennung ausgefuehrt
+	if (($sigpos < $quotepos) and ($sigpos != 0))
+		return(array('body' => $message, 'sig' => ''));
+
+	// To-Do: Regexp umstellen, so dass auf 1 oder kein Leerzeichen
+	// geprueft wird
+	//$message = str_replace("\n--\n", "\n-- \n", $message);
+
+	$pattern = '/(.*)[\r\n]-- [\r\n](.*)/is';
+
+	preg_match($pattern, $message, $result);
+
+	if (($result[1] != '') and ($result[2] != '')) {
+		$cleaned = trim($result[1])."\n";
+		$sig = trim($result[2]);
+		//	'[hr][size=x-small][color=darkblue]'.trim($result[2]).'[/color][/size]';
+	} else {
+		$cleaned = $message;
+		$sig = '';
+	}
+
+	return(array('body' => $cleaned, 'sig' => $sig));
+}
+
+function removelinebreak($message)
+{
+	$arrbody = explode("\n", trim($message));
+
+	$lines = array();
+	$lineno = 0;
+
+	foreach($arrbody as $i => $line) {
+		$currquotelevel = 0;
+		$currline = $line;
+		while ((strlen($currline)>0) and ((substr($currline, 0, 1) == '>')
+ 			or (substr($currline, 0, 1) == ' '))) {
+			if (substr($currline, 0, 1) == '>')
+				$currquotelevel++;
+
+			$currline = ltrim(substr($currline, 1));
+		}
+
+		$quotelevel = 0;
+		$nextline = trim($arrbody[$i+1]);
+		while ((strlen($nextline)>0) and ((substr($nextline, 0, 1) == '>')
+ 			or (substr($nextline, 0, 1) == ' '))) {
+			if (substr($nextline, 0, 1) == '>')
+				$quotelevel++;
+
+			$nextline = ltrim(substr($nextline, 1));
+		}
+
+		$len = strlen($line);
+		$firstword = strpos($nextline.' ', ' ');
+
+		$specialchars = ((substr(trim($nextline), 0, 1) == '-') or
+				(substr(trim($nextline), 0, 1) == '=') or
+				(substr(trim($nextline), 0, 1) == '*') or
+				(substr(trim($nextline), 0, 1) == '·') or
+				(substr(trim($nextline), 0, 4) == '[url') or
+				(substr(trim($nextline), 0, 5) == '[size') or
+				(substr(trim($nextline), 0, 7) == 'http://') or
+				(substr(trim($nextline), 0, 8) == 'https://'));
+
+		if (!$specialchars) 
+			$specialchars = ((substr(rtrim($line), -1) == '-') or
+					(substr(rtrim($line), -1) == '=') or
+					(substr(rtrim($line), -1) == '*') or
+					(substr(rtrim($line), -1) == '·') or
+					(substr(rtrim($line), -6) == '[/url]') or
+					(substr(rtrim($line), -7) == '[/size]'));
+
+		//if ($specialchars)
+		//	echo ("Special\n");
+
+		if ($lines[$lineno] != '') {
+			if (substr($lines[$lineno], -1) != ' ')
+			$lines[$lineno] .= ' ';
+
+			while ((strlen($line)>0) and ((substr($line, 0, 1) == '>')
+ 			or (substr($line, 0, 1) == ' '))) {
+
+				$line = ltrim(substr($line, 1));
+			}
+
+		}
+		//else
+		//	$lines[$lineno] = $quotelevel.'-'.$len.'-'.$firstword.'-';
+
+		$lines[$lineno] .= $line;
+		//if ((($len + $firstword < 68) and (substr($line, -1, 1) != ' '))
+		//	or ($quotelevel != $currquotelevel) or $specialchars)
+		if (((substr($line, -1, 1) != ' '))
+			or ($quotelevel != $currquotelevel))
+			$lineno++;
+	}
+	return(implode("\n", $lines));
+
+}
+?>
diff --git a/include/nav.php b/include/nav.php
index 511ca07fc..2c9c643a9 100755..100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -8,6 +8,8 @@ function nav(&$a) {
 	 *
 	 */
 
+	$ssl_state = ((local_user()) ? true : false);
+
 	if(!(x($a->page,'nav')))
 		$a->page['nav'] = '';
 
@@ -27,7 +29,7 @@ function nav(&$a) {
 
 	$myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : '');
 		
-	$sitelocation = $myident . substr($a->get_baseurl(),strpos($a->get_baseurl(),'//') + 2 );
+	$sitelocation = $myident . substr($a->get_baseurl($ssl_state),strpos($a->get_baseurl($ssl_state),'//') + 2 );
 
 
 	// nav links: array of array('href', 'text', 'extra css classes', 'title')
@@ -53,7 +55,7 @@ function nav(&$a) {
 		// user info
 		$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"),
+			'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl($ssl_state)."/images/person-48.jpg"),
 			'name' => $a->user['username'],
 		);
 		
@@ -67,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'));
@@ -76,7 +80,7 @@ function nav(&$a) {
 	if(($a->config['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user()))
 		$nav['register'] = array('register',t('Register'), "", t('Create an account'));
 
-	$help_url = $a->get_baseurl() . '/help';
+	$help_url = $a->get_baseurl($ssl_state) . '/help';
 
 	if(! get_config('system','hide_help'))
 		$nav['help'] = array($help_url, t('Help'), "", t('Help and documentation'));
@@ -122,6 +126,9 @@ function nav(&$a) {
 		}
 
 		$nav['messages'] = array('message', t('Messages'), "", t('Private mail'));
+		$nav['messages']['inbox'] = array('message', t('Inbox'), "", t('Inbox'));
+		$nav['messages']['outbox']= array('message/sent', t('Outbox'), "", t('Outbox'));
+		$nav['messages']['new'] = array('message/new', t('New Message'), "", t('New Message'));
 		
 		if(is_array($a->identities) && count($a->identities) > 1) {
 			$nav['manage'] = array('manage', t('Manage'), "", t('Manage other pages'));
diff --git a/include/network.php b/include/network.php
index c72919dd8..38d0980d5 100755..100644
--- a/include/network.php
+++ b/include/network.php
@@ -303,7 +303,7 @@ function webfinger_dfrn($s,&$hcard) {
 
 
 if(! function_exists('webfinger')) {
-function webfinger($s) {
+function webfinger($s, $debug = false) {
 	$host = '';
 	if(strstr($s,'@')) {
 		$host = substr($s,strpos($s,'@') + 1);
@@ -328,7 +328,7 @@ function webfinger($s) {
 }}
 
 if(! function_exists('lrdd')) {
-function lrdd($uri) {
+function lrdd($uri, $debug = false) {
 
 	$a = get_app();
 
@@ -364,6 +364,9 @@ function lrdd($uri) {
 
 	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 4765cca06..ca7c7b92e 100755..100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -201,7 +201,7 @@ function notifier_run($argv, $argc){
 		// by stringing togther an array of retractions and sending them onward.
 		 
   	
-		$localhost = $a->get_hostname();
+		$localhost = str_replace('www.','',$a->get_hostname());
 		if(strpos($localhost,':'))
 			$localhost = substr($localhost,0,strpos($localhost,':'));
 
@@ -337,7 +337,9 @@ function notifier_run($argv, $argc){
 			'$picdate'      => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , ATOM_TIME)) ,
 			'$uridate'      => xmlify(datetime_convert('UTC','UTC',$owner['uri-date']    . '+00:00' , ATOM_TIME)) ,
 			'$namdate'      => xmlify(datetime_convert('UTC','UTC',$owner['name-date']   . '+00:00' , ATOM_TIME)) ,
-			'$birthday'     => $birthday
+			'$birthday'     => $birthday,
+			'$community'    => (($owner['page-flags'] == PAGE_COMMUNITY) ? '<dfrn:community>1</dfrn:community>' : '')
+
 	));
 
 	if($mail) {
@@ -535,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);
@@ -648,38 +661,23 @@ function notifier_run($argv, $argc){
 							$headers .= 'Reply-to: ' . $reply_to . "\n";
 
 						// for testing purposes: Collect exported mails
-						$file = tempnam("/tmp/friendica/", "mail-out2-");
-						file_put_contents($file, json_encode($it));
+						//$file = tempnam("/tmp/friendica/", "mail-out2-");
+						//file_put_contents($file, json_encode($it));
 
 						$headers .= 'Message-Id: <' . iri2msgid($it['uri']) . '>' . "\n";
 
 						if($it['uri'] !== $it['parent-uri']) {
 							$headers .= 'References: <' . iri2msgid($it['parent-uri']) . '>' . "\n";
-							if(! strlen($it['title'])) {
+							if(!strlen($it['title'])) {
 								$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1",
-									dbesc($it['parent-uri'])
-								);
-								if(count($r)) {
-									$subtitle = $r[0]['title'];
-									if($subtitle) {
-										if(strncasecmp($subtitle,'RE:',3))
-											$subject = $subtitle;
-										else
-											$subject = 'Re: ' . $subtitle;
-									}
-								}
+									dbesc($it['parent-uri']));
+
+								if(count($r) AND ($r[0]['title'] != ''))  
+									$subject = $r[0]['title'];
 							}
+							if(strncasecmp($subject,'RE:',3))
+								$subject = 'Re: '.$subject;
 						}
-
-						/*$headers .= 'MIME-Version: 1.0' . "\n";
-						//$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
-						$headers .= 'Content-Type: text/plain; charset=UTF-8' . "\n";
-						$headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
-						$html    = prepare_body($it);
-						//$message = '<html><body>' . $html . '</body></html>';
-						$message = html2plain($html);
-						logger('notifier: email delivery to ' . $addr);
-						mail($addr, $subject, $message, $headers);*/
 						email_send($addr, $subject, $headers, $it);
 					}
 					break;
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 5c3c595f5..1f45d2814 100755..100644
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -1,6 +1,6 @@
 <?php
 function oembed_replacecb($matches){
-	logger('oembedcb');
+//	logger('oembedcb');
 	$embedurl=$matches[1];
 	$j = oembed_fetch_url($embedurl);
 	$s =  oembed_format_object($j);
@@ -14,6 +14,9 @@ function oembed_fetch_url($embedurl){
 
 	$txt = Cache::get($embedurl);
 
+	// These media files should now be caught in bbcode.php
+	// left here as a fallback in case this is called from another source
+
 	$noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm");
 	$ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION);
 	
@@ -35,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;
 					}
 				}
 			}
@@ -43,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);
 		}
 		
@@ -62,7 +66,7 @@ function oembed_fetch_url($embedurl){
 	
 function oembed_format_object($j){
 	$embedurl = $j->embedurl;
-	$jhtml = oembed_iframe($j->embedurl,$j->width,$j->height );
+	$jhtml = oembed_iframe($j->embedurl,(isset($j->width) ? $j->width : null), (isset($j->height) ? $j->height : null) );
 	$ret="<span class='oembed ".$j->type."'>";
 	switch ($j->type) {
 		case "video": {
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/pidfile.php b/include/pidfile.php
new file mode 100644
index 000000000..47df8d1f4
--- /dev/null
+++ b/include/pidfile.php
@@ -0,0 +1,32 @@
+<?php
+class pidfile {
+	private $_file;
+	private $_running;
+
+	public function __construct($dir, $name) {
+		$this->_file = "$dir/$name.pid";
+
+		if (file_exists($this->_file)) {
+			$pid = trim(file_get_contents($this->_file));
+			if (posix_kill($pid, 0)) {
+				$this->_running = true;
+			}
+		}
+
+		if (! $this->_running) {
+			$pid = getmypid();
+			file_put_contents($this->_file, $pid);
+		}
+	}
+
+	public function __destruct() {
+		if ((! $this->_running) && file_exists($this->_file)) {
+			unlink($this->_file);
+		}
+	}
+
+	public function is_already_running() {
+		return $this->_running;
+	}
+}
+?>
diff --git a/include/plugin.php b/include/plugin.php
index 8280b1022..8196e8756 100755..100644
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -17,7 +17,12 @@ function uninstall_plugin($plugin){
 }}
 
 if (! function_exists('install_plugin')){
-function install_plugin($plugin){
+function install_plugin($plugin) {
+
+	// silently fail if plugin was removed
+
+	if(! file_exists('addon/' . $plugin . '/' . $plugin . '.php'))
+		return false;
 	logger("Addons: installing " . $plugin);
 	$t = @filemtime('addon/' . $plugin . '/' . $plugin . '.php');
 	@include_once('addon/' . $plugin . '/' . $plugin . '.php');
@@ -32,9 +37,11 @@ function install_plugin($plugin){
 			intval($t),
 			$plugin_admin
 		);
+		return true;
 	}
 	else {
 		logger("Addons: FAILED installing " . $plugin);
+		return false;
 	}
 
 }}
@@ -249,6 +256,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 +284,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 cfbc46b87..499483d00 100755..100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -1,7 +1,6 @@
 <?php
 
 require_once("boot.php");
-require_once("include/quoteconvert.php");
 
 
 function poller_run($argv, $argc){
@@ -26,10 +25,20 @@ function poller_run($argv, $argc){
 	require_once('include/Contact.php');
 	require_once('include/email.php');
 	require_once('include/socgraph.php');
+	require_once('include/pidfile.php');
 
 	load_config('config');
 	load_config('system');
 
+	$lockpath = get_config('system','lockpath');
+	if ($lockpath != '') {
+		$pidfile = new pidfile($lockpath, 'poller.lck');
+		if($pidfile->is_already_running()) {
+			logger("poller: Already running");
+			exit;
+		}
+	}
+
 	$a->set_baseurl(get_config('system','url'));
 
 	load_hooks();
@@ -70,6 +79,19 @@ function poller_run($argv, $argc){
 	// clear old cache
 	Cache::clear();
 
+	// clear item cache files if they are older than one day
+	$cache = get_config('system','itemcache');
+	if (($cache != '') and is_dir($cache)) {
+		if ($dh = opendir($cache)) {
+			while (($file = readdir($dh)) !== false) {
+				$fullpath = $cache."/".$file;
+				if ((filetype($fullpath) == "file") and filectime($fullpath) < (time() - 86400))
+					unlink($fullpath);
+			}
+			closedir($dh);
+		}
+	}
+
 	$manual_id  = 0;
 	$generation = 0;
 	$hub_update = false;
@@ -141,7 +163,10 @@ function poller_run($argv, $argc){
 			if($manual_id)
 				$contact['last-update'] = '0000-00-00 00:00:00';
 
-			if($contact['network'] === NETWORK_DFRN || $contact['network'] === NETWORK_OSTATUS)
+			if($contact['network'] === NETWORK_DFRN)
+				$contact['priority'] = 2;
+
+			if(!get_config('system','ostatus_use_priority') and ($contact['network'] === NETWORK_OSTATUS))
 				$contact['priority'] = 2;
 
 			if($contact['priority'] || $contact['subhub']) {
@@ -217,7 +242,7 @@ function poller_run($argv, $argc){
 
 			$importer_uid = $contact['uid'];
 		
-			$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+			$r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` LEFT JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
 				intval($importer_uid)
 			);
 			if(! count($r))
@@ -489,12 +514,17 @@ 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;
 							}
-							$datarray['body'] = escape_tags(convertquote($r['body'], false));
+							$datarray['body'] = escape_tags($r['body']);
 
 							logger("Mail: Importing ".$msg_uid);
 
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 d312b50f5..7e92705be 100755..100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -61,13 +61,18 @@ function queue_run($argv, $argc){
 		q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
 	}
 		
-	if($queue_id)
+	if($queue_id) {
 		$r = q("SELECT `id` FROM `queue` WHERE `id` = %d LIMIT 1",
 			intval($queue_id)
 		);
-	else
-		$r = q("SELECT `id` FROM `queue` WHERE `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ");
+	}
+	else {
 
+		// For the first 12 hours we'll try to deliver every 15 minutes
+		// After that, we'll only attempt delivery once per hour. 
+
+		$r = q("SELECT `id` FROM `queue` WHERE (( `created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR && `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ) OR ( `last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR ))");
+	}
 	if(! count($r)){
 		return;
 	}
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 bc2c9f0bf..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;
@@ -108,14 +109,18 @@ function can_write_wall(&$a,$owner) {
 
 	if(remote_user()) {
 
-		// user remembered decision and avoid a DB lookup for each and every display item
+		// use remembered decision and avoid a DB lookup for each and every display item
 		// DO NOT use this function if there are going to be multiple owners
 
+		// We have a contact-id for an authenticated remote user, this block determines if the contact
+		// belongs to this page owner, and has the necessary permissions to post content
+
 		if($verified === 2)
 			return true;
 		elseif($verified === 1)
 			return false;
 		else {
+
 			$r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` LEFT JOIN `user` on `user`.`uid` = `contact`.`uid` 
 				WHERE `contact`.`uid` = %d AND `contact`.`id` = %d AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
 				AND `user`.`blockwall` = 0 AND `readonly` = 0  AND ( `contact`.`rel` IN ( %d , %d ) OR `user`.`page-flags` = %d ) LIMIT 1",
@@ -125,6 +130,7 @@ function can_write_wall(&$a,$owner) {
 				intval(CONTACT_IS_FRIEND),
 				intval(PAGE_COMMUNITY)
 			);
+
 			if(count($r)) {
 				$verified = 2;
 				return true;
@@ -197,7 +203,7 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
 				" AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' ) 
 				  AND ( deny_cid  = '' OR  NOT deny_cid REGEXP '<%d>' ) 
 				  AND ( allow_gid = '' OR allow_gid REGEXP '%s' )
-				  AND ( deny_gid  = '' OR NOT deny_gid REGEXP '%s') 
+				  AND ( deny_gid  = '' OR NOT deny_gid REGEXP '%s')
 				",
 				intval($remote_user),
 				intval($remote_user),
@@ -207,4 +213,135 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
 		}
 	}
 	return $sql;
+}
+
+
+function item_permissions_sql($owner_id,$remote_verified = false,$groups = null) {
+
+	$local_user = local_user();
+	$remote_user = remote_user();
+
+	/**
+	 * Construct permissions
+	 *
+	 * default permissions - anonymous user
+	 */
+
+	$sql = " AND allow_cid = '' 
+			 AND allow_gid = '' 
+			 AND deny_cid  = '' 
+			 AND deny_gid  = '' 
+			 AND private = 0
+	";
+
+	/**
+	 * Profile owner - everything is visible
+	 */
+
+	if(($local_user) && ($local_user == $owner_id)) {
+		$sql = ''; 
+	}
+
+	/**
+	 * Authenticated visitor. Unless pre-verified, 
+	 * check that the contact belongs to this $owner_id
+	 * and load the groups the visitor belongs to.
+	 * If pre-verified, the caller is expected to have already
+	 * done this and passed the groups into this function.
+	 */
+
+	elseif($remote_user) {
+
+		if(! $remote_verified) {
+			$r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1",
+				intval($remote_user),
+				intval($owner_id)
+			);
+			if(count($r)) {
+				$remote_verified = true;
+				$groups = init_groups_visitor($remote_user);
+			}
+		}
+		if($remote_verified) {
+		
+			$gs = '<<>>'; // should be impossible to match
+
+			if(is_array($groups) && count($groups)) {
+				foreach($groups as $g)
+					$gs .= '|<' . intval($g) . '>';
+			} 
+
+			$sql = sprintf(
+				" AND ( private = 0 OR ( private = 1 AND wall = 1 AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' ) 
+				  AND ( deny_cid  = '' OR  NOT deny_cid REGEXP '<%d>' ) 
+				  AND ( allow_gid = '' OR allow_gid REGEXP '%s' )
+				  AND ( deny_gid  = '' OR NOT deny_gid REGEXP '%s'))) 
+				",
+				intval($remote_user),
+				intval($remote_user),
+				dbesc($gs),
+				dbesc($gs)
+			);
+		}
+	}
+
+	return $sql;
+}
+
+
+/*
+ * Functions used to protect against Cross-Site Request Forgery
+ * The security token has to base on at least one value that an attacker can't know - here it's the session ID and the private key.
+ * In this implementation, a security token is reusable (if the user submits a form, goes back and resubmits the form, maybe with small changes;
+ * or if the security token is used for ajax-calls that happen several times), but only valid for a certain amout of time (3hours).
+ * The "typename" seperates the security tokens of different types of forms. This could be relevant in the following case:
+ *    A security token is used to protekt a link from CSRF (e.g. the "delete this profile"-link).
+ *    If the new page contains by any chance external elements, then the used security token is exposed by the referrer.
+ *    Actually, important actions should not be triggered by Links / GET-Requests at all, but somethimes they still are,
+ *    so this mechanism brings in some damage control (the attacker would be able to forge a request to a form of this type, but not to forms of other types).
+ */ 
+function get_form_security_token($typename = '') {
+	$a = get_app();
+	
+	$timestamp = time();
+	$sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $timestamp . $typename);
+	
+	return $timestamp . '.' . $sec_hash;
+}
+
+function check_form_security_token($typename = '', $formname = 'form_security_token') {
+	if (!x($_REQUEST, $formname)) return false;
+	$hash = $_REQUEST[$formname];
+	
+	$max_livetime = 10800; // 3 hours
+	
+	$a = get_app();
+	
+	$x = explode('.', $hash);
+	if (time() > (IntVal($x[0]) + $max_livetime)) return false;
+	
+	$sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $x[0] . $typename);
+	
+	return ($sec_hash == $x[1]);
+}
+
+function check_form_security_std_err_msg() {
+	return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before subitting it.') . EOL;
+}
+function check_form_security_token_redirectOnErr($err_redirect, $typename = '', $formname = 'form_security_token') {
+	if (!check_form_security_token($typename, $formname)) {
+		$a = get_app();
+		logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
+		logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
+		notice( check_form_security_std_err_msg() );
+		goaway($a->get_baseurl() . $err_redirect );
+	}
+}
+function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') {
+	if (!check_form_security_token($typename, $formname)) {
+		logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
+		logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
+		header('HTTP/1.1 403 Forbidden');
+		killme();
+	}
 }
\ No newline at end of file
diff --git a/include/session.php b/include/session.php
index 6c32e299f..6c32e299f 100755..100644
--- a/include/session.php
+++ b/include/session.php
diff --git a/include/socgraph.php b/include/socgraph.php
index 79d7340a4..3f5194049 100755..100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -230,19 +230,21 @@ function all_friends($uid,$cid,$start = 0, $limit = 80) {
 
 
 
-function suggestion_query($uid, $start = 0, $limit = 40) {
+function suggestion_query($uid, $start = 0, $limit = 80) {
 
 	if(! $uid)
 		return array();
 
 	$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 = 40) {
 
 	$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 8671587fc..46252c355 100755..100644
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -13,12 +13,14 @@
 		var $debug=false;
 		
 		private function _preg_error(){
+			
 			switch(preg_last_error()){
 			    case PREG_INTERNAL_ERROR: echo('PREG_INTERNAL_ERROR'); break;
 			    case PREG_BACKTRACK_LIMIT_ERROR: echo('PREG_BACKTRACK_LIMIT_ERROR'); break;
 			    case PREG_RECURSION_LIMIT_ERROR: echo('PREG_RECURSION_LIMIT_ERROR'); break;
 			    case PREG_BAD_UTF8_ERROR: echo('PREG_BAD_UTF8_ERROR'); break;
-			    case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break;
+// This is only valid for php > 5.3, not certain how to code around it for unit tests
+//			    case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break;
 			    default:
 					//die("Unknown preg error.");
 					return;
@@ -80,8 +82,13 @@
 		 */
 		private function _replcb_for($args){
 			$m = array_map('trim', explode(" as ", $args[2]));
-			list($keyname, $varname) = explode("=>",$m[1]);
-			if (is_null($varname)) { $varname=$keyname; $keyname=""; }
+			$x = explode("=>",$m[1]);
+			if (count($x) == 1) {
+				$varname = $x[0];
+				$keyname = "";
+			} else {
+				list($keyname, $varname) = $x;
+			}
 			if ($m[0]=="" || $varname=="" || is_null($varname)) die("template error: 'for ".$m[0]." as ".$varname."'") ;
 			//$vals = $this->r[$m[0]];
 			$vals = $this->_get_var($m[0]);
@@ -91,7 +98,7 @@
 				$this->_push_stack();
 				$r = $this->r;
 				$r[$varname] = $v;
-				if ($keyname!='') $r[$keyname] = $k;
+				if ($keyname!='') $r[$keyname] = (($k === 0) ? '0' : $k);
 				$ret .=  $this->replace($args[3], $r);
 				$this->_pop_stack();
 			}
@@ -198,7 +205,7 @@
 				$os=$s; $count++;
 				$s = $this->var_replace($s);
 			}
-			return template_unescape($s);
+			return $s;
 		}
 	}
 	
diff --git a/include/text.php b/include/text.php
index 042ee982c..aced9e0a8 100755..100644
--- a/include/text.php
+++ b/include/text.php
@@ -20,7 +20,7 @@ function replace_macros($s,$r) {
 	
 	//$a = get_app();
 	//$a->page['debug'] .= "$tt <br>\n";
-	return $r;
+	return template_unescape($r);
 
 }}
 
@@ -80,6 +80,9 @@ function escape_tags($string) {
 if(! function_exists('autoname')) {
 function autoname($len) {
 
+	if($len <= 0)
+		return '';
+
 	$vowels = array('a','a','ai','au','e','e','e','ee','ea','i','ie','o','ou','u'); 
 	if(mt_rand(0,5) == 4)
 		$vowels[] = 'y';
@@ -205,7 +208,6 @@ function hex2bin($s) {
 		return '';
 
 	if(! ctype_xdigit($s)) {
-		logger('hex2bin: illegal input: ' . print_r(debug_backtrace(), true));
 		return($s);
 	}
 
@@ -226,6 +228,9 @@ if(! function_exists('paginate')) {
 function paginate(&$a) {
 	$o = '';
 	$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
+
+//	$stripped = preg_replace('/&zrl=(.*?)([\?&]|$)/ism','',$stripped);
+
 	$stripped = str_replace('q=','',$stripped);
 	$stripped = trim($stripped,'/');
 	$pagenum = $a->pager['page'];
@@ -610,6 +615,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)
@@ -638,7 +645,7 @@ if(! function_exists('search')) {
 function search($s,$id='search-box',$url='/search',$save = false) {
 	$a = get_app();
 	$o  = '<div id="' . $id . '">';
-	$o .= '<form action="' . $a->get_baseurl() . $url . '" method="get" >';
+	$o .= '<form action="' . $a->get_baseurl((stristr($url,'network')) ? true : false) . $url . '" method="get" >';
 	$o .= '<input type="text" name="search" id="search-text" value="' . $s .'" />';
 	$o .= '<input type="submit" name="submit" id="search-submit" value="' . t('Search') . '" />'; 
 	if($save)
@@ -694,8 +701,13 @@ function linkify($s) {
 
 if(! function_exists('smilies')) {
 function smilies($s, $sample = false) {
+
 	$a = get_app();
 
+	if(intval(get_config('system','no_smilies')) 
+		|| (local_user() && intval(get_pconfig(local_user(),'system','no_smilies'))))
+		return $s;
+
 	$s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','smile_encode',$s);
 	$s = preg_replace_callback('/<code>(.*?)<\/code>/ism','smile_encode',$s);
 
@@ -704,27 +716,23 @@ function smilies($s, $sample = false) {
 		'&lt;/3', 
 		'&lt;\\3', 
 		':-)', 
-//		':)', 
 		';-)', 
-//		';)', 
 		':-(', 
-//		':(', 
 		':-P', 
-//		':P', 
+		':-p', 
 		':-"', 
 		':-&quot;', 
 		':-x', 
 		':-X', 
 		':-D', 
-//		':D', 
 		'8-|', 
 		'8-O', 
 		':-O', 
 		'\\o/', 
 		'o.O', 
 		'O.o', 
-		'\\.../', 
-		'\\ooo/', 
+		'o_O', 
+		'O_o', 
 		":'(", 
 		":-!", 
 		":-/", 
@@ -734,10 +742,9 @@ function smilies($s, $sample = false) {
 		':homebrew', 
 		':coffee', 
 		':facepalm',
-		':headdesk',
 		'~friendika', 
-		'~friendica', 
-		'Diaspora*' 
+		'~friendica'
+
 	);
 
 	$icons = array(
@@ -745,27 +752,23 @@ function smilies($s, $sample = false) {
 		'<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="</3" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="<\\3" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />',
-//		'<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":)" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />',
-//		'<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";)"/>',                
 		'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />',
-//		'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":(" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" />',
-//		'<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":P" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-p" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-x" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-X" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" />',
-//		'<img src="' . $a->get_baseurl() . '/images/smiley-laughing.gif" alt=":D"/>',                
 		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt=":-O" />',                
 		'<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-shaka.gif" alt="\\.../" />',
-		'<img src="' . $a->get_baseurl() . '/images/smiley-shaka.gif" alt="\\ooo/" />',
+		'<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=":-/" />',
@@ -775,11 +778,8 @@ function smilies($s, $sample = false) {
 		'<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />',
 		'<img src="' . $a->get_baseurl() . '/images/coffee.gif" alt=":coffee" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
-		'<img src="' . $a->get_baseurl() . '/images/smiley-bangheaddesk.gif" alt=":headdesk" />',
 		'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
-		'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
-		'<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
-
+		'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>'
 	);
 
 	$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
@@ -870,16 +870,30 @@ function link_compare($a,$b) {
 if(! function_exists('prepare_body')) {
 function prepare_body($item,$attach = false) {
 
+	$a = get_app();
 	call_hooks('prepare_body_init', $item); 
 
-	$s = prepare_text($item['body']);
+	$cache = get_config('system','itemcache');
+
+	if (($cache != '')) {
+		$cachefile = $cache."/".$item["guid"]."-".strtotime($item["edited"])."-".hash("crc32", $item['body']);
+
+		if (file_exists($cachefile))
+			$s = file_get_contents($cachefile);
+		else {
+			$s = prepare_text($item['body']);
+			file_put_contents($cachefile, $s);
+		}
+	} else
+		$s = prepare_text($item['body']);
 
 	$prep_arr = array('item' => $item, 'html' => $s);
 	call_hooks('prepare_body', $prep_arr);
 	$s = $prep_arr['html'];
 
-	if(! $attach)
+	if(! $attach) {
 		return $s;
+	}
 
 	$arr = explode(',',$item['attach']);
 	if(count($arr)) {
@@ -909,10 +923,67 @@ function prepare_body($item,$attach = false) {
 		}
 		$s .= '<div class="clear"></div></div>';
 	}
+	$matches = false;
+	$cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER);
+	if($cnt) {
+//		logger('prepare_text: categories: ' . print_r($matches,true), LOGGER_DEBUG);
+		foreach($matches as $mtch) {
+			if(strlen($x))
+				$x .= ',';
+			$x .= xmlify(file_tag_decode($mtch[1]));
+		}
+		if(strlen($x))
+			$s .= '<div class="categorytags"><span>' . t('Categories:') . ' </span>' . $x . '</div>'; 
+
+
+	}
+	$matches = false;
+	$x = '';
+	$cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER);
+	if($cnt) {
+//		logger('prepare_text: filed_under: ' . print_r($matches,true), LOGGER_DEBUG);
+		foreach($matches as $mtch) {
+			if(strlen($x))
+				$x .= '&nbsp;&nbsp;&nbsp;';
+			$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);
+
 	return $prep_arr['html'];
 }}
 
@@ -1231,4 +1302,207 @@ function item_post_type($item) {
 	return t('post');
 }
 
+// post categories and "save to file" use the same item.file table for storage.
+// We will differentiate the different uses by wrapping categories in angle brackets
+// and save to file categories in square brackets.
+// To do this we need to escape these characters if they appear in our tag. 
+
+function file_tag_encode($s) {
+	return str_replace(array('<','>','[',']'),array('%3c','%3e','%5b','%5d'),$s);
+}
+
+function file_tag_decode($s) {
+	return str_replace(array('%3c','%3e','%5b','%5d'),array('<','>','[',']'),$s);
+}
+
+function file_tag_file_query($table,$s,$type = 'file') {
+
+	if($type == 'file')
+		$str = preg_quote( '[' . str_replace('%','%%',file_tag_encode($s)) . ']' );
+	else
+		$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))
+		return false;
+	$r = q("select file from item where id = %d and uid = %d limit 1",
+		intval($item),
+		intval($uid)
+	);
+	if(count($r)) {
+		if(! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']'))
+			q("update item set file = '%s' where id = %d and uid = %d limit 1",
+				dbesc($r[0]['file'] . '[' . file_tag_encode($file) . ']'),
+				intval($item),
+				intval($uid)
+			);
+		$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;
+}
+
+function file_tag_unsave_file($uid,$item,$file) {
+	$result = false;
+	if(! intval($uid))
+		return false;
+
+	$pattern = '[' . file_tag_encode($file) . ']' ;
+
+	$r = q("select file from item where id = %d and uid = %d limit 1",
+		intval($item),
+		intval($uid)
+	);
+	if(! count($r))
+		return false;
+
+	q("update item set file = '%s' where id = %d and uid = %d limit 1",
+		dbesc(str_replace($pattern,'',$r[0]['file'])),
+		intval($item),
+		intval($uid)
+	);
+
+	$r = q("select file from item where uid = %d " . file_tag_file_query('item',$file),
+		intval($uid)
+	);
+
+	if(! count($r)) {
+		$saved = get_pconfig($uid,'system','filetags');
+		set_pconfig($uid,'system','filetags',str_replace($pattern,'',$saved));
+	}
+	return true;
+}
+
+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 509466bd9..b1db92c41 100755..100644
--- a/js/fk.autocomplete.js
+++ b/js/fk.autocomplete.js
@@ -14,22 +14,22 @@ function ACPopup(elm,backend_url){
 	this.kp_timer = false;
 	this.url = backend_url;
 
+	var w = 530;
+	var h = 130;
+
+
 	if(typeof elm.editorId == "undefined") {	
 		style = $(elm).offset();
 		w = $(elm).width();
 		h = $(elm).height();
 	}
 	else {
-		style = $(elm.container).offset();
-		w = elm.container.offsetWidth;
-		h = elm.container.offsetHeight;
-		// Quick fix for chrome until I get a tool to inspect the dom
-		// Chrome returns 0x0
-		if(! w)
-			w = 530;
-		if(! h)
-			h = 130;
-
+		var container = elm.getContainer();
+		if(typeof container != "undefined") {
+			style = $(container).offset();
+			w = $(container).width();
+	    	h = $(container).height();
+		}
 	}
 
 	style.top=style.top+h;
@@ -103,6 +103,7 @@ ACPopup.prototype._search = function(){
 		}
 		else {
 			txt = tinyMCE.activeEditor.getContent();
+			//			alert(that.searchText + ':' + t);
 			newtxt = txt.replace(that.searchText,t+' ');
 			tinyMCE.activeEditor.setContent(newtxt);
 			tinyMCE.activeEditor.focus();
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 c20455ad1..7f0428b5b 100755
--- 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({
@@ -101,9 +119,7 @@
 			var home = $(data).find('home').text();
 			if(home == 0) { home = '';  $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
 			$('#home-update').html(home);
-
- 
-
+			
 			var intro = $(data).find('intro').text();
 			if(intro == 0) { intro = '';  $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') }
 			$('#intro-update').html(intro);
@@ -111,6 +127,14 @@
 			var mail = $(data).find('mail').text();
 			if(mail == 0) { mail = '';  $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') }
 			$('#mail-update').html(mail);
+			
+			var intro = $(data).find('intro').text();
+			if(intro == 0) { intro = '';  $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') }
+			$('#intro-update-li').html(intro);
+
+			var mail = $(data).find('mail').text();
+			if(mail == 0) { mail = '';  $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') }
+			$('#mail-update-li').html(mail);
 
 			var eNotif = $(data).find('notif')
 			notif = eNotif.attr('count');
@@ -151,6 +175,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) {
@@ -486,9 +516,9 @@
         return a.join('');  
     }  
 
-	function groupChangeMember(gid,cid) {
+	function groupChangeMember(gid, cid, sec_token) {
 		$('body .fakelink').css('cursor', 'wait');
-		$.get('group/' + gid + '/' + cid, function(data) {
+		$.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) {
 				$('#group-update-wrapper').html(data);
 				$('body .fakelink').css('cursor', 'auto');				
 		});
@@ -573,3 +603,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
new file mode 100644
index 000000000..578163a9d
--- /dev/null
+++ b/library/mcefixes/README
@@ -0,0 +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. 
+ 
+
+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
new file mode 100644
index 000000000..a2829a21c
--- /dev/null
+++ b/library/mcefixes/plugins.bbcode.editor_plugin_src.js
@@ -0,0 +1,258 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+/* Macgirvin Aug-2010 changed from punbb to dfrn dialect */

+

+(function() {

+	tinymce.create('tinymce.plugins.BBCodePlugin', {

+		init : function(ed, url) {

+			var t = this, dialect = ed.getParam('bbcode_dialect', 'dfrn').toLowerCase();

+

+			ed.onBeforeSetContent.add(function(ed, o) {

+				o.content = t['_' + dialect + '_bbcode2html'](o.content);

+			});

+

+			ed.onPostProcess.add(function(ed, o) {

+				if (o.set)

+					o.content = t['_' + dialect + '_bbcode2html'](o.content);

+

+				if (o.get)

+					o.content = t['_' + dialect + '_html2bbcode'](o.content);

+			});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'BBCode Plugin',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		},

+

+		// Private methods

+

+		// HTML -> BBCode in DFRN dialect

+		_dfrn_html2bbcode : function(s) {

+			s = tinymce.trim(s);

+

+			function rep(re, str) {

+

+				//modify code to keep stuff intact within [code][/code] blocks

+				//Waitman Gobble NO WARRANTY

+

+

+				var o = new Array();

+				var x = s.split("[code]");

+				var i = 0;

+

+				var si = "";

+				si = x.shift();

+				si = si.replace(re,str);

+				o.push(si);

+

+				for (i = 0; i < x.length; i++) {

+					var no = new Array();

+					var j = x.shift();

+					var g = j.split("[/code]");

+					no.push(g.shift());

+					si = g.shift();

+					si = si.replace(re,str);

+					no.push(si);

+					o.push(no.join("[/code]"));

+				}

+

+				s = o.join("[code]");

+

+			};

+

+

+

+

+			/* oembed */

+			function _h2b_cb(match) {

+				/*

+				function s_h2b(data) {

+						match = data;

+				}

+				$.ajax({

+					type:"POST",

+					url: 'oembed/h2b',

+					data: {text: match},

+					async: false,

+					success: s_h2b,

+					dataType: 'html'

+				});

+				*/

+				

+				var f, g, tof = [], tor = [];

+				var find_spanc = /<span [^>]*class *= *[\"'](?:[^\"']* )*oembed(?: [^\"']*)*[\"'][^>]*>(.*?(?:<span[^>]*>(.*?)<\/span *>)*.*?)<\/span *>/ig;

+				while (f = find_spanc.exec(match)) {

+					var find_a = /<a([^>]* rel=[\"']oembed[\"'][^>]*)>.*?<\/a *>/ig;

+					if (g = find_a.exec(f[1])) {

+						var find_href = /href=[\"']([^\"']*)[\"']/ig;

+						var m2 = find_href.exec(g[1]);

+						if (m2[1]) {

+							tof.push(f[0]);

+							tor.push("[EMBED]" + m2[1] + "[/EMBED]");

+						}

+					}

+				}

+				for (var i = 0; i < tof.length; i++) match = match.replace(tof[i], tor[i]);

+				

+				return match;

+			}

+			if (s.indexOf('class="oembed')>=0){

+				//alert("request oembed html2bbcode");

+				s = _h2b_cb(s);

+			}

+			

+			/* /oembed */

+

+

+			// example: <strong> to [b]

+			rep(/<a class=\"bookmark\" href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[bookmark=$1]$2[/bookmark]");

+			rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");

+			rep(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");

+			rep(/<span style=\"color:(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");

+			rep(/<font>(.*?)<\/font>/gi,"$1");

+			rep(/<img.*?width=\"(.*?)\".*?height=\"(.*?)\".*?src=\"(.*?)\".*?\/>/gi,"[img=$1x$2]$3[/img]");

+			rep(/<img.*?height=\"(.*?)\".*?width=\"(.*?)\".*?src=\"(.*?)\".*?\/>/gi,"[img=$2x$1]$3[/img]");

+			rep(/<img.*?src=\"(.*?)\".*?height=\"(.*?)\".*?width=\"(.*?)\".*?\/>/gi,"[img=$3x$2]$1[/img]");

+			rep(/<img.*?src=\"(.*?)\".*?width=\"(.*?)\".*?height=\"(.*?)\".*?\/>/gi,"[img=$2x$3]$1[/img]");

+			rep(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");

+

+			rep(/<ul class=\"listbullet\" style=\"list-style-type\: circle\;\">(.*?)<\/ul>/gi,"[list]$1[/list]");

+			rep(/<ul class=\"listnone\" style=\"list-style-type\: none\;\">(.*?)<\/ul>/gi,"[list=]$1[/list]");

+			rep(/<ul class=\"listdecimal\" style=\"list-style-type\: decimal\;\">(.*?)<\/ul>/gi,"[list=1]$1[/list]");

+			rep(/<ul class=\"listlowerroman\" style=\"list-style-type\: lower-roman\;\">(.*?)<\/ul>/gi,"[list=i]$1[/list]");

+			rep(/<ul class=\"listupperroman\" style=\"list-style-type\: upper-roman\;\">(.*?)<\/ul>/gi,"[list=I]$1[/list]");

+			rep(/<ul class=\"listloweralpha\" style=\"list-style-type\: lower-alpha\;\">(.*?)<\/ul>/gi,"[list=a]$1[/list]");

+			rep(/<ul class=\"listupperalpha\" style=\"list-style-type\: upper-alpha\;\">(.*?)<\/ul>/gi,"[list=A]$1[/list]");

+			rep(/<li>(.*?)<\/li>/gi,'[li]$1[/li]');

+

+			rep(/<code>(.*?)<\/code>/gi,"[code]$1[/code]");

+			rep(/<\/(strong|b)>/gi,"[/b]");

+			rep(/<(strong|b)>/gi,"[b]");

+			rep(/<\/(em|i)>/gi,"[/i]");

+			rep(/<(em|i)>/gi,"[i]");

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

+			rep(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");

+			rep(/<u>/gi,"[u]");

+			rep(/<blockquote[^>]*>/gi,"[quote]");

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

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

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

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

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

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

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

+			rep(/&nbsp;/gi," ");

+			rep(/&quot;/gi,"\"");

+			rep(/&lt;/gi,"<");

+			rep(/&gt;/gi,">");

+			rep(/&amp;/gi,"&");

+

+			return s; 

+		},

+

+		// BBCode -> HTML from DFRN dialect

+		_dfrn_bbcode2html : function(s) {

+			s = tinymce.trim(s);

+

+

+                        function rep(re, str) {

+

+                                //modify code to keep stuff intact within [code][/code] blocks

+                                //Waitman Gobble NO WARRANTY

+

+

+                                var o = new Array();

+                                var x = s.split("[code]");

+                                var i = 0;

+

+                                var si = "";

+                                si = x.shift();

+                                si = si.replace(re,str);

+                                o.push(si);

+

+                                for (i = 0; i < x.length; i++) {

+                                        var no = new Array();

+                                        var j = x.shift();

+                                        var g = j.split("[/code]");

+                                        no.push(g.shift());

+                                        si = g.shift();

+                                        si = si.replace(re,str);

+                                        no.push(si);

+                                        o.push(no.join("[/code]"));

+                                }

+

+                                s = o.join("[code]");

+

+                        };

+

+

+

+

+

+			// example: [b] to <strong>

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

+			rep(/\[b\]/gi,"<strong>");

+			rep(/\[\/b\]/gi,"</strong>");

+			rep(/\[i\]/gi,"<em>");

+			rep(/\[\/i\]/gi,"</em>");

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

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

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

+			rep(/\[bookmark=([^\]]+)\](.*?)\[\/bookmark\]/gi,"<a class=\"bookmark\" href=\"$1\">$2</a>");

+			rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>");

+			rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");

+			rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,"<img width=\"$1\" height=\"$2\" src=\"$3\" />");

+			rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />");

+

+			rep(/\[list\](.*?)\[\/list\]/gi, '<ul class="listbullet" style="list-style-type: circle;">$1</ul>');

+			rep(/\[list=\](.*?)\[\/list\]/gi, '<ul class="listnone" style="list-style-type: none;">$1</ul>');

+			rep(/\[list=1\](.*?)\[\/list\]/gi, '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>');

+			rep(/\[list=i\](.*?)\[\/list\]/gi,'<ul class="listlowerroman" style="list-style-type: lower-roman;">$1</ul>');

+			rep(/\[list=I\](.*?)\[\/list\]/gi, '<ul class="listupperroman" style="list-style-type: upper-roman;">$1</ul>');

+			rep(/\[list=a\](.*?)\[\/list\]/gi, '<ul class="listloweralpha" style="list-style-type: lower-alpha;">$1</ul>');

+			rep(/\[list=A\](.*?)\[\/list\]/gi, '<ul class="listupperalpha" style="list-style-type: upper-alpha;">$1</ul>');

+			rep(/\[li\](.*?)\[\/li\]/gi, '<li>$1</li>');

+			rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"<span style=\"color: $1;\">$2</span>");

+			rep(/\[size=(.*?)\](.*?)\[\/size\]/gi,"<span style=\"font-size: $1;\">$2</span>");

+			rep(/\[code\](.*?)\[\/code\]/gi,"<code>$1</code>");

+			rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<blockquote>$1</blockquote>");

+

+			/* oembed */

+			function _b2h_cb(match, url) {

+				url = bin2hex(url);

+				function s_b2h(data) {

+						match = data;

+				}

+				$.ajax({

+					url: 'oembed/b2h?url=' + url,

+					async: false,

+					success: s_b2h,

+					dataType: 'html'

+				});

+				return match;

+			}

+			s = s.replace(/\[embed\](.*?)\[\/embed\]/gi, _b2h_cb);

+			

+			/* /oembed */

+

+			return s; 

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('bbcode', tinymce.plugins.BBCodePlugin);

+})();

diff --git a/library/mcefixes/themes.advanced.img.icons.gif b/library/mcefixes/themes.advanced.img.icons.gif
new file mode 100644
index 000000000..efb356c41
--- /dev/null
+++ 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
new file mode 100644
index 000000000..f01222650
--- /dev/null
+++ b/library/mcefixes/themes.advanced.skins.default.dialog.css
@@ -0,0 +1,117 @@
+/* Generic */

+body {

+font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px;

+scrollbar-3dlight-color:#F0F0EE;

+scrollbar-arrow-color:#676662;

+scrollbar-base-color:#F0F0EE;

+scrollbar-darkshadow-color:#DDDDDD;

+scrollbar-face-color:#E0E0DD;

+scrollbar-highlight-color:#F0F0EE;

+scrollbar-shadow-color:#F0F0EE;

+scrollbar-track-color:#F5F5F5;

+background:#F0F0EE;

+padding:0;

+margin:8px 8px 0 8px;

+}

+

+html {background:#F0F0EE;}

+td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}

+textarea {resize:none;outline:none;}

+a:link, a:visited {color:black;}

+a:hover {color:#2B6FB6;}

+.nowrap {white-space: nowrap}

+

+/* Forms */

+fieldset {margin:0; padding:4px; border:1px solid #919B9C; font-family:Verdana, Arial; font-size:10px;}

+legend {color:#2B6FB6; font-weight:bold;}

+label.msg {display:none;}

+label.invalid {color:#EE0000; display:inline;}

+input.invalid {border:1px solid #EE0000;}

+input {background:#FFF; border:1px solid #CCC;}

+input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}

+input, select, textarea {border:1px solid #808080;}

+input.radio {border:1px none #000000; background:transparent; vertical-align:middle;}

+input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;}

+.input_noborder {border:0;}

+

+/* Buttons */

+#insert, #cancel, input.button, .updateButton {

+border:0; margin:0; padding:0;

+font-weight:bold;

+width:94px; height:26px;

+background:url(img/buttons.png) 0 -26px;

+cursor:pointer;

+padding-bottom:2px;

+float:left;

+}

+

+#insert {background:url(img/buttons.png) 0 -52px}

+#cancel {background:url(img/buttons.png) 0 0; float:right}

+

+/* Browse */

+a.pickcolor, a.browse {text-decoration:none}

+a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.gif) -860px 0; border:1px solid #FFF; margin-left:1px;}

+.mceOldBoxModel a.browse span {width:22px; height:20px;}

+a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;}

+a.browse span.disabled {border:1px solid white; opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}

+a.browse:hover span.disabled {border:1px solid white; background-color:transparent;}

+a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.gif) -840px 0; margin-left:2px;}

+.mceOldBoxModel a.pickcolor span {width:21px; height:17px;}

+a.pickcolor:hover span {background-color:#B2BBD0;}

+a.pickcolor:hover span.disabled {}

+

+/* Charmap */

+table.charmap {border:1px solid #AAA; text-align:center}

+td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;}

+#charmap a {display:block; color:#000; text-decoration:none; border:0}

+#charmap a:hover {background:#CCC;color:#2B6FB6}

+#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center}

+#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center}

+

+/* Source */

+.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;}

+.mceActionPanel {margin-top:5px;}

+

+/* Tabs classes */

+.tabs {width:100%; height:18px; line-height:normal; background:url(img/tabs.gif) repeat-x 0 -72px;}

+.tabs ul {margin:0; padding:0; list-style:none;}

+.tabs li {float:left; background:url(img/tabs.gif) no-repeat 0 0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block;}

+.tabs li.current {background:url(img/tabs.gif) no-repeat 0 -18px; margin-right:2px;}

+.tabs span {float:left; display:block; background:url(img/tabs.gif) no-repeat right -36px; padding:0px 10px 0 0;}

+.tabs .current span {background:url(img/tabs.gif) no-repeat right -54px;}

+.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;}

+.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;}

+

+/* Panels */

+.panel_wrapper div.panel {display:none;}

+.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;}

+.panel_wrapper {border:1px solid #919B9C; border-top:0px; padding:10px; padding-top:5px; clear:both; background:white;}

+

+/* Columns */

+.column {float:left;}

+.properties {width:100%;}

+.properties .column1 {}

+.properties .column2 {text-align:left;}

+

+/* Titles */

+h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;}

+h3 {font-size:14px;}

+.title {font-size:12px; font-weight:bold; color:#2B6FB6;}

+

+/* Dialog specific */

+#link .panel_wrapper, #link div.current {height:125px;}

+#image .panel_wrapper, #image div.current {height:200px;}

+#plugintable thead {font-weight:bold; background:#DDD;}

+#plugintable, #about #plugintable td {border:1px solid #919B9C;}

+#plugintable {width:96%; margin-top:10px;}

+#pluginscontainer {height:290px; overflow:auto;}

+#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;}

+#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}

+#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}

+#colorpicker #light div {overflow:hidden;}

+#colorpicker #previewblock {float:right; padding-left:10px; height:20px;}

+#colorpicker .panel_wrapper div.current {height:175px;}

+#colorpicker #namedcolors {width:150px;}

+#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}

+#colorpicker #colornamecontainer {margin-top:5px;}

+#colorpicker #picker_panel fieldset {margin:auto;width:325px;}

diff --git a/library/mcefixes/themes.advanced.skins.default.ui.css b/library/mcefixes/themes.advanced.skins.default.ui.css
new file mode 100644
index 000000000..5f1f96448
--- /dev/null
+++ b/library/mcefixes/themes.advanced.skins.default.ui.css
@@ -0,0 +1,213 @@
+/* Reset */

+.defaultSkin table, .defaultSkin tbody, .defaultSkin a, .defaultSkin img, .defaultSkin tr, .defaultSkin div, .defaultSkin td, .defaultSkin iframe, .defaultSkin span, .defaultSkin *, .defaultSkin .mceText {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate; text-align:left}

+.defaultSkin a:hover, .defaultSkin a:link, .defaultSkin a:visited, .defaultSkin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000}

+.defaultSkin table td {vertical-align:middle}

+

+/* Containers */

+.defaultSkin table {direction:ltr; background:#FFF}

+.defaultSkin iframe {display:block; background:#FFF}

+.defaultSkin .mceToolbar {height:26px}

+.defaultSkin .mceLeft {text-align:left}

+.defaultSkin .mceRight {text-align:right}

+

+/* External */

+.defaultSkin .mceExternalToolbar {position:absolute; border:2px solid #CCC; border-bottom:0; display:none;}

+.defaultSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;}

+.defaultSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.gif) -820px 0}

+

+/* Layout */

+.defaultSkin table.mceLayout {border:0; border-left:1px solid #CCC; border-right:1px solid #CCC}

+.defaultSkin table.mceLayout tr.mceFirst td {border-top:1px solid #CCC}

+.defaultSkin table.mceLayout tr.mceLast td {border-bottom:1px solid #CCC}

+.defaultSkin table.mceToolbar, .defaultSkin tr.mceFirst .mceToolbar tr td, .defaultSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0;}

+.defaultSkin td.mceToolbar {padding-top:1px; vertical-align:top}

+.defaultSkin .mceIframeContainer { /*border-top:1px solid #CCC; border-bottom:1px solid #CCC */ border: none;}

+.defaultSkin .mceStatusbar {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:20px}

+.defaultSkin .mceStatusbar div {float:left; margin:2px}

+.defaultSkin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize; outline:0}

+.defaultSkin .mceStatusbar a:hover {text-decoration:underline}

+.defaultSkin table.mceToolbar {margin-left:3px}

+.defaultSkin span.mceIcon, .defaultSkin img.mceIcon {display:block; width:20px; height:20px}

+.defaultSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}

+.defaultSkin td.mceCenter {text-align:center;}

+.defaultSkin td.mceCenter table {margin:0 auto; text-align:left;}

+.defaultSkin td.mceRight table {margin:0 0 0 auto;}

+

+/* Button */

+.defaultSkin .mceButton {display:block; border:1px solid #F0F0EE; width:20px; height:20px; margin-right:10px}

+.defaultSkin a.mceButtonEnabled:hover {border:1px solid #0A246A; background-color:#B2BBD0}

+.defaultSkin a.mceButtonActive, .defaultSkin a.mceButtonSelected {border:1px solid #0A246A; background-color:#C2CBE0}

+.defaultSkin .mceButtonDisabled .mceIcon {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}

+.defaultSkin .mceButtonLabeled {width:auto}

+.defaultSkin .mceButtonLabeled span.mceIcon {float:left}

+.defaultSkin span.mceButtonLabel {display:block; font-size:10px; padding:4px 6px 0 22px; font-family:Tahoma,Verdana,Arial,Helvetica}

+.defaultSkin .mceButtonDisabled .mceButtonLabel {color:#888}

+

+/* Separator */

+.defaultSkin .mceSeparator {display:block; background:url(../../img/icons.gif) -180px 0; width:2px; height:20px; margin:2px 2px 0 4px}

+

+/* ListBox */

+.defaultSkin .mceListBox, .defaultSkin .mceListBox a {display:block}

+.defaultSkin .mceListBox .mceText {padding-left:4px; width:70px; text-align:left; border:1px solid #CCC; border-right:0; background:#FFF; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden}

+.defaultSkin .mceListBox .mceOpen {width:9px; height:20px; background:url(../../img/icons.gif) -741px 0; margin-right:2px; border:1px solid #CCC;}

+.defaultSkin table.mceListBoxEnabled:hover .mceText, .defaultSkin .mceListBoxHover .mceText, .defaultSkin .mceListBoxSelected .mceText {border:1px solid #A2ABC0; border-right:0; background:#FFF}

+.defaultSkin table.mceListBoxEnabled:hover .mceOpen, .defaultSkin .mceListBoxHover .mceOpen, .defaultSkin .mceListBoxSelected .mceOpen {background-color:#FFF; border:1px solid #A2ABC0}

+.defaultSkin .mceListBoxDisabled a.mceText {color:gray; background-color:transparent;}

+.defaultSkin .mceListBoxMenu {overflow:auto; overflow-x:hidden}

+.defaultSkin .mceOldBoxModel .mceListBox .mceText {height:22px}

+.defaultSkin .mceOldBoxModel .mceListBox .mceOpen {width:11px; height:22px;}

+.defaultSkin select.mceNativeListBox {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:7pt; background:#F0F0EE; border:1px solid gray; margin-right:2px;}

+

+/* SplitButton */

+.defaultSkin .mceSplitButton {width:32px; height:20px; direction:ltr}

+.defaultSkin .mceSplitButton a, .defaultSkin .mceSplitButton span {height:20px; display:block}

+.defaultSkin .mceSplitButton a.mceAction {width:20px; border:1px solid #F0F0EE; border-right:0;}

+.defaultSkin .mceSplitButton span.mceAction {width:20px; background-image:url(../../img/icons.gif);}

+.defaultSkin .mceSplitButton a.mceOpen {width:9px; background:url(../../img/icons.gif) -741px 0; border:1px solid #F0F0EE;}

+.defaultSkin .mceSplitButton span.mceOpen {display:none}

+.defaultSkin table.mceSplitButtonEnabled:hover a.mceAction, .defaultSkin .mceSplitButtonHover a.mceAction, .defaultSkin .mceSplitButtonSelected a.mceAction {border:1px solid #0A246A; border-right:0; background-color:#B2BBD0}

+.defaultSkin table.mceSplitButtonEnabled:hover a.mceOpen, .defaultSkin .mceSplitButtonHover a.mceOpen, .defaultSkin .mceSplitButtonSelected a.mceOpen {background-color:#B2BBD0; border:1px solid #0A246A;}

+.defaultSkin .mceSplitButtonDisabled .mceAction, .defaultSkin .mceSplitButtonDisabled a.mceOpen {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}

+.defaultSkin .mceSplitButtonActive a.mceAction {border:1px solid #0A246A; background-color:#C2CBE0}

+.defaultSkin .mceSplitButtonActive a.mceOpen {border-left:0;}

+

+/* ColorSplitButton */

+.defaultSkin div.mceColorSplitMenu table {background:#FFF; border:1px solid gray}

+.defaultSkin .mceColorSplitMenu td {padding:2px}

+.defaultSkin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden; border:1px solid #808080}

+.defaultSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}

+.defaultSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF}

+.defaultSkin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid #0A246A; background-color:#B6BDD2}

+.defaultSkin a.mceMoreColors:hover {border:1px solid #0A246A}

+.defaultSkin .mceColorPreview {margin-left:2px; width:16px; height:4px; overflow:hidden; background:#9a9b9a}

+.defaultSkin .mce_forecolor span.mceAction, .defaultSkin .mce_backcolor span.mceAction {overflow:hidden; height:16px}

+

+/* Menu */

+.defaultSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #D4D0C8}

+.defaultSkin .mceNoIcons span.mceIcon {width:0;}

+.defaultSkin .mceNoIcons a .mceText {padding-left:10px}

+.defaultSkin .mceMenu table {background:#FFF}

+.defaultSkin .mceMenu a, .defaultSkin .mceMenu span, .defaultSkin .mceMenu {display:block}

+.defaultSkin .mceMenu td {height:20px}

+.defaultSkin .mceMenu a {position:relative;padding:3px 0 4px 0}

+.defaultSkin .mceMenu .mceText {position:relative; display:block; font-family:Tahoma,Verdana,Arial,Helvetica; color:#000; cursor:default; margin:0; padding:0 25px 0 25px; display:block}

+.defaultSkin .mceMenu span.mceText, .defaultSkin .mceMenu .mcePreview {font-size:11px}

+.defaultSkin .mceMenu pre.mceText {font-family:Monospace}

+.defaultSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;}

+.defaultSkin .mceMenu .mceMenuItemEnabled a:hover, .defaultSkin .mceMenu .mceMenuItemActive {background-color:#dbecf3}

+.defaultSkin td.mceMenuItemSeparator {background:#DDD; height:1px}

+.defaultSkin .mceMenuItemTitle a {border:0; background:#EEE; border-bottom:1px solid #DDD}

+.defaultSkin .mceMenuItemTitle span.mceText {color:#000; font-weight:bold; padding-left:4px}

+.defaultSkin .mceMenuItemDisabled .mceText {color:#888}

+.defaultSkin .mceMenuItemSelected .mceIcon {background:url(img/menu_check.gif)}

+.defaultSkin .mceNoIcons .mceMenuItemSelected a {background:url(img/menu_arrow.gif) no-repeat -6px center}

+.defaultSkin .mceMenu span.mceMenuLine {display:none}

+.defaultSkin .mceMenuItemSub a {background:url(img/menu_arrow.gif) no-repeat top right;}

+

+/* Progress,Resize */

+.defaultSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=50)'; filter:alpha(opacity=50); background:#FFF}

+.defaultSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}

+

+/* Formats */

+.defaultSkin .mce_formatPreview a {font-size:10px}

+.defaultSkin .mce_p span.mceText {}

+.defaultSkin .mce_address span.mceText {font-style:italic}

+.defaultSkin .mce_pre span.mceText {font-family:monospace}

+.defaultSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}

+.defaultSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}

+.defaultSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}

+.defaultSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}

+.defaultSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}

+.defaultSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}

+

+/* Theme */

+.defaultSkin span.mce_bold {background-position:0 0}

+.defaultSkin span.mce_italic {background-position:-60px 0}

+.defaultSkin span.mce_underline {background-position:-140px 0}

+.defaultSkin span.mce_strikethrough {background-position:-120px 0}

+.defaultSkin span.mce_undo {background-position:-160px 0}

+.defaultSkin span.mce_redo {background-position:-100px 0}

+.defaultSkin span.mce_cleanup {background-position:-40px 0}

+.defaultSkin span.mce_bullist {background-position:-20px 0}

+.defaultSkin span.mce_numlist {background-position:-80px 0}

+.defaultSkin span.mce_justifyleft {background-position:-460px 0}

+.defaultSkin span.mce_justifyright {background-position:-480px 0}

+.defaultSkin span.mce_justifycenter {background-position:-420px 0}

+.defaultSkin span.mce_justifyfull {background-position:-440px 0}

+.defaultSkin span.mce_anchor {background-position:-200px 0}

+.defaultSkin span.mce_indent {background-position:-400px 0}

+.defaultSkin span.mce_outdent {background-position:-540px 0}

+.defaultSkin span.mce_link {background-position:-500px 0}

+.defaultSkin span.mce_unlink {background-position:-640px 0}

+.defaultSkin span.mce_sub {background-position:-600px 0}

+.defaultSkin span.mce_sup {background-position:-620px 0}

+.defaultSkin span.mce_removeformat {background-position:-580px 0}

+.defaultSkin span.mce_newdocument {background-position:-520px 0}

+.defaultSkin span.mce_image {background-position:-380px 0}

+.defaultSkin span.mce_help {background-position:-340px 0}

+.defaultSkin span.mce_code {background-position:-260px 0}

+.defaultSkin span.mce_hr {background-position:-360px 0}

+.defaultSkin span.mce_visualaid {background-position:-660px 0}

+.defaultSkin span.mce_charmap {background-position:-240px 0}

+.defaultSkin span.mce_paste {background-position:-560px 0}

+.defaultSkin span.mce_copy {background-position:-700px 0}

+.defaultSkin span.mce_cut {background-position:-680px 0}

+.defaultSkin span.mce_blockquote {background-position:-220px 0}

+.defaultSkin .mce_forecolor span.mceAction {background-position:-720px 0}

+.defaultSkin .mce_backcolor span.mceAction {background-position:-760px 0}

+.defaultSkin span.mce_forecolorpicker {background-position:-720px 0}

+.defaultSkin span.mce_backcolorpicker {background-position:-760px 0}

+

+/* Plugins */

+.defaultSkin span.mce_advhr {background-position:-0px -20px}

+.defaultSkin span.mce_ltr {background-position:-20px -20px}

+.defaultSkin span.mce_rtl {background-position:-40px -20px}

+.defaultSkin span.mce_emotions {background-position:-60px -20px}

+.defaultSkin span.mce_fullpage {background-position:-80px -20px}

+.defaultSkin span.mce_fullscreen {background-position:-100px -20px}

+.defaultSkin span.mce_iespell {background-position:-120px -20px}

+.defaultSkin span.mce_insertdate {background-position:-140px -20px}

+.defaultSkin span.mce_inserttime {background-position:-160px -20px}

+.defaultSkin span.mce_absolute {background-position:-180px -20px}

+.defaultSkin span.mce_backward {background-position:-200px -20px}

+.defaultSkin span.mce_forward {background-position:-220px -20px}

+.defaultSkin span.mce_insert_layer {background-position:-240px -20px}

+.defaultSkin span.mce_insertlayer {background-position:-260px -20px}

+.defaultSkin span.mce_movebackward {background-position:-280px -20px}

+.defaultSkin span.mce_moveforward {background-position:-300px -20px}

+.defaultSkin span.mce_media {background-position:-320px -20px}

+.defaultSkin span.mce_nonbreaking {background-position:-340px -20px}

+.defaultSkin span.mce_pastetext {background-position:-360px -20px}

+.defaultSkin span.mce_pasteword {background-position:-380px -20px}

+.defaultSkin span.mce_selectall {background-position:-400px -20px}

+.defaultSkin span.mce_preview {background-position:-420px -20px}

+.defaultSkin span.mce_print {background-position:-440px -20px}

+.defaultSkin span.mce_cancel {background-position:-460px -20px}

+.defaultSkin span.mce_save {background-position:-480px -20px}

+.defaultSkin span.mce_replace {background-position:-500px -20px}

+.defaultSkin span.mce_search {background-position:-520px -20px}

+.defaultSkin span.mce_styleprops {background-position:-560px -20px}

+.defaultSkin span.mce_table {background-position:-580px -20px}

+.defaultSkin span.mce_cell_props {background-position:-600px -20px}

+.defaultSkin span.mce_delete_table {background-position:-620px -20px}

+.defaultSkin span.mce_delete_col {background-position:-640px -20px}

+.defaultSkin span.mce_delete_row {background-position:-660px -20px}

+.defaultSkin span.mce_col_after {background-position:-680px -20px}

+.defaultSkin span.mce_col_before {background-position:-700px -20px}

+.defaultSkin span.mce_row_after {background-position:-720px -20px}

+.defaultSkin span.mce_row_before {background-position:-740px -20px}

+.defaultSkin span.mce_merge_cells {background-position:-760px -20px}

+.defaultSkin span.mce_table_props {background-position:-980px -20px}

+.defaultSkin span.mce_row_props {background-position:-780px -20px}

+.defaultSkin span.mce_split_cells {background-position:-800px -20px}

+.defaultSkin span.mce_template {background-position:-820px -20px}

+.defaultSkin span.mce_visualchars {background-position:-840px -20px}

+.defaultSkin span.mce_abbr {background-position:-860px -20px}

+.defaultSkin span.mce_acronym {background-position:-880px -20px}

+.defaultSkin span.mce_attribs {background-position:-900px -20px}

+.defaultSkin span.mce_cite {background-position:-920px -20px}

+.defaultSkin span.mce_del {background-position:-940px -20px}

+.defaultSkin span.mce_ins {background-position:-960px -20px}

+.defaultSkin span.mce_pagebreak {background-position:0 -40px}

+.defaultSkin span.mce_restoredraft {background-position:-20px -40px}

+.defaultSkin span.mce_spellchecker {background-position:-540px -20px}

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/spam/b8/storage/storage_frndc.php b/library/spam/b8/storage/storage_frndc.php
index 7702c108b..62909d471 100644
--- a/library/spam/b8/storage/storage_frndc.php
+++ b/library/spam/b8/storage/storage_frndc.php
@@ -174,20 +174,44 @@ class b8_storage_frndc extends b8_storage_base
 				array_push($where, $token);
 			}
 
-			$where = 'token IN ("' . implode('", "', $where) . '")';
+			$where = 'term IN ("' . implode('", "', $where) . '")';
 		}
 
 		else {
 			$token = dbesc($token);
-			$where = 'token = "' . $token . '"';
+			$where = 'term = "' . $token . '"';
 		}
 
 		# ... and fetch the data
 
 		$result = q('
-			SELECT *
-			FROM ' . $this->config['table_name'] . '
-			WHERE ' . $where . ' AND uid = ' . $uid );
+			SELECT * FROM spam WHERE ' . $where . ' AND uid = ' . $uid );
+
+
+		$returned_tokens = array();
+		if(count($result)) {
+			foreach($result as $rr)
+				$returned_tokens[] = $rr['term'];
+		}
+		$to_create = array();
+
+		if(count($tokens) > 0) {
+			foreach($tokens as $token)
+				if(! in_array($token,$returned_tokens))
+					$to_create[] = str_tolower($token); 
+		}
+		if(count($to_create)) {
+			$sql = '';
+			foreach($to_create as $term) {
+				if(strlen($sql))
+					$sql .= ',';
+				$sql .= sprintf("(term,datetime,uid) values('%s','%s',%d)",
+					dbesc(str_tolower($term))
+					dbesc(datetime_convert()),
+					intval($uid)
+				);
+			q("insert into spam " . $sql);
+		}
 
 		return $result;
 
diff --git a/library/tinymce/changelog.txt b/library/tinymce/changelog.txt
index bcd3f294c..ec712077a 100755..100644
--- a/library/tinymce/changelog.txt
+++ b/library/tinymce/changelog.txt
@@ -1,3 +1,456 @@
+Version 3.5b2 (2012-03-15)

+	Rewrote the enter key logic to normalize browser behavior.

+	Fixed so enter within PRE elements produces a BR and shift+enter breaks/end the PRE. Can be disabled using the br_in_pre option.

+	Fixed bug where the selection wouldn't be correct after applying formatting and having the caret at the end of the new format node.

+	Fixed bug where the noneditable plugin would process contents on raw input calls for example on undo/redo calls.

+	Fixed bug where WebKit could produce an exception when a bookmark was requested when there wasn't a proper selection.

+	Fixed bug where WebKit would fail to open the image dialog since it would be returning false for a class name instead of a string.

+	Fixed so alignment and indentation works properly when forced_root_blocks is set to false. It will produce a DIV by default.

+Version 3.5b1 (2012-03-08)

+	Added new event class that is faster and enables support for faking events.

+	Added new self_closing_elements, short_ended_elements, boolean_attributes, non_empty_elements and block_elements options to control the HTML Schema.

+	Added new schema option and support for the HTML5 schema.

+	Added new visualblocks plugin that shows html5 blocks with visual borders.

+	Added new types and selector options to make it easier to create editor instances with different configs.

+	Added new preview of formatting options in various listboxes.

+	Added new preview_styles option that enables control over what gets previewed.

+	Fixed bug where content css would be loaded twice into iframe. 

+	Fixed bug where start elements with only whitespace in the attribute part wouldn't be correctly parsed.

+	Fixed bug where the advlink dialog would produce an error about the addSelectAccessibility function not being defined.

+	Fixed bug where the caret would be placed at an incorrect position if span was removed by the invalid_elements setting.

+	Fixed bug where elements inside a white space preserve element like pre didn't inherit the behavior while parsing.

+Version 3.4.9.x (2012-02-xx)

+	Improved behaviour of backspacing into a table to be consistant across browsers and disable backspace when cursor immediately follows a table.

+	Improved edit CSS style plugin for single and multiple block selection and provide option to apply style to only selected text.

+	Fixed bug in Chrome where moving caret down in table and pasting throws errors.

+	Corrected reference to TinyMCE trim function.

+	Fixed bug where Ignore All in IE did not remove the underline from the selected word.

+	Fixed bug in html source editor word wrap option not wrapping text in Webkit browsers.

+	Fixed bug where it was possible to insert an invalid colour in the color pop-up dialog.

+	Fixed bug in Webkit where if anchor is on last line by itself caret can not be placed after it.

+Version 3.4.9 (2012-02-23)

+	Added settings to wordcount plugin to configure update rate and checking wordcount on backspace and delete using wordcount_update_rate and wordcount_update_on_delete.

+	Fixed bug in Webkit and IE where deleting empty paragraphs would remove entire editor contents.

+	Fixed bug where pressing enter on end of list item with a heading would create a new item with heading.	

+	Fixed edit css style dialog text-decoration none checkbox so it disables other text-decoration options when enabled.

+	Fixed bug in Gecko where undo wasn't added when focus was lost.

+	Fixed bug in Gecko where shift-enter in table cell ending with BR doesn't move caret to new line.

+	Fixed bug where right-click on formatted text in IE selected the entire line.

+	Fixed bug where text ending with space could not be unformatted in IE.

+	Fixed bug where caret formatting would be removed when moving the caret when a selector expression was used.

+	Fixed bug where formatting would be applied to the body element when all contents where selected and format had both inline and selector parts.

+	Fixed bug where the media plugin would throw errors if you had iframe set as an invalid element in config.

+	Fixed bug where the caret would be placed at the top of the document if you inserted a table and undo:ed that operation. Patch contributed by Wesley Walser.

+	Fixed bug where content css files where loaded twice into the iframe.

+	Fixed so elements with comments would be trated as non empty elements. Patch contributed by Arjan Scherpenisse.

+Version 3.4.8 (2012-02-02)

+	Fixed bug in IE where selected text ending with space cannot be formatted then formatted again to get original text.

+	Fixed bug in IE where images larger than editor area were being deselected when toolbar buttons are clicked.

+	Fixed bug where wrong text align buttons are active when multiple block elements are selected.

+	Fixed bug where selected link not showing in target field of link dialog in some selection cases.

+	Use settings for remove_trailing_br so this can be turned off instead of hard coding the value.

+	Fixed bug in IE where the media plugin displayed null text when some values aren't filled in.

+	Added API method 'onSetAttrib' that fires when the attribute value on a node changes.

+	Fix font size dropdown value not being updated when text already has a font size in the advanced template.

+	Fixed bug in IE where IE doesn't use ARIA attributes properly on options - causing labels to be read out 2 times.

+	Fixed bug where caret cannot be placed after table if table is at end of document in IE.

+	Fixed bug where adding range isn't always successful so we need to check range count otherwise an exception can occur.

+	Added spacebar onclick handler to toolbar buttons to ensure that the accessibility behaviour works correctly.

+	Fixed bug where a stranded bullet point would get created in WebKit.

+	Fixed bug where selecting text in a blockquote and pressing backspace toggles the style.

+	Fixed bug where pressing enter from a heading in IE, the resulting P tag below it shares the style property. 

+	Fix white space in between spans from being deleted. 

+	Fixed bug where scrollbars where visible in the character map dialog on Gecko.

+	Fixed issue with missing translation for one of the emoticons.

+	Fixed bug where dots in id:s where causing problems. Patch provided by Abhishek Dev.

+	Fixed bug where urls with an at sign in the path wouldn't be parsed correctly. Patch contributed by Jason Grout.

+	Fixed bug where Opera would remove the first character of a inline formatted word if you pressed backspace.

+	Fixed bugs with the autoresize plugin on various browsers and removed the need for the throbber.

+	Fixed performance issue where the contextmenu plugin would try to remove the menu even if it was removed. Patch contributed by mhu.

+Version 3.4.7 (2011-11-03)

+	Modified the caret formatting behavior to word similar to common desktop wordprocessors like Word or Libre Office.

+	Fixed bug in Webkit - Cursor positioning does not work vertically within a table cell with multiple lines of text.

+	Fixed bug in IE where Inserting a table in IE8 places cursor in the second cell of the first row.

+	Fixed bug in IE where editor in a frame doesn't give focus to the toolbar using ALT-F10.

+	Fix for webkit and gecko so that deleting bullet from start of list outdents inner list items and moves first item into paragraph.

+	Fix new list items in IE8 not displayed on a new line when list contains nested list items.

+	Clear formatting in table cell breaks the cell.

+	Made media type list localisable.

+	Fix out of memory error when using prototype in media dialog.

+	Fixed bug where could not add a space in the middle of a th cell.

+	Fixed bug where adding a bullet between two existing bullets adds an extra one

+	Fixed bug where trying to insert a new entry midway through a bulleted list fails dismally when the next entry is tabbed in.

+	Fixed bug where pressing enter on an empty list item does not outdent properly in FF

+	Fixed bug where adding a heading after a list item in a table cell changes all styles in that cell

+	Fixed bug where hitting enter to exit from a bullet list moves cursor to the top of the page in Firefox.

+	Fixed bug where pressing backspace would not delete HRs in Firefox and IE when next to an empty paragraph.

+	Fixed bug where deleting part of the link text can cause a link with no destination to be saved.

+	Fixed bug where css style border widths wasn't handled correctly in table dialog.

+	Fixed bug where parsing invalid html contents on IE or WebKit could produce an infinite loop.

+	Fixed bug where scripts with custom script types wasn't properly passed though the editor.

+	Fixed issue where some Japanese kanji characters wasn't properly entity encoded when numeric entity mode was enabled.

+	Made emoticons dialog use the keyboard naviation.

+	Added navigation instructions to the symbols dialog.

+	Added ability to set default values for the media plugin.

+	Added new font_size_legacy_values option for converting old font element sizes to span with font-size properties.

+	Fixed bug where the symbols dialog was not accessible.

+	Added quirk for IE ensuring that the body of the document containing tinyMCE has a role="application" for accessibility.

+	Fixed bug where the advanced color picker wasn't working properly on FF 7.

+	Fixed issue where the advanced color picker was producing uppercase hex codes.

+	Fixed bug where IE 8 could throw exceptions if the contents contained resizable content elements.

+	Fixed bug where caret formatting wouldn't be correctly applied to previous sibling on WebKit.

+	Fixed bug where the select boxes for font size/family would loose it's value on WebKit due to recent iOS fixes.

+Version 3.4.6 (2011-09-29)

+	Fixed bug where list items were being created for empty divs.

+	Added support in Media plugin for audio media using the embed tag

+	Fixed accessibility bugs in WebKit and IE8 where toolbar items were not being read.

+	Added new use_accessible_selects option to ensure accessible list boxes are used in all browsers (custom widget in firefox native on other browsers)

+	Fixed bug where classid attribute was not being checked from embed objects.

+	Fixed bug in jsrobot tests with intermittently failing.

+	Fixed bug where anchors wasn't updated properly if you edited them using IE 8.

+	Fixed bug where input method on WebKit on Mac OS X would fail to initialize when sometimes focusing the editor.

+	Fixed bug where it wasn't possible to select HR elements on WebKit by simply clicking on them.

+	Fixed bug where the media plugin wouldn't work on IE9 when not using the inlinepopups plugin.

+	Fixed bug where hspace,vspace,align and bgcolor would be removed from object elements in the media plugin.

+	Fixed bug where the new youtube format wouldn't be properly parsed by the media plugin.

+	Fixed bug where the style attribute of layers wasn't properly updated on IE and Gecko.

+	Fixed bug where editing contents in a layer would fail on Gecko since contentEditable doesn't inherit properly.

+	Fixed bug where IE 6/7 would produce JS errors when serializing contents containing layers.

+Version 3.4.5 (2011-09-06)

+	Fixed accessibility bug in WebKit where the right and left arrow keys would update native list boxes.

+	Added new whitespace_elements option to enable users to specify specific elements where the whitespace is preserved.

+	Added new merge_siblings option to formats. This option makes it possible to disable the auto merging of siblings when applying formats.

+	Fixed bug in IE where trailing comma in paste plugin would cause plugin to not run correctly.

+	Fixed bug in WebKit where console messages would be logged when deleting an empty document.

+	Fixed bug in IE8 where caret positioned is on list item instead of paragraph when outdent splits the list

+	Fixed bug with image dialogs not inserting an image if id was omitted from valid_elements.

+	Fixed bug where the selection normalization logic wouldn't properly handle image elements in specific config cases.

+	Fixed bug where the map elements coords attribute would be messed up by IE when serializing the DOM.

+	Fixed bug where IE wouldn't properly handle custom elements when the contents was serialized.

+	Fixed bug where you couldn't move the caret in Gecko if you focused the editor using the API or a UI control.

+	Fixed bug where adjacent links would get merged on IE due to bugs in their link command.

+	Fixed bug where the color split buttons would loose the selection on IE if the editor was placed in a frame/iframe.

+	Fixed bug where floated images in WebKit wouldn't get properly linked.

+	Fixed bug where the fullscreen mode in a separate window wasn't forced into IE9+ standards mode.

+	Fixed bug where pressing enter in an empty editor on WebKit could produce DIV elements instead of P.

+	Fixed bug where spans would get removed incorrectly when merging two blocks on backspace/delete on WebKit.

+	Fixed bug where the editor contents wouldn't be completely removed on backspace/delete on WebKit.

+	Fixed bug where the fullpage plugin wouldn't properly render style elements in the head on IE 6/7.

+	Fixed bug where the nonbreaking_force_tab option in the nonbreaking plugin wouldn't work on Gecko/WebKit.

+	Fixed bug where the isDirty state would become true on non IE browsers if there was an table at the end of the contents.

+	Fixed bug where entities wasn't properly encoded on WebKit when pasting text as plain text.

+	Fixed bug where empty editors would produce an exception of valid_elements didn't include body and forced_root_blocks where disabled.

+	Fixed bug where the fullscreen mode wouldn't retain the header/footer in the fullpage plugin.

+	Fixed issue where the plaintext_mode and plaintext_mode_sticky language keys where swapped.

+Version 3.4.4 (2011-08-04)

+	Added new html5 audio support. Patch contributed by Ronald M. Clifford.

+	Added mute option for video elements and preload options for video/audio patch contributed by Dmitry Kalinkin.

+	Fixed selection to match visual selection before applying formatting changes.

+	Fixed browser specific bugs in lists for WebKit and IE.

+	Fixed bug where IE would scroll the window if you closed an inline dialog that was larger than the viewport. Patch by Laurence Keijmel.

+	Fixed bug where pasting contents near a span element could remove parts of that span. Patch contributed by Wesley Walser.

+	Fixed bug where formatting change would be lost after pressing enter.

+	Fixed bug in WebKit where deleting across blocks would add extra styles.

+	Fixed bug where moving cursor vertically in tables in WebKit wasn't working.

+	Fixed bug in IE where deleting would cause error in console.

+	Fixed bug where the formatter was not applying formats across list elements.

+	Fixed bug where the wordcount plugin would try and update the wordcount if tinymce had been destroyed.

+	Fixed bug where tabfocus plugin would attempt to focus elements not displayed when their parent element was hidden.

+	Fixed bug where the contentEditable state would sometimes be removed if you deleted contents in Gecko.

+	Fixed bug where inserting contents using mceInsertContent would fail if "span" was disabled in valid_elements.

+	Fixed bug where initialization might fail if some resource on gecko wouldn't load properly and fire the onload event.

+	Fixed bug where ctrl+7/8/9 keys wouldn't properly add the specific formats associated with them.

+	Fixed bug where the HTML tags wasn't properly closed in the style plugins properties dialog.

+	Fixed bug where the list plugin would produce an exception if the user tried to delete an element at the very first location.

+Version 3.4.3.2 (2011-06-30)

+	Fixed bug where deleting all of a paragraph inside a table cell would behave badly in webkit.

+	Fixed bugs in tests in firefox5 and WebKit.

+	Fixed bug where selection of table cells would produce an exception on Gecko.

+	Fixed bug where the caret wasn't properly rendered on Gecko when the editor was hidden.

+	Fixed bug where pasting plain text into WebKit would produce a pre element it will now produce more semantic markup.

+	Fixed bug where selecting list type formats using the advlist plugin on IE8 would loose editor selection.

+	Fixed bug where forced root blocks logic wouldn't properly pad elements created if they contained data attributes.

+	Fixed bug where it would remove all contents of the editor if you inserted an image when not having a caret in the document.

+	Fixed bug where the YUI compressor wouldn't properly encode strings with only a quote in them.

+	Fixed bug where WebKit on iOS5 wouldn't call nodeChanged when the selection was changed.

+	Fixed bug where mceFocus command wouldn't work properly on Gecko since it didn't focus the body element.

+	Fixed performance issue with the noneditable plugin where it would enable/disable controls to often.

+Version 3.4.3.1 (2011-06-16)

+	Fixed bug where listboxes were not being handled correctly by JAWS in firefox with the o2k7 skin.

+	Fixed bug where custom buttons were not being rendered correctly when in high contrast mode.

+	Added support for iOS 5 that now supporting contentEditable in it's latest beta.

+	Fixed bug where urls in style attributes with a _ character followed by a number would cause incorrect output.

+	Fixed bug where custom_elements option wasn't working properly on IE browsers.

+	Fixed bug where custom_elements marked as block elements wouldn't get correctly treated as block elements.

+	Fixed bug where attributes with </> wasn't properly encoded as XML entities.

+Version 3.4.3 (2011-06-09)

+	Fixed bug where deleting backwards before an image into a list would put the cursor in the wrong location.

+	Fixed bug where styles plugin would not apply styles across multiple selected block elements correctly.

+	Fixed bug where cursor would jump to start of document when selection contained empty table cells in IE8.

+	Fixed bug where applied styles wouldn't be kept if you pressed enter twice to produce two paragraphs.

+	Fixed bug where a ghost like caret would appear on Gecko when pressing enter while having a text color applied.

+	Fixed bug where IE would produce absolute urls if you inserted a image/link and reloaded the page.

+	Fixed bug where applying a heading style to a list item would cascade style to children list items.

+	Fixed bug where Editor loses focus when backspacing and changing styles in WebKit.

+	Fixed bug where exception was thrown in tinymce.util.URI when parsing a relative URI and no base_uri setting was provided.

+	Fixed bug where alt-f10 was not always giving focus to the toolbar on Safari.

+	Added new 'allow_html_in_named_anchor' option to allow html to occur within a named anchor tag.  Use at own risk.

+	Added plugin dependency support.  Will autoload plugins specified as a dependency if they haven't been loaded.

+	Fixed bug where the autolink plugin didn't work with non-English keyboards when pressing ).

+	Added possibility to change properties of all table cells in a column.

+	Added external_image_list option to get images list from user-defined variable or function.

+	Fixed bug where the autoresize plugin wouldn't reduce the editors height on Chrome.

+	Fixed bug where table size inputs were to small for values with size units.

+	Fixed bug where table cell/row size input values were not validated.

+	Fixed bug where menu item line-height would be set to wrong value by external styles.

+	Fixed bug where hasUndo() would return wrong answer.

+	Fixed bug where page title would be set to undefined by fullpage plugin.

+	Fixed bug where HTML5 video properties were not updated in embedded media settings.

+	Fixed bug where HTML comment on the first line would cause an error.

+	Fixed bug where spellchecker menu was positioned incorrectly on IE.

+	Fixed bug where breaking out of list elements on WebKit would produce a DIV instead of P after the list.

+	Fixed bug where pasting from Word in IE9 would add extra BR elements when text was word wrapped.

+	Fixed bug where numeric entities with leading zeros would produce incorrect decoding.

+	Fixed bug where hexadecimal entities wasn't properly decoded.

+	Fixed bug where bookmarks wasn't properly stored/restored on undo/redo.

+	Fixed bug where the mceInsertCommand didn't retain the values of links if they contained non url contents.

+	Fixed bug where the valid_styles option wouldn't be properly used on styles for specific elements.

+	Fixed so contentEditable is used for the body of the editor if it's supported.

+	Fixed so trailing BR elements gets removed even when forced_root_blocks option was set to false/null.

+	Fixed performance issue with mceInsertCommand and inserting very simple contents.

+	Fixed performance issue with older IE version and huge documents by optimizing the forced root blocks logic.

+	Fixed performance issue with table plugin where it checked for selected cells to often.

+	Fixed bug where creating a link on centered/floated image would produce an error on WebKit browsers.

+	Fixed bug where Gecko would remove single paragraphs if there where contents before/after it.

+	Fixed bug where the scrollbar would move up/down when pasting contents using the paste plugin.

+Version 3.4.2 (2011-04-07)

+	Added new 'paste_text_sticky_default' option to paste plugin, enables you to set the default state for paste as plain text.

+	Added new autoresize_bottom_margin option to autoresize plugin that enables you to add an extra margin at the bottom. Patch contributed by Andrew Ozz.

+	Rewritten the fullpage plugin to handle style contents better and have a more normalized behavior across browsers.

+	Fixed bug where contents inserted with mceInsertContent wasn't parsed using the default dom parser.

+	Fixed bug where blocks containing a single anchor element would be treated as empty.

+	Fixed bug where merging of table cells on IE 6, 7 wouldn't look correctly until the contents was refreshed.

+	Fixed bug where context menu wouldn't work properly on Safari since it was passing out the ctrl key as pressed.

+	Fixed bug where image border color/style values were overwritten by advimage plugin.

+	Fixed bug where setting border in advimage plugin would throw error in IE.

+	Fixed bug where empty anchors list in link settings wasn't hidden.

+	Fixed bug where xhtmlextras popups were missing localized popup-size parameters.

+	Fixed bug where the context menu wouldn't select images on WebKit browsers.

+	Fixed bug where paste plugin wouldn't properly extract the contents on WebKit due to recent changes in browser behavior.

+	Fixed bug where focus of the editor would get on control contents on IE lost due to a bug in the ColorSplitButton control.

+	Fixed bug where contextmenu wasn't disabled on noneditable elements.

+	Fixed bug where getStyle function would trigger error when called on element without style property.

+	Fixed bug where editor fail to load if Javascript Compressor was used.

+	Fixed bug where list-style-type=lower-greek would produce errors in IE<8.

+	Fixed bug where spellchecker plugin would produce errors on IE6-7.

+	Fixed bug where theme_advanced_containers configuration option causes error.

+	Fixed bug where the mceReplaceContent command would produce an error since it didn't correctly handle a return value.

+	Fixed bug where you couldn't enter float point values for em in dialog input fields since it wouldn't be considered a valid size.

+	Fixed bug in xhtmlxtras plugin where it wasn't possible to remove some attributes in the attributes dialog.

+Version 3.4.1 (2011-03-24)

+	Added significantly improved list handling via the new 'lists' plugin.

+	Added 'autolink' plugin to enable automatically linking URLs. Similar to the behavior IE has by default.

+	Added 'theme_advanced_show_current_color' setting to enable the forecolor and backcolor buttons to continuously show the current text color.

+	Added 'contextmenu_never_use_native' setting to disable the ctrl-right-click showing the native browser context menu behaviour.

+	Added 'paste_enable_default_filters' setting to enable the default paste filters to be disabled.

+	Fixed bug where selection locations on undo/redo didn't work correctly on specific contents.

+	Fixed bug where an exception would be trown on IE when loading TinyMCE inside an iframe.

+	Fixed bug where some ascii numeric entities wasn't properly decoded.

+	Fixed bug where some non western language codes wasn't properly decoded/encoded.

+	Fixed bug where undo levels wasn't created when deleting contents on IE.

+	Fixed bug where the initial undo levels bookmark wasn't updated correctly.

+	Fixed bug where search/replace wouldn't be scoped to editor instances on IE8.

+	Fixed bug where IE9 would produce two br elements after block elements when pasting.

+	Fixed bug where IE would place the caret at an incorrect position after a paste operation.

+	Fixed bug where a paste operation using the keyboard would add an extra undo level.

+	Fixed bug where some attributes/elements wasn't correctly filtered when invalid contents was inserted.

+	Fixed bug where the table plugin couldn't correctly handle invalid table structures.

+	Fixed bug where charset and title of the page were handled incorrectly by the fullpage plugin.

+	Fixed bug where toggle states on some of the list boxes didn't update correctly.

+	Fixed bug where sub/sub wouldn't work correctly when done as a caret action in Chrome 10.

+	Fixed bug where the constrain proportions checkbox wouldn't work in the media plugin.

+	Fixed bug where block elements containing trailing br elements wouldn't treated properly if they where invalid.

+	Fixed bug where the color picker dialog wouldn't be rendered correctly when using the o2k7 theme.

+	Fixed bug where setting border=0 using advimage plugin invalid style attribute content was created in Chrome.

+	Fixed bug with references to non-existing images in css of fullpage plugin.

+	Fixed bug where item could be unselected in spellchecker's language selector.

+	Fixed bug where some mispelled words could be not highlighted using spellchecker plugin.

+	Fixed bug where spellchecking would merge some words on IE.

+	Fixed bug where spellchecker context menu was not always positioned correctly.

+	Fixed bug with empty anchors list in advlink popup when Invisible Elements feature was disabled.

+	Fixed bug where older IE versions wouldn't properly handle some elements if they where placed at the top of editor contents.

+	Fixed bug where selecting the whole table would enable table tools for cells and rows.

+	Fixed bug where it wasn't possible to replace selected contents on IE when pasting using the paste plugin.

+	Fixed bug where setting text color in fullpage plugin doesn't work.

+	Fixed bug where the state of checkboxes in media plugin wouldn't be set correctly.

+	Fixed bug where black spade suit character was not included in special character selector.

+	Fixed bug where setting invalid values for table cell size would throw an error in IE.

+	Fixed bug where spellchecking would remove whitespace characters from PRE block in IE.

+	Fixed bug where HR was inserted inside P elements instead of splitting them.

+	Fixed bug where extra, empty span tags were added when using a format with both selector and inline modes.

+	Fixed bug where bullet lists weren't always detected correctly.

+	Fixed bug where deleting some paragraphs on IE would cause an exception.

+	Fixed bug where the json encoder logic wouldn't properly encode \ characters.

+	Fixed bug where the onChange event would be fired when the editor was first initialized.

+	Fixed bug where mceSelected wouldn't be removed properly from output even if it's an internal class.

+	Fixed issue with table background colors not being transparent. This improves compliance with users browser color preferences.

+	Fixed issue where styles were not included when using the full page plugin.

+	Fixed issue where drag/drop operations wasn't properly added to the undo levels.

+	Fixed issue where colors wasn't correctly applied to elements with underline decoration.

+	Fixed issue where deleting some paragraphs on IE would cause an exception.

+Version 3.4 (2011-03-10)

+	Added accessibility example with various accessibility options contributed by Ephox.

+	Fixed bug where attributes wasn't properly handled in the xhtmlxtras plugin.

+	Fixed bug where the image.htm had some strange td artifacts probably due to auto merging.

+	Fixed bug where the ToolbarGroup had an missing reference to this in it's destroy method.

+	Fixed bug with the resizeBy function in the advanced theme where it was scaled by the wrong parent.

+	Fixed bug where an exception would be thrown by the element if the page was served in xhtml mode.

+	Fixed bug where mceInsertContent would throw an exception when page was served in xhtml mode.

+	Fixed bug where you couldn't select a forground/background color when page was served in xhtml mode.

+	Fixed bug where the editor would scroll to the toolbar when clicked due to a call to focus in ListBox.

+	Fixed bug where pages with rtl dir wouldn't render split buttons correctly when using the o2k7 theme.

+	Fixed bug where anchor elements with names wasn't properly collapsed as they where in 3.3.x.

+	Fixed bug where WebKit wouldn't properly handle image selection if it was done left to right.

+	Fixed bug where the formatter would align images when the selection range was collapsed.

+	Fixed bug where the image button would be active when the selection range was collapsed.

+	Fixed bug where the element_format option wasn't used by the new (X)HTML serializer logic.

+	Fixed bug where the table cell/row dialogs would produce empty attributes.

+	Fixed bug where the tfoot wouldn't be added to the top of the table.

+	Fixed bug where the formatter would merge siblings with white space between them.

+	Fixed bug where pasting headers and paragraphs would produce an extra paragraph.

+	Fixed bug where the ColorSplitButton would throw an exception if you clicked out side a color.

+	Fixed bug where IE9 wouldn't properly produce new paragraphs on enter if the current paragraph had formatting.

+	Fixed bug where multiple BR elements at end of block elements where removed.

+	Fixed bug where fullscreen plugin wouldn't correctly display the edit area on IE6 for long pages.

+	Fixed bug where paste plugin wouldn't properly encode raw entities when pasting in plain text mode.

+	Fixed bug where the search/replace plugin wouldn't work correctly on IE 9.

+	Fixed so the drop menus doesn't get an outline border visible when focused, patch contributed by Ephox.

+	Fixed so the values entered in the color picker are forced to hex values.

+	Removed dialog workaround for IE 9 beta since the RC is now out and people should upgrade.

+	Removed obsolete calls in various plugins to the mceBeginUndoLevel command.

+Version 3.4b3 (2011-02-10)

+	Added WAI-ARIA support for the main UI and dialogs this feature was contributed by Ephox.

+	Added iframe support to media plugin in order to handle the new YouTube HTML5 video formats.

+	Fixed bug where anchors would wrap the text contents after it due to a bug in the DomParser logic.

+	Fixed bug where the selected state wouldn't be removed on ListBox controls when a menu item was selected.

+	Fixed bug where IE could throw an unspecified error exception when the getBookmark logic was executed.

+	Fixed bug where IE would throw an invalid argument error when focus was applied to an empty editor instance.

+	Fixed bug where applying inline format wouldn't work if the start cell in the selection was empty.

+	Fixed bug where auto detection logic for YouTube and Google Video wouldn't work in the new media plugin.

+	Fixed bug where td elements would get a colspan/rowspan of 1 when created by the table plugin.

+	Fixed bug where removal/padding of empty elements wasn't handled correctly.

+	Fixed bug where internal elements would show up in element path.

+	Fixed bug where internal elements would get serialized as valid output.

+	Fixed bug where color wasn't correctly applied to anchor elements.

+	Fixed bug where float option in the style plugin dialog wouldn't be handled correctly on WebKit.

+	Fixed bug where the tinymce.dom.TreeWalker prev function wouldn't walk the DOM correctly.

+	Fixed bug where mceInsertContent command could produce empty block elements after the inserted content.

+	Fixed bug where mceInsertContent command wouldn't apply visual aids on tables and similar elements.

+	Fixed bug where empty block elements would get double br bogus elements in them.

+	Fixed bug where the color menu wouldn't apply the color correctly on IE when the viewport was to small.

+	Fixed bug where right clicking out side the body element of the editor iframe would prevent paste from working on IE.

+	Fixed bug where the onContextMenu event wouldn't fire correctly on IE if you clicked out side the body element.

+	Fixed bug where the onContextMenu event wouldn't fire correctly on modern Opera versions that now support it by default.

+	Fixed bug where legacy content wasn't converted correctly when inserted using mceInsertContent or through the source dialog.

+	Fixed bug where resizing images or tables wouldn't update the style attribute correctly or leave data-mce prefixed attributes.

+	Fixed bug where adding links wouldn't work correctly when using TinyMCE jQuery version with jQuery 1.5.

+	Fixed bug where single quotes inside param elements wasn't treated correctly by the media plugin.

+	Fixed bug where pasting plain text in WebKit wouldn't work correctly. It will now auto detect the WebKit bug and use plain text mode.

+	Fixed bug where the DomParser would fail to move out invalid elements within invalid elements on complex contents.

+	Fixed bug where paste as plain text would not decode html entities properly.

+	Fixed bug where large paragraphs would cause incorrect scrolling behavior if you would split them using enter.

+	Fixed bug where the SaxParser wouldn't properly parse some specific short ended elements.

+	Fixed so mceReplaceContent supports caret position and makes sure that the contents inserted gets validated.

+	Fixed so unnecessary traling br elements in blocks gets removed on Gecko/WebKit when using mceInsertContent command.

+	Moved some plugin css contents into the skin content css files to reduce the number of http requests.

+	Moved some plugin specific images into the theme img directory since they can then be shared.

+Version 3.4b2 (2011-01-13)

+	Added new custom flash player, this player supports mp4 and flv and has skin support.

+	Fixed so mceInsertContent handles context correctly to enforce valid nesting of elements.

+	Fixed bug where scrolling would become jerky on IE on some contents.

+	Fixed bug where paste as plain text would throw exception of missing entities setting.

+	Fixed bug where anchor nodes where removed by the new serializer engine.

+	Fixed bug where IE would crash if when backspace where used on some specific contents.

+	Fixed bug where pasting of plain text in WebKit would result in merging of text lines.

+	Fixed bug where it wasn't possible to delete images or tables using backspace on IE9.

+	Fixed bug where urls in styles would generate a JS error due to incorrect scope.

+	Fixed bug where copy paste from Java applications would produce extra contents in FF on Mac.

+	Fixed bug where the verify_html option wouldn't allow all elements and attributes.

+Version 3.4b1 (2010-12-20)

+	Added new serialization engine that increases performance and enforces valid output according to the specified schema settings.

+	Added new HTML parser logic used by the serialization engine and can handle malformed html contents.

+	Added new valid_children config option, enables more fine grain control of elements can be inside other elements.

+	Added new entities encoding logic boost performance and will only encode entities based on context i.e. attributes/text nodes.

+	Added new protect setting that enables users to protect template items from being removed by the serializer logic.

+	Added new {$caret} marker for the mceInsertContent command. Makes it possible to move the caret to a specific position when inserting contents.

+	Added new validation of anchor names. Only valid W3C names will be accepted.

+	Replaced the internal _mce_ prefixed attributes to the more standard HTML5 data-mce- prefix. This will also resolve future browser santiaztion issues.

+	Fixed bug where the paste plugin wouldn't convert Word lists with more than 9 items to real ol lists. Patch contributed by Mike (yogaboy).

+	Fixed bug where clicking on a format title would produce errors if the current selection didn't have any formats.

+	Fixed bug where paste of simple texts wouldn't work correctly in Gecko using the paste plugin since it keeps block formatting.

+	Fixed bug where confirm dialogs didn't display correctly due to resent IE9 fixes.

+	Fixed bug where spaces in URLs wouldn't be properly encoded to %20 if the user entered them in the link dialogs. Patch contributed by Ephox.

+	Fixed bug where the image alignment buttons wouldn't reposition the resize handles on FF due to a browser issue. Patch contributed by Ephox.

+	Fixed bug where the compareBoundaryPoints method of the IE Range class didn't work correctly. Patch contributed by Ephox.

+	Fixed bug where selection of elements using double click wouldn't select the clicked element but rather the parent node on FF. Patch contributed by Ephox.

+	Fixed bug where IE would scroll the user to the current selection causing parent document to scroll as well. Patch contributed by Ephox.

+	Fixed bug where style compression would incorrectly compress items with different values. It now only compresses if the values are the same. Patch contributed by Ephox.

+	Fixed bug where FF would add non breaking spaces outside TD elements if formatting was applied to table cells. Patch contributed by Ephox.

+	Fixed bug where the caret position would be lost on WebKit browsers if you pasted images multiple times. Patch contributed by Ephox.

+	Fixed bug where non word contents like * would be counted as words in the wordcount pluging. Patch contributed by David Balatero.

+	Fixed bug where the toggle absolute button in the layer plugin wouldn't remove the existing internal style attribute first.

+	Fixed bug where the autosave plugin would generate an exception on IE if the user had disabled userdata persistence.

+	Fixed bug where the paste plugin would remove dashed classes on IE since the regexps didn't include that character.

+	Fixed bug where applying text color would not add spans inside link elements. This is needed due to CSS style inheritance.

+	Fixed bug where applying block formats to empty elements wouldn't render correctly on IE.

+	Fixed bug where the searchreplace plugin would add a f or r character when shortcuts where used on IE while using default dialogs.

+	Fixed bug where Opera wouldn't load scripts correctly since the onreadystate would fire even though the script wasn't loaded.

+	Fixed issue where &nbsp; wouldn't be handled correctly in the bbcode plugin if entity_encoding was set to raw.

+	Fixed issue where contents would flicker since the content css files where asynchronously loaded.

+	Fixed bug where WebKit wouldn't create links on images with a float style.

+Version 3.3.9.3 (2010-12-20)

+	Fixed issue where WebKit wouldn't correctly apply ins/del in xhtmlxtras plugin.

+	Fixed bug where paste as plaintext on WebKit wouldn't produce br and p elements correctly.

+	Fixed bug where the confirm dialog texts would be incorrectly placed due to recent IE 9 workarounds in the window.css.

+	Fixed bug where applying text color would not add spans inside link elements. This is needed due to CSS style inheritance.

+Version 3.3.9.2 (2010-09-29)

+	Fixed bug where placing the caret in IE 9 beta 1 would not work correctly if you clicked out side the document body element.

+	Fixed bug where IE 9 beta 1 wouldn't resize the editor correctly since the events didn't fire as previous versions did.

+	Fixed bug where FF would produce an error message when being rendered inside a hidden div element.

+	Fixed bug where resize logic could produce a cookie with a width/height less than the size of the container.

+	Fixed bug where content_css wouldn't populate the styles dropdown correctly.

+Version 3.3.9.1 (2010-09-23)

+	Fixed bug where WebKit browsers wouldn't activate the image button when images where selected.

+	Fixed bug where Opera Presto 10.60 deletes elements when restoring bookmarks.

+	Fixed bug where IE9 beta1 doesn't handle regexp replacement values correctly.

+	Fixed bug where IE9 beta1 didn't render the inline dialogs correctly due to a bug with CSS clip.

+	Fixed bug where IE9 beta1 would produce error messages on load since they removed the document.recalc method.

+	Fixed bug where IE9 beta1 would produce <html xmlns=""> since they haven't implemented document.implementation.createDocument correctly.

+	Fixed bug where IE9 beta1 would searchreplace doesn't work since their native DOM Range doesn't have a find method.

+	Fixed bug where IE9 beta1 would render the source view incorrectly due to incorrect viewport size measurements.

+	Fixed bug where IE9 beta1 would crash when running the basic functionality unit tests.

+	Fixed bug where IE9 beta1 would wrap elements in blocks correctly due to changes to the selection object.

+	Fixed bug where IE9 beta1 would fail to insert contents since they havn't implemented the createContextualFragment method in their DOM Range.

+	Fixed bug where IE9 beta1 would fail to handle image selection since they currently doesn't support control selections in their DOM Range.

+	Fixed bug where IE9 beta1 would fail to load scripts since they fire the onload event before the scripts are parsed and executed.

+Version 3.3.9 (2010-09-08)

+	Fixed bug where inserting table rows into a table with subtable would produce an incorrect column count.

+	Fixed bug where the selection of cells in a table with subtables could produce invalid selections.

+	Fixed bug where the table plugin would produce a script error if you tried to move the caret before a first child table.

+	Fixed bug where the keep_styles feature on IE would move the caret to an incorrect location at the end of list blocks.

+	Fixed so attributes from legacy elements such as font gets retained when they get converted to spans.

+	Fixed minor issue where the select boxes wouldn't be set the not set by default in the table dialog.

+Version 3.3.8 (2010-06-30)

+	On IE8+ and FireFox 3.5+, dragging an image now correctly adds an undo

+	event.

+	Fixed bug where WebKit would not move the caret to a correct position after a paste operation.

+	Fixed bug where WebKit would produce a div wrapper element when pasting some contents.

+	Fixed bug where the visual chars and nonbreaking plugin wouldn't show nbsp elements correctly.

+	Fixed bug where the format states would be enabled even after the format was removed.

+	Fixed bug where the delete key would move the caret to an incorrect position.

+	Fixed bug where it wasn't possible to toggle of the current font size/family/style by clicking the title item.

+	Fixed bug where the abbr element wouldn't get serialized correctly on IE6.

+	Fixed so that the examples checks if they are executed from the local file system since that might not work properly.

 Version 3.3.7 (2010-06-10)

 	Fixed bug where context menu would produce an error on IE if you right clicked twice and left clicked once.

 	Fixed bug where resizing of the window on WebKit browsers in fullscreen mode wouldn't position the statusbar correctly.

diff --git a/library/tinymce/examples/accessibility.html b/library/tinymce/examples/accessibility.html
new file mode 100644
index 000000000..69059403c
--- /dev/null
+++ b/library/tinymce/examples/accessibility.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<title>Full featured example</title>

+

+<!-- TinyMCE -->

+<script type="text/javascript" src="../jscripts/tiny_mce/tiny_mce.js"></script>

+<script type="text/javascript">

+	tinyMCE.init({

+		// General options

+		mode : "textareas",

+		theme : "advanced",

+		plugins : "pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave",

+

+		// Theme options

+		theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",

+		theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",

+		theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",

+		theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft",

+		theme_advanced_toolbar_location : "top",

+		theme_advanced_toolbar_align : "left",

+		theme_advanced_statusbar_location : "bottom",

+		theme_advanced_resizing : true,

+

+		// Example content CSS (should be your site CSS)

+		// using false to ensure that the default browser settings are used for best Accessibility

+		// ACCESSIBILITY SETTINGS
+		content_css : false,

+		// Use browser preferred colors for dialogs.
+		browser_preferred_colors : true,

+		detect_highcontrast : true,

+

+		// Drop lists for link/image/media/template dialogs

+		template_external_list_url : "lists/template_list.js",

+		external_link_list_url : "lists/link_list.js",

+		external_image_list_url : "lists/image_list.js",

+		media_external_list_url : "lists/media_list.js",

+

+		// Style formats

+		style_formats : [

+			{title : 'Bold text', inline : 'b'},

+			{title : 'Red text', inline : 'span', styles : {color : '#ff0000'}},

+			{title : 'Red header', block : 'h1', styles : {color : '#ff0000'}},

+			{title : 'Example 1', inline : 'span', classes : 'example1'},

+			{title : 'Example 2', inline : 'span', classes : 'example2'},

+			{title : 'Table styles'},

+			{title : 'Table row 1', selector : 'tr', classes : 'tablerow1'}

+		],

+

+		// Replace values for the template plugin

+		template_replace_values : {

+			username : "Some User",

+			staffid : "991234"

+		}

+	});

+</script>

+<!-- /TinyMCE -->

+

+</head>

+<body>

+

+<form method="post" action="http://tinymce.moxiecode.com/dump.php?example=true">

+	<div>

+		<h3>Full featured example, with Accessibility settings enabled</h3>

+

+		<p>

+			This page has got the TinyMCE set up to work with configurations related to accessiblity enabled.

+			In particular
+			<ul>
+			<li>the <strong>content_css</strong> is set to false, to ensure that all default browser styles are used, </li>
+			<li>the <strong>browser_preferred_colors</strong> dialog option is used to ensure that default css is used for dialogs, </li>
+			<li>and the <strong>detect_highcontrast</strong> option has been set to ensure that highcontrast mode in Windows browsers
+			is detected and the toolbars are displayed in a high contrast mode.</li>
+			</ul>
+		</p>

+

+		<!-- Gets replaced with TinyMCE, remember HTML in a textarea should be encoded -->

+		<div>

+			<textarea id="elm1" name="elm1" rows="15" cols="80" style="width: 80%">

+				&lt;p&gt;

+					This is some example text that you can edit inside the &lt;strong&gt;TinyMCE editor&lt;/strong&gt;.

+				&lt;/p&gt;

+				&lt;p&gt;

+				Nam nisi elit, cursus in rhoncus sit amet, pulvinar laoreet leo. Nam sed lectus quam, ut sagittis tellus. Quisque dignissim mauris a augue rutrum tempor. Donec vitae purus nec massa vestibulum ornare sit amet id tellus. Nunc quam mauris, fermentum nec lacinia eget, sollicitudin nec ante. Aliquam molestie volutpat dapibus. Nunc interdum viverra sodales. Morbi laoreet pulvinar gravida. Quisque ut turpis sagittis nunc accumsan vehicula. Duis elementum congue ultrices. Cras faucibus feugiat arcu quis lacinia. In hac habitasse platea dictumst. Pellentesque fermentum magna sit amet tellus varius ullamcorper. Vestibulum at urna augue, eget varius neque. Fusce facilisis venenatis dapibus. Integer non sem at arcu euismod tempor nec sed nisl. Morbi ultricies, mauris ut ultricies adipiscing, felis odio condimentum massa, et luctus est nunc nec eros.

+				&lt;/p&gt;

+			</textarea>

+		</div>

+

+		<br />

+		<input type="submit" name="save" value="Submit" />

+		<input type="reset" name="reset" value="Reset" />

+	</div>

+</form>

+

+<script type="text/javascript">

+if (document.location.protocol == 'file:') {

+	alert("The examples might not work properly on the local file system due to security settings in your browser. Please use a real webserver.");

+}

+</script>

+</body>

+</html>
diff --git a/library/tinymce/examples/css/content.css b/library/tinymce/examples/css/content.css
index a76c38a2f..a76c38a2f 100755..100644
--- a/library/tinymce/examples/css/content.css
+++ b/library/tinymce/examples/css/content.css
diff --git a/library/tinymce/examples/css/word.css b/library/tinymce/examples/css/word.css
index 049a39fbd..049a39fbd 100755..100644
--- a/library/tinymce/examples/css/word.css
+++ b/library/tinymce/examples/css/word.css
diff --git a/library/tinymce/examples/custom_formats.html b/library/tinymce/examples/custom_formats.html
index 7c475b19b..ba9d1eb0c 100755..100644
--- a/library/tinymce/examples/custom_formats.html
+++ b/library/tinymce/examples/custom_formats.html
@@ -10,7 +10,7 @@
 		// General options

 		mode : "textareas",

 		theme : "advanced",

-		plugins : "pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave",

+		plugins : "autolink,lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave",

 

 		// Theme options

 		theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",

@@ -102,6 +102,10 @@
 		<input type="reset" name="reset" value="Reset" />

 	</div>

 </form>

-

+<script type="text/javascript">

+if (document.location.protocol == 'file:') {

+	alert("The examples might not work properly on the local file system due to security settings in your browser. Please use a real webserver.");

+}

+</script>

 </body>

 </html>

diff --git a/library/tinymce/examples/full.html b/library/tinymce/examples/full.html
index 0b24b6e48..84b76ca7a 100755..100644
--- a/library/tinymce/examples/full.html
+++ b/library/tinymce/examples/full.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">

 <head>

 <title>Full featured example</title>

-

+<meta http-equiv="X-UA-Compatible" content="IE=edge" />

 <!-- TinyMCE -->

 <script type="text/javascript" src="../jscripts/tiny_mce/tiny_mce.js"></script>

 <script type="text/javascript">

@@ -10,13 +10,13 @@
 		// General options

 		mode : "textareas",

 		theme : "advanced",

-		plugins : "pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave",

+		plugins : "autolink,lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave,visualblocks",

 

 		// Theme options

 		theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",

 		theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",

 		theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",

-		theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft",

+		theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft,visualblocks",

 		theme_advanced_toolbar_location : "top",

 		theme_advanced_toolbar_align : "left",

 		theme_advanced_statusbar_location : "bottom",

@@ -52,7 +52,7 @@
 <!-- /TinyMCE -->

 

 </head>

-<body>

+<body role="application">

 

 <form method="post" action="http://tinymce.moxiecode.com/dump.php?example=true">

 	<div>

@@ -76,15 +76,15 @@
 		</div>

 

 		<!-- Some integration calls -->

-		<a href="javascript:;" onmousedown="tinyMCE.get('elm1').show();">[Show]</a>

-		<a href="javascript:;" onmousedown="tinyMCE.get('elm1').hide();">[Hide]</a>

-		<a href="javascript:;" onmousedown="tinyMCE.get('elm1').execCommand('Bold');">[Bold]</a>

-		<a href="javascript:;" onmousedown="alert(tinyMCE.get('elm1').getContent());">[Get contents]</a>

-		<a href="javascript:;" onmousedown="alert(tinyMCE.get('elm1').selection.getContent());">[Get selected HTML]</a>

-		<a href="javascript:;" onmousedown="alert(tinyMCE.get('elm1').selection.getContent({format : 'text'}));">[Get selected text]</a>

-		<a href="javascript:;" onmousedown="alert(tinyMCE.get('elm1').selection.getNode().nodeName);">[Get selected element]</a>

-		<a href="javascript:;" onmousedown="tinyMCE.execCommand('mceInsertContent',false,'<b>Hello world!!</b>');">[Insert HTML]</a>

-		<a href="javascript:;" onmousedown="tinyMCE.execCommand('mceReplaceContent',false,'<b>{$selection}</b>');">[Replace selection]</a>

+		<a href="javascript:;" onclick="tinyMCE.get('elm1').show();return false;">[Show]</a>

+		<a href="javascript:;" onclick="tinyMCE.get('elm1').hide();return false;">[Hide]</a>

+		<a href="javascript:;" onclick="tinyMCE.get('elm1').execCommand('Bold');return false;">[Bold]</a>

+		<a href="javascript:;" onclick="alert(tinyMCE.get('elm1').getContent());return false;">[Get contents]</a>

+		<a href="javascript:;" onclick="alert(tinyMCE.get('elm1').selection.getContent());return false;">[Get selected HTML]</a>

+		<a href="javascript:;" onclick="alert(tinyMCE.get('elm1').selection.getContent({format : 'text'}));return false;">[Get selected text]</a>

+		<a href="javascript:;" onclick="alert(tinyMCE.get('elm1').selection.getNode().nodeName);return false;">[Get selected element]</a>

+		<a href="javascript:;" onclick="tinyMCE.execCommand('mceInsertContent',false,'<b>Hello world!!</b>');return false;">[Insert HTML]</a>

+		<a href="javascript:;" onclick="tinyMCE.execCommand('mceReplaceContent',false,'<b>{$selection}</b>');return false;">[Replace selection]</a>

 

 		<br />

 		<input type="submit" name="save" value="Submit" />

@@ -92,5 +92,10 @@
 	</div>

 </form>

 

+<script type="text/javascript">

+if (document.location.protocol == 'file:') {

+	alert("The examples might not work properly on the local file system due to security settings in your browser. Please use a real webserver.");

+}

+</script>

 </body>

 </html>

diff --git a/library/tinymce/examples/index.html b/library/tinymce/examples/index.html
index 6ebfbea57..6ebfbea57 100755..100644
--- a/library/tinymce/examples/index.html
+++ b/library/tinymce/examples/index.html
diff --git a/library/tinymce/examples/lists/image_list.js b/library/tinymce/examples/lists/image_list.js
index 7ba049a24..7ba049a24 100755..100644
--- a/library/tinymce/examples/lists/image_list.js
+++ b/library/tinymce/examples/lists/image_list.js
diff --git a/library/tinymce/examples/lists/link_list.js b/library/tinymce/examples/lists/link_list.js
index 0d464331f..0d464331f 100755..100644
--- a/library/tinymce/examples/lists/link_list.js
+++ b/library/tinymce/examples/lists/link_list.js
diff --git a/library/tinymce/examples/lists/media_list.js b/library/tinymce/examples/lists/media_list.js
index 3a3836cc5..2e049587c 100755..100644
--- a/library/tinymce/examples/lists/media_list.js
+++ b/library/tinymce/examples/lists/media_list.js
@@ -6,5 +6,9 @@ var tinyMCEMediaList = [
 	// Name, URL

 	["Some Flash", "media/sample.swf"],

 	["Some Quicktime", "media/sample.mov"],

-	["Some AVI", "media/sample.avi"]

+	["Some AVI", "media/sample.avi"],

+	["Some RealMedia", "media/sample.rm"],

+	["Some Shockwave", "media/sample.dcr"],

+	["Some Video", "media/sample.mp4"],

+	["Some FLV", "media/sample.flv"]

 ];
\ No newline at end of file
diff --git a/library/tinymce/examples/lists/template_list.js b/library/tinymce/examples/lists/template_list.js
index e06d35788..e06d35788 100755..100644
--- a/library/tinymce/examples/lists/template_list.js
+++ b/library/tinymce/examples/lists/template_list.js
diff --git a/library/tinymce/examples/media/logo.jpg b/library/tinymce/examples/media/logo.jpg
index ad535d671..ad535d671 100755..100644
--- a/library/tinymce/examples/media/logo.jpg
+++ b/library/tinymce/examples/media/logo.jpg
diff --git a/library/tinymce/examples/media/logo_over.jpg b/library/tinymce/examples/media/logo_over.jpg
index 79fcd884a..79fcd884a 100755..100644
--- a/library/tinymce/examples/media/logo_over.jpg
+++ b/library/tinymce/examples/media/logo_over.jpg
diff --git a/library/tinymce/examples/media/sample.avi b/library/tinymce/examples/media/sample.avi
index 238bb688a..238bb688a 100755..100644
--- a/library/tinymce/examples/media/sample.avi
+++ b/library/tinymce/examples/media/sample.avi
diff --git a/library/tinymce/examples/media/sample.dcr b/library/tinymce/examples/media/sample.dcr
index 353b3ce67..353b3ce67 100755..100644
--- a/library/tinymce/examples/media/sample.dcr
+++ b/library/tinymce/examples/media/sample.dcr
diff --git a/library/tinymce/examples/media/sample.flv b/library/tinymce/examples/media/sample.flv
new file mode 100644
index 000000000..799d137e6
--- /dev/null
+++ b/library/tinymce/examples/media/sample.flv
diff --git a/library/tinymce/examples/media/sample.mov b/library/tinymce/examples/media/sample.mov
index 9c0a0932c..9c0a0932c 100755..100644
--- a/library/tinymce/examples/media/sample.mov
+++ b/library/tinymce/examples/media/sample.mov
diff --git a/library/tinymce/examples/media/sample.ram b/library/tinymce/examples/media/sample.ram
index e2ce04cf7..e2ce04cf7 100755..100644
--- a/library/tinymce/examples/media/sample.ram
+++ b/library/tinymce/examples/media/sample.ram
diff --git a/library/tinymce/examples/media/sample.rm b/library/tinymce/examples/media/sample.rm
index 8947706e0..8947706e0 100755..100644
--- a/library/tinymce/examples/media/sample.rm
+++ b/library/tinymce/examples/media/sample.rm
diff --git a/library/tinymce/examples/media/sample.swf b/library/tinymce/examples/media/sample.swf
index 9f5fc4ac5..9f5fc4ac5 100755..100644
--- a/library/tinymce/examples/media/sample.swf
+++ b/library/tinymce/examples/media/sample.swf
diff --git a/library/tinymce/examples/menu.html b/library/tinymce/examples/menu.html
index a65c3104f..e48650abd 100755..100644
--- a/library/tinymce/examples/menu.html
+++ b/library/tinymce/examples/menu.html
@@ -13,5 +13,6 @@ a {display:block;}
 <a href="skins.html" target="main">Skin support</a>

 <a href="word.html" target="main">Word processor</a>

 <a href="custom_formats.html" target="main">Custom formats</a>

+<a href="accessibility.html" target="main">Accessibility Options</a>

 </body>

-</html>
\ No newline at end of file
+</html>

diff --git a/library/tinymce/examples/simple.html b/library/tinymce/examples/simple.html
index c37839890..70720caa1 100755..100644
--- a/library/tinymce/examples/simple.html
+++ b/library/tinymce/examples/simple.html
@@ -38,6 +38,10 @@
 	<input type="submit" name="save" value="Submit" />

 	<input type="reset" name="reset" value="Reset" />

 </form>

-

+<script type="text/javascript">

+if (document.location.protocol == 'file:') {

+	alert("The examples might not work properly on the local file system due to security settings in your browser. Please use a real webserver.");

+}

+</script>

 </body>

 </html>

diff --git a/library/tinymce/examples/skins.html b/library/tinymce/examples/skins.html
index a39817221..c15085885 100755..100644
--- a/library/tinymce/examples/skins.html
+++ b/library/tinymce/examples/skins.html
@@ -12,7 +12,7 @@
 		mode : "exact",

 		elements : "elm1",

 		theme : "advanced",

-		plugins : "pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,inlinepopups,autosave",

+		plugins : "autolink,lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,inlinepopups,autosave",

 

 		// Theme options

 		theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",

@@ -47,7 +47,7 @@
 		elements : "elm2",

 		theme : "advanced",

 		skin : "o2k7",

-		plugins : "pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,inlinepopups,autosave",

+		plugins : "lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,inlinepopups,autosave",

 

 		// Theme options

 		theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",

@@ -83,7 +83,7 @@
 		theme : "advanced",

 		skin : "o2k7",

 		skin_variant : "silver",

-		plugins : "pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,inlinepopups,autosave",

+		plugins : "lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,inlinepopups,autosave",

 

 		// Theme options

 		theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",

@@ -119,7 +119,7 @@
 		theme : "advanced",

 		skin : "o2k7",

 		skin_variant : "black",

-		plugins : "pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,inlinepopups,autosave",

+		plugins : "lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,inlinepopups,autosave",

 

 		// Theme options

 		theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",

@@ -207,6 +207,10 @@
 	<input type="submit" name="save" value="Submit" />

 	<input type="reset" name="reset" value="Reset" />

 </form>

-

+<script type="text/javascript">

+if (document.location.protocol == 'file:') {

+	alert("The examples might not work properly on the local file system due to security settings in your browser. Please use a real webserver.");

+}

+</script>

 </body>

 </html>

diff --git a/library/tinymce/examples/templates/layout1.htm b/library/tinymce/examples/templates/layout1.htm
index a38df3e68..a38df3e68 100755..100644
--- a/library/tinymce/examples/templates/layout1.htm
+++ b/library/tinymce/examples/templates/layout1.htm
diff --git a/library/tinymce/examples/templates/snippet1.htm b/library/tinymce/examples/templates/snippet1.htm
index b2520beaf..b2520beaf 100755..100644
--- a/library/tinymce/examples/templates/snippet1.htm
+++ b/library/tinymce/examples/templates/snippet1.htm
diff --git a/library/tinymce/examples/translate.html b/library/tinymce/examples/translate.html
deleted file mode 100755
index bdd8ac54a..000000000
--- a/library/tinymce/examples/translate.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<title>Full featured example</title>

-<style>

-body {font-family:Arial,Verdana; font-size: 12px;}

-</style>

-

-<!-- TinyMCE -->

-<script type="text/javascript" src="../jscripts/tiny_mce/tiny_mce.js"></script>

-<script type="text/javascript">

-	tinyMCE.init({

-		// General options

-		mode : "textareas",

-		theme : "advanced",

-		plugins : "pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template",

-

-		// Theme options

-		theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect",

-		theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",

-		theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",

-		theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak",

-		theme_advanced_toolbar_location : "top",

-		theme_advanced_toolbar_align : "left",

-		theme_advanced_path_location : "bottom",

-		theme_advanced_resizing : true,

-

-		// Example content CSS (should be your site CSS)

-		content_css : "css/content.css",

-

-		// Drop lists for link/image/media/template dialogs

-		template_external_list_url : "lists/template_list.js",

-		external_link_list_url : "lists/link_list.js",

-		external_image_list_url : "lists/image_list.js",

-		media_external_list_url : "lists/media_list.js",

-

-		// Replace values for the template plugin

-		template_replace_values : {

-			username : "Some User",

-			staffid : "991234"

-		},

-

-		// Enable translation mode

-		translate_mode : true,

-		language : "en"

-	});

-</script>

-<!-- /TinyMCE -->

-

-</head>

-<body>

-

-<form method="post" action="http://tinymce.moxiecode.com/dump.php?example=true">

-	<h3>Translation</h3>

-

-	<p>This page enables you to translate TinyMCE by using XML files.</p>

-	<p>Steps to translate:</p>

-	<ol>

-		<li>Download one of the language XML files from the TinyMCE site.</li>

-		<li>Place it in /jscripts/tiny_mce/langs directory, for example /jscripts/tiny_mce/langs/sv.xml.</li>

-		<li>Change the language init option in this file to match the XML file code. For example: sv</li>

-		<li>TinyMCE will now use the XML file instead of the .js versions.</li>

-		<li>Modify the XML file until everything is translated</li>

-		<li>Modify the author information, this is optional.</li>

-		<li>Upload the XML file to the TinyMCE site to share it with others.</li>

-		<li>You can now download the .js versions of the language pack from the TinyMCE site.</li>

-	</ol>

-

-	<textarea id="elm1" name="elm1" rows="15" cols="80" style="width: 80%">

-		&lt;p&gt;

-			This is some example text that you can edit inside the &lt;strong&gt;TinyMCE editor&lt;/strong&gt;.

-		&lt;/p&gt;

-		&lt;p&gt;

-		Nam nisi elit, cursus in rhoncus sit amet, pulvinar laoreet leo. Nam sed lectus quam, ut sagittis tellus. Quisque dignissim mauris a augue rutrum tempor. Donec vitae purus nec massa vestibulum ornare sit amet id tellus. Nunc quam mauris, fermentum nec lacinia eget, sollicitudin nec ante. Aliquam molestie volutpat dapibus. Nunc interdum viverra sodales. Morbi laoreet pulvinar gravida. Quisque ut turpis sagittis nunc accumsan vehicula. Duis elementum congue ultrices. Cras faucibus feugiat arcu quis lacinia. In hac habitasse platea dictumst. Pellentesque fermentum magna sit amet tellus varius ullamcorper. Vestibulum at urna augue, eget varius neque. Fusce facilisis venenatis dapibus. Integer non sem at arcu euismod tempor nec sed nisl. Morbi ultricies, mauris ut ultricies adipiscing, felis odio condimentum massa, et luctus est nunc nec eros.

-		&lt;/p&gt;

-	</textarea>

-</form>

-

-</body>

-</html>

diff --git a/library/tinymce/examples/word.html b/library/tinymce/examples/word.html
index f778f983c..d827b6fed 100755..100644
--- a/library/tinymce/examples/word.html
+++ b/library/tinymce/examples/word.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">

 <head>

 <title>Word processor example</title>

-

+<meta http-equiv="X-UA-Compatible" content="IE=edge" />

 <!-- TinyMCE -->

 <script type="text/javascript" src="../jscripts/tiny_mce/tiny_mce.js"></script>

 <script type="text/javascript">

@@ -10,7 +10,8 @@
 		// General options

 		mode : "textareas",

 		theme : "advanced",

-		plugins : "pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,inlinepopups,autosave",

+		skin : "o2k7",

+		plugins : "autolink,lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,inlinepopups,autosave",

 

 		// Theme options

 		theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect",

@@ -62,6 +63,10 @@
 	<input type="submit" name="save" value="Submit" />

 	<input type="reset" name="reset" value="Reset" />

 </form>

-

+<script type="text/javascript">

+if (document.location.protocol == 'file:') {

+	alert("The examples might not work properly on the local file system due to security settings in your browser. Please use a real webserver.");

+}

+</script>

 </body>

 </html>

diff --git a/library/tinymce/jscripts/tiny_mce/langs/en.js b/library/tinymce/jscripts/tiny_mce/langs/en.js
index ea4a1b0e1..19324f74c 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/langs/en.js
+++ b/library/tinymce/jscripts/tiny_mce/langs/en.js
@@ -1,170 +1 @@
-tinyMCE.addI18n({en:{

-common:{

-edit_confirm:"Do you want to use the WYSIWYG mode for this textarea?",

-apply:"Apply",

-insert:"Insert",

-update:"Update",

-cancel:"Cancel",

-close:"Close",

-browse:"Browse",

-class_name:"Class",

-not_set:"-- Not set --",

-clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?",

-clipboard_no_support:"Currently not supported by your browser, use keyboard shortcuts instead.",

-popup_blocked:"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.",

-invalid_data:"Error: Invalid values entered, these are marked in red.",

-more_colors:"More colors"

-},

-contextmenu:{

-align:"Alignment",

-left:"Left",

-center:"Center",

-right:"Right",

-full:"Full"

-},

-insertdatetime:{

-date_fmt:"%Y-%m-%d",

-time_fmt:"%H:%M:%S",

-insertdate_desc:"Insert date",

-inserttime_desc:"Insert time",

-months_long:"January,February,March,April,May,June,July,August,September,October,November,December",

-months_short:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec",

-day_long:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday",

-day_short:"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun"

-},

-print:{

-print_desc:"Print"

-},

-preview:{

-preview_desc:"Preview"

-},

-directionality:{

-ltr_desc:"Direction left to right",

-rtl_desc:"Direction right to left"

-},

-layer:{

-insertlayer_desc:"Insert new layer",

-forward_desc:"Move forward",

-backward_desc:"Move backward",

-absolute_desc:"Toggle absolute positioning",

-content:"New layer..."

-},

-save:{

-save_desc:"Save",

-cancel_desc:"Cancel all changes"

-},

-nonbreaking:{

-nonbreaking_desc:"Insert non-breaking space character"

-},

-iespell:{

-iespell_desc:"Run spell checking",

-download:"ieSpell not detected. Do you want to install it now?"

-},

-advhr:{

-advhr_desc:"Horizontal rule"

-},

-emotions:{

-emotions_desc:"Emotions"

-},

-searchreplace:{

-search_desc:"Find",

-replace_desc:"Find/Replace"

-},

-advimage:{

-image_desc:"Insert/edit image"

-},

-advlink:{

-link_desc:"Insert/edit link"

-},

-xhtmlxtras:{

-cite_desc:"Citation",

-abbr_desc:"Abbreviation",

-acronym_desc:"Acronym",

-del_desc:"Deletion",

-ins_desc:"Insertion",

-attribs_desc:"Insert/Edit Attributes"

-},

-style:{

-desc:"Edit CSS Style"

-},

-paste:{

-paste_text_desc:"Paste as Plain Text",

-paste_word_desc:"Paste from Word",

-selectall_desc:"Select All",

-plaintext_mode_sticky:"Paste is now in plain text mode. Click again to toggle back to regular paste mode. After you paste something you will be returned to regular paste mode.",

-plaintext_mode:"Paste is now in plain text mode. Click again to toggle back to regular paste mode."

-},

-paste_dlg:{

-text_title:"Use CTRL+V on your keyboard to paste the text into the window.",

-text_linebreaks:"Keep linebreaks",

-word_title:"Use CTRL+V on your keyboard to paste the text into the window."

-},

-table:{

-desc:"Inserts a new table",

-row_before_desc:"Insert row before",

-row_after_desc:"Insert row after",

-delete_row_desc:"Delete row",

-col_before_desc:"Insert column before",

-col_after_desc:"Insert column after",

-delete_col_desc:"Remove column",

-split_cells_desc:"Split merged table cells",

-merge_cells_desc:"Merge table cells",

-row_desc:"Table row properties",

-cell_desc:"Table cell properties",

-props_desc:"Table properties",

-paste_row_before_desc:"Paste table row before",

-paste_row_after_desc:"Paste table row after",

-cut_row_desc:"Cut table row",

-copy_row_desc:"Copy table row",

-del:"Delete table",

-row:"Row",

-col:"Column",

-cell:"Cell"

-},

-autosave:{

-unload_msg:"The changes you made will be lost if you navigate away from this page.",

-restore_content:"Restore auto-saved content.",

-warning_message:"If you restore the saved content, you will lose all the content that is currently in the editor.\n\nAre you sure you want to restore the saved content?."

-},

-fullscreen:{

-desc:"Toggle fullscreen mode"

-},

-media:{

-desc:"Insert / edit embedded media",

-edit:"Edit embedded media"

-},

-fullpage:{

-desc:"Document properties"

-},

-template:{

-desc:"Insert predefined template content"

-},

-visualchars:{

-desc:"Visual control characters on/off."

-},

-spellchecker:{

-desc:"Toggle spellchecker",

-menu:"Spellchecker settings",

-ignore_word:"Ignore word",

-ignore_words:"Ignore all",

-langs:"Languages",

-wait:"Please wait...",

-sug:"Suggestions",

-no_sug:"No suggestions",

-no_mpell:"No misspellings found."

-},

-pagebreak:{

-desc:"Insert page break."

-},

-advlist:{

-types:"Types",

-def:"Default",

-lower_alpha:"Lower alpha",

-lower_greek:"Lower greek",

-lower_roman:"Lower roman",

-upper_alpha:"Upper alpha",

-upper_roman:"Upper roman",

-circle:"Circle",

-disc:"Disc",

-square:"Square"

-}}});
\ No newline at end of file
+tinyMCE.addI18n({en:{common:{"more_colors":"More Colors...","invalid_data":"Error: Invalid values entered, these are marked in red.","popup_blocked":"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.","clipboard_no_support":"Currently not supported by your browser, use keyboard shortcuts instead.","clipboard_msg":"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?","not_set":"-- Not Set --","class_name":"Class",browse:"Browse",close:"Close",cancel:"Cancel",update:"Update",insert:"Insert",apply:"Apply","edit_confirm":"Do you want to use the WYSIWYG mode for this textarea?","invalid_data_number":"{#field} must be a number","invalid_data_min":"{#field} must be a number greater than {#min}","invalid_data_size":"{#field} must be a number or percentage",value:"(value)"},contextmenu:{full:"Full",right:"Right",center:"Center",left:"Left",align:"Alignment"},insertdatetime:{"day_short":"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun","day_long":"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday","months_short":"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec","months_long":"January,February,March,April,May,June,July,August,September,October,November,December","inserttime_desc":"Insert Time","insertdate_desc":"Insert Date","time_fmt":"%H:%M:%S","date_fmt":"%Y-%m-%d"},print:{"print_desc":"Print"},preview:{"preview_desc":"Preview"},directionality:{"rtl_desc":"Direction Right to Left","ltr_desc":"Direction Left to Right"},layer:{content:"New layer...","absolute_desc":"Toggle Absolute Positioning","backward_desc":"Move Backward","forward_desc":"Move Forward","insertlayer_desc":"Insert New Layer"},save:{"save_desc":"Save","cancel_desc":"Cancel All Changes"},nonbreaking:{"nonbreaking_desc":"Insert Non-Breaking Space Character"},iespell:{download:"ieSpell not detected. Do you want to install it now?","iespell_desc":"Check Spelling"},advhr:{"delta_height":"","delta_width":"","advhr_desc":"Insert Horizontal Line"},emotions:{"delta_height":"","delta_width":"","emotions_desc":"Emotions"},searchreplace:{"replace_desc":"Find/Replace","delta_width":"","delta_height":"","search_desc":"Find"},advimage:{"delta_width":"","image_desc":"Insert/Edit Image","delta_height":""},advlink:{"delta_height":"","delta_width":"","link_desc":"Insert/Edit Link"},xhtmlxtras:{"attribs_delta_height":"","attribs_delta_width":"","ins_delta_height":"","ins_delta_width":"","del_delta_height":"","del_delta_width":"","acronym_delta_height":"","acronym_delta_width":"","abbr_delta_height":"","abbr_delta_width":"","cite_delta_height":"","cite_delta_width":"","attribs_desc":"Insert/Edit Attributes","ins_desc":"Insertion","del_desc":"Deletion","acronym_desc":"Acronym","abbr_desc":"Abbreviation","cite_desc":"Citation"},style:{"delta_height":"","delta_width":"",desc:"Edit CSS Style"},paste:{"plaintext_mode_stick":"Paste is now in plain text mode. Click again to toggle back to regular paste mode.","plaintext_mode":"Paste is now in plain text mode. Click again to toggle back to regular paste mode. After you paste something you will be returned to regular paste mode.","selectall_desc":"Select All","paste_word_desc":"Paste from Word","paste_text_desc":"Paste as Plain Text"},"paste_dlg":{"word_title":"Use Ctrl+V on your keyboard to paste the text into the window.","text_linebreaks":"Keep Linebreaks","text_title":"Use Ctrl+V on your keyboard to paste the text into the window."},table:{"merge_cells_delta_height":"","merge_cells_delta_width":"","table_delta_height":"","table_delta_width":"","cellprops_delta_height":"","cellprops_delta_width":"","rowprops_delta_height":"","rowprops_delta_width":"",cell:"Cell",col:"Column",row:"Row",del:"Delete Table","copy_row_desc":"Copy Table Row","cut_row_desc":"Cut Table Row","paste_row_after_desc":"Paste Table Row After","paste_row_before_desc":"Paste Table Row Before","props_desc":"Table Properties","cell_desc":"Table Cell Properties","row_desc":"Table Row Properties","merge_cells_desc":"Merge Table Cells","split_cells_desc":"Split Merged Table Cells","delete_col_desc":"Delete Column","col_after_desc":"Insert Column After","col_before_desc":"Insert Column Before","delete_row_desc":"Delete Row","row_after_desc":"Insert Row After","row_before_desc":"Insert Row Before",desc:"Insert/Edit Table"},autosave:{"warning_message":"If you restore the saved content, you will lose all the content that is currently in the editor.\n\nAre you sure you want to restore the saved content?","restore_content":"Restore auto-saved content.","unload_msg":"The changes you made will be lost if you navigate away from this page."},fullscreen:{desc:"Toggle Full Screen Mode"},media:{"delta_height":"","delta_width":"",edit:"Edit Embedded Media",desc:"Insert/Edit Embedded Media"},fullpage:{desc:"Document Properties","delta_width":"","delta_height":""},template:{desc:"Insert Predefined Template Content"},visualchars:{desc:"Show/Hide Visual Control Characters"},spellchecker:{desc:"Toggle Spell Checker",menu:"Spell Checker Settings","ignore_word":"Ignore Word","ignore_words":"Ignore All",langs:"Languages",wait:"Please wait...",sug:"Suggestions","no_sug":"No Suggestions","no_mpell":"No misspellings found.","learn_word":"Learn word"},pagebreak:{desc:"Insert Page Break for Printing"},advlist:{types:"Types",def:"Default","lower_alpha":"Lower Alpha","lower_greek":"Lower Greek","lower_roman":"Lower Roman","upper_alpha":"Upper Alpha","upper_roman":"Upper Roman",circle:"Circle",disc:"Disc",square:"Square"},colors:{"333300":"Dark olive","993300":"Burnt orange","000000":"Black","003300":"Dark green","003366":"Dark azure","000080":"Navy Blue","333399":"Indigo","333333":"Very dark gray","800000":"Maroon",FF6600:"Orange","808000":"Olive","008000":"Green","008080":"Teal","0000FF":"Blue","666699":"Grayish blue","808080":"Gray",FF0000:"Red",FF9900:"Amber","99CC00":"Yellow green","339966":"Sea green","33CCCC":"Turquoise","3366FF":"Royal blue","800080":"Purple","999999":"Medium gray",FF00FF:"Magenta",FFCC00:"Gold",FFFF00:"Yellow","00FF00":"Lime","00FFFF":"Aqua","00CCFF":"Sky blue","993366":"Brown",C0C0C0:"Silver",FF99CC:"Pink",FFCC99:"Peach",FFFF99:"Light yellow",CCFFCC:"Pale green",CCFFFF:"Pale cyan","99CCFF":"Light sky blue",CC99FF:"Plum",FFFFFF:"White"},aria:{"rich_text_area":"Rich Text Area"},wordcount:{words:"Words:"},visualblocks:{desc:'Show/hide block elements'}}});
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/license.txt b/library/tinymce/jscripts/tiny_mce/license.txt
index 60d6d4c8f..60d6d4c8f 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/license.txt
+++ b/library/tinymce/jscripts/tiny_mce/license.txt
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css b/library/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css
index 0e2283498..0e2283498 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js
index 4d3b062de..4d3b062de 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js
index 0c652d330..0c652d330 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js b/library/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js
index b6cbd66c7..b6cbd66c7 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
index 873bfd8d3..0c3bf15e6 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
@@ -1,5 +1 @@
-tinyMCE.addI18n('en.advhr_dlg',{

-width:"Width",

-size:"Height",

-noshade:"No shadow"

-});
\ No newline at end of file
+tinyMCE.addI18n('en.advhr_dlg',{size:"Height",noshade:"No Shadow",width:"Width",normal:"Normal",widthunits:"Units"});
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm b/library/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm
index fc37b2aec..843e1f8f0 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm
@@ -8,43 +8,44 @@
 	<script type="text/javascript" src="../../utils/form_utils.js"></script>

 	<link href="css/advhr.css" rel="stylesheet" type="text/css" />

 </head>

-<body>

+<body role="application">

 <form onsubmit="AdvHRDialog.update();return false;" action="#">

 	<div class="tabs">

 		<ul>

-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advhr.advhr_desc}</a></span></li>

+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advhr.advhr_desc}</a></span></li>

 		</ul>

 	</div>

 

 	<div class="panel_wrapper">

 		<div id="general_panel" class="panel current">

-			<table border="0" cellpadding="4" cellspacing="0">

-                    <tr>

-                        <td><label for="width">{#advhr_dlg.width}</label></td>

-                        <td class="nowrap">

-                            <input id="width" name="width" type="text" value="" class="mceFocus" />

-                            <select name="width2" id="width2">

-                                <option value="">px</option>

-                                <option value="%">%</option>

-                            </select>

-                        </td>

-                    </tr>

-                    <tr>

-                        <td><label for="size">{#advhr_dlg.size}</label></td>

-                        <td><select id="size" name="size">

-                            <option value="">Normal</option>

-                            <option value="1">1</option>

-                            <option value="2">2</option>

-                            <option value="3">3</option>

-                            <option value="4">4</option>

-                            <option value="5">5</option>

-                        </select></td>

-                    </tr>

-                    <tr>

-                        <td><label for="noshade">{#advhr_dlg.noshade}</label></td>

-                        <td><input type="checkbox" name="noshade" id="noshade" class="radio" /></td>

-                    </tr>

-            </table>

+			<table role="presentation" border="0" cellpadding="4" cellspacing="0">

+					<tr role="group" aria-labelledby="width_label">

+						<td><label id="width_label" for="width">{#advhr_dlg.width}</label></td>

+						<td class="nowrap">

+							<input id="width" name="width" type="text" value="" class="mceFocus" />

+							<span style="display:none;" id="width_unit_label">{#advhr_dlg.widthunits}</span>

+							<select name="width2" id="width2" aria-labelledby="width_unit_label">

+								<option value="">px</option>

+								<option value="%">%</option>

+							</select>

+						</td>

+					</tr>

+					<tr>

+						<td><label for="size">{#advhr_dlg.size}</label></td>

+						<td><select id="size" name="size">

+							<option value="">{#advhr_dlg.normal}</option>

+							<option value="1">1</option>

+							<option value="2">2</option>

+							<option value="3">3</option>

+							<option value="4">4</option>

+							<option value="5">5</option>

+						</select></td>

+					</tr>

+					<tr>

+						<td><label for="noshade">{#advhr_dlg.noshade}</label></td>

+						<td><input type="checkbox" name="noshade" id="noshade" class="radio" /></td>

+					</tr>

+			</table>

 		</div>

 	</div>

 

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advimage/css/advimage.css b/library/tinymce/jscripts/tiny_mce/plugins/advimage/css/advimage.css
index 0a6251a69..0a6251a69 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advimage/css/advimage.css
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advimage/css/advimage.css
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js
index 4c7a9c3a8..d613a6139 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.AdvancedImagePlugin",{init:function(a,b){a.addCommand("mceAdvImage",function(){if(a.dom.getAttrib(a.selection.getNode(),"class").indexOf("mceItem")!=-1){return}a.windowManager.open({file:b+"/image.htm",width:480+parseInt(a.getLang("advimage.delta_width",0)),height:385+parseInt(a.getLang("advimage.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("image",{title:"advimage.image_desc",cmd:"mceAdvImage"})},getInfo:function(){return{longname:"Advanced image",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advimage",tinymce.plugins.AdvancedImagePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.AdvancedImagePlugin",{init:function(a,b){a.addCommand("mceAdvImage",function(){if(a.dom.getAttrib(a.selection.getNode(),"class","").indexOf("mceItem")!=-1){return}a.windowManager.open({file:b+"/image.htm",width:480+parseInt(a.getLang("advimage.delta_width",0)),height:385+parseInt(a.getLang("advimage.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("image",{title:"advimage.image_desc",cmd:"mceAdvImage"})},getInfo:function(){return{longname:"Advanced image",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advimage",tinymce.plugins.AdvancedImagePlugin)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js
index 2625dd213..d2678cbcf 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js
@@ -14,7 +14,7 @@
 			// Register commands

 			ed.addCommand('mceAdvImage', function() {

 				// Internal image object like a flash placeholder

-				if (ed.dom.getAttrib(ed.selection.getNode(), 'class').indexOf('mceItem') != -1)

+				if (ed.dom.getAttrib(ed.selection.getNode(), 'class', '').indexOf('mceItem') != -1)

 					return;

 

 				ed.windowManager.open({

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm b/library/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm
index 79cff3f19..ed16b3d4a 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm
@@ -10,13 +10,14 @@
 	<script type="text/javascript" src="js/image.js"></script>

 	<link href="css/advimage.css" rel="stylesheet" type="text/css" />

 </head>

-<body id="advimage" style="display: none">

-    <form onsubmit="ImageDialog.insert();return false;" action="#"> 

+<body id="advimage" style="display: none" role="application" aria-labelledby="app_title">

+	<span id="app_title" style="display:none">{#advimage_dlg.dialog_title}</span>

+	<form onsubmit="ImageDialog.insert();return false;" action="#"> 

 		<div class="tabs">

 			<ul>

-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advimage_dlg.tab_general}</a></span></li>

-				<li id="appearance_tab"><span><a href="javascript:mcTabs.displayTab('appearance_tab','appearance_panel');" onmousedown="return false;">{#advimage_dlg.tab_appearance}</a></span></li>

-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#advimage_dlg.tab_advanced}</a></span></li>

+				<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advimage_dlg.tab_general}</a></span></li>

+				<li id="appearance_tab" aria-controls="appearance_panel"><span><a href="javascript:mcTabs.displayTab('appearance_tab','appearance_panel');" onmousedown="return false;">{#advimage_dlg.tab_appearance}</a></span></li>

+				<li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#advimage_dlg.tab_advanced}</a></span></li>

 			</ul>

 		</div>

 

@@ -25,15 +26,15 @@
 				<fieldset>

 						<legend>{#advimage_dlg.general}</legend>

 

-						<table class="properties">

+						<table role="presentation" class="properties">

 							<tr>

 								<td class="column1"><label id="srclabel" for="src">{#advimage_dlg.src}</label></td>

-								<td colspan="2"><table border="0" cellspacing="0" cellpadding="0">

+								<td colspan="2"><table role="presentation" border="0" cellspacing="0" cellpadding="0">

 									<tr> 

-									  <td><input name="src" type="text" id="src" value="" class="mceFocus" onchange="ImageDialog.showPreviewImage(this.value);" /></td> 

-									  <td id="srcbrowsercontainer">&nbsp;</td>

+										<td><input name="src" type="text" id="src" value="" class="mceFocus" onchange="ImageDialog.showPreviewImage(this.value);" aria-required="true" /></td> 

+										<td id="srcbrowsercontainer">&nbsp;</td>

 									</tr>

-								  </table></td>

+								</table></td>

 							</tr>

 							<tr>

 								<td><label for="src_list">{#advimage_dlg.image_list}</label></td>

@@ -60,7 +61,7 @@
 				<fieldset>

 					<legend>{#advimage_dlg.tab_appearance}</legend>

 

-					<table border="0" cellpadding="4" cellspacing="0">

+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">

 						<tr> 

 							<td class="column1"><label id="alignlabel" for="align">{#advimage_dlg.align}</label></td> 

 							<td><select id="align" name="align" onchange="ImageDialog.updateStyle('align');ImageDialog.changeAppearance();"> 

@@ -86,17 +87,19 @@
 							</td>

 						</tr>

 

-						<tr>

+						<tr role="group" aria-labelledby="widthlabel">

 							<td class="column1"><label id="widthlabel" for="width">{#advimage_dlg.dimensions}</label></td>

 							<td class="nowrap">

-								<input name="width" type="text" id="width" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeHeight();" /> x 

-								<input name="height" type="text" id="height" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeWidth();" /> px

+								<span style="display:none" id="width_voiceLabel">{#advimage_dlg.width}</span>

+								<input name="width" type="text" id="width" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeHeight();" aria-labelledby="width_voiceLabel" /> x 

+								<span style="display:none" id="height_voiceLabel">{#advimage_dlg.height}</span>

+								<input name="height" type="text" id="height" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeWidth();" aria-labelledby="height_voiceLabel" /> px

 							</td>

 						</tr>

 

 						<tr>

 							<td>&nbsp;</td>

-							<td><table border="0" cellpadding="0" cellspacing="0">

+							<td><table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

 										<td><input id="constrain" type="checkbox" name="constrain" class="checkbox" /></td>

 										<td><label id="constrainlabel" for="constrain">{#advimage_dlg.constrain_proportions}</label></td>

@@ -142,18 +145,18 @@
 				<fieldset>

 					<legend>{#advimage_dlg.swap_image}</legend>

 

-					<input type="checkbox" id="onmousemovecheck" name="onmousemovecheck" class="checkbox" onclick="ImageDialog.setSwapImage(this.checked);" />

+					<input type="checkbox" id="onmousemovecheck" name="onmousemovecheck" class="checkbox" onclick="ImageDialog.setSwapImage(this.checked);" aria-controls="onmouseoversrc onmouseoutsrc" />

 					<label id="onmousemovechecklabel" for="onmousemovecheck">{#advimage_dlg.alt_image}</label>

 

-					<table border="0" cellpadding="4" cellspacing="0" width="100%">

+					<table role="presentation" border="0" cellpadding="4" cellspacing="0" width="100%">

 							<tr>

 								<td class="column1"><label id="onmouseoversrclabel" for="onmouseoversrc">{#advimage_dlg.mouseover}</label></td> 

-								<td><table border="0" cellspacing="0" cellpadding="0"> 

+								<td><table role="presentation" border="0" cellspacing="0" cellpadding="0"> 

 									<tr> 

-									  <td><input id="onmouseoversrc" name="onmouseoversrc" type="text" value="" /></td> 

-									  <td id="onmouseoversrccontainer">&nbsp;</td>

+										<td><input id="onmouseoversrc" name="onmouseoversrc" type="text" value="" /></td> 

+										<td id="onmouseoversrccontainer">&nbsp;</td>

 									</tr>

-								  </table></td>

+								</table></td>

 							</tr>

 							<tr>

 								<td><label for="over_list">{#advimage_dlg.image_list}</label></td>

@@ -161,12 +164,12 @@
 							</tr>

 							<tr> 

 								<td class="column1"><label id="onmouseoutsrclabel" for="onmouseoutsrc">{#advimage_dlg.mouseout}</label></td> 

-								<td class="column2"><table border="0" cellspacing="0" cellpadding="0"> 

+								<td class="column2"><table role="presentation" border="0" cellspacing="0" cellpadding="0"> 

 									<tr> 

-									  <td><input id="onmouseoutsrc" name="onmouseoutsrc" type="text" value="" /></td> 

-									  <td id="onmouseoutsrccontainer">&nbsp;</td>

+										<td><input id="onmouseoutsrc" name="onmouseoutsrc" type="text" value="" /></td> 

+										<td id="onmouseoutsrccontainer">&nbsp;</td>

 									</tr> 

-								  </table></td> 

+								</table></td> 

 							</tr>

 							<tr>

 								<td><label for="out_list">{#advimage_dlg.image_list}</label></td>

@@ -178,7 +181,7 @@
 				<fieldset>

 					<legend>{#advimage_dlg.misc}</legend>

 

-					<table border="0" cellpadding="4" cellspacing="0">

+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">

 						<tr>

 							<td class="column1"><label id="idlabel" for="id">{#advimage_dlg.id}</label></td> 

 							<td><input id="id" name="id" type="text" value="" /></td> 

@@ -211,12 +214,12 @@
 

 						<tr>

 							<td class="column1"><label id="longdesclabel" for="longdesc">{#advimage_dlg.long_desc}</label></td>

-							<td><table border="0" cellspacing="0" cellpadding="0">

+							<td><table role="presentation" border="0" cellspacing="0" cellpadding="0">

 									<tr>

-									  <td><input id="longdesc" name="longdesc" type="text" value="" /></td>

-									  <td id="longdesccontainer">&nbsp;</td>

+										<td><input id="longdesc" name="longdesc" type="text" value="" /></td>

+										<td id="longdesccontainer">&nbsp;</td>

 									</tr>

-								</table></td> 

+							</table></td> 

 						</tr>

 					</table>

 				</fieldset>

@@ -227,6 +230,6 @@
 			<input type="submit" id="insert" name="insert" value="{#insert}" />

 			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

 		</div>

-    </form>

+	</form>

 </body> 

 </html> 

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advimage/img/sample.gif b/library/tinymce/jscripts/tiny_mce/plugins/advimage/img/sample.gif
index 53bf6890b..53bf6890b 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advimage/img/sample.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advimage/img/sample.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js b/library/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
index 3bda86a2d..546b69c0d 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
@@ -9,13 +9,13 @@ var ImageDialog = {
 	},

 

 	init : function(ed) {

-		var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, dom = ed.dom, n = ed.selection.getNode();

+		var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, dom = ed.dom, n = ed.selection.getNode(), fl = tinyMCEPopup.getParam('external_image_list', 'tinyMCEImageList');

 

 		tinyMCEPopup.resizeToInnerSize();

 		this.fillClassList('class_list');

-		this.fillFileList('src_list', 'tinyMCEImageList');

-		this.fillFileList('over_list', 'tinyMCEImageList');

-		this.fillFileList('out_list', 'tinyMCEImageList');

+		this.fillFileList('src_list', fl);

+		this.fillFileList('over_list', fl);

+		this.fillFileList('out_list', fl);

 		TinyMCE_EditableSelects.init();

 

 		if (n.nodeName == 'IMG') {

@@ -142,7 +142,7 @@ var ImageDialog = {
 		}

 

 		tinymce.extend(args, {

-			src : nl.src.value,

+			src : nl.src.value.replace(/ /g, '%20'),

 			width : nl.width.value,

 			height : nl.height.value,

 			alt : nl.alt.value,

@@ -171,12 +171,18 @@ var ImageDialog = {
 		if (el && el.nodeName == 'IMG') {

 			ed.dom.setAttribs(el, args);

 		} else {

-			ed.execCommand('mceInsertContent', false, '<img id="__mce_tmp" />', {skip_undo : 1});

-			ed.dom.setAttribs('__mce_tmp', args);

-			ed.dom.setAttrib('__mce_tmp', 'id', '');

+			tinymce.each(args, function(value, name) {

+				if (value === "") {

+					delete args[name];

+				}

+			});

+

+			ed.execCommand('mceInsertContent', false, tinyMCEPopup.editor.dom.createHTML('img', args), {skip_undo : 1});

 			ed.undoManager.add();

 		}

 

+		tinyMCEPopup.editor.execCommand('mceRepaint');

+		tinyMCEPopup.editor.focus();

 		tinyMCEPopup.close();

 	},

 

@@ -285,7 +291,7 @@ var ImageDialog = {
 	fillFileList : function(id, l) {

 		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;

 

-		l = window[l];

+		l = typeof(l) === 'function' ? l() : window[l];

 		lst.options.length = 0;

 

 		if (l && l.length > 0) {

@@ -359,7 +365,7 @@ var ImageDialog = {
 	},

 

 	updateStyle : function(ty) {

-		var dom = tinyMCEPopup.dom, st, v, f = document.forms[0], img = dom.create('img', {style : dom.get('style').value});

+		var dom = tinyMCEPopup.dom, b, bStyle, bColor, v, isIE = tinymce.isIE, f = document.forms[0], img = dom.create('img', {style : dom.get('style').value});

 

 		if (tinyMCEPopup.editor.settings.inline_styles) {

 			// Handle align

@@ -378,14 +384,27 @@ var ImageDialog = {
 

 			// Handle border

 			if (ty == 'border') {

+				b = img.style.border ? img.style.border.split(' ') : [];

+				bStyle = dom.getStyle(img, 'border-style');

+				bColor = dom.getStyle(img, 'border-color');

+

 				dom.setStyle(img, 'border', '');

 

 				v = f.border.value;

 				if (v || v == '0') {

 					if (v == '0')

-						img.style.border = '0';

-					else

-						img.style.border = v + 'px solid black';

+						img.style.border = isIE ? '0' : '0 none none';

+					else {

+						if (b.length == 3 && b[isIE ? 2 : 1])

+							bStyle = b[isIE ? 2 : 1];

+						else if (!bStyle || bStyle == 'none')

+							bStyle = 'solid';

+						if (b.length == 3 && b[isIE ? 0 : 2])

+							bColor = b[isIE ? 0 : 2];

+						else if (!bColor || bColor == 'none')

+							bColor = 'black';

+						img.style.border = v + 'px ' + bStyle + ' ' + bColor;

+					}

 				}

 			}

 

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js
index f493d196f..5f122e2cd 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js
@@ -1,43 +1 @@
-tinyMCE.addI18n('en.advimage_dlg',{

-tab_general:"General",

-tab_appearance:"Appearance",

-tab_advanced:"Advanced",

-general:"General",

-title:"Title",

-preview:"Preview",

-constrain_proportions:"Constrain proportions",

-langdir:"Language direction",

-langcode:"Language code",

-long_desc:"Long description link",

-style:"Style",

-classes:"Classes",

-ltr:"Left to right",

-rtl:"Right to left",

-id:"Id",

-map:"Image map",

-swap_image:"Swap image",

-alt_image:"Alternative image",

-mouseover:"for mouse over",

-mouseout:"for mouse out",

-misc:"Miscellaneous",

-example_img:"Appearance preview image",

-missing_alt:"Are you sure you want to continue without including an Image Description? Without it the image may not be accessible to some users with disabilities, or to those using a text browser, or browsing the Web with images turned off.",

-dialog_title:"Insert/edit image",

-src:"Image URL",

-alt:"Image description",

-list:"Image list",

-border:"Border",

-dimensions:"Dimensions",

-vspace:"Vertical space",

-hspace:"Horizontal space",

-align:"Alignment",

-align_baseline:"Baseline",

-align_top:"Top",

-align_middle:"Middle",

-align_bottom:"Bottom",

-align_texttop:"Text top",

-align_textbottom:"Text bottom",

-align_left:"Left",

-align_right:"Right",

-image_list:"Image list"

-});
\ No newline at end of file
+tinyMCE.addI18n('en.advimage_dlg',{"image_list":"Image List","align_right":"Right","align_left":"Left","align_textbottom":"Text Bottom","align_texttop":"Text Top","align_bottom":"Bottom","align_middle":"Middle","align_top":"Top","align_baseline":"Baseline",align:"Alignment",hspace:"Horizontal Space",vspace:"Vertical Space",dimensions:"Dimensions",border:"Border",list:"Image List",alt:"Image Description",src:"Image URL","dialog_title":"Insert/Edit Image","missing_alt":"Are you sure you want to continue without including an Image Description? Without it the image may not be accessible to some users with disabilities, or to those using a text browser, or browsing the Web with images turned off.","example_img":"Appearance Preview Image",misc:"Miscellaneous",mouseout:"For Mouse Out",mouseover:"For Mouse Over","alt_image":"Alternative Image","swap_image":"Swap Image",map:"Image Map",id:"ID",rtl:"Right to Left",ltr:"Left to Right",classes:"Classes",style:"Style","long_desc":"Long Description Link",langcode:"Language Code",langdir:"Language Direction","constrain_proportions":"Constrain Proportions",preview:"Preview",title:"Title",general:"General","tab_advanced":"Advanced","tab_appearance":"Appearance","tab_general":"General",width:"Width",height:"Height"});
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advlink/css/advlink.css b/library/tinymce/jscripts/tiny_mce/plugins/advlink/css/advlink.css
index 14364316a..14364316a 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advlink/css/advlink.css
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advlink/css/advlink.css
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js
index 983fe5a9c..983fe5a9c 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js
index 14e46a762..14e46a762 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js b/library/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
index b78e82f76..9ca955c92 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
@@ -30,8 +30,6 @@ function init() {
 

 	document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser','href','file','advlink');

 	document.getElementById('popupurlbrowsercontainer').innerHTML = getBrowserHTML('popupurlbrowser','popupurl','file','advlink');

-	document.getElementById('linklisthrefcontainer').innerHTML = getLinkListHTML('linklisthref','href');

-	document.getElementById('anchorlistcontainer').innerHTML = getAnchorListHTML('anchorlist','href');

 	document.getElementById('targetlistcontainer').innerHTML = getTargetListHTML('targetlist','target');

 

 	// Link list

@@ -41,6 +39,13 @@ function init() {
 	else

 		document.getElementById("linklisthrefcontainer").innerHTML = html;

 

+	// Anchor list

+	html = getAnchorListHTML('anchorlist','href');

+	if (html == "")

+		document.getElementById("anchorlistrow").style.display = 'none';

+	else

+		document.getElementById("anchorlistcontainer").innerHTML = html;

+

 	// Resize some elements

 	if (isVisible('hrefbrowser'))

 		document.getElementById('href').style.width = '260px';

@@ -49,6 +54,13 @@ function init() {
 		document.getElementById('popupurl').style.width = '180px';

 

 	elm = inst.dom.getParent(elm, "A");

+	if (elm == null) {

+		var prospect = inst.dom.create("p", null, inst.selection.getContent());

+		if (prospect.childNodes.length === 1) {

+			elm = prospect.firstChild;

+		}

+	}

+

 	if (elm != null && elm.nodeName == "A")

 		action = "update";

 

@@ -360,20 +372,22 @@ function setAttrib(elm, attrib, value) {
 }

 

 function getAnchorListHTML(id, target) {

-	var inst = tinyMCEPopup.editor;

-	var nodes = inst.dom.select('a.mceItemAnchor,img.mceItemAnchor'), name, i;

-	var html = "";

-

-	html += '<select id="' + id + '" name="' + id + '" class="mceAnchorList" o2nfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target + '.value=';

-	html += 'this.options[this.selectedIndex].value;">';

-	html += '<option value="">---</option>';

+	var ed = tinyMCEPopup.editor, nodes = ed.dom.select('a'), name, i, len, html = "";

 

-	for (i=0; i<nodes.length; i++) {

-		if ((name = inst.dom.getAttrib(nodes[i], "name")) != "")

+	for (i=0, len=nodes.length; i<len; i++) {

+		if ((name = ed.dom.getAttrib(nodes[i], "name")) != "")

 			html += '<option value="#' + name + '">' + name + '</option>';

 	}

 

-	html += '</select>';

+	if (html == "")

+		return "";

+

+	html = '<select id="' + id + '" name="' + id + '" class="mceAnchorList"'

+		+ ' onchange="this.form.' + target + '.value=this.options[this.selectedIndex].value"'

+		+ '>'

+		+ '<option value="">---</option>'

+		+ html

+		+ '</select>';

 

 	return html;

 }

@@ -389,7 +403,6 @@ function insertAction() {
 

 	// Remove element if there is no href

 	if (!document.forms[0].href.value) {

-		tinyMCEPopup.execCommand("mceBeginUndoLevel");

 		i = inst.selection.getBookmark();

 		inst.dom.remove(elm, 1);

 		inst.selection.moveToBookmark(i);

@@ -398,12 +411,10 @@ function insertAction() {
 		return;

 	}

 

-	tinyMCEPopup.execCommand("mceBeginUndoLevel");

-

 	// Create new anchor elements

 	if (elm == null) {

 		inst.getDoc().execCommand("unlink", false, null);

-		tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});

+		tinyMCEPopup.execCommand("mceInsertLink", false, "#mce_temp_url#", {skip_undo : 1});

 

 		elementArray = tinymce.grep(inst.dom.select("a"), function(n) {return inst.dom.getAttrib(n, 'href') == '#mce_temp_url#';});

 		for (i=0; i<elementArray.length; i++)

@@ -425,7 +436,7 @@ function insertAction() {
 

 function setAllAttribs(elm) {

 	var formObj = document.forms[0];

-	var href = formObj.href.value;

+	var href = formObj.href.value.replace(/ /g, '%20');

 	var target = getSelectValue(formObj, 'targetlist');

 

 	setAttrib(elm, 'href', href);

@@ -477,7 +488,7 @@ function getLinkListHTML(elm_id, target_form_element, onchange_func) {
 	var html = "";

 

 	html += '<select id="' + elm_id + '" name="' + elm_id + '"';

-	html += ' class="mceLinkList" onfoc2us="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';

+	html += ' class="mceLinkList" onchange="this.form.' + target_form_element + '.value=';

 	html += 'this.options[this.selectedIndex].value;';

 

 	if (typeof(onchange_func) != "undefined")

@@ -499,7 +510,7 @@ function getTargetListHTML(elm_id, target_form_element) {
 	var targets = tinyMCEPopup.getParam('theme_advanced_link_targets', '').split(';');

 	var html = '';

 

-	html += '<select id="' + elm_id + '" name="' + elm_id + '" onf2ocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';

+	html += '<select id="' + elm_id + '" name="' + elm_id + '" onchange="this.form.' + target_form_element + '.value=';

 	html += 'this.options[this.selectedIndex].value;">';

 	html += '<option value="_self">' + tinyMCEPopup.getLang('advlink_dlg.target_same') + '</option>';

 	html += '<option value="_blank">' + tinyMCEPopup.getLang('advlink_dlg.target_blank') + ' (_blank)</option>';

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js
index c71ffbd0f..3169a5658 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js
@@ -1,52 +1 @@
-tinyMCE.addI18n('en.advlink_dlg',{

-title:"Insert/edit link",

-url:"Link URL",

-target:"Target",

-titlefield:"Title",

-is_email:"The URL you entered seems to be an email address, do you want to add the required mailto: prefix?",

-is_external:"The URL you entered seems to external link, do you want to add the required http:// prefix?",

-list:"Link list",

-general_tab:"General",

-popup_tab:"Popup",

-events_tab:"Events",

-advanced_tab:"Advanced",

-general_props:"General properties",

-popup_props:"Popup properties",

-event_props:"Events",

-advanced_props:"Advanced properties",

-popup_opts:"Options",

-anchor_names:"Anchors",

-target_same:"Open in this window / frame",

-target_parent:"Open in parent window / frame",

-target_top:"Open in top frame (replaces all frames)",

-target_blank:"Open in new window",

-popup:"Javascript popup",

-popup_url:"Popup URL",

-popup_name:"Window name",

-popup_return:"Insert 'return false'",

-popup_scrollbars:"Show scrollbars",

-popup_statusbar:"Show status bar",

-popup_toolbar:"Show toolbars",

-popup_menubar:"Show menu bar",

-popup_location:"Show location bar",

-popup_resizable:"Make window resizable",

-popup_dependent:"Dependent (Mozilla/Firefox only)",

-popup_size:"Size",

-popup_position:"Position (X/Y)",

-id:"Id",

-style:"Style",

-classes:"Classes",

-target_name:"Target name",

-langdir:"Language direction",

-target_langcode:"Target language",

-langcode:"Language code",

-encoding:"Target character encoding",

-mime:"Target MIME type",

-rel:"Relationship page to target",

-rev:"Relationship target to page",

-tabindex:"Tabindex",

-accesskey:"Accesskey",

-ltr:"Left to right",

-rtl:"Right to left",

-link_list:"Link list"

-});
\ No newline at end of file
+tinyMCE.addI18n('en.advlink_dlg',{"target_name":"Target Name",classes:"Classes",style:"Style",id:"ID","popup_position":"Position (X/Y)",langdir:"Language Direction","popup_size":"Size","popup_dependent":"Dependent (Mozilla/Firefox Only)","popup_resizable":"Make Window Resizable","popup_location":"Show Location Bar","popup_menubar":"Show Menu Bar","popup_toolbar":"Show Toolbars","popup_statusbar":"Show Status Bar","popup_scrollbars":"Show Scrollbars","popup_return":"Insert \'return false\'","popup_name":"Window Name","popup_url":"Popup URL",popup:"JavaScript Popup","target_blank":"Open in New Window","target_top":"Open in Top Frame (Replaces All Frames)","target_parent":"Open in Parent Window/Frame","target_same":"Open in This Window/Frame","anchor_names":"Anchors","popup_opts":"Options","advanced_props":"Advanced Properties","event_props":"Events","popup_props":"Popup Properties","general_props":"General Properties","advanced_tab":"Advanced","events_tab":"Events","popup_tab":"Popup","general_tab":"General",list:"Link List","is_external":"The URL you entered seems to be an external link. Do you want to add the required http:// prefix?","is_email":"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",titlefield:"Title",target:"Target",url:"Link URL",title:"Insert/Edit Link","link_list":"Link List",rtl:"Right to Left",ltr:"Left to Right",accesskey:"AccessKey",tabindex:"TabIndex",rev:"Relationship Target to Page",rel:"Relationship Page to Target",mime:"Target MIME Type",encoding:"Target Character Encoding",langcode:"Language Code","target_langcode":"Target Language",width:"Width",height:"Height"});
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm b/library/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm
index 876669c6b..8ab7c2a95 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm
@@ -9,37 +9,38 @@
 	<script type="text/javascript" src="js/advlink.js"></script>

 	<link href="css/advlink.css" rel="stylesheet" type="text/css" />

 </head>

-<body id="advlink" style="display: none">

-    <form onsubmit="insertAction();return false;" action="#">

-		<div class="tabs">

+<body id="advlink" style="display: none" role="application" onload="javascript:mcTabs.displayTab('general_tab','general_panel', true);" aria-labelledby="app_label">

+	<span class="mceVoiceLabel" id="app_label" style="display:none;">{#advlink_dlg.title}</span>

+	<form onsubmit="insertAction();return false;" action="#">

+		<div class="tabs" role="presentation">

 			<ul>

-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advlink_dlg.general_tab}</a></span></li>

-				<li id="popup_tab"><span><a href="javascript:mcTabs.displayTab('popup_tab','popup_panel');" onmousedown="return false;">{#advlink_dlg.popup_tab}</a></span></li>

-				<li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#advlink_dlg.events_tab}</a></span></li>

-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#advlink_dlg.advanced_tab}</a></span></li>

+				<li id="general_tab" class="current" aria-controls="general_panel" ><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advlink_dlg.general_tab}</a></span></li>

+				<li id="popup_tab" aria-controls="popup_panel" ><span><a href="javascript:mcTabs.displayTab('popup_tab','popup_panel');" onmousedown="return false;">{#advlink_dlg.popup_tab}</a></span></li>

+				<li id="events_tab" aria-controls="events_panel"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#advlink_dlg.events_tab}</a></span></li>

+				<li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#advlink_dlg.advanced_tab}</a></span></li>

 			</ul>

 		</div>

 

-		<div class="panel_wrapper">

+		<div class="panel_wrapper" role="presentation">

 			<div id="general_panel" class="panel current">

 				<fieldset>

 					<legend>{#advlink_dlg.general_props}</legend>

 

-					<table border="0" cellpadding="4" cellspacing="0">

+					<table border="0" cellpadding="4" cellspacing="0" role="presentation">

 						<tr>

-						  <td class="nowrap"><label id="hreflabel" for="href">{#advlink_dlg.url}</label></td>

-						  <td><table border="0" cellspacing="0" cellpadding="0">

-								<tr>

-								  <td><input id="href" name="href" type="text" class="mceFocus" value="" onchange="selectByValue(this.form,'linklisthref',this.value);" /></td>

-								  <td id="hrefbrowsercontainer">&nbsp;</td>

-								</tr>

-							  </table></td>

+							<td class="nowrap"><label id="hreflabel" for="href">{#advlink_dlg.url}</label></td>

+								<td><table border="0" cellspacing="0" cellpadding="0">

+							<tr>

+								<td><input id="href" name="href" type="text" class="mceFocus" value="" onchange="selectByValue(this.form,'linklisthref',this.value);" aria-required="true" /></td>

+								<td id="hrefbrowsercontainer">&nbsp;</td>

+							</tr>

+							</table></td>

 						</tr>

 						<tr id="linklisthrefrow">

 							<td class="column1"><label for="linklisthref">{#advlink_dlg.list}</label></td>

 							<td colspan="2" id="linklisthrefcontainer"><select id="linklisthref"><option value=""></option></select></td>

 						</tr>

-						<tr>

+						<tr id="anchorlistrow">

 							<td class="column1"><label for="anchorlist">{#advlink_dlg.anchor_names}</label></td>

 							<td colspan="2" id="anchorlistcontainer"><select id="anchorlist"><option value=""></option></select></td>

 						</tr>

@@ -70,7 +71,7 @@
 					<input type="checkbox" id="ispopup" name="ispopup" class="radio" onclick="setPopupControlsDisabled(!this.checked);buildOnClick();" />

 					<label id="ispopuplabel" for="ispopup">{#advlink_dlg.popup}</label>

 

-					<table border="0" cellpadding="0" cellspacing="4">

+					<table border="0" cellpadding="0" cellspacing="4" role="presentation" >

 						<tr>

 							<td class="nowrap"><label for="popupurl">{#advlink_dlg.popup_url}</label>&nbsp;</td>

 							<td>

@@ -86,18 +87,22 @@
 							<td class="nowrap"><label for="popupname">{#advlink_dlg.popup_name}</label>&nbsp;</td>

 							<td><input type="text" name="popupname" id="popupname" value="" onchange="buildOnClick();" /></td>

 						</tr>

-						<tr>

-							<td class="nowrap"><label>{#advlink_dlg.popup_size}</label>&nbsp;</td>

+						<tr role="group" aria-labelledby="popup_size_label">

+							<td class="nowrap"><label id="popup_size_label">{#advlink_dlg.popup_size}</label>&nbsp;</td>

 							<td class="nowrap">

-								<input type="text" id="popupwidth" name="popupwidth" value="" onchange="buildOnClick();" /> x

-								<input type="text" id="popupheight" name="popupheight" value="" onchange="buildOnClick();" /> px

+								<span style="display:none" id="width_voiceLabel">{#advlink_dlg.width}</span>

+								<input type="text" id="popupwidth" name="popupwidth" value="" onchange="buildOnClick();" aria-labelledby="width_voiceLabel" /> x

+								<span style="display:none" id="height_voiceLabel">{#advlink_dlg.height}</span>

+								<input type="text" id="popupheight" name="popupheight" value="" onchange="buildOnClick();" aria-labelledby="height_voiceLabel" /> px

 							</td>

 						</tr>

-						<tr>

-							<td class="nowrap" id="labelleft"><label>{#advlink_dlg.popup_position}</label>&nbsp;</td>

+						<tr role="group" aria-labelledby="popup_position_label center_hint">

+							<td class="nowrap" id="labelleft"><label id="popup_position_label">{#advlink_dlg.popup_position}</label>&nbsp;</td>

 							<td class="nowrap">

-								<input type="text" id="popupleft" name="popupleft" value="" onchange="buildOnClick();" /> /                                

-								<input type="text" id="popuptop" name="popuptop" value="" onchange="buildOnClick();" /> (c /c = center)

+								<span style="display:none" id="x_voiceLabel">X</span>

+								<input type="text" id="popupleft" name="popupleft" value="" onchange="buildOnClick();" aria-labelledby="x_voiceLabel" /> /                                

+								<span style="display:none" id="y_voiceLabel">Y</span>

+								<input type="text" id="popuptop" name="popuptop" value="" onchange="buildOnClick();" aria-labelledby="y_voiceLabel" /> <span id="center_hint">(c /c = center)</span>

 							</td>

 						</tr>

 					</table>

@@ -105,7 +110,7 @@
 					<fieldset>

 						<legend>{#advlink_dlg.popup_opts}</legend>

 

-						<table border="0" cellpadding="0" cellspacing="4">

+						<table border="0" cellpadding="0" cellspacing="4" role="presentation" >

 							<tr>

 								<td><input type="checkbox" id="popuplocation" name="popuplocation" class="checkbox" onchange="buildOnClick();" /></td>

 								<td class="nowrap"><label id="popuplocationlabel" for="popuplocation">{#advlink_dlg.popup_location}</label></td>

@@ -139,7 +144,7 @@
 			<fieldset>

 					<legend>{#advlink_dlg.advanced_props}</legend>

 

-					<table border="0" cellpadding="0" cellspacing="4">

+					<table border="0" cellpadding="0" cellspacing="4" role="presentation" >

 						<tr>

 							<td class="column1"><label id="idlabel" for="id">{#advlink_dlg.id}</label></td> 

 							<td><input id="id" name="id" type="text" value="" /></td> 

@@ -259,7 +264,7 @@
 			<fieldset>

 					<legend>{#advlink_dlg.event_props}</legend>

 

-					<table border="0" cellpadding="0" cellspacing="4">

+					<table border="0" cellpadding="0" cellspacing="4" role="presentation" >

 						<tr>

 							<td class="column1"><label for="onfocus">onfocus</label></td> 

 							<td><input id="onfocus" name="onfocus" type="text" value="" /></td> 

@@ -328,6 +333,6 @@
 			<input type="submit" id="insert" name="insert" value="{#insert}" />

 			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

 		</div>

-    </form>

+	</form>

 </body>

 </html>

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js
index 02d16971a..57ecce6e0 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.AdvListPlugin",{init:function(b,c){var d=this;d.editor=b;function e(g){var f=[];a(g.split(/,/),function(h){f.push({title:"advlist."+(h=="default"?"def":h.replace(/-/g,"_")),styles:{listStyleType:h=="default"?"":h}})});return f}d.numlist=b.getParam("advlist_number_styles")||e("default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman");d.bullist=b.getParam("advlist_bullet_styles")||e("default,circle,disc,square")},createControl:function(d,b){var f=this,e,h;if(d=="numlist"||d=="bullist"){if(f[d][0].title=="advlist.def"){h=f[d][0]}function c(i,k){var j=true;a(k.styles,function(m,l){if(f.editor.dom.getStyle(i,l)!=m){j=false;return false}});return j}function g(){var k,i=f.editor,l=i.dom,j=i.selection;k=l.getParent(j.getNode(),"ol,ul");if(!k||k.nodeName==(d=="bullist"?"OL":"UL")||c(k,h)){i.execCommand(d=="bullist"?"InsertUnorderedList":"InsertOrderedList")}if(h){k=l.getParent(j.getNode(),"ol,ul");if(k){l.setStyles(k,h.styles);k.removeAttribute("_mce_style")}}}e=b.createSplitButton(d,{title:"advanced."+d+"_desc","class":"mce_"+d,onclick:function(){g()}});e.onRenderMenu.add(function(i,j){j.onShowMenu.add(function(){var m=f.editor.dom,l=m.getParent(f.editor.selection.getNode(),"ol,ul"),k;if(l||h){k=f[d];a(j.items,function(n){var o=true;n.setSelected(0);if(l&&!n.isDisabled()){a(k,function(p){if(p.id==n.id){if(!c(l,p)){o=false;return false}}});if(o){n.setSelected(1)}}});if(!l){j.items[h.id].setSelected(1)}}});j.add({id:f.editor.dom.uniqueId(),title:"advlist.types","class":"mceMenuItemTitle"}).setDisabled(1);a(f[d],function(k){k.id=f.editor.dom.uniqueId();j.add({id:k.id,title:k.title,onclick:function(){h=k;g()}})})});return e}},getInfo:function(){return{longname:"Advanced lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlist",tinymce.plugins.AdvListPlugin)})();
\ No newline at end of file
+(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.AdvListPlugin",{init:function(b,c){var d=this;d.editor=b;function e(g){var f=[];a(g.split(/,/),function(h){f.push({title:"advlist."+(h=="default"?"def":h.replace(/-/g,"_")),styles:{listStyleType:h=="default"?"":h}})});return f}d.numlist=b.getParam("advlist_number_styles")||e("default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman");d.bullist=b.getParam("advlist_bullet_styles")||e("default,circle,disc,square");if(tinymce.isIE&&/MSIE [2-7]/.test(navigator.userAgent)){d.isIE7=true}},createControl:function(d,b){var f=this,e,i,g=f.editor;if(d=="numlist"||d=="bullist"){if(f[d][0].title=="advlist.def"){i=f[d][0]}function c(j,l){var k=true;a(l.styles,function(n,m){if(g.dom.getStyle(j,m)!=n){k=false;return false}});return k}function h(){var k,l=g.dom,j=g.selection;k=l.getParent(j.getNode(),"ol,ul");if(!k||k.nodeName==(d=="bullist"?"OL":"UL")||c(k,i)){g.execCommand(d=="bullist"?"InsertUnorderedList":"InsertOrderedList")}if(i){k=l.getParent(j.getNode(),"ol,ul");if(k){l.setStyles(k,i.styles);k.removeAttribute("data-mce-style")}}g.focus()}e=b.createSplitButton(d,{title:"advanced."+d+"_desc","class":"mce_"+d,onclick:function(){h()}});e.onRenderMenu.add(function(j,k){k.onHideMenu.add(function(){if(f.bookmark){g.selection.moveToBookmark(f.bookmark);f.bookmark=0}});k.onShowMenu.add(function(){var n=g.dom,m=n.getParent(g.selection.getNode(),"ol,ul"),l;if(m||i){l=f[d];a(k.items,function(o){var p=true;o.setSelected(0);if(m&&!o.isDisabled()){a(l,function(q){if(q.id==o.id){if(!c(m,q)){p=false;return false}}});if(p){o.setSelected(1)}}});if(!m){k.items[i.id].setSelected(1)}}g.focus();if(tinymce.isIE){f.bookmark=g.selection.getBookmark(1)}});k.add({id:g.dom.uniqueId(),title:"advlist.types","class":"mceMenuItemTitle",titleItem:true}).setDisabled(1);a(f[d],function(l){if(f.isIE7&&l.styles.listStyleType=="lower-greek"){return}l.id=g.dom.uniqueId();k.add({id:l.id,title:l.title,onclick:function(){i=l;h()}})})});return e}},getInfo:function(){return{longname:"Advanced lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlist",tinymce.plugins.AdvListPlugin)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js
index a61887a92..a8f046b41 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js
@@ -35,10 +35,13 @@
 			// Setup number formats from config or default

 			t.numlist = ed.getParam("advlist_number_styles") || buildFormats("default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman");

 			t.bullist = ed.getParam("advlist_bullet_styles") || buildFormats("default,circle,disc,square");

+

+			if (tinymce.isIE && /MSIE [2-7]/.test(navigator.userAgent))

+				t.isIE7 = true;

 		},

 

 		createControl: function(name, cm) {

-			var t = this, btn, format;

+			var t = this, btn, format, editor = t.editor;

 

 			if (name == 'numlist' || name == 'bullist') {

 				// Default to first item if it's a default item

@@ -50,7 +53,7 @@
 

 					each(format.styles, function(value, name) {

 						// Format doesn't match

-						if (t.editor.dom.getStyle(node, name) != value) {

+						if (editor.dom.getStyle(node, name) != value) {

 							state = false;

 							return false;

 						}

@@ -60,24 +63,25 @@
 				};

 

 				function applyListFormat() {

-					var list, ed = t.editor, dom = ed.dom, sel = ed.selection;

+					var list, dom = editor.dom, sel = editor.selection;

 

 					// Check for existing list element

 					list = dom.getParent(sel.getNode(), 'ol,ul');

 

 					// Switch/add list type if needed

 					if (!list || list.nodeName == (name == 'bullist' ? 'OL' : 'UL') || hasFormat(list, format))

-						ed.execCommand(name == 'bullist' ? 'InsertUnorderedList' : 'InsertOrderedList');

+						editor.execCommand(name == 'bullist' ? 'InsertUnorderedList' : 'InsertOrderedList');

 

 					// Append styles to new list element

 					if (format) {

 						list = dom.getParent(sel.getNode(), 'ol,ul');

-

 						if (list) {

 							dom.setStyles(list, format.styles);

-							list.removeAttribute('_mce_style');

+							list.removeAttribute('data-mce-style');

 						}

 					}

+

+					editor.focus();

 				};

 

 				btn = cm.createSplitButton(name, {

@@ -89,8 +93,15 @@
 				});

 

 				btn.onRenderMenu.add(function(btn, menu) {

+					menu.onHideMenu.add(function() {

+						if (t.bookmark) {

+							editor.selection.moveToBookmark(t.bookmark);

+							t.bookmark = 0;

+						}

+					});

+

 					menu.onShowMenu.add(function() {

-						var dom = t.editor.dom, list = dom.getParent(t.editor.selection.getNode(), 'ol,ul'), fmtList;

+						var dom = editor.dom, list = dom.getParent(editor.selection.getNode(), 'ol,ul'), fmtList;

 

 						if (list || format) {

 							fmtList = t[name];

@@ -120,12 +131,23 @@
 							if (!list)

 								menu.items[format.id].setSelected(1);

 						}

+	

+						editor.focus();

+

+						// IE looses it's selection so store it away and restore it later

+						if (tinymce.isIE) {

+							t.bookmark = editor.selection.getBookmark(1);

+						}

 					});

 

-					menu.add({id : t.editor.dom.uniqueId(), title : 'advlist.types', 'class' : 'mceMenuItemTitle'}).setDisabled(1);

+					menu.add({id : editor.dom.uniqueId(), title : 'advlist.types', 'class' : 'mceMenuItemTitle', titleItem: true}).setDisabled(1);

 

 					each(t[name], function(item) {

-						item.id = t.editor.dom.uniqueId();

+						// IE<8 doesn't support lower-greek, skip it

+						if (t.isIE7 && item.styles.listStyleType == 'lower-greek')

+							return;

+

+						item.id = editor.dom.uniqueId();

 

 						menu.add({id : item.id, title : item.title, onclick : function() {

 							format = item;

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js
new file mode 100644
index 000000000..d54e37a8e
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.AutolinkPlugin",{init:function(a,b){var c=this;if(tinyMCE.isIE){return}a.onKeyDown.add(function(d,f){if(f.keyCode==13){return c.handleEnter(d)}});a.onKeyPress.add(function(d,f){if(f.which==41){return c.handleEclipse(d)}});a.onKeyUp.add(function(d,f){if(f.keyCode==32){return c.handleSpacebar(d)}})},handleEclipse:function(a){this.parseCurrentLine(a,-1,"(",true)},handleSpacebar:function(a){this.parseCurrentLine(a,0,"",true)},handleEnter:function(a){this.parseCurrentLine(a,-1,"",false)},parseCurrentLine:function(i,d,b,g){var a,f,c,n,k,m,h,e,j;a=i.selection.getRng().cloneRange();if(a.startOffset<5){e=a.endContainer.previousSibling;if(e==null){if(a.endContainer.firstChild==null||a.endContainer.firstChild.nextSibling==null){return}e=a.endContainer.firstChild.nextSibling}j=e.length;a.setStart(e,j);a.setEnd(e,j);if(a.endOffset<5){return}f=a.endOffset;n=e}else{n=a.endContainer;if(n.nodeType!=3&&n.firstChild){while(n.nodeType!=3&&n.firstChild){n=n.firstChild}a.setStart(n,0);a.setEnd(n,n.nodeValue.length)}if(a.endOffset==1){f=2}else{f=a.endOffset-1-d}}c=f;do{a.setStart(n,f-2);a.setEnd(n,f-1);f-=1}while(a.toString()!=" "&&a.toString()!=""&&a.toString().charCodeAt(0)!=160&&(f-2)>=0&&a.toString()!=b);if(a.toString()==b||a.toString().charCodeAt(0)==160){a.setStart(n,f);a.setEnd(n,c);f+=1}else{if(a.startOffset==0){a.setStart(n,0);a.setEnd(n,c)}else{a.setStart(n,f);a.setEnd(n,c)}}m=a.toString();h=m.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|[A-Z0-9._%+-]+@)(.+)$/i);if(h){if(h[1]=="www."){h[1]="http://www."}else{if(/@$/.test(h[1])){h[1]="mailto:"+h[1]}}k=i.selection.getBookmark();i.selection.setRng(a);tinyMCE.execCommand("createlink",false,h[1]+h[2]);i.selection.moveToBookmark(k);if(tinyMCE.isWebKit){i.selection.collapse(false);var l=Math.min(n.length,c+1);a.setStart(n,l);a.setEnd(n,l);i.selection.setRng(a)}}},getInfo:function(){return{longname:"Autolink",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autolink",tinymce.plugins.AutolinkPlugin)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js
new file mode 100644
index 000000000..4db4acf6c
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js
@@ -0,0 +1,174 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2011, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	tinymce.create('tinymce.plugins.AutolinkPlugin', {

+	/**

+	* Initializes the plugin, this will be executed after the plugin has been created.

+	* This call is done before the editor instance has finished it's initialization so use the onInit event

+	* of the editor instance to intercept that event.

+	*

+	* @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.

+	* @param {string} url Absolute URL to where the plugin is located.

+	*/

+

+	init : function(ed, url) {

+		var t = this;

+

+		// Internet Explorer has built-in automatic linking

+		if (tinyMCE.isIE)

+			return;

+

+		// Add a key down handler

+		ed.onKeyDown.add(function(ed, e) {

+			if (e.keyCode == 13)

+				return t.handleEnter(ed);

+			});

+

+		ed.onKeyPress.add(function(ed, e) {

+			if (e.which == 41)

+				return t.handleEclipse(ed);

+		});

+

+		// Add a key up handler

+		ed.onKeyUp.add(function(ed, e) {

+			if (e.keyCode == 32)

+				return t.handleSpacebar(ed);

+			});

+	       },

+

+		handleEclipse : function(ed) {

+			this.parseCurrentLine(ed, -1, '(', true);

+		},

+

+		handleSpacebar : function(ed) {

+			 this.parseCurrentLine(ed, 0, '', true);

+		 },

+

+		handleEnter : function(ed) {

+			this.parseCurrentLine(ed, -1, '', false);

+		},

+

+		parseCurrentLine : function(ed, end_offset, delimiter, goback) {

+			var r, end, start, endContainer, bookmark, text, matches, prev, len;

+

+			// We need at least five characters to form a URL,

+			// hence, at minimum, five characters from the beginning of the line.

+			r = ed.selection.getRng().cloneRange();

+			if (r.startOffset < 5) {

+				// During testing, the caret is placed inbetween two text nodes. 

+				// The previous text node contains the URL.

+				prev = r.endContainer.previousSibling;

+				if (prev == null) {

+					if (r.endContainer.firstChild == null || r.endContainer.firstChild.nextSibling == null)

+						return;

+

+					prev = r.endContainer.firstChild.nextSibling;

+				}

+				len = prev.length;

+				r.setStart(prev, len);

+				r.setEnd(prev, len);

+

+				if (r.endOffset < 5)

+					return;

+

+				end = r.endOffset;

+				endContainer = prev;

+			} else {

+				endContainer = r.endContainer;

+

+				// Get a text node

+				if (endContainer.nodeType != 3 && endContainer.firstChild) {

+					while (endContainer.nodeType != 3 && endContainer.firstChild)

+						endContainer = endContainer.firstChild;

+

+					r.setStart(endContainer, 0);

+					r.setEnd(endContainer, endContainer.nodeValue.length);

+				}

+

+				if (r.endOffset == 1)

+					end = 2;

+				else

+					end = r.endOffset - 1 - end_offset;

+			}

+

+			start = end;

+

+			do

+			{

+				// Move the selection one character backwards.

+				r.setStart(endContainer, end - 2);

+				r.setEnd(endContainer, end - 1);

+				end -= 1;

+

+				// Loop until one of the following is found: a blank space, &nbsp;, delimeter, (end-2) >= 0

+			} while (r.toString() != ' ' && r.toString() != '' && r.toString().charCodeAt(0) != 160 && (end -2) >= 0 && r.toString() != delimiter);

+

+			if (r.toString() == delimiter || r.toString().charCodeAt(0) == 160) {

+				r.setStart(endContainer, end);

+				r.setEnd(endContainer, start);

+				end += 1;

+			} else if (r.startOffset == 0) {

+				r.setStart(endContainer, 0);

+				r.setEnd(endContainer, start);

+			}

+			else {

+				r.setStart(endContainer, end);

+				r.setEnd(endContainer, start);

+			}

+

+			text = r.toString();

+			matches = text.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|[A-Z0-9._%+-]+@)(.+)$/i);

+

+			if (matches) {

+				if (matches[1] == 'www.') {

+					matches[1] = 'http://www.';

+				} else if (/@$/.test(matches[1])) {

+					matches[1] = 'mailto:' + matches[1];

+				}

+

+				bookmark = ed.selection.getBookmark();

+

+				ed.selection.setRng(r);

+				tinyMCE.execCommand('createlink',false, matches[1] + matches[2]);

+				ed.selection.moveToBookmark(bookmark);

+

+				// TODO: Determine if this is still needed.

+				if (tinyMCE.isWebKit) {

+					// move the caret to its original position

+					ed.selection.collapse(false);

+					var max = Math.min(endContainer.length, start + 1);

+					r.setStart(endContainer, max);

+					r.setEnd(endContainer, max);

+					ed.selection.setRng(r);

+				}

+			}

+		},

+

+		/**

+		* Returns information about the plugin as a name/value array.

+		* The current keys are longname, author, authorurl, infourl and version.

+		*

+		* @return {Object} Name/value array containing information about the plugin.

+		*/

+		getInfo : function() {

+			return {

+				longname : 'Autolink',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('autolink', tinymce.plugins.AutolinkPlugin);

+})();

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js
index 1676b154a..46d9dc3dd 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.AutoResizePlugin",{init:function(a,c){var d=this;if(a.getParam("fullscreen_is_enabled")){return}function b(){var h=a.getDoc(),e=h.body,j=h.documentElement,g=tinymce.DOM,i=d.autoresize_min_height,f;f=tinymce.isIE?e.scrollHeight:j.offsetHeight;if(f>d.autoresize_min_height){i=f}g.setStyle(g.get(a.id+"_ifr"),"height",i+"px");if(d.throbbing){a.setProgressState(false);a.setProgressState(true)}}d.editor=a;d.autoresize_min_height=a.getElement().offsetHeight;a.onChange.add(b);a.onSetContent.add(b);a.onPaste.add(b);a.onKeyUp.add(b);a.onPostRender.add(b);if(a.getParam("autoresize_on_init",true)){a.onInit.add(function(f,e){f.setProgressState(true);d.throbbing=true;f.getBody().style.overflowY="hidden"});a.onLoadContent.add(function(f,e){b();setTimeout(function(){b();f.setProgressState(false);d.throbbing=false},1250)})}a.addCommand("mceAutoResize",b)},getInfo:function(){return{longname:"Auto Resize",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autoresize",tinymce.plugins.AutoResizePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.AutoResizePlugin",{init:function(a,c){var d=this,e=0;if(a.getParam("fullscreen_is_enabled")){return}function b(){var j,i=a.getDoc(),f=i.body,l=i.documentElement,h=tinymce.DOM,k=d.autoresize_min_height,g;g=tinymce.isIE?f.scrollHeight:(tinymce.isWebKit&&f.clientHeight==0?0:f.offsetHeight);if(g>d.autoresize_min_height){k=g}if(d.autoresize_max_height&&g>d.autoresize_max_height){k=d.autoresize_max_height;f.style.overflowY="auto";l.style.overflowY="auto"}else{f.style.overflowY="hidden";l.style.overflowY="hidden";f.scrollTop=0}if(k!==e){j=k-e;h.setStyle(h.get(a.id+"_ifr"),"height",k+"px");e=k;if(tinymce.isWebKit&&j<0){b()}}}d.editor=a;d.autoresize_min_height=parseInt(a.getParam("autoresize_min_height",a.getElement().offsetHeight));d.autoresize_max_height=parseInt(a.getParam("autoresize_max_height",0));a.onInit.add(function(f){f.dom.setStyle(f.getBody(),"paddingBottom",f.getParam("autoresize_bottom_margin",50)+"px")});a.onChange.add(b);a.onSetContent.add(b);a.onPaste.add(b);a.onKeyUp.add(b);a.onPostRender.add(b);if(a.getParam("autoresize_on_init",true)){a.onLoad.add(b);a.onLoadContent.add(b)}a.addCommand("mceAutoResize",b)},getInfo:function(){return{longname:"Auto Resize",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autoresize",tinymce.plugins.AutoResizePlugin)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js
index c260b7a24..7673bcff8 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js
@@ -11,7 +11,7 @@
 (function() {
 	/**
 	 * Auto Resize
-	 * 
+	 *
 	 * This plugin automatically resizes the content area to fit its content height.
 	 * It will retain a minimum height, which is the height of the content area when
 	 * it's initialized.
@@ -26,7 +26,7 @@
 		 * @param {string} url Absolute URL to where the plugin is located.
 		 */
 		init : function(ed, url) {
-			var t = this;
+			var t = this, oldSize = 0;
 
 			if (ed.getParam('fullscreen_is_enabled'))
 				return;
@@ -35,29 +35,51 @@
 			 * This method gets executed each time the editor needs to resize.
 			 */
 			function resize() {
-				var d = ed.getDoc(), b = d.body, de = d.documentElement, DOM = tinymce.DOM, resizeHeight = t.autoresize_min_height, myHeight;
+				var deltaSize, d = ed.getDoc(), body = d.body, de = d.documentElement, DOM = tinymce.DOM, resizeHeight = t.autoresize_min_height, myHeight;
 
 				// Get height differently depending on the browser used
-				myHeight = tinymce.isIE ? b.scrollHeight : de.offsetHeight;
+				myHeight = tinymce.isIE ? body.scrollHeight : (tinymce.isWebKit && body.clientHeight == 0 ? 0 : body.offsetHeight);
 
 				// Don't make it smaller than the minimum height
 				if (myHeight > t.autoresize_min_height)
 					resizeHeight = myHeight;
 
-				// Resize content element
-				DOM.setStyle(DOM.get(ed.id + '_ifr'), 'height', resizeHeight + 'px');
+				// If a maximum height has been defined don't exceed this height
+				if (t.autoresize_max_height && myHeight > t.autoresize_max_height) {
+					resizeHeight = t.autoresize_max_height;
+					body.style.overflowY = "auto";
+					de.style.overflowY = "auto"; // Old IE
+				} else {
+					body.style.overflowY = "hidden";
+					de.style.overflowY = "hidden"; // Old IE
+					body.scrollTop = 0;
+				}
 
-				// if we're throbbing, we'll re-throb to match the new size
-				if (t.throbbing) {
-					ed.setProgressState(false);
-					ed.setProgressState(true);
+				// Resize content element
+				if (resizeHeight !== oldSize) {
+					deltaSize = resizeHeight - oldSize;
+					DOM.setStyle(DOM.get(ed.id + '_ifr'), 'height', resizeHeight + 'px');
+					oldSize = resizeHeight;
+
+					// WebKit doesn't decrease the size of the body element until the iframe gets resized
+					// So we need to continue to resize the iframe down until the size gets fixed
+					if (tinymce.isWebKit && deltaSize < 0)
+						resize();
 				}
 			};
 
 			t.editor = ed;
 
 			// Define minimum height
-			t.autoresize_min_height = ed.getElement().offsetHeight;
+			t.autoresize_min_height = parseInt(ed.getParam('autoresize_min_height', ed.getElement().offsetHeight));
+
+			// Define maximum height
+			t.autoresize_max_height = parseInt(ed.getParam('autoresize_max_height', 0));
+
+			// Add padding at the bottom for better UX
+			ed.onInit.add(function(ed){
+				ed.dom.setStyle(ed.getBody(), 'paddingBottom', ed.getParam('autoresize_bottom_margin', 50) + 'px');
+			});
 
 			// Add appropriate listeners for resizing content area
 			ed.onChange.add(resize);
@@ -67,30 +89,8 @@
 			ed.onPostRender.add(resize);
 
 			if (ed.getParam('autoresize_on_init', true)) {
-				// Things to do when the editor is ready
-				ed.onInit.add(function(ed, l) {
-					// Show throbber until content area is resized properly
-					ed.setProgressState(true);
-					t.throbbing = true;
-
-					// Hide scrollbars
-					ed.getBody().style.overflowY = "hidden";
-				});
-
-				ed.onLoadContent.add(function(ed, l) {
-					resize();
-
-					// Because the content area resizes when its content CSS loads,
-					// and we can't easily add a listener to its onload event,
-					// we'll just trigger a resize after a short loading period
-					setTimeout(function() {
-						resize();
-
-						// Disable throbber
-						ed.setProgressState(false);
-						t.throbbing = false;
-					}, 1250);
-				});
+				ed.onLoad.add(resize);
+				ed.onLoadContent.add(resize);
 			}
 
 			// Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');
@@ -116,4 +116,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('autoresize', tinymce.plugins.AutoResizePlugin);
-})();
\ No newline at end of file
+})();
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js
index b33ebfb7c..f7d057600 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js
@@ -1 +1 @@
-(function(e){var c="autosave",g="restoredraft",b=true,f,d,a=e.util.Dispatcher;e.create("tinymce.plugins.AutoSave",{init:function(i,j){var h=this,l=i.settings;h.editor=i;function k(n){var m={s:1000,m:60000};n=/^(\d+)([ms]?)$/.exec(""+n);return(n[2]?m[n[2]]:1)*parseInt(n)}e.each({ask_before_unload:b,interval:"30s",retention:"20m",minlength:50},function(n,m){m=c+"_"+m;if(l[m]===f){l[m]=n}});l.autosave_interval=k(l.autosave_interval);l.autosave_retention=k(l.autosave_retention);i.addButton(g,{title:c+".restore_content",onclick:function(){if(i.getContent().replace(/\s|&nbsp;|<\/?p[^>]*>|<br[^>]*>/gi,"").length>0){i.windowManager.confirm(c+".warning_message",function(m){if(m){h.restoreDraft()}})}else{h.restoreDraft()}}});i.onNodeChange.add(function(){var m=i.controlManager;if(m.get(g)){m.setDisabled(g,!h.hasDraft())}});i.onInit.add(function(){if(i.controlManager.get(g)){h.setupStorage(i);setInterval(function(){h.storeDraft();i.nodeChanged()},l.autosave_interval)}});h.onStoreDraft=new a(h);h.onRestoreDraft=new a(h);h.onRemoveDraft=new a(h);if(!d){window.onbeforeunload=e.plugins.AutoSave._beforeUnloadHandler;d=b}},getInfo:function(){return{longname:"Auto save",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave",version:e.majorVersion+"."+e.minorVersion}},getExpDate:function(){return new Date(new Date().getTime()+this.editor.settings.autosave_retention).toUTCString()},setupStorage:function(i){var h=this,k=c+"_test",j="OK";h.key=c+i.id;e.each([function(){if(localStorage){localStorage.setItem(k,j);if(localStorage.getItem(k)===j){localStorage.removeItem(k);return localStorage}}},function(){if(sessionStorage){sessionStorage.setItem(k,j);if(sessionStorage.getItem(k)===j){sessionStorage.removeItem(k);return sessionStorage}}},function(){if(e.isIE){i.getElement().style.behavior="url('#default#userData')";return{autoExpires:b,setItem:function(l,n){var m=i.getElement();m.setAttribute(l,n);m.expires=h.getExpDate();m.save("TinyMCE")},getItem:function(l){var m=i.getElement();m.load("TinyMCE");return m.getAttribute(l)},removeItem:function(l){i.getElement().removeAttribute(l)}}}},],function(l){try{h.storage=l();if(h.storage){return false}}catch(m){}})},storeDraft:function(){var i=this,l=i.storage,j=i.editor,h,k;if(l){if(!l.getItem(i.key)&&!j.isDirty()){return}k=j.getContent();if(k.length>j.settings.autosave_minlength){h=i.getExpDate();if(!i.storage.autoExpires){i.storage.setItem(i.key+"_expires",h)}i.storage.setItem(i.key,k);i.onStoreDraft.dispatch(i,{expires:h,content:k})}}},restoreDraft:function(){var h=this,i=h.storage;if(i){content=i.getItem(h.key);if(content){h.editor.setContent(content);h.onRestoreDraft.dispatch(h,{content:content})}}},hasDraft:function(){var h=this,k=h.storage,i,j;if(k){j=!!k.getItem(h.key);if(j){if(!h.storage.autoExpires){i=new Date(k.getItem(h.key+"_expires"));if(new Date().getTime()<i.getTime()){return b}h.removeDraft()}else{return b}}}return false},removeDraft:function(){var h=this,k=h.storage,i=h.key,j;if(k){j=k.getItem(i);k.removeItem(i);k.removeItem(i+"_expires");if(j){h.onRemoveDraft.dispatch(h,{content:j})}}},"static":{_beforeUnloadHandler:function(h){var i;e.each(tinyMCE.editors,function(j){if(j.plugins.autosave){j.plugins.autosave.storeDraft()}if(j.getParam("fullscreen_is_enabled")){return}if(!i&&j.isDirty()&&j.getParam("autosave_ask_before_unload")){i=j.getLang("autosave.unload_msg")}});return i}}});e.PluginManager.add("autosave",e.plugins.AutoSave)})(tinymce);
\ No newline at end of file
+(function(e){var c="autosave",g="restoredraft",b=true,f,d,a=e.util.Dispatcher;e.create("tinymce.plugins.AutoSave",{init:function(i,j){var h=this,l=i.settings;h.editor=i;function k(n){var m={s:1000,m:60000};n=/^(\d+)([ms]?)$/.exec(""+n);return(n[2]?m[n[2]]:1)*parseInt(n)}e.each({ask_before_unload:b,interval:"30s",retention:"20m",minlength:50},function(n,m){m=c+"_"+m;if(l[m]===f){l[m]=n}});l.autosave_interval=k(l.autosave_interval);l.autosave_retention=k(l.autosave_retention);i.addButton(g,{title:c+".restore_content",onclick:function(){if(i.getContent({draft:true}).replace(/\s|&nbsp;|<\/?p[^>]*>|<br[^>]*>/gi,"").length>0){i.windowManager.confirm(c+".warning_message",function(m){if(m){h.restoreDraft()}})}else{h.restoreDraft()}}});i.onNodeChange.add(function(){var m=i.controlManager;if(m.get(g)){m.setDisabled(g,!h.hasDraft())}});i.onInit.add(function(){if(i.controlManager.get(g)){h.setupStorage(i);setInterval(function(){h.storeDraft();i.nodeChanged()},l.autosave_interval)}});h.onStoreDraft=new a(h);h.onRestoreDraft=new a(h);h.onRemoveDraft=new a(h);if(!d){window.onbeforeunload=e.plugins.AutoSave._beforeUnloadHandler;d=b}},getInfo:function(){return{longname:"Auto save",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave",version:e.majorVersion+"."+e.minorVersion}},getExpDate:function(){return new Date(new Date().getTime()+this.editor.settings.autosave_retention).toUTCString()},setupStorage:function(i){var h=this,k=c+"_test",j="OK";h.key=c+i.id;e.each([function(){if(localStorage){localStorage.setItem(k,j);if(localStorage.getItem(k)===j){localStorage.removeItem(k);return localStorage}}},function(){if(sessionStorage){sessionStorage.setItem(k,j);if(sessionStorage.getItem(k)===j){sessionStorage.removeItem(k);return sessionStorage}}},function(){if(e.isIE){i.getElement().style.behavior="url('#default#userData')";return{autoExpires:b,setItem:function(l,n){var m=i.getElement();m.setAttribute(l,n);m.expires=h.getExpDate();try{m.save("TinyMCE")}catch(o){}},getItem:function(l){var m=i.getElement();try{m.load("TinyMCE");return m.getAttribute(l)}catch(n){return null}},removeItem:function(l){i.getElement().removeAttribute(l)}}}},],function(l){try{h.storage=l();if(h.storage){return false}}catch(m){}})},storeDraft:function(){var i=this,l=i.storage,j=i.editor,h,k;if(l){if(!l.getItem(i.key)&&!j.isDirty()){return}k=j.getContent({draft:true});if(k.length>j.settings.autosave_minlength){h=i.getExpDate();if(!i.storage.autoExpires){i.storage.setItem(i.key+"_expires",h)}i.storage.setItem(i.key,k);i.onStoreDraft.dispatch(i,{expires:h,content:k})}}},restoreDraft:function(){var h=this,j=h.storage,i;if(j){i=j.getItem(h.key);if(i){h.editor.setContent(i);h.onRestoreDraft.dispatch(h,{content:i})}}},hasDraft:function(){var h=this,k=h.storage,i,j;if(k){j=!!k.getItem(h.key);if(j){if(!h.storage.autoExpires){i=new Date(k.getItem(h.key+"_expires"));if(new Date().getTime()<i.getTime()){return b}h.removeDraft()}else{return b}}}return false},removeDraft:function(){var h=this,k=h.storage,i=h.key,j;if(k){j=k.getItem(i);k.removeItem(i);k.removeItem(i+"_expires");if(j){h.onRemoveDraft.dispatch(h,{content:j})}}},"static":{_beforeUnloadHandler:function(h){var i;e.each(tinyMCE.editors,function(j){if(j.plugins.autosave){j.plugins.autosave.storeDraft()}if(j.getParam("fullscreen_is_enabled")){return}if(!i&&j.isDirty()&&j.getParam("autosave_ask_before_unload")){i=j.getLang("autosave.unload_msg")}});return i}}});e.PluginManager.add("autosave",e.plugins.AutoSave)})(tinymce);
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js
index d8cc1120f..8311483f9 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js
@@ -106,7 +106,7 @@
 			ed.addButton(RESTORE_DRAFT, {

 				title : PLUGIN_NAME + ".restore_content",

 				onclick : function() {

-					if (ed.getContent().replace(/\s|&nbsp;|<\/?p[^>]*>|<br[^>]*>/gi, "").length > 0) {

+					if (ed.getContent({draft: true}).replace(/\s|&nbsp;|<\/?p[^>]*>|<br[^>]*>/gi, "").length > 0) {

 						// Show confirm dialog if the editor isn't empty

 						ed.windowManager.confirm(

 							PLUGIN_NAME + ".warning_message",

@@ -257,15 +257,24 @@
 

 								userDataElement.setAttribute(key, value);

 								userDataElement.expires = self.getExpDate();

-								userDataElement.save("TinyMCE");

+

+								try {

+									userDataElement.save("TinyMCE");

+								} catch (e) {

+									// Ignore, saving might fail if "Userdata Persistence" is disabled in IE

+								}

 							},

 

 							getItem : function(key) {

 								var userDataElement = ed.getElement();

 

-								userDataElement.load("TinyMCE");

-

-								return userDataElement.getAttribute(key);

+								try {

+									userDataElement.load("TinyMCE");

+									return userDataElement.getAttribute(key);

+								} catch (e) {

+									// Ignore, loading might fail if "Userdata Persistence" is disabled in IE

+									return null;

+								}

 							},

 

 							removeItem : function(key) {

@@ -303,7 +312,7 @@
 					return;

 

 				// Store contents if the contents if longer than the minlength of characters

-				content = editor.getContent();

+				content = editor.getContent({draft: true});

 				if (content.length > editor.settings.autosave_minlength) {

 					expires = self.getExpDate();

 

@@ -326,7 +335,7 @@
 		 * @method restoreDraft

 		 */

 		restoreDraft : function() {

-			var self = this, storage = self.storage;

+			var self = this, storage = self.storage, content;

 

 			if (storage) {

 				content = storage.getItem(self.key);

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/autosave/langs/en.js b/library/tinymce/jscripts/tiny_mce/plugins/autosave/langs/en.js
index fce6bd3e1..fce6bd3e1 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/autosave/langs/en.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/autosave/langs/en.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
index db676cd90..8f8821fd6 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
@@ -1,155 +1 @@
-/**

- * editor_plugin_src.js

- *

- * Copyright 2009, Moxiecode Systems AB

- * Released under LGPL License.

- *

- * License: http://tinymce.moxiecode.com/license

- * Contributing: http://tinymce.moxiecode.com/contributing

- */

-

-/* Macgirvin Aug-2010 changed from punbb to dfrn dialect */

-

-(function() {

-	tinymce.create('tinymce.plugins.BBCodePlugin', {

-		init : function(ed, url) {

-			var t = this, dialect = ed.getParam('bbcode_dialect', 'dfrn').toLowerCase();

-

-			ed.onBeforeSetContent.add(function(ed, o) {

-				o.content = t['_' + dialect + '_bbcode2html'](o.content);

-			});

-

-			ed.onPostProcess.add(function(ed, o) {

-				if (o.set)

-					o.content = t['_' + dialect + '_bbcode2html'](o.content);

-

-				if (o.get)

-					o.content = t['_' + dialect + '_html2bbcode'](o.content);

-			});

-		},

-

-		getInfo : function() {

-			return {

-				longname : 'BBCode Plugin',

-				author : 'Moxiecode Systems AB',

-				authorurl : 'http://tinymce.moxiecode.com',

-				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode',

-				version : tinymce.majorVersion + "." + tinymce.minorVersion

-			};

-		},

-

-		// Private methods

-

-		// HTML -> BBCode in DFRN dialect

-		_dfrn_html2bbcode : function(s) {

-			s = tinymce.trim(s);

-

-			function rep(re, str) {

-				s = s.replace(re, str);

-			};

-
-
-
-
-			/* oembed */
-			function _h2b_cb(match) {
-				text = bin2hex(match);
-				function s_h2b(data) {
-						match = data;
-				}
-				$.ajax({
-					url: 'oembed/h2b?text=' + text,
-					async: false,
-					success: s_h2b,
-					dataType: 'html'
-				});
-				return match;
-			}
-			s = s.replace(/<span class=\"oembed(.*?)<\/span>/gi, _h2b_cb);
-			/* /oembed */
-
-

-			// example: <strong> to [b]

-			rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");

-			rep(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");

-			rep(/<span style=\"color:(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");

-			rep(/<font>(.*?)<\/font>/gi,"$1");

-			rep(/<img.*?width=\"(.*?)\".*?height=\"(.*?)\".*?src=\"(.*?)\".*?\/>/gi,"[img=$1x$2]$3[/img]");

-			rep(/<img.*?height=\"(.*?)\".*?width=\"(.*?)\".*?src=\"(.*?)\".*?\/>/gi,"[img=$2x$1]$3[/img]");

-			rep(/<img.*?src=\"(.*?)\".*?height=\"(.*?)\".*?width=\"(.*?)\".*?\/>/gi,"[img=$3x$2]$1[/img]");

-			rep(/<img.*?src=\"(.*?)\".*?width=\"(.*?)\".*?height=\"(.*?)\".*?\/>/gi,"[img=$2x$3]$1[/img]");

-			rep(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");

-			rep(/<code>(.*?)<\/code>/gi,"[code]$1[/code]");

-			rep(/<\/(strong|b)>/gi,"[/b]");

-			rep(/<(strong|b)>/gi,"[b]");

-			rep(/<\/(em|i)>/gi,"[/i]");

-			rep(/<(em|i)>/gi,"[i]");

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

-			rep(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");

-			rep(/<u>/gi,"[u]");

-			rep(/<blockquote[^>]*>/gi,"[quote]");

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

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

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

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

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

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

-			rep(/&nbsp;/gi," ");

-			rep(/&quot;/gi,"\"");

-			rep(/&lt;/gi,"<");

-			rep(/&gt;/gi,">");

-			rep(/&amp;/gi,"&");

-

-			return s; 

-		},

-

-		// BBCode -> HTML from DFRN dialect

-		_dfrn_bbcode2html : function(s) {

-			s = tinymce.trim(s);

-

-			function rep(re, str) {

-				s = s.replace(re, str);

-			};

-

-			// example: [b] to <strong>

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

-			rep(/\[b\]/gi,"<strong>");

-			rep(/\[\/b\]/gi,"</strong>");

-			rep(/\[i\]/gi,"<em>");

-			rep(/\[\/i\]/gi,"</em>");

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

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

-			rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>");

-			rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");

-			rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,"<img width=\"$1\" height=\"$2\" src=\"$3\" />");

-			rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />");

-			rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"<span style=\"color: $1;\">$2</span>");

-			rep(/\[size=(.*?)\](.*?)\[\/size\]/gi,"<span style=\"font-size: $1;\">$2</span>");

-			rep(/\[code\](.*?)\[\/code\]/gi,"<code>$1</code>");

-			rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<blockquote>$1</blockquote>");

-
-			/* oembed */
-			function _b2h_cb(match, url) {
-				url = bin2hex(url);
-				function s_b2h(data) {
-						match = data;
-				}
-				$.ajax({
-					url: 'oembed/b2h?url=' + url,
-					async: false,
-					success: s_b2h,
-					dataType: 'html'
-				});
-				return match;
-			}
-			s = s.replace(/\[embed\](.*?)\[\/embed\]/gi, _b2h_cb);
-			
-			/* /oembed */
-

-			return s; 

-		}

-	});

-

-	// Register plugin

-	tinymce.PluginManager.add('bbcode', tinymce.plugins.BBCodePlugin);

-})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(a,b){var d=this,c=a.getParam("bbcode_dialect","punbb").toLowerCase();a.onBeforeSetContent.add(function(e,f){f.content=d["_"+c+"_bbcode2html"](f.content)});a.onPostProcess.add(function(e,f){if(f.set){f.content=d["_"+c+"_bbcode2html"](f.content)}if(f.get){f.content=d["_"+c+"_html2bbcode"](f.content)}})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_punbb_html2bbcode:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");b(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");b(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");b(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");b(/<font>(.*?)<\/font>/gi,"$1");b(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");b(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");b(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");b(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");b(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");b(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");b(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");b(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");b(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");b(/<\/(strong|b)>/gi,"[/b]");b(/<(strong|b)>/gi,"[b]");b(/<\/(em|i)>/gi,"[/i]");b(/<(em|i)>/gi,"[i]");b(/<\/u>/gi,"[/u]");b(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");b(/<u>/gi,"[u]");b(/<blockquote[^>]*>/gi,"[quote]");b(/<\/blockquote>/gi,"[/quote]");b(/<br \/>/gi,"\n");b(/<br\/>/gi,"\n");b(/<br>/gi,"\n");b(/<p>/gi,"");b(/<\/p>/gi,"\n");b(/&nbsp;|\u00a0/gi," ");b(/&quot;/gi,'"');b(/&lt;/gi,"<");b(/&gt;/gi,">");b(/&amp;/gi,"&");return a},_punbb_bbcode2html:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/\n/gi,"<br />");b(/\[b\]/gi,"<strong>");b(/\[\/b\]/gi,"</strong>");b(/\[i\]/gi,"<em>");b(/\[\/i\]/gi,"</em>");b(/\[u\]/gi,"<u>");b(/\[\/u\]/gi,"</u>");b(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>');b(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>');b(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />');b(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<font color="$1">$2</font>');b(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span>&nbsp;');b(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span>&nbsp;');return a}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_cmp.js b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_cmp.js
deleted file mode 100755
index b0926c92a..000000000
--- a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_cmp.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(){tinymce.create('tinymce.plugins.BBCodePlugin',{init:function(ed,url){var t=this,dialect=ed.getParam('bbcode_dialect','dfrn').toLowerCase();ed.onBeforeSetContent.add(function(ed,o){o.content=t['_'+dialect+'_bbcode2html'](o.content)});ed.onPostProcess.add(function(ed,o){if(o.set)o.content=t['_'+dialect+'_bbcode2html'](o.content);if(o.get)o.content=t['_'+dialect+'_html2bbcode'](o.content)})},getInfo:function(){return{longname:'BBCode Plugin',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode',version:tinymce.majorVersion+"."+tinymce.minorVersion version:tinymce.majorVersion+"."+tinymce.minorVersion}},_dfrn_html2bbcode:function(s){s=tinymce.trim(s);function rep(re,str){s=s.replace(re,str)};rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");rep(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");rep(/<font>(.*?)<\/font>/gi,"$1");rep(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");rep(/<code>(.*?)<\/code>/gi,"[code]$1[/code]");rep(/<\/(strong|b)>/gi,"[/b]");rep(/<(strong|b)>/gi,"[b]");rep(/<\/(em|i)>/gi,"[/i]");rep(/<(em|i)>/gi,"[i]");rep(/<\/u>/gi,"[/u]");rep(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");rep(/<u>/gi,"[u]");rep(/<blockquote[^>]*>/gi,"[quote]");rep(/<\/blockquote>/gi,"[/quote]");rep(/<br \/>/gi,"\n");rep(/<br\/>/gi,"\n");rep(/<br>/gi,"\n");rep(/<p>/gi,"");rep(/<\/p>/gi,"\n");rep(/&nbsp;/gi," ");rep(/&quot;/gi,"\"");rep(/&lt;/gi,"<");rep(/&gt;/gi,">");rep(/&amp;/gi,"&");return s},_dfrn_bbcode2html:function(s){s=tinymce.trim(s);function rep(re,str){s=s.replace(re,str)};rep(/\n/gi,"<br />");rep(/\[b\]/gi,"<strong>");rep(/\[\/b\]/gi,"</strong>");rep(/\[i\]/gi,"<em>");rep(/\[\/i\]/gi,"</em>");rep(/\[u\]/gi,"<u>");rep(/\[\/u\]/gi,"</u>");rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>");rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />");rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"<font color=\"$1\">$2</font>");rep(/\[code\](.*?)\[\/code\]/gi,"<code>$1</code>");rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<blockquote>$1</blockquote>");return s}});tinymce.PluginManager.add('bbcode',tinymce.plugins.BBCodePlugin)})();
\ No newline at end of file
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 44d1473a9..a2829a21c 100755..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
@@ -44,61 +44,79 @@
 		_dfrn_html2bbcode : function(s) {

 			s = tinymce.trim(s);

 

-			function rep(re, str) {
-
-				//modify code to keep stuff intact within [code][/code] blocks
-				//Waitman Gobble NO WARRANTY
-
-
-				var o = new Array();
-				var x = s.split("[code]");
-				var i = 0;
-
-				var si = "";
-				si = x.shift();
-				si = si.replace(re,str);
-				o.push(si);
-
-				for (i = 0; i < x.length; i++) {
-					var no = new Array();
-					var j = x.shift();
-					var g = j.split("[/code]");
-					no.push(g.shift());
-					si = g.shift();
-					si = si.replace(re,str);
-					no.push(si);
-					o.push(no.join("[/code]"));
-				}
-
-				s = o.join("[code]");
-
-			};
-
-
-
-
-			/* oembed */
-			function _h2b_cb(match) {
-				function s_h2b(data) {
-						match = data;
+			function rep(re, str) {

+

+				//modify code to keep stuff intact within [code][/code] blocks

+				//Waitman Gobble NO WARRANTY

+

+

+				var o = new Array();

+				var x = s.split("[code]");

+				var i = 0;

+

+				var si = "";

+				si = x.shift();

+				si = si.replace(re,str);

+				o.push(si);

+

+				for (i = 0; i < x.length; i++) {

+					var no = new Array();

+					var j = x.shift();

+					var g = j.split("[/code]");

+					no.push(g.shift());

+					si = g.shift();

+					si = si.replace(re,str);

+					no.push(si);

+					o.push(no.join("[/code]"));

+				}

+

+				s = o.join("[code]");

+

+			};

+

+

+

+

+			/* oembed */

+			function _h2b_cb(match) {

+				/*

+				function s_h2b(data) {

+						match = data;

 				}

 				$.ajax({

-					type:"POST",
+					type:"POST",

 					url: 'oembed/h2b',

-					data: {text: match},
-					async: false,
-					success: s_h2b,
-					dataType: 'html'
-				});
-				return match;
-			}
+					data: {text: match},

+					async: false,

+					success: s_h2b,

+					dataType: 'html'

+				});

+				*/

+				

+				var f, g, tof = [], tor = [];

+				var find_spanc = /<span [^>]*class *= *[\"'](?:[^\"']* )*oembed(?: [^\"']*)*[\"'][^>]*>(.*?(?:<span[^>]*>(.*?)<\/span *>)*.*?)<\/span *>/ig;

+				while (f = find_spanc.exec(match)) {

+					var find_a = /<a([^>]* rel=[\"']oembed[\"'][^>]*)>.*?<\/a *>/ig;

+					if (g = find_a.exec(f[1])) {

+						var find_href = /href=[\"']([^\"']*)[\"']/ig;

+						var m2 = find_href.exec(g[1]);

+						if (m2[1]) {

+							tof.push(f[0]);

+							tor.push("[EMBED]" + m2[1] + "[/EMBED]");

+						}

+					}

+				}

+				for (var i = 0; i < tof.length; i++) match = match.replace(tof[i], tor[i]);

+				

+				return match;

+			}

 			if (s.indexOf('class="oembed')>=0){

 				//alert("request oembed html2bbcode");

 				s = _h2b_cb(s);

 			}

-			
-			/* /oembed */
-
+			

+			/* /oembed */

+

 

 			// example: <strong> to [b]

 			rep(/<a class=\"bookmark\" href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[bookmark=$1]$2[/bookmark]");

@@ -111,16 +129,16 @@
 			rep(/<img.*?src=\"(.*?)\".*?height=\"(.*?)\".*?width=\"(.*?)\".*?\/>/gi,"[img=$3x$2]$1[/img]");

 			rep(/<img.*?src=\"(.*?)\".*?width=\"(.*?)\".*?height=\"(.*?)\".*?\/>/gi,"[img=$2x$3]$1[/img]");

 			rep(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");

-
-			rep(/<ul class=\"listbullet\" style=\"list-style-type\: circle\;\">(.*?)<\/ul>/gi,"[list]$1[/list]");
-			rep(/<ul class=\"listnone\" style=\"list-style-type\: none\;\">(.*?)<\/ul>/gi,"[list=]$1[/list]");
-			rep(/<ul class=\"listdecimal\" style=\"list-style-type\: decimal\;\">(.*?)<\/ul>/gi,"[list=1]$1[/list]");
-			rep(/<ul class=\"listlowerroman\" style=\"list-style-type\: lower-roman\;\">(.*?)<\/ul>/gi,"[list=i]$1[/list]");
-			rep(/<ul class=\"listupperroman\" style=\"list-style-type\: upper-roman\;\">(.*?)<\/ul>/gi,"[list=I]$1[/list]");
-			rep(/<ul class=\"listloweralpha\" style=\"list-style-type\: lower-alpha\;\">(.*?)<\/ul>/gi,"[list=a]$1[/list]");
-			rep(/<ul class=\"listupperalpha\" style=\"list-style-type\: upper-alpha\;\">(.*?)<\/ul>/gi,"[list=A]$1[/list]");
-			rep(/<li>(.*?)<\/li>/gi,'[li]$1[/li]');
-
+

+			rep(/<ul class=\"listbullet\" style=\"list-style-type\: circle\;\">(.*?)<\/ul>/gi,"[list]$1[/list]");

+			rep(/<ul class=\"listnone\" style=\"list-style-type\: none\;\">(.*?)<\/ul>/gi,"[list=]$1[/list]");

+			rep(/<ul class=\"listdecimal\" style=\"list-style-type\: decimal\;\">(.*?)<\/ul>/gi,"[list=1]$1[/list]");

+			rep(/<ul class=\"listlowerroman\" style=\"list-style-type\: lower-roman\;\">(.*?)<\/ul>/gi,"[list=i]$1[/list]");

+			rep(/<ul class=\"listupperroman\" style=\"list-style-type\: upper-roman\;\">(.*?)<\/ul>/gi,"[list=I]$1[/list]");

+			rep(/<ul class=\"listloweralpha\" style=\"list-style-type\: lower-alpha\;\">(.*?)<\/ul>/gi,"[list=a]$1[/list]");

+			rep(/<ul class=\"listupperalpha\" style=\"list-style-type\: upper-alpha\;\">(.*?)<\/ul>/gi,"[list=A]$1[/list]");

+			rep(/<li>(.*?)<\/li>/gi,'[li]$1[/li]');

+

 			rep(/<code>(.*?)<\/code>/gi,"[code]$1[/code]");

 			rep(/<\/(strong|b)>/gi,"[/b]");

 			rep(/<(strong|b)>/gi,"[b]");

@@ -132,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,"");

@@ -149,42 +167,42 @@
 		// BBCode -> HTML from DFRN dialect

 		_dfrn_bbcode2html : function(s) {

 			s = tinymce.trim(s);

-
-
-                        function rep(re, str) {
-
-                                //modify code to keep stuff intact within [code][/code] blocks
-                                //Waitman Gobble NO WARRANTY
-
-
-                                var o = new Array();
-                                var x = s.split("[code]");
-                                var i = 0;
-
-                                var si = "";
-                                si = x.shift();
-                                si = si.replace(re,str);
-                                o.push(si);
-
-                                for (i = 0; i < x.length; i++) {
-                                        var no = new Array();
-                                        var j = x.shift();
-                                        var g = j.split("[/code]");
-                                        no.push(g.shift());
-                                        si = g.shift();
-                                        si = si.replace(re,str);
-                                        no.push(si);
-                                        o.push(no.join("[/code]"));
-                                }
-
-                                s = o.join("[code]");
-
-                        };
-
-
-
-
-
+

+

+                        function rep(re, str) {

+

+                                //modify code to keep stuff intact within [code][/code] blocks

+                                //Waitman Gobble NO WARRANTY

+

+

+                                var o = new Array();

+                                var x = s.split("[code]");

+                                var i = 0;

+

+                                var si = "";

+                                si = x.shift();

+                                si = si.replace(re,str);

+                                o.push(si);

+

+                                for (i = 0; i < x.length; i++) {

+                                        var no = new Array();

+                                        var j = x.shift();

+                                        var g = j.split("[/code]");

+                                        no.push(g.shift());

+                                        si = g.shift();

+                                        si = si.replace(re,str);

+                                        no.push(si);

+                                        o.push(no.join("[/code]"));

+                                }

+

+                                s = o.join("[code]");

+

+                        };

+

+

+

+

+

 			// example: [b] to <strong>

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

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

@@ -193,43 +211,43 @@
 			rep(/\[\/i\]/gi,"</em>");

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

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

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

 			rep(/\[bookmark=([^\]]+)\](.*?)\[\/bookmark\]/gi,"<a class=\"bookmark\" href=\"$1\">$2</a>");

 			rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>");

 			rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");

 			rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,"<img width=\"$1\" height=\"$2\" src=\"$3\" />");

 			rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />");

-
-			rep(/\[list\](.*?)\[\/list\]/gi, '<ul class="listbullet" style="list-style-type: circle;">$1</ul>');
-			rep(/\[list=\](.*?)\[\/list\]/gi, '<ul class="listnone" style="list-style-type: none;">$1</ul>');
-			rep(/\[list=1\](.*?)\[\/list\]/gi, '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>');
-			rep(/\[list=i\](.*?)\[\/list\]/gi,'<ul class="listlowerroman" style="list-style-type: lower-roman;">$1</ul>');
-			rep(/\[list=I\](.*?)\[\/list\]/gi, '<ul class="listupperroman" style="list-style-type: upper-roman;">$1</ul>');
-			rep(/\[list=a\](.*?)\[\/list\]/gi, '<ul class="listloweralpha" style="list-style-type: lower-alpha;">$1</ul>');
-			rep(/\[list=A\](.*?)\[\/list\]/gi, '<ul class="listupperalpha" style="list-style-type: upper-alpha;">$1</ul>');
-			rep(/\[li\](.*?)\[\/li\]/gi, '<li>$1</li>');
+

+			rep(/\[list\](.*?)\[\/list\]/gi, '<ul class="listbullet" style="list-style-type: circle;">$1</ul>');

+			rep(/\[list=\](.*?)\[\/list\]/gi, '<ul class="listnone" style="list-style-type: none;">$1</ul>');

+			rep(/\[list=1\](.*?)\[\/list\]/gi, '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>');

+			rep(/\[list=i\](.*?)\[\/list\]/gi,'<ul class="listlowerroman" style="list-style-type: lower-roman;">$1</ul>');

+			rep(/\[list=I\](.*?)\[\/list\]/gi, '<ul class="listupperroman" style="list-style-type: upper-roman;">$1</ul>');

+			rep(/\[list=a\](.*?)\[\/list\]/gi, '<ul class="listloweralpha" style="list-style-type: lower-alpha;">$1</ul>');

+			rep(/\[list=A\](.*?)\[\/list\]/gi, '<ul class="listupperalpha" style="list-style-type: upper-alpha;">$1</ul>');

+			rep(/\[li\](.*?)\[\/li\]/gi, '<li>$1</li>');

 			rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"<span style=\"color: $1;\">$2</span>");

 			rep(/\[size=(.*?)\](.*?)\[\/size\]/gi,"<span style=\"font-size: $1;\">$2</span>");

 			rep(/\[code\](.*?)\[\/code\]/gi,"<code>$1</code>");

 			rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<blockquote>$1</blockquote>");

-
-			/* oembed */
-			function _b2h_cb(match, url) {
-				url = bin2hex(url);
-				function s_b2h(data) {
-						match = data;
-				}
-				$.ajax({
-					url: 'oembed/b2h?url=' + url,
-					async: false,
-					success: s_b2h,
-					dataType: 'html'
-				});
-				return match;
-			}
-			s = s.replace(/\[embed\](.*?)\[\/embed\]/gi, _b2h_cb);
-			
-			/* /oembed */
+

+			/* oembed */

+			function _b2h_cb(match, url) {

+				url = bin2hex(url);

+				function s_b2h(data) {

+						match = data;

+				}

+				$.ajax({

+					url: 'oembed/b2h?url=' + url,

+					async: false,

+					success: s_b2h,

+					dataType: 'html'

+				});

+				return match;

+			}

+			s = s.replace(/\[embed\](.*?)\[\/embed\]/gi, _b2h_cb);

+			

+			/* /oembed */

 

 			return s; 

 		}

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js
index 9749e5164..4f99010e8 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.dom.Event,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.ContextMenu",{init:function(d){var f=this,g;f.editor=d;f.onContextMenu=new tinymce.util.Dispatcher(this);d.onContextMenu.add(function(h,i){if(!i.ctrlKey){if(g){h.selection.setRng(g)}f._getMenu(h).showMenu(i.clientX,i.clientY);a.add(h.getDoc(),"click",function(j){e(h,j)});a.cancel(i)}});d.onRemove.add(function(){if(f._menu){f._menu.removeAll()}});function e(h,i){g=null;if(i&&i.button==2){g=h.selection.getRng();return}if(f._menu){f._menu.removeAll();f._menu.destroy();a.remove(h.getDoc(),"click",e)}}d.onMouseDown.add(e);d.onKeyDown.add(e)},getInfo:function(){return{longname:"Contextmenu",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getMenu:function(h){var l=this,f=l._menu,i=h.selection,e=i.isCollapsed(),d=i.getNode()||h.getBody(),g,k,j;if(f){f.removeAll();f.destroy()}k=b.getPos(h.getContentAreaContainer());j=b.getPos(h.getContainer());f=h.controlManager.createDropMenu("contextmenu",{offset_x:k.x+h.getParam("contextmenu_offset_x",0),offset_y:k.y+h.getParam("contextmenu_offset_y",0),constrain:1});l._menu=f;f.add({title:"advanced.cut_desc",icon:"cut",cmd:"Cut"}).setDisabled(e);f.add({title:"advanced.copy_desc",icon:"copy",cmd:"Copy"}).setDisabled(e);f.add({title:"advanced.paste_desc",icon:"paste",cmd:"Paste"});if((d.nodeName=="A"&&!h.dom.getAttrib(d,"name"))||!e){f.addSeparator();f.add({title:"advanced.link_desc",icon:"link",cmd:h.plugins.advlink?"mceAdvLink":"mceLink",ui:true});f.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"})}f.addSeparator();f.add({title:"advanced.image_desc",icon:"image",cmd:h.plugins.advimage?"mceAdvImage":"mceImage",ui:true});f.addSeparator();g=f.addMenu({title:"contextmenu.align"});g.add({title:"contextmenu.left",icon:"justifyleft",cmd:"JustifyLeft"});g.add({title:"contextmenu.center",icon:"justifycenter",cmd:"JustifyCenter"});g.add({title:"contextmenu.right",icon:"justifyright",cmd:"JustifyRight"});g.add({title:"contextmenu.full",icon:"justifyfull",cmd:"JustifyFull"});l.onContextMenu.dispatch(l,f,d,e);return f}});tinymce.PluginManager.add("contextmenu",tinymce.plugins.ContextMenu)})();
\ No newline at end of file
+(function(){var a=tinymce.dom.Event,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.ContextMenu",{init:function(e){var h=this,f,d,i;h.editor=e;d=e.settings.contextmenu_never_use_native;h.onContextMenu=new tinymce.util.Dispatcher(this);f=e.onContextMenu.add(function(j,k){if((i!==0?i:k.ctrlKey)&&!d){return}a.cancel(k);if(k.target.nodeName=="IMG"){j.selection.select(k.target)}h._getMenu(j).showMenu(k.clientX||k.pageX,k.clientY||k.pageY);a.add(j.getDoc(),"click",function(l){g(j,l)});j.nodeChanged()});e.onRemove.add(function(){if(h._menu){h._menu.removeAll()}});function g(j,k){i=0;if(k&&k.button==2){i=k.ctrlKey;return}if(h._menu){h._menu.removeAll();h._menu.destroy();a.remove(j.getDoc(),"click",g);h._menu=null}}e.onMouseDown.add(g);e.onKeyDown.add(g);e.onKeyDown.add(function(j,k){if(k.shiftKey&&!k.ctrlKey&&!k.altKey&&k.keyCode===121){a.cancel(k);f(j,k)}})},getInfo:function(){return{longname:"Contextmenu",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getMenu:function(e){var g=this,d=g._menu,j=e.selection,f=j.isCollapsed(),h=j.getNode()||e.getBody(),i,k;if(d){d.removeAll();d.destroy()}k=b.getPos(e.getContentAreaContainer());d=e.controlManager.createDropMenu("contextmenu",{offset_x:k.x+e.getParam("contextmenu_offset_x",0),offset_y:k.y+e.getParam("contextmenu_offset_y",0),constrain:1,keyboard_focus:true});g._menu=d;d.add({title:"advanced.cut_desc",icon:"cut",cmd:"Cut"}).setDisabled(f);d.add({title:"advanced.copy_desc",icon:"copy",cmd:"Copy"}).setDisabled(f);d.add({title:"advanced.paste_desc",icon:"paste",cmd:"Paste"});if((h.nodeName=="A"&&!e.dom.getAttrib(h,"name"))||!f){d.addSeparator();d.add({title:"advanced.link_desc",icon:"link",cmd:e.plugins.advlink?"mceAdvLink":"mceLink",ui:true});d.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"})}d.addSeparator();d.add({title:"advanced.image_desc",icon:"image",cmd:e.plugins.advimage?"mceAdvImage":"mceImage",ui:true});d.addSeparator();i=d.addMenu({title:"contextmenu.align"});i.add({title:"contextmenu.left",icon:"justifyleft",cmd:"JustifyLeft"});i.add({title:"contextmenu.center",icon:"justifycenter",cmd:"JustifyCenter"});i.add({title:"contextmenu.right",icon:"justifyright",cmd:"JustifyRight"});i.add({title:"contextmenu.full",icon:"justifyfull",cmd:"JustifyFull"});g.onContextMenu.dispatch(g,d,h,f);return d}});tinymce.PluginManager.add("contextmenu",tinymce.plugins.ContextMenu)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
index 13813a64e..004d011d0 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
@@ -27,10 +27,12 @@
 		 * @param {string} url Absolute URL to where the plugin is located.

 		 */

 		init : function(ed) {

-			var t = this, lastRng;

+			var t = this, showMenu, contextmenuNeverUseNative, realCtrlKey;

 

 			t.editor = ed;

 

+			contextmenuNeverUseNative = ed.settings.contextmenu_never_use_native;

+

 			/**

 			 * This event gets fired when the context menu is shown.

 			 *

@@ -40,18 +42,23 @@
 			 */

 			t.onContextMenu = new tinymce.util.Dispatcher(this);

 

-			ed.onContextMenu.add(function(ed, e) {

-				if (!e.ctrlKey) {

-					// Restore the last selection since it was removed

-					if (lastRng)

-						ed.selection.setRng(lastRng);

+			showMenu = ed.onContextMenu.add(function(ed, e) {

+				// Block TinyMCE menu on ctrlKey and work around Safari issue

+				if ((realCtrlKey !== 0 ? realCtrlKey : e.ctrlKey) && !contextmenuNeverUseNative)

+					return;

 

-					t._getMenu(ed).showMenu(e.clientX, e.clientY);

-					Event.add(ed.getDoc(), 'click', function(e) {

-						hide(ed, e);

-					});

-					Event.cancel(e);

-				}

+				Event.cancel(e);

+

+				// Select the image if it's clicked. WebKit would other wise expand the selection

+				if (e.target.nodeName == 'IMG')

+					ed.selection.select(e.target);

+

+				t._getMenu(ed).showMenu(e.clientX || e.pageX, e.clientY || e.pageY);

+				Event.add(ed.getDoc(), 'click', function(e) {

+					hide(ed, e);

+				});

+

+				ed.nodeChanged();

 			});

 

 			ed.onRemove.add(function() {

@@ -60,12 +67,12 @@
 			});

 

 			function hide(ed, e) {

-				lastRng = null;

+				realCtrlKey = 0;

 

 				// Since the contextmenu event moves

 				// the selection we need to store it away

 				if (e && e.button == 2) {

-					lastRng = ed.selection.getRng();

+					realCtrlKey = e.ctrlKey;

 					return;

 				}

 

@@ -73,11 +80,18 @@
 					t._menu.removeAll();

 					t._menu.destroy();

 					Event.remove(ed.getDoc(), 'click', hide);

+					t._menu = null;

 				}

 			};

 

 			ed.onMouseDown.add(hide);

 			ed.onKeyDown.add(hide);

+			ed.onKeyDown.add(function(ed, e) {

+				if (e.shiftKey && !e.ctrlKey && !e.altKey && e.keyCode === 121) {

+					Event.cancel(e);

+					showMenu(ed, e);

+				}

+			});

 		},

 

 		/**

@@ -98,20 +112,20 @@
 		},

 

 		_getMenu : function(ed) {

-			var t = this, m = t._menu, se = ed.selection, col = se.isCollapsed(), el = se.getNode() || ed.getBody(), am, p1, p2;

+			var t = this, m = t._menu, se = ed.selection, col = se.isCollapsed(), el = se.getNode() || ed.getBody(), am, p;

 

 			if (m) {

 				m.removeAll();

 				m.destroy();

 			}

 

-			p1 = DOM.getPos(ed.getContentAreaContainer());

-			p2 = DOM.getPos(ed.getContainer());

+			p = DOM.getPos(ed.getContentAreaContainer());

 

 			m = ed.controlManager.createDropMenu('contextmenu', {

-				offset_x : p1.x + ed.getParam('contextmenu_offset_x', 0),

-				offset_y : p1.y + ed.getParam('contextmenu_offset_y', 0),

-				constrain : 1

+				offset_x : p.x + ed.getParam('contextmenu_offset_x', 0),

+				offset_y : p.y + ed.getParam('contextmenu_offset_y', 0),

+				constrain : 1,

+				keyboard_focus: true

 			});

 

 			t._menu = m;

@@ -144,4 +158,4 @@
 

 	// Register plugin

 	tinymce.PluginManager.add('contextmenu', tinymce.plugins.ContextMenu);

-})();
\ No newline at end of file
+})();

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js
index bce8e7399..bce8e7399 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js
index 4444959bf..4444959bf 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js
index dbdd8ffb5..dbdd8ffb5 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js
index 71d541697..71d541697 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm b/library/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm
index 55a1d72fa..101355654 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm
@@ -5,36 +5,38 @@
 	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

 	<script type="text/javascript" src="js/emotions.js"></script>

 </head>

-<body style="display: none">

-	<div align="center">

-		<div class="title">{#emotions_dlg.title}:<br /><br /></div>

+<body style="display: none" role="application" aria-labelledby="app_title">

+<span style="display:none;" id="app_title">{#emotions_dlg.title}</span>

+<div align="center">

+	<div class="title">{#emotions_dlg.title}:<br /><br /></div>

 

-		<table border="0" cellspacing="0" cellpadding="4">

-		  <tr>

-			<td><a href="javascript:EmotionsDialog.insert('smiley-cool.gif','emotions_dlg.cool');"><img src="img/smiley-cool.gif" width="18" height="18" border="0" alt="{#emotions_dlg.cool}" title="{#emotions_dlg.cool}" /></a></td>

-			<td><a href="javascript:EmotionsDialog.insert('smiley-cry.gif','emotions_dlg.cry');"><img src="img/smiley-cry.gif" width="18" height="18" border="0" alt="{#emotions_dlg.cry}" title="{#emotions_dlg.cry}" /></a></td>

-			<td><a href="javascript:EmotionsDialog.insert('smiley-embarassed.gif','emotions_dlg.embarassed');"><img src="img/smiley-embarassed.gif" width="18" height="18" border="0" alt="{#emotions_dlg.embarassed}" title="{#emotions_dlg.embarassed}" /></a></td>

-			<td><a href="javascript:EmotionsDialog.insert('smiley-foot-in-mouth.gif','emotions_dlg.foot_in_mouth');"><img src="img/smiley-foot-in-mouth.gif" width="18" height="18" border="0" alt="{#emotions_dlg.foot_in_mouth}" title="{#emotions_dlg.foot_in_mouth}" /></a></td>

-		  </tr>

-		  <tr>

-			<td><a href="javascript:EmotionsDialog.insert('smiley-frown.gif','emotions_dlg.frown');"><img src="img/smiley-frown.gif" width="18" height="18" border="0" alt="{#emotions_dlg.frown}" title="{#emotions_dlg.frown}" /></a></td>

-			<td><a href="javascript:EmotionsDialog.insert('smiley-innocent.gif','emotions_dlg.innocent');"><img src="img/smiley-innocent.gif" width="18" height="18" border="0" alt="{#emotions_dlg.innocent}" title="{#emotions_dlg.innocent}" /></a></td>

-			<td><a href="javascript:EmotionsDialog.insert('smiley-kiss.gif','emotions_dlg.kiss');"><img src="img/smiley-kiss.gif" width="18" height="18" border="0" alt="{#emotions_dlg.kiss}" title="{#emotions_dlg.kiss}" /></a></td>

-			<td><a href="javascript:EmotionsDialog.insert('smiley-laughing.gif','emotions_dlg.laughing');"><img src="img/smiley-laughing.gif" width="18" height="18" border="0" alt="{#emotions_dlg.laughing}" title="{#emotions_dlg.laughing}" /></a></td>

-		  </tr>

-		  <tr>

-			<td><a href="javascript:EmotionsDialog.insert('smiley-money-mouth.gif','emotions_dlg.money_mouth');"><img src="img/smiley-money-mouth.gif" width="18" height="18" border="0" alt="{#emotions_dlg.money_mouth}" title="{#emotions_dlg.money_mouth}" /></a></td>

-			<td><a href="javascript:EmotionsDialog.insert('smiley-sealed.gif','emotions_dlg.sealed');"><img src="img/smiley-sealed.gif" width="18" height="18" border="0" alt="{#emotions_dlg.sealed}" title="{#emotions_dlg.sealed}" /></a></td>

-			<td><a href="javascript:EmotionsDialog.insert('smiley-smile.gif','emotions_dlg.smile');"><img src="img/smiley-smile.gif" width="18" height="18" border="0" alt="{#emotions_dlg.smile}" title="{#emotions_dlg.smile}" /></a></td>

-			<td><a href="javascript:EmotionsDialog.insert('smiley-surprised.gif','emotions_dlg.surprised');"><img src="img/smiley-surprised.gif" width="18" height="18" border="0" alt="{#emotions_dlg.surprised}" title="{#emotions_dlg.surprised}" /></a></td>

-		  </tr>

-		  <tr>

-			<td><a href="javascript:EmotionsDialog.insert('smiley-tongue-out.gif','emotions_dlg.tongue_out');"><img src="img/smiley-tongue-out.gif" width="18" height="18" border="0" alt="{#emotions_dlg.tongue-out}" title="{#emotions_dlg.tongue_out}" /></a></td>

-			<td><a href="javascript:EmotionsDialog.insert('smiley-undecided.gif','emotions_dlg.undecided');"><img src="img/smiley-undecided.gif" width="18" height="18" border="0" alt="{#emotions_dlg.undecided}" title="{#emotions_dlg.undecided}" /></a></td>

-			<td><a href="javascript:EmotionsDialog.insert('smiley-wink.gif','emotions_dlg.wink');"><img src="img/smiley-wink.gif" width="18" height="18" border="0" alt="{#emotions_dlg.wink}" title="{#emotions_dlg.wink}" /></a></td>

-			<td><a href="javascript:EmotionsDialog.insert('smiley-yell.gif','emotions_dlg.yell');"><img src="img/smiley-yell.gif" width="18" height="18" border="0" alt="{#emotions_dlg.yell}" title="{#emotions_dlg.yell}" /></a></td>

-		  </tr>

-		</table>

-	</div>

+	<table id="emoticon_table" role="presentation" border="0" cellspacing="0" cellpadding="4">

+		<tr>

+			<td><a class="emoticon_link" role="button" title="{#emotions_dlg.cool}. {#emotions_dlg.usage}" href="javascript:EmotionsDialog.insert('smiley-cool.gif','emotions_dlg.cool');"><img src="img/smiley-cool.gif" width="18" height="18" border="0" alt="{#emotions_dlg.cool}. {#emotions_dlg.usage}" /></a></td>

+			<td><a class="emoticon_link" role="button" title="{#emotions_dlg.cry}. {#emotions_dlg.usage}" href="javascript:EmotionsDialog.insert('smiley-cry.gif','emotions_dlg.cry');"><img src="img/smiley-cry.gif" width="18" height="18" border="0" alt="{#emotions_dlg.cry}. {#emotions_dlg.usage}" /></a></td>

+			<td><a class="emoticon_link" role="button" title="{#emotions_dlg.embarassed}. {#emotions_dlg.usage}" href="javascript:EmotionsDialog.insert('smiley-embarassed.gif','emotions_dlg.embarassed');"><img src="img/smiley-embarassed.gif" width="18" height="18" border="0" alt="{#emotions_dlg.embarassed}. {#emotions_dlg.usage}"  /></a></td>

+			<td><a class="emoticon_link" role="button" title="{#emotions_dlg.foot_in_mouth}. {#emotions_dlg.usage}" href="javascript:EmotionsDialog.insert('smiley-foot-in-mouth.gif','emotions_dlg.foot_in_mouth');"><img src="img/smiley-foot-in-mouth.gif" width="18" height="18" border="0" alt="{#emotions_dlg.foot_in_mouth}. {#emotions_dlg.usage}" /></a></td>

+		</tr>

+		<tr>

+			<td><a class="emoticon_link" role="button" title="{#emotions_dlg.frown}. {#emotions_dlg.usage}" href="javascript:EmotionsDialog.insert('smiley-frown.gif','emotions_dlg.frown');"><img src="img/smiley-frown.gif" width="18" height="18" border="0" alt="{#emotions_dlg.frown}. {#emotions_dlg.usage}" /></a></td>

+			<td><a class="emoticon_link" role="button" title="{#emotions_dlg.innocent}. {#emotions_dlg.usage}" href="javascript:EmotionsDialog.insert('smiley-innocent.gif','emotions_dlg.innocent');"><img src="img/smiley-innocent.gif" width="18" height="18" border="0" alt="{#emotions_dlg.innocent}. {#emotions_dlg.usage}"  /></a></td>

+			<td><a class="emoticon_link" role="button" title="{#emotions_dlg.kiss}. {#emotions_dlg.usage}" href="javascript:EmotionsDialog.insert('smiley-kiss.gif','emotions_dlg.kiss');"><img src="img/smiley-kiss.gif" width="18" height="18" border="0" alt="{#emotions_dlg.kiss}. {#emotions_dlg.usage}" /></a></td>

+			<td><a class="emoticon_link" role="button" title="{#emotions_dlg.laughing}. {#emotions_dlg.usage}" href="javascript:EmotionsDialog.insert('smiley-laughing.gif','emotions_dlg.laughing');"><img src="img/smiley-laughing.gif" width="18" height="18" border="0" alt="{#emotions_dlg.laughing}. {#emotions_dlg.usage}" /></a></td>

+		</tr>

+		<tr>

+			<td><a class="emoticon_link" role="button" title="{#emotions_dlg.money_mouth}. {#emotions_dlg.usage}" href="javascript:EmotionsDialog.insert('smiley-money-mouth.gif','emotions_dlg.money_mouth');"><img src="img/smiley-money-mouth.gif" width="18" height="18" border="0" alt="{#emotions_dlg.money_mouth}. {#emotions_dlg.usage}"/></a></td>

+			<td><a class="emoticon_link" role="button" title="{#emotions_dlg.sealed}. {#emotions_dlg.usage}" href="javascript:EmotionsDialog.insert('smiley-sealed.gif','emotions_dlg.sealed');"><img src="img/smiley-sealed.gif" width="18" height="18" border="0" alt="{#emotions_dlg.sealed}. {#emotions_dlg.usage}" /></a></td>

+			<td><a class="emoticon_link" role="button" title="{#emotions_dlg.smile}. {#emotions_dlg.usage}" href="javascript:EmotionsDialog.insert('smiley-smile.gif','emotions_dlg.smile');"><img src="img/smiley-smile.gif" width="18" height="18" border="0" alt="{#emotions_dlg.smile}. {#emotions_dlg.usage}" /></a></td>

+			<td><a class="emoticon_link" role="button" title="{#emotions_dlg.surprised}. {#emotions_dlg.usage}" href="javascript:EmotionsDialog.insert('smiley-surprised.gif','emotions_dlg.surprised');"><img src="img/smiley-surprised.gif" width="18" height="18" border="0" alt="{#emotions_dlg.surprised}. {#emotions_dlg.usage}" /></a></td>

+		</tr>

+		<tr>

+			<td><a class="emoticon_link" role="button" title="{#emotions_dlg.tongue_out}. {#emotions_dlg.usage}" href="javascript:EmotionsDialog.insert('smiley-tongue-out.gif','emotions_dlg.tongue_out');"><img src="img/smiley-tongue-out.gif" width="18" height="18" border="0" alt="{#emotions_dlg.tongue-out}. {#emotions_dlg.usage}" /></a></td>

+			<td><a class="emoticon_link" role="button" title="{#emotions_dlg.undecided}. {#emotions_dlg.usage}" href="javascript:EmotionsDialog.insert('smiley-undecided.gif','emotions_dlg.undecided');"><img src="img/smiley-undecided.gif" width="18" height="18" border="0" alt="{#emotions_dlg.undecided}. {#emotions_dlg.usage}" /></a></td>

+			<td><a class="emoticon_link" role="button" title="{#emotions_dlg.wink}. {#emotions_dlg.usage}" href="javascript:EmotionsDialog.insert('smiley-wink.gif','emotions_dlg.wink');"><img src="img/smiley-wink.gif" width="18" height="18" border="0" alt="{#emotions_dlg.wink}. {#emotions_dlg.usage}" /></a></td>

+			<td><a class="emoticon_link" role="button" title="{#emotions_dlg.yell}. {#emotions_dlg.usage}" href="javascript:EmotionsDialog.insert('smiley-yell.gif','emotions_dlg.yell');"><img src="img/smiley-yell.gif" width="18" height="18" border="0" alt="{#emotions_dlg.yell}. {#emotions_dlg.usage}" /></a></td>

+		</tr>

+	</table>

+	<div>{#emotions_dlg.usage}</div>

+</div>

 </body>

 </html>

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cool.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cool.gif
index ba90cc36f..ba90cc36f 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cool.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cool.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cry.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cry.gif
index 74d897a4f..74d897a4f 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cry.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cry.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif
index 963a96b8a..963a96b8a 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
index 16f68cc1e..c7cf1011d 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-frown.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-frown.gif
index 716f55e16..716f55e16 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-frown.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-frown.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif
index 334d49e0e..334d49e0e 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif
index 4efd549ed..4efd549ed 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif
index 1606c119e..82c5b182e 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif
index ca2451e10..ca2451e10 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif
index b33d3cca1..fe66220c2 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif
index e6a9e60d5..fd27edfaa 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif
index cb99cdd91..0cc9bb71c 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif
index 2075dc160..2075dc160 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif
index bef7e2573..bef7e2573 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif
index 9faf1aff8..0631c7616 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-yell.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-yell.gif
index 648e6e879..648e6e879 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-yell.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-yell.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js b/library/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js
index c54936709..b360f20b6 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js
@@ -1,8 +1,29 @@
 tinyMCEPopup.requireLangPack();

 

 var EmotionsDialog = {

+	addKeyboardNavigation: function(){

+		var tableElm, cells, settings;

+			

+		cells = tinyMCEPopup.dom.select("a.emoticon_link", "emoticon_table");

+			

+		settings ={

+			root: "emoticon_table",

+			items: cells

+		};

+		cells[0].tabindex=0;

+		tinyMCEPopup.dom.addClass(cells[0], "mceFocus");

+		if (tinymce.isGecko) {

+			cells[0].focus();		

+		} else {

+			setTimeout(function(){

+				cells[0].focus();

+			}, 100);

+		}

+		tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', settings, tinyMCEPopup.dom);

+	}, 

 	init : function(ed) {

 		tinyMCEPopup.resizeToInnerSize();

+		this.addKeyboardNavigation();

 	},

 

 	insert : function(file, title) {

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js
index 3b57ad9e3..037c4b588 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js
@@ -1,20 +1 @@
-tinyMCE.addI18n('en.emotions_dlg',{

-title:"Insert emotion",

-desc:"Emotions",

-cool:"Cool",

-cry:"Cry",

-embarassed:"Embarassed",

-foot_in_mouth:"Foot in mouth",

-frown:"Frown",

-innocent:"Innocent",

-kiss:"Kiss",

-laughing:"Laughing",

-money_mouth:"Money mouth",

-sealed:"Sealed",

-smile:"Smile",

-surprised:"Surprised",

-tongue_out:"Tongue out",

-undecided:"Undecided",

-wink:"Wink",

-yell:"Yell"

-});
\ No newline at end of file
+tinyMCE.addI18n('en.emotions_dlg',{cry:"Cry",cool:"Cool",desc:"Emotions",title:"Insert Emotion",usage:"Use left and right arrows to navigate.",yell:"Yell",wink:"Wink",undecided:"Undecided","tongue_out":"Tongue Out",surprised:"Surprised",smile:"Smile",sealed:"Sealed","money_mouth":"Money Mouth",laughing:"Laughing",kiss:"Kiss",innocent:"Innocent",frown:"Frown","foot_in_mouth":"Foot in Mouth",embarassed:"Embarassed"});
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/example/dialog.htm b/library/tinymce/jscripts/tiny_mce/plugins/example/dialog.htm
index 50b2b3445..50b2b3445 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/example/dialog.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/example/dialog.htm
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin.js
index ec1f81ea4..ec1f81ea4 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js
index 9a0e7da15..9a0e7da15 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/example/img/example.gif b/library/tinymce/jscripts/tiny_mce/plugins/example/img/example.gif
index 1ab5da446..1ab5da446 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/example/img/example.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/example/img/example.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/example/js/dialog.js b/library/tinymce/jscripts/tiny_mce/plugins/example/js/dialog.js
index fa8341132..fa8341132 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/example/js/dialog.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/example/js/dialog.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/example/langs/en.js b/library/tinymce/jscripts/tiny_mce/plugins/example/langs/en.js
index e0784f80f..e0784f80f 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/example/langs/en.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/example/langs/en.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/example/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/example/langs/en_dlg.js
index ebcf948da..ebcf948da 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/example/langs/en_dlg.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/example/langs/en_dlg.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin.js
new file mode 100644
index 000000000..0a4551d38
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.ExampleDependencyPlugin",{init:function(a,b){},getInfo:function(){return{longname:"Example Dependency plugin",author:"Some author",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example_dependency",version:"1.0"}}});tinymce.PluginManager.add("example_dependency",tinymce.plugins.ExampleDependencyPlugin,["example"])})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin_src.js
new file mode 100644
index 000000000..e1c55e41b
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin_src.js
@@ -0,0 +1,50 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+
+	tinymce.create('tinymce.plugins.ExampleDependencyPlugin', {
+		/**
+		 * Initializes the plugin, this will be executed after the plugin has been created.
+		 * This call is done before the editor instance has finished it's initialization so use the onInit event
+		 * of the editor instance to intercept that event.
+		 *
+		 * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+		 * @param {string} url Absolute URL to where the plugin is located.
+		 */
+		init : function(ed, url) {
+		},
+
+
+		/**
+		 * Returns information about the plugin as a name/value array.
+		 * The current keys are longname, author, authorurl, infourl and version.
+		 *
+		 * @return {Object} Name/value array containing information about the plugin.
+		 */
+		getInfo : function() {
+			return {
+				longname : 'Example Dependency plugin',
+				author : 'Some author',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example_dependency',
+				version : "1.0"
+			};
+		}
+	});
+
+	/**
+	 * Register the plugin, specifying the list of the plugins that this plugin depends on.  They are specified in a list, with the list loaded in order.
+	 * plugins in this list will be initialised when this plugin is initialized. (before the init method is called).
+	 * plugins in a depends list should typically be specified using the short name).  If neccesary this can be done
+	 * with an object which has the url to the plugin and the shortname.
+	 */
+	tinymce.PluginManager.add('example_dependency', tinymce.plugins.ExampleDependencyPlugin, ['example']);
+})();
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css b/library/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css
index 7a3334f08..2675cec15 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css
+++ b/library/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css
@@ -35,53 +35,14 @@
 	width: 240px;

 }

 

-/* Head list classes */

-

-.headlistwrapper {

-	width: 100%;

-}

-

-.addbutton, .removebutton, .moveupbutton, .movedownbutton {

-	border-top: 1px solid;

-	border-left: 1px solid;

-	border-bottom: 1px solid;

-	border-right: 1px solid;

-	border-color: #F0F0EE;

-	cursor: default;

-	display: block;

-	width: 20px;

-	height: 20px;

-}

-

 #doctypes {

 	width: 200px;

 }

 

-.addbutton:hover, .removebutton:hover, .moveupbutton:hover, .movedownbutton:hover {

-	border: 1px solid #0A246A;

-	background-color: #B6BDD2;

-}

-

-.addbutton {

-	background-image: url('../images/add.gif');

-	float: left;

-	margin-right: 3px;

-}

-

-.removebutton {

-	background-image: url('../images/remove.gif');

-	float: left;

-}

-

-.moveupbutton {

-	background-image: url('../images/move_up.gif');

-	float: left;

-	margin-right: 3px;

-}

+/* Head list classes */

 

-.movedownbutton {

-	background-image: url('../images/move_down.gif');

-	float: left;

+.headlistwrapper {

+	width: 100%;

 }

 

 .selected {

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js
index aeaa66979..dcf76024d 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.FullPagePlugin",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceFullPageProperties",function(){a.windowManager.open({file:b+"/fullpage.htm",width:430+parseInt(a.getLang("fullpage.delta_width",0)),height:495+parseInt(a.getLang("fullpage.delta_height",0)),inline:1},{plugin_url:b,head_html:c.head})});a.addButton("fullpage",{title:"fullpage.desc",cmd:"mceFullPageProperties"});a.onBeforeSetContent.add(c._setContent,c);a.onSetContent.add(c._setBodyAttribs,c);a.onGetContent.add(c._getContent,c)},getInfo:function(){return{longname:"Fullpage",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullpage",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_setBodyAttribs:function(d,a){var l,c,e,g,b,h,j,f=this.head.match(/body(.*?)>/i);if(f&&f[1]){l=f[1].match(/\s*(\w+\s*=\s*".*?"|\w+\s*=\s*'.*?'|\w+\s*=\s*\w+|\w+)\s*/g);if(l){for(c=0,e=l.length;c<e;c++){g=l[c].split("=");b=g[0].replace(/\s/,"");h=g[1];if(h){h=h.replace(/^\s+/,"").replace(/\s+$/,"");j=h.match(/^["'](.*)["']$/);if(j){h=j[1]}}else{h=b}d.dom.setAttrib(d.getBody(),"style",h)}}}},_createSerializer:function(){return new tinymce.dom.Serializer({dom:this.editor.dom,apply_source_formatting:true})},_setContent:function(d,b){var h=this,a,j,f=b.content,g,i="";if(b.format=="raw"&&h.head){return}if(b.source_view&&d.getParam("fullpage_hide_in_source_view")){return}f=f.replace(/<(\/?)BODY/gi,"<$1body");a=f.indexOf("<body");if(a!=-1){a=f.indexOf(">",a);h.head=f.substring(0,a+1);j=f.indexOf("</body",a);if(j==-1){j=f.indexOf("</body",j)}b.content=f.substring(a+1,j);h.foot=f.substring(j);function e(c){return c.replace(/<\/?[A-Z]+/g,function(k){return k.toLowerCase()})}h.head=e(h.head);h.foot=e(h.foot)}else{h.head="";if(d.getParam("fullpage_default_xml_pi")){h.head+='<?xml version="1.0" encoding="'+d.getParam("fullpage_default_encoding","ISO-8859-1")+'" ?>\n'}h.head+=d.getParam("fullpage_default_doctype",'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');h.head+="\n<html>\n<head>\n<title>"+d.getParam("fullpage_default_title","Untitled document")+"</title>\n";if(g=d.getParam("fullpage_default_encoding")){h.head+='<meta http-equiv="Content-Type" content="'+g+'" />\n'}if(g=d.getParam("fullpage_default_font_family")){i+="font-family: "+g+";"}if(g=d.getParam("fullpage_default_font_size")){i+="font-size: "+g+";"}if(g=d.getParam("fullpage_default_text_color")){i+="color: "+g+";"}h.head+="</head>\n<body"+(i?' style="'+i+'"':"")+">\n";h.foot="\n</body>\n</html>"}},_getContent:function(a,c){var b=this;if(!c.source_view||!a.getParam("fullpage_hide_in_source_view")){c.content=tinymce.trim(b.head)+"\n"+tinymce.trim(c.content)+"\n"+tinymce.trim(b.foot)}}});tinymce.PluginManager.add("fullpage",tinymce.plugins.FullPagePlugin)})();
\ No newline at end of file
+(function(){var b=tinymce.each,a=tinymce.html.Node;tinymce.create("tinymce.plugins.FullPagePlugin",{init:function(c,d){var e=this;e.editor=c;c.addCommand("mceFullPageProperties",function(){c.windowManager.open({file:d+"/fullpage.htm",width:430+parseInt(c.getLang("fullpage.delta_width",0)),height:495+parseInt(c.getLang("fullpage.delta_height",0)),inline:1},{plugin_url:d,data:e._htmlToData()})});c.addButton("fullpage",{title:"fullpage.desc",cmd:"mceFullPageProperties"});c.onBeforeSetContent.add(e._setContent,e);c.onGetContent.add(e._getContent,e)},getInfo:function(){return{longname:"Fullpage",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullpage",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_htmlToData:function(){var f=this._parseHeader(),h={},c,i,g,e=this.editor;function d(l,j){var k=l.attr(j);return k||""}h.fontface=e.getParam("fullpage_default_fontface","");h.fontsize=e.getParam("fullpage_default_fontsize","");i=f.firstChild;if(i.type==7){h.xml_pi=true;g=/encoding="([^"]+)"/.exec(i.value);if(g){h.docencoding=g[1]}}i=f.getAll("#doctype")[0];if(i){h.doctype="<!DOCTYPE"+i.value+">"}i=f.getAll("title")[0];if(i&&i.firstChild){h.metatitle=i.firstChild.value}b(f.getAll("meta"),function(m){var k=m.attr("name"),j=m.attr("http-equiv"),l;if(k){h["meta"+k.toLowerCase()]=m.attr("content")}else{if(j=="Content-Type"){l=/charset\s*=\s*(.*)\s*/gi.exec(m.attr("content"));if(l){h.docencoding=l[1]}}}});i=f.getAll("html")[0];if(i){h.langcode=d(i,"lang")||d(i,"xml:lang")}i=f.getAll("link")[0];if(i&&i.attr("rel")=="stylesheet"){h.stylesheet=i.attr("href")}i=f.getAll("body")[0];if(i){h.langdir=d(i,"dir");h.style=d(i,"style");h.visited_color=d(i,"vlink");h.link_color=d(i,"link");h.active_color=d(i,"alink")}return h},_dataToHtml:function(g){var f,d,h,j,k,e=this.editor.dom;function c(n,l,m){n.attr(l,m?m:undefined)}function i(l){if(d.firstChild){d.insert(l,d.firstChild)}else{d.append(l)}}f=this._parseHeader();d=f.getAll("head")[0];if(!d){j=f.getAll("html")[0];d=new a("head",1);if(j.firstChild){j.insert(d,j.firstChild,true)}else{j.append(d)}}j=f.firstChild;if(g.xml_pi){k='version="1.0"';if(g.docencoding){k+=' encoding="'+g.docencoding+'"'}if(j.type!=7){j=new a("xml",7);f.insert(j,f.firstChild,true)}j.value=k}else{if(j&&j.type==7){j.remove()}}j=f.getAll("#doctype")[0];if(g.doctype){if(!j){j=new a("#doctype",10);if(g.xml_pi){f.insert(j,f.firstChild)}else{i(j)}}j.value=g.doctype.substring(9,g.doctype.length-1)}else{if(j){j.remove()}}j=f.getAll("title")[0];if(g.metatitle){if(!j){j=new a("title",1);j.append(new a("#text",3)).value=g.metatitle;i(j)}}if(g.docencoding){j=null;b(f.getAll("meta"),function(l){if(l.attr("http-equiv")=="Content-Type"){j=l}});if(!j){j=new a("meta",1);j.attr("http-equiv","Content-Type");j.shortEnded=true;i(j)}j.attr("content","text/html; charset="+g.docencoding)}b("keywords,description,author,copyright,robots".split(","),function(m){var l=f.getAll("meta"),n,p,o=g["meta"+m];for(n=0;n<l.length;n++){p=l[n];if(p.attr("name")==m){if(o){p.attr("content",o)}else{p.remove()}return}}if(o){j=new a("meta",1);j.attr("name",m);j.attr("content",o);j.shortEnded=true;i(j)}});j=f.getAll("link")[0];if(j&&j.attr("rel")=="stylesheet"){if(g.stylesheet){j.attr("href",g.stylesheet)}else{j.remove()}}else{if(g.stylesheet){j=new a("link",1);j.attr({rel:"stylesheet",text:"text/css",href:g.stylesheet});j.shortEnded=true;i(j)}}j=f.getAll("body")[0];if(j){c(j,"dir",g.langdir);c(j,"style",g.style);c(j,"vlink",g.visited_color);c(j,"link",g.link_color);c(j,"alink",g.active_color);e.setAttribs(this.editor.getBody(),{style:g.style,dir:g.dir,vLink:g.visited_color,link:g.link_color,aLink:g.active_color})}j=f.getAll("html")[0];if(j){c(j,"lang",g.langcode);c(j,"xml:lang",g.langcode)}h=new tinymce.html.Serializer({validate:false,indent:true,apply_source_formatting:true,indent_before:"head,html,body,meta,title,script,link,style",indent_after:"head,html,body,meta,title,script,link,style"}).serialize(f);this.head=h.substring(0,h.indexOf("</body>"))},_parseHeader:function(){return new tinymce.html.DomParser({validate:false,root_name:"#document"}).parse(this.head)},_setContent:function(g,d){var m=this,i,c,h=d.content,f,l="",e=m.editor.dom,j;function k(n){return n.replace(/<\/?[A-Z]+/g,function(o){return o.toLowerCase()})}if(d.format=="raw"&&m.head){return}if(d.source_view&&g.getParam("fullpage_hide_in_source_view")){return}h=h.replace(/<(\/?)BODY/gi,"<$1body");i=h.indexOf("<body");if(i!=-1){i=h.indexOf(">",i);m.head=k(h.substring(0,i+1));c=h.indexOf("</body",i);if(c==-1){c=h.length}d.content=h.substring(i+1,c);m.foot=k(h.substring(c))}else{m.head=this._getDefaultHeader();m.foot="\n</body>\n</html>"}f=m._parseHeader();b(f.getAll("style"),function(n){if(n.firstChild){l+=n.firstChild.value}});j=f.getAll("body")[0];if(j){e.setAttribs(m.editor.getBody(),{style:j.attr("style")||"",dir:j.attr("dir")||"",vLink:j.attr("vlink")||"",link:j.attr("link")||"",aLink:j.attr("alink")||""})}e.remove("fullpage_styles");if(l){e.add(m.editor.getDoc().getElementsByTagName("head")[0],"style",{id:"fullpage_styles"},l);j=e.get("fullpage_styles");if(j.styleSheet){j.styleSheet.cssText=l}}},_getDefaultHeader:function(){var f="",c=this.editor,e,d="";if(c.getParam("fullpage_default_xml_pi")){f+='<?xml version="1.0" encoding="'+c.getParam("fullpage_default_encoding","ISO-8859-1")+'" ?>\n'}f+=c.getParam("fullpage_default_doctype",'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');f+="\n<html>\n<head>\n";if(e=c.getParam("fullpage_default_title")){f+="<title>"+e+"</title>\n"}if(e=c.getParam("fullpage_default_encoding")){f+='<meta http-equiv="Content-Type" content="text/html; charset='+e+'" />\n'}if(e=c.getParam("fullpage_default_font_family")){d+="font-family: "+e+";"}if(e=c.getParam("fullpage_default_font_size")){d+="font-size: "+e+";"}if(e=c.getParam("fullpage_default_text_color")){d+="color: "+e+";"}f+="</head>\n<body"+(d?' style="'+d+'"':"")+">\n";return f},_getContent:function(d,e){var c=this;if(!e.source_view||!d.getParam("fullpage_hide_in_source_view")){e.content=tinymce.trim(c.head)+"\n"+tinymce.trim(e.content)+"\n"+tinymce.trim(c.foot)}}});tinymce.PluginManager.add("fullpage",tinymce.plugins.FullPagePlugin)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js
index a2c9df898..23de7c5a1 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js
@@ -9,6 +9,8 @@
  */

 

 (function() {

+	var each = tinymce.each, Node = tinymce.html.Node;

+

 	tinymce.create('tinymce.plugins.FullPagePlugin', {

 		init : function(ed, url) {

 			var t = this;

@@ -24,7 +26,7 @@
 					inline : 1

 				}, {

 					plugin_url : url,

-					head_html : t.head

+					data : t._htmlToData()

 				});

 			});

 

@@ -32,7 +34,6 @@
 			ed.addButton('fullpage', {title : 'fullpage.desc', cmd : 'mceFullPageProperties'});

 

 			ed.onBeforeSetContent.add(t._setContent, t);

-			ed.onSetContent.add(t._setBodyAttribs, t);

 			ed.onGetContent.add(t._getContent, t);

 		},

 

@@ -48,106 +49,357 @@
 

 		// Private plugin internal methods

 

-		_setBodyAttribs : function(ed, o) {

-			var bdattr, i, len, kv, k, v, t, attr = this.head.match(/body(.*?)>/i);

+		_htmlToData : function() {

+			var headerFragment = this._parseHeader(), data = {}, nodes, elm, matches, editor = this.editor;

 

-			if (attr && attr[1]) {

-				bdattr = attr[1].match(/\s*(\w+\s*=\s*".*?"|\w+\s*=\s*'.*?'|\w+\s*=\s*\w+|\w+)\s*/g);

+			function getAttr(elm, name) {

+				var value = elm.attr(name);

 

-				if (bdattr) {

-					for(i = 0, len = bdattr.length; i < len; i++) {

-						kv = bdattr[i].split('=');

-						k = kv[0].replace(/\s/,'');

-						v = kv[1];

+				return value || '';

+			};

 

-						if (v) {

-							v = v.replace(/^\s+/,'').replace(/\s+$/,'');

-							t = v.match(/^["'](.*)["']$/);

+			// Default some values

+			data.fontface = editor.getParam("fullpage_default_fontface", "");

+			data.fontsize = editor.getParam("fullpage_default_fontsize", "");

+

+			// Parse XML PI

+			elm = headerFragment.firstChild;

+			if (elm.type == 7) {

+				data.xml_pi = true;

+				matches = /encoding="([^"]+)"/.exec(elm.value);

+				if (matches)

+					data.docencoding = matches[1];

+			}

 

-							if (t)

-								v = t[1];

-						} else

-							v = k;

+			// Parse doctype

+			elm = headerFragment.getAll('#doctype')[0];

+			if (elm)

+				data.doctype = '<!DOCTYPE' + elm.value + ">"; 

 

-						ed.dom.setAttrib(ed.getBody(), 'style', v);

-					}

+			// Parse title element

+			elm = headerFragment.getAll('title')[0];

+			if (elm && elm.firstChild) {

+				data.metatitle = elm.firstChild.value;

+			}

+

+			// Parse meta elements

+			each(headerFragment.getAll('meta'), function(meta) {

+				var name = meta.attr('name'), httpEquiv = meta.attr('http-equiv'), matches;

+

+				if (name)

+					data['meta' + name.toLowerCase()] = meta.attr('content');

+				else if (httpEquiv == "Content-Type") {

+					matches = /charset\s*=\s*(.*)\s*/gi.exec(meta.attr('content'));

+

+					if (matches)

+						data.docencoding = matches[1];

 				}

+			});

+

+			// Parse html attribs

+			elm = headerFragment.getAll('html')[0];

+			if (elm)

+				data.langcode = getAttr(elm, 'lang') || getAttr(elm, 'xml:lang');

+	

+			// Parse stylesheet

+			elm = headerFragment.getAll('link')[0];

+			if (elm && elm.attr('rel') == 'stylesheet')

+				data.stylesheet = elm.attr('href');

+

+			// Parse body parts

+			elm = headerFragment.getAll('body')[0];

+			if (elm) {

+				data.langdir = getAttr(elm, 'dir');

+				data.style = getAttr(elm, 'style');

+				data.visited_color = getAttr(elm, 'vlink');

+				data.link_color = getAttr(elm, 'link');

+				data.active_color = getAttr(elm, 'alink');

 			}

+

+			return data;

 		},

 

-		_createSerializer : function() {

-			return new tinymce.dom.Serializer({

-				dom : this.editor.dom,

-				apply_source_formatting : true

+		_dataToHtml : function(data) {

+			var headerFragment, headElement, html, elm, value, dom = this.editor.dom;

+

+			function setAttr(elm, name, value) {

+				elm.attr(name, value ? value : undefined);

+			};

+

+			function addHeadNode(node) {

+				if (headElement.firstChild)

+					headElement.insert(node, headElement.firstChild);

+				else

+					headElement.append(node);

+			};

+

+			headerFragment = this._parseHeader();

+			headElement = headerFragment.getAll('head')[0];

+			if (!headElement) {

+				elm = headerFragment.getAll('html')[0];

+				headElement = new Node('head', 1);

+

+				if (elm.firstChild)

+					elm.insert(headElement, elm.firstChild, true);

+				else

+					elm.append(headElement);

+			}

+

+			// Add/update/remove XML-PI

+			elm = headerFragment.firstChild;

+			if (data.xml_pi) {

+				value = 'version="1.0"';

+

+				if (data.docencoding)

+					value += ' encoding="' + data.docencoding + '"';

+

+				if (elm.type != 7) {

+					elm = new Node('xml', 7);

+					headerFragment.insert(elm, headerFragment.firstChild, true);

+				}

+

+				elm.value = value;

+			} else if (elm && elm.type == 7)

+				elm.remove();

+

+			// Add/update/remove doctype

+			elm = headerFragment.getAll('#doctype')[0];

+			if (data.doctype) {

+				if (!elm) {

+					elm = new Node('#doctype', 10);

+

+					if (data.xml_pi)

+						headerFragment.insert(elm, headerFragment.firstChild);

+					else

+						addHeadNode(elm);

+				}

+

+				elm.value = data.doctype.substring(9, data.doctype.length - 1);

+			} else if (elm)

+				elm.remove();

+

+			// Add/update/remove title

+			elm = headerFragment.getAll('title')[0];

+			if (data.metatitle) {

+				if (!elm) {

+					elm = new Node('title', 1);

+					elm.append(new Node('#text', 3)).value = data.metatitle;

+					addHeadNode(elm);

+				}

+			}

+

+			// Add meta encoding

+			if (data.docencoding) {

+				elm = null;

+				each(headerFragment.getAll('meta'), function(meta) {

+					if (meta.attr('http-equiv') == 'Content-Type')

+						elm = meta;

+				});

+

+				if (!elm) {

+					elm = new Node('meta', 1);

+					elm.attr('http-equiv', 'Content-Type');

+					elm.shortEnded = true;

+					addHeadNode(elm);

+				}

+

+				elm.attr('content', 'text/html; charset=' + data.docencoding);

+			}

+

+			// Add/update/remove meta

+			each('keywords,description,author,copyright,robots'.split(','), function(name) {

+				var nodes = headerFragment.getAll('meta'), i, meta, value = data['meta' + name];

+

+				for (i = 0; i < nodes.length; i++) {

+					meta = nodes[i];

+

+					if (meta.attr('name') == name) {

+						if (value)

+							meta.attr('content', value);

+						else

+							meta.remove();

+

+						return;

+					}

+				}

+

+				if (value) {

+					elm = new Node('meta', 1);

+					elm.attr('name', name);

+					elm.attr('content', value);

+					elm.shortEnded = true;

+

+					addHeadNode(elm);

+				}

 			});

+

+			// Add/update/delete link

+			elm = headerFragment.getAll('link')[0];

+			if (elm && elm.attr('rel') == 'stylesheet') {

+				if (data.stylesheet)

+					elm.attr('href', data.stylesheet);

+				else

+					elm.remove();

+			} else if (data.stylesheet) {

+				elm = new Node('link', 1);

+				elm.attr({

+					rel : 'stylesheet',

+					text : 'text/css',

+					href : data.stylesheet

+				});

+				elm.shortEnded = true;

+

+				addHeadNode(elm);

+			}

+

+			// Update body attributes

+			elm = headerFragment.getAll('body')[0];

+			if (elm) {

+				setAttr(elm, 'dir', data.langdir);

+				setAttr(elm, 'style', data.style);

+				setAttr(elm, 'vlink', data.visited_color);

+				setAttr(elm, 'link', data.link_color);

+				setAttr(elm, 'alink', data.active_color);

+

+				// Update iframe body as well

+				dom.setAttribs(this.editor.getBody(), {

+					style : data.style,

+					dir : data.dir,

+					vLink : data.visited_color,

+					link : data.link_color,

+					aLink : data.active_color

+				});

+			}

+

+			// Set html attributes

+			elm = headerFragment.getAll('html')[0];

+			if (elm) {

+				setAttr(elm, 'lang', data.langcode);

+				setAttr(elm, 'xml:lang', data.langcode);

+			}

+

+			// Serialize header fragment and crop away body part

+			html = new tinymce.html.Serializer({

+				validate: false,

+				indent: true,

+				apply_source_formatting : true,

+				indent_before: 'head,html,body,meta,title,script,link,style',

+				indent_after: 'head,html,body,meta,title,script,link,style'

+			}).serialize(headerFragment);

+

+			this.head = html.substring(0, html.indexOf('</body>'));

+		},

+

+		_parseHeader : function() {

+			// Parse the contents with a DOM parser

+			return new tinymce.html.DomParser({

+				validate: false,

+				root_name: '#document'

+			}).parse(this.head);

 		},

 

 		_setContent : function(ed, o) {

-			var t = this, sp, ep, c = o.content, v, st = '';

+			var self = this, startPos, endPos, content = o.content, headerFragment, styles = '', dom = self.editor.dom, elm;

+

+			function low(s) {

+				return s.replace(/<\/?[A-Z]+/g, function(a) {

+					return a.toLowerCase();

+				})

+			};

 

 			// Ignore raw updated if we already have a head, this will fix issues with undo/redo keeping the head/foot separate

-			if (o.format == 'raw' && t.head)

+			if (o.format == 'raw' && self.head)

 				return;

 

 			if (o.source_view && ed.getParam('fullpage_hide_in_source_view'))

 				return;

 

 			// Parse out head, body and footer

-			c = c.replace(/<(\/?)BODY/gi, '<$1body');

-			sp = c.indexOf('<body');

+			content = content.replace(/<(\/?)BODY/gi, '<$1body');

+			startPos = content.indexOf('<body');

 

-			if (sp != -1) {

-				sp = c.indexOf('>', sp);

-				t.head = c.substring(0, sp + 1);

+			if (startPos != -1) {

+				startPos = content.indexOf('>', startPos);

+				self.head = low(content.substring(0, startPos + 1));

 

-				ep = c.indexOf('</body', sp);

-				if (ep == -1)

-					ep = c.indexOf('</body', ep);

+				endPos = content.indexOf('</body', startPos);

+				if (endPos == -1)

+					endPos = content.length;

 

-				o.content = c.substring(sp + 1, ep);

-				t.foot = c.substring(ep);

+				o.content = content.substring(startPos + 1, endPos);

+				self.foot = low(content.substring(endPos));

+			} else {

+				self.head = this._getDefaultHeader();

+				self.foot = '\n</body>\n</html>';

+			}

 

-				function low(s) {

-					return s.replace(/<\/?[A-Z]+/g, function(a) {

-						return a.toLowerCase();

-					})

-				};

+			// Parse header and update iframe

+			headerFragment = self._parseHeader();

+			each(headerFragment.getAll('style'), function(node) {

+				if (node.firstChild)

+					styles += node.firstChild.value;

+			});

 

-				t.head = low(t.head);

-				t.foot = low(t.foot);

-			} else {

-				t.head = '';

-				if (ed.getParam('fullpage_default_xml_pi'))

-					t.head += '<?xml version="1.0" encoding="' + ed.getParam('fullpage_default_encoding', 'ISO-8859-1') + '" ?>\n';

+			elm = headerFragment.getAll('body')[0];

+			if (elm) {

+				dom.setAttribs(self.editor.getBody(), {

+					style : elm.attr('style') || '',

+					dir : elm.attr('dir') || '',

+					vLink : elm.attr('vlink') || '',

+					link : elm.attr('link') || '',

+					aLink : elm.attr('alink') || ''

+				});

+			}

 

-				t.head += ed.getParam('fullpage_default_doctype', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');

-				t.head += '\n<html>\n<head>\n<title>' + ed.getParam('fullpage_default_title', 'Untitled document') + '</title>\n';

+			dom.remove('fullpage_styles');

 

-				if (v = ed.getParam('fullpage_default_encoding'))

-					t.head += '<meta http-equiv="Content-Type" content="' + v + '" />\n';

+			if (styles) {

+				dom.add(self.editor.getDoc().getElementsByTagName('head')[0], 'style', {id : 'fullpage_styles'}, styles);

 

-				if (v = ed.getParam('fullpage_default_font_family'))

-					st += 'font-family: ' + v + ';';

+				// Needed for IE 6/7

+				elm = dom.get('fullpage_styles');

+				if (elm.styleSheet)

+					elm.styleSheet.cssText = styles;

+			}

+		},

 

-				if (v = ed.getParam('fullpage_default_font_size'))

-					st += 'font-size: ' + v + ';';

+		_getDefaultHeader : function() {

+			var header = '', editor = this.editor, value, styles = '';

 

-				if (v = ed.getParam('fullpage_default_text_color'))

-					st += 'color: ' + v + ';';

+			if (editor.getParam('fullpage_default_xml_pi'))

+				header += '<?xml version="1.0" encoding="' + editor.getParam('fullpage_default_encoding', 'ISO-8859-1') + '" ?>\n';

 

-				t.head += '</head>\n<body' + (st ? ' style="' + st + '"' : '') + '>\n';

-				t.foot = '\n</body>\n</html>';

-			}

+			header += editor.getParam('fullpage_default_doctype', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');

+			header += '\n<html>\n<head>\n';

+

+			if (value = editor.getParam('fullpage_default_title'))

+				header += '<title>' + value + '</title>\n';

+

+			if (value = editor.getParam('fullpage_default_encoding'))

+				header += '<meta http-equiv="Content-Type" content="text/html; charset=' + value + '" />\n';

+

+			if (value = editor.getParam('fullpage_default_font_family'))

+				styles += 'font-family: ' + value + ';';

+

+			if (value = editor.getParam('fullpage_default_font_size'))

+				styles += 'font-size: ' + value + ';';

+

+			if (value = editor.getParam('fullpage_default_text_color'))

+				styles += 'color: ' + value + ';';

+

+			header += '</head>\n<body' + (styles ? ' style="' + styles + '"' : '') + '>\n';

+

+			return header;

 		},

 

 		_getContent : function(ed, o) {

-			var t = this;

+			var self = this;

 

 			if (!o.source_view || !ed.getParam('fullpage_hide_in_source_view'))

-				o.content = tinymce.trim(t.head) + '\n' + tinymce.trim(o.content) + '\n' + tinymce.trim(t.foot);

+				o.content = tinymce.trim(self.head) + '\n' + tinymce.trim(o.content) + '\n' + tinymce.trim(self.foot);

 		}

 	});

 

 	// Register plugin

 	tinymce.PluginManager.add('fullpage', tinymce.plugins.FullPagePlugin);

-})();
\ No newline at end of file
+})();

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm b/library/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm
index c32afaf2d..14ab8652e 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm
@@ -8,13 +8,12 @@
 	<script type="text/javascript" src="js/fullpage.js"></script>

 	<link href="css/fullpage.css" rel="stylesheet" type="text/css" />

 </head>

-<body id="advlink" style="display: none">

-    <form onsubmit="updateAction();return false;" name="fullpage" action="#">

+<body id="fullpage" style="display: none">

+<form onsubmit="FullPageDialog.update();return false;" name="fullpage" action="#">

 		<div class="tabs">

 			<ul>

 				<li id="meta_tab" class="current"><span><a href="javascript:mcTabs.displayTab('meta_tab','meta_panel');" onmousedown="return false;">{#fullpage_dlg.meta_tab}</a></span></li>

 				<li id="appearance_tab"><span><a href="javascript:mcTabs.displayTab('appearance_tab','appearance_panel');" onmousedown="return false;">{#fullpage_dlg.appearance_tab}</a></span></li>

-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#fullpage_dlg.advanced_tab}</a></span></li>

 			</ul>

 		</div>

 

@@ -72,9 +71,9 @@
 							</td> 

 						</tr>

 						<tr>

-							<td class="nowrap"><label for="doctypes">{#fullpage_dlg.doctypes}</label>&nbsp;</td>

+							<td class="nowrap"><label for="doctype">{#fullpage_dlg.doctypes}</label>&nbsp;</td>

 							<td>

-								<select id="doctypes" name="doctypes">

+								<select id="doctype" name="doctype">

 										<option value="">{#not_set}</option>

 								</select>

 							</td>

@@ -109,7 +108,7 @@
 						<tr>

 							<td class="column1"><label for="fontface">{#fullpage_dlg.fontface}</label></td> 

 							<td>

-								<select id="fontface" name="fontface" onchange="changedStyleField(this);">

+								<select id="fontface" name="fontface" onchange="FullPageDialog.changedStyleProp();">

 										<option value="">{#not_set}</option>

 								</select>

 							</td> 

@@ -118,7 +117,7 @@
 						<tr>

 							<td class="column1"><label for="fontsize">{#fullpage_dlg.fontsize}</label></td> 

 							<td>

-								<select id="fontsize" name="fontsize" onchange="changedStyleField(this);">

+								<select id="fontsize" name="fontsize" onchange="FullPageDialog.changedStyleProp();">

 										<option value="">{#not_set}</option>

 								</select>

 							</td>

@@ -129,7 +128,7 @@
 							<td>

 								<table border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input id="textcolor" name="textcolor" type="text" value="" size="9" onchange="updateColor('textcolor_pick','textcolor');changedStyleField(this);" /></td>

+										<td><input id="textcolor" name="textcolor" type="text" value="" size="9" onchange="updateColor('textcolor_pick','textcolor');FullPageDialog.changedStyleProp();" /></td>

 										<td id="textcolor_pickcontainer">&nbsp;</td>

 									</tr>

 								</table>

@@ -147,7 +146,7 @@
 							<td>

 								<table border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input id="bgimage" name="bgimage" type="text" value="" onchange="changedStyleField(this);" /></td>

+										<td><input id="bgimage" name="bgimage" type="text" value="" onchange="FullPageDialog.changedStyleProp();" /></td>

 										<td id="bgimage_pickcontainer">&nbsp;</td>

 									</tr>

 								</table>

@@ -158,7 +157,7 @@
 							<td>

 								<table border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedStyleField(this);" /></td>

+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');FullPageDialog.changedStyleProp();" /></td>

 										<td id="bgcolor_pickcontainer">&nbsp;</td>

 									</tr>

 								</table>

@@ -173,15 +172,15 @@
 					<table border="0" cellpadding="4" cellspacing="0">

 						<tr>

 							<td class="column1"><label for="leftmargin">{#fullpage_dlg.left_margin}</label></td> 

-							<td><input id="leftmargin" name="leftmargin" type="text" value="" onchange="changedStyleField(this);" /></td>

+							<td><input id="leftmargin" name="leftmargin" type="text" value="" onchange="FullPageDialog.changedStyleProp();" /></td>

 							<td class="column1"><label for="rightmargin">{#fullpage_dlg.right_margin}</label></td> 

-							<td><input id="rightmargin" name="rightmargin" type="text" value="" onchange="changedStyleField(this);" /></td>

+							<td><input id="rightmargin" name="rightmargin" type="text" value="" onchange="FullPageDialog.changedStyleProp();" /></td>

 						</tr>

 						<tr>

 							<td class="column1"><label for="topmargin">{#fullpage_dlg.top_margin}</label></td> 

-							<td><input id="topmargin" name="topmargin" type="text" value="" onchange="changedStyleField(this);" /></td>

+							<td><input id="topmargin" name="topmargin" type="text" value="" onchange="FullPageDialog.changedStyleProp();" /></td>

 							<td class="column1"><label for="bottommargin">{#fullpage_dlg.bottom_margin}</label></td> 

-							<td><input id="bottommargin" name="bottommargin" type="text" value="" onchange="changedStyleField(this);" /></td>

+							<td><input id="bottommargin" name="bottommargin" type="text" value="" onchange="FullPageDialog.changedStyleProp();" /></td>

 						</tr>

 					</table>

 				</fieldset>

@@ -195,7 +194,7 @@
 							<td>

 								<table border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input id="link_color" name="link_color" type="text" value="" size="9" onchange="updateColor('link_color_pick','link_color');changedStyleField(this);" /></td>

+										<td><input id="link_color" name="link_color" type="text" value="" size="9" onchange="updateColor('link_color_pick','link_color');FullPageDialog.changedStyleProp();" /></td>

 										<td id="link_color_pickcontainer">&nbsp;</td>

 									</tr>

 								</table>

@@ -205,7 +204,7 @@
 							<td>

 								<table border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input id="visited_color" name="visited_color" type="text" value="" size="9" onchange="updateColor('visited_color_pick','visited_color');changedStyleField(this);" /></td>

+										<td><input id="visited_color" name="visited_color" type="text" value="" size="9" onchange="updateColor('visited_color_pick','visited_color');FullPageDialog.changedStyleProp();" /></td>

 										<td id="visited_color_pickcontainer">&nbsp;</td>

 									</tr>

 								</table>

@@ -217,7 +216,7 @@
 							<td>

 								<table border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input id="active_color" name="active_color" type="text" value="" size="9" onchange="updateColor('active_color_pick','active_color');changedStyleField(this);" /></td>

+										<td><input id="active_color" name="active_color" type="text" value="" size="9" onchange="updateColor('active_color_pick','active_color');FullPageDialog.changedStyleProp();" /></td>

 										<td id="active_color_pickcontainer">&nbsp;</td>

 									</tr>

 								</table>

@@ -225,16 +224,6 @@
 

 							<td>&nbsp;</td>

 							<td>&nbsp;</td>

-

-<!--							<td class="column1"><label for="hover_color">{#fullpage_dlg.hover_color}</label></td> 

-							<td>

-								<table border="0" cellpadding="0" cellspacing="0">

-									<tr>

-										<td><input id="hover_color" name="hover_color" type="text" value="" size="9" onchange="changedStyleField(this);" /></td>

-										<td id="hover_color_pickcontainer">&nbsp;</td>

-									</tr>

-								</table>

-							</td> -->

 						</tr>

 					</table>

 				</fieldset>

@@ -254,310 +243,9 @@
 						</tr>

 						<tr>

 							<td class="column1"><label for="style">{#fullpage_dlg.style}</label></td> 

-							<td><input id="style" name="style" type="text" value="" onchange="changedStyleField(this);" /></td>

-						</tr>

-					</table>

-				</fieldset>

-			</div>

-

-			<div id="advanced_panel" class="panel">

-				<div id="addmenu">

-					<table border="0" cellpadding="0" cellspacing="0">

-						<tr><td><a href="javascript:addHeadElm('title');" onmousedown="return false;"><span>{#fullpage_dlg.add_title}</span></a></td></tr>

-						<tr><td><a href="javascript:addHeadElm('meta');" onmousedown="return false;"><span>{#fullpage_dlg.add_meta}</span></a></td></tr>

-						<tr><td><a href="javascript:addHeadElm('script');" onmousedown="return false;"><span>{#fullpage_dlg.add_script}</span></a></td></tr>

-						<tr><td><a href="javascript:addHeadElm('style');" onmousedown="return false;"><span>{#fullpage_dlg.add_style}</span></a></td></tr>

-						<tr><td><a href="javascript:addHeadElm('link');" onmousedown="return false;"><span>{#fullpage_dlg.add_link}</span></a></td></tr>

-						<tr><td><a href="javascript:addHeadElm('base');" onmousedown="return false;"><span>{#fullpage_dlg.add_base}</span></a></td></tr>

-						<tr><td><a href="javascript:addHeadElm('comment');" onmousedown="return false;"><span>{#fullpage_dlg.add_comment}</span></a></td></tr>

-					</table>

-				</div>

-

-				<fieldset>

-					<legend>{#fullpage_dlg.head_elements}</legend>

-

-					<div class="headlistwrapper">

-						<div class="toolbar">

-							<div style="float: left">

-								<a id="addbutton" href="javascript:showAddMenu();" onmousedown="return false;" class="addbutton" title="{#fullpage_dlg.add}"></a>

-								<a href="#" onmousedown="return false;" class="removebutton" title="{#fullpage_dlg.remove}"></a>

-							</div>

-							<div style="float: right">

-								<a href="#" onmousedown="return false;" class="moveupbutton" title="{#fullpage_dlg.moveup}"></a>

-								<a href="#" onmousedown="return false;" class="movedownbutton" title="{#fullpage_dlg.movedown}"></a>

-							</div>

-							<br style="clear: both" />

-						</div>

-						<select id="headlist" size="26" onchange="updateHeadElm(this.options[this.selectedIndex].value);">

-							<option value="title_0">&lt;title&gt;Some title bla bla bla&lt;/title&gt;</option>

-							<option value="meta_1">&lt;meta name="keywords"&gt;Some bla bla bla&lt;/meta&gt;</option>

-							<option value="meta_2">&lt;meta name="description"&gt;Some bla bla bla bla bla bla bla bla bla&lt;/meta&gt;</option>

-							<option value="script_3">&lt;script language=&quot;javascript&quot;&gt;...&lt;/script&gt;</option>

-							<option value="style_4">&lt;style&gt;...&lt;/style&gt;</option>

-							<option value="base_5">&lt;base href="." /&gt;</option>

-							<option value="comment_6">&lt;!-- ... --&gt;</option>

-							<option value="link_7">&lt;link href="." /&gt;</option>

-						</select>

-					</div>

-				</fieldset>

-

-				<fieldset id="meta_element">

-					<legend>{#fullpage_dlg.meta_element}</legend>

-

-					<table border="0" cellpadding="4" cellspacing="0">

-						<tr>

-							<td class="column1"><label for="element_meta_type">{#fullpage_dlg.type}</label></td> 

-							<td><select id="element_meta_type">

-										<option value="name">name</option>

-										<option value="http-equiv">http-equiv</option>

-								</select></td>

-						</tr>

-						<tr>

-							<td class="column1"><label for="element_meta_name">{#fullpage_dlg.name}</label></td> 

-							<td><input id="element_meta_name" name="element_meta_name" type="text" value="" /></td>

-						</tr>

-						<tr>

-							<td class="column1"><label for="element_meta_content">{#fullpage_dlg.content}</label></td> 

-							<td><input id="element_meta_content" name="element_meta_content" type="text" value="" /></td>

-						</tr>

-					</table>

-

-					<input type="button" id="meta_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

-				</fieldset>

-

-				<fieldset id="title_element">

-					<legend>{#fullpage_dlg.title_element}</legend>

-

-					<table border="0" cellpadding="4" cellspacing="0">

-						<tr>

-							<td class="column1"><label for="element_title">{#fullpage_dlg.meta_title}</label></td> 

-							<td><input id="element_title" name="element_title" type="text" value="" /></td>

-						</tr>

-					</table>

-

-					<input type="button" id="title_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

-				</fieldset>

-

-				<fieldset id="script_element">

-					<legend>{#fullpage_dlg.script_element}</legend>

-

-					<div class="tabs">

-						<ul>

-							<li id="script_props_tab" class="current"><span><a href="javascript:mcTabs.displayTab('script_props_tab','script_props_panel');" onmousedown="return false;">{#fullpage_dlg.properties}</a></span></li>

-							<li id="script_value_tab"><span><a href="javascript:mcTabs.displayTab('script_value_tab','script_value_panel');" onmousedown="return false;">{#fullpage_dlg.value}</a></span></li>

-						</ul>

-					</div>

-

-					<br style="clear: both" />

-

-					<div class="panel_wrapper">

-						<div id="script_props_panel" class="panel current">

-							<table border="0" cellpadding="4" cellspacing="0">

-								<tr>

-									<td class="column1"><label for="element_script_type">{#fullpage_dlg.type}</label></td> 

-									<td><select id="element_script_type">

-										<option value="text/javascript">text/javascript</option>

-										<option value="text/jscript">text/jscript</option>

-										<option value="text/vbscript">text/vbscript</option>

-										<option value="text/vbs">text/vbs</option>

-										<option value="text/ecmascript">text/ecmascript</option>

-										<option value="text/xml">text/xml</option>

-									</select></td>

-								</tr>

-								<tr>

-									<td class="column1"><label for="element_script_src">{#fullpage_dlg.src}</label></td> 

-									<td><table border="0" cellpadding="0" cellspacing="0">

-									<tr>

-										<td><input id="element_script_src" name="element_script_src" type="text" value="" /></td>

-										<td id="script_src_pickcontainer">&nbsp;</td>

-									</tr>

-								</table></td>

-								</tr>

-								<tr>

-									<td class="column1"><label for="element_script_charset">{#fullpage_dlg.charset}</label></td> 

-									<td><select id="element_script_charset"><option value="">{#not_set}</option></select></td>

-								</tr>

-								<tr>

-									<td class="column1"><label for="element_script_defer">{#fullpage_dlg.defer}</label></td> 

-									<td><input type="checkbox" id="element_script_defer" name="element_script_defer" class="checkbox" /></td>

-								</tr>

-							</table>

-						</div>

-

-						<div id="script_value_panel" class="panel">

-							<textarea id="element_script_value"></textarea>

-						</div>

-					</div>

-

-					<input type="button" id="script_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

-				</fieldset>

-

-				<fieldset id="style_element">

-					<legend>{#fullpage_dlg.style_element}</legend>

-

-					<div class="tabs">

-						<ul>

-							<li id="style_props_tab" class="current"><span><a href="javascript:mcTabs.displayTab('style_props_tab','style_props_panel');" onmousedown="return false;">{#fullpage_dlg.properties}</a></span></li>

-							<li id="style_value_tab"><span><a href="javascript:mcTabs.displayTab('style_value_tab','style_value_panel');" onmousedown="return false;">{#fullpage_dlg.value}</a></span></li>

-						</ul>

-					</div>

-

-					<br style="clear: both" />

-

-					<div class="panel_wrapper">

-						<div id="style_props_panel" class="panel current">

-							<table border="0" cellpadding="4" cellspacing="0">

-								<tr>

-									<td class="column1"><label for="element_style_type">{#fullpage_dlg.type}</label></td> 

-									<td><select id="element_style_type">

-										<option value="text/css">text/css</option>

-									</select></td>

-								</tr>

-								<tr>

-									<td class="column1"><label for="element_style_media">{#fullpage_dlg.media}</label></td> 

-									<td><select id="element_style_media"></select></td>

-								</tr>

-							</table>

-						</div>

-

-						<div id="style_value_panel" class="panel">

-							<textarea id="element_style_value"></textarea>

-						</div>

-					</div>

-

-					<input type="button" id="style_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

-				</fieldset>

-

-				<fieldset id="base_element">

-					<legend>{#fullpage_dlg.base_element}</legend>

-

-					<table border="0" cellpadding="4" cellspacing="0">

-						<tr>

-							<td class="column1"><label for="element_base_href">{#fullpage_dlg.href}</label></td> 

-							<td><input id="element_base_href" name="element_base_href" type="text" value="" /></td>

-						</tr>

-						<tr>

-							<td class="column1"><label for="element_base_target">{#fullpage_dlg.target}</label></td> 

-							<td><input id="element_base_target" name="element_base_target" type="text" value="" /></td>

+							<td><input id="style" name="style" type="text" value="" onchange="FullPageDialog.changedStyle();" /></td>

 						</tr>

 					</table>

-

-					<input type="button" id="base_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

-				</fieldset>

-

-				<fieldset id="link_element">

-					<legend>{#fullpage_dlg.link_element}</legend>

-

-					<div class="tabs">

-						<ul>

-							<li id="link_general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('link_general_tab','link_general_panel');" onmousedown="return false;">{#fullpage_dlg.general_props}</a></span></li>

-							<li id="link_advanced_tab"><span><a href="javascript:mcTabs.displayTab('link_advanced_tab','link_advanced_panel');" onmousedown="return false;">{#fullpage_dlg.advanced_props}</a></span></li>

-						</ul>

-					</div>

-

-					<br style="clear: both" />

-

-					<div class="panel_wrapper">

-						<div id="link_general_panel" class="panel current">

-							<table border="0" cellpadding="4" cellspacing="0">

-								<tr>

-									<td class="column1"><label for="element_link_href">{#fullpage_dlg.href}</label></td> 

-									<td><table border="0" cellpadding="0" cellspacing="0">

-									<tr>

-										<td><input id="element_link_href" name="element_link_href" type="text" value="" /></td>

-										<td id="link_href_pickcontainer">&nbsp;</td>

-									</tr>

-								</table></td>

-								</tr>

-								<tr>

-									<td class="column1"><label for="element_link_title">{#fullpage_dlg.meta_title}</label></td> 

-									<td><input id="element_link_title" name="element_link_title" type="text" value="" /></td>

-								</tr>

-								<tr>

-									<td class="column1"><label for="element_link_type">{#fullpage_dlg.type}</label></td> 

-									<td><select id="element_link_type" name="element_link_type">

-										<option value="text/css">text/css</option>

-										<option value="text/javascript">text/javascript</option>

-									</select></td>

-								</tr>

-								<tr>

-									<td class="column1"><label for="element_link_media">{#fullpage_dlg.media}</label></td> 

-									<td><select id="element_link_media" name="element_link_media"></select></td>

-								</tr>

-								<tr>

-									<td><label for="element_style_rel">{#fullpage_dlg.rel}</label></td>

-									<td><select id="element_style_rel" name="element_style_rel"> 

-											<option value="">{#not_set}</option> 

-											<option value="stylesheet">Stylesheet</option>

-											<option value="alternate">Alternate</option>

-											<option value="designates">Designates</option>

-											<option value="start">Start</option>

-											<option value="next">Next</option>

-											<option value="prev">Prev</option>

-											<option value="contents">Contents</option>

-											<option value="index">Index</option>

-											<option value="glossary">Glossary</option>

-											<option value="copyright">Copyright</option>

-											<option value="chapter">Chapter</option>

-											<option value="subsection">Subsection</option>

-											<option value="appendix">Appendix</option>

-											<option value="help">Help</option>

-											<option value="bookmark">Bookmark</option>

-										</select> 

-									</td>

-								</tr>

-							</table>

-						</div>

-

-						<div id="link_advanced_panel" class="panel">

-							<table border="0" cellpadding="4" cellspacing="0">

-								<tr>

-									<td class="column1"><label for="element_link_charset">{#fullpage_dlg.charset}</label></td> 

-									<td><select id="element_link_charset"><option value="">{#not_set}</option></select></td>

-								</tr>

-								<tr>

-									<td class="column1"><label for="element_link_hreflang">{#fullpage_dlg.hreflang}</label></td> 

-									<td><input id="element_link_hreflang" name="element_link_hreflang" type="text" value="" /></td>

-								</tr>

-								<tr>

-									<td class="column1"><label for="element_link_target">{#fullpage_dlg.target}</label></td> 

-									<td><input id="element_link_target" name="element_link_target" type="text" value="" /></td>

-								</tr>

-								<tr>

-									<td><label for="element_style_rev">{#fullpage_dlg.rev}</label></td>

-									<td><select id="element_style_rev" name="element_style_rev"> 

-											<option value="">{#not_set}</option> 

-											<option value="alternate">Alternate</option> 

-											<option value="designates">Designates</option> 

-											<option value="stylesheet">Stylesheet</option> 

-											<option value="start">Start</option> 

-											<option value="next">Next</option> 

-											<option value="prev">Prev</option> 

-											<option value="contents">Contents</option> 

-											<option value="index">Index</option> 

-											<option value="glossary">Glossary</option> 

-											<option value="copyright">Copyright</option> 

-											<option value="chapter">Chapter</option> 

-											<option value="subsection">Subsection</option> 

-											<option value="appendix">Appendix</option> 

-											<option value="help">Help</option> 

-											<option value="bookmark">Bookmark</option> 

-										</select> 

-									</td>

-								</tr>

-							</table>

-						</div>

-					</div>

-

-					<input type="button" id="link_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

-				</fieldset>

-

-				<fieldset id="comment_element">

-					<legend>{#fullpage_dlg.comment_element}</legend>

-

-					<textarea id="element_comment_value"></textarea>

-

-					<input type="button" id="comment_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

 				</fieldset>

 			</div>

 		</div>

@@ -566,6 +254,6 @@
 			<input type="submit" id="insert" name="update" value="{#update}" />

 			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

 		</div>

-    </form>

+</form>

 </body>

 </html>

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js b/library/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js
index a1bb719a3..3f672ad3b 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js
@@ -8,464 +8,225 @@
  * Contributing: http://tinymce.moxiecode.com/contributing

  */

 

-tinyMCEPopup.requireLangPack();

-

-var doc;

-

-var defaultDocTypes = 

-	'XHTML 1.0 Transitional=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">,' +

-	'XHTML 1.0 Frameset=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">,' +

-	'XHTML 1.0 Strict=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">,' +

-	'XHTML 1.1=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">,' +

-	'HTML 4.01 Transitional=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">,' +

-	'HTML 4.01 Strict=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">,' +

-	'HTML 4.01 Frameset=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">';

-

-var defaultEncodings = 

-	'Western european (iso-8859-1)=iso-8859-1,' +

-	'Central European (iso-8859-2)=iso-8859-2,' +

-	'Unicode (UTF-8)=utf-8,' +

-	'Chinese traditional (Big5)=big5,' +

-	'Cyrillic (iso-8859-5)=iso-8859-5,' +

-	'Japanese (iso-2022-jp)=iso-2022-jp,' +

-	'Greek (iso-8859-7)=iso-8859-7,' +

-	'Korean (iso-2022-kr)=iso-2022-kr,' +

-	'ASCII (us-ascii)=us-ascii';

-

-var defaultMediaTypes = 

-	'all=all,' +

-	'screen=screen,' +

-	'print=print,' +

-	'tty=tty,' +

-	'tv=tv,' +

-	'projection=projection,' +

-	'handheld=handheld,' +

-	'braille=braille,' +

-	'aural=aural';

-

-var defaultFontNames = 'Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings';

-var defaultFontSizes = '10px,11px,12px,13px,14px,15px,16px';

-

-function init() {

-	var f = document.forms['fullpage'], el = f.elements, e, i, p, doctypes, encodings, mediaTypes, fonts, ed = tinyMCEPopup.editor, dom = tinyMCEPopup.dom, style;

-

-	// Setup doctype select box

-	doctypes = ed.getParam("fullpage_doctypes", defaultDocTypes).split(',');

-	for (i=0; i<doctypes.length; i++) {

-		p = doctypes[i].split('=');

-

-		if (p.length > 1)

-			addSelectValue(f, 'doctypes', p[0], p[1]);

-	}

-

-	// Setup fonts select box

-	fonts = ed.getParam("fullpage_fonts", defaultFontNames).split(';');

-	for (i=0; i<fonts.length; i++) {

-		p = fonts[i].split('=');

-

-		if (p.length > 1)

-			addSelectValue(f, 'fontface', p[0], p[1]);

-	}

-

-	// Setup fontsize select box

-	fonts = ed.getParam("fullpage_fontsizes", defaultFontSizes).split(',');

-	for (i=0; i<fonts.length; i++)

-		addSelectValue(f, 'fontsize', fonts[i], fonts[i]);

-

-	// Setup mediatype select boxs

-	mediaTypes = ed.getParam("fullpage_media_types", defaultMediaTypes).split(',');

-	for (i=0; i<mediaTypes.length; i++) {

-		p = mediaTypes[i].split('=');

-

-		if (p.length > 1) {

-			addSelectValue(f, 'element_style_media', p[0], p[1]);

-			addSelectValue(f, 'element_link_media', p[0], p[1]);

-		}

-	}

-

-	// Setup encodings select box

-	encodings = ed.getParam("fullpage_encodings", defaultEncodings).split(',');

-	for (i=0; i<encodings.length; i++) {

-		p = encodings[i].split('=');

-

-		if (p.length > 1) {

-			addSelectValue(f, 'docencoding', p[0], p[1]);

-			addSelectValue(f, 'element_script_charset', p[0], p[1]);

-			addSelectValue(f, 'element_link_charset', p[0], p[1]);

-		}

-	}

-

-	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');

-	document.getElementById('link_color_pickcontainer').innerHTML = getColorPickerHTML('link_color_pick','link_color');

-	//document.getElementById('hover_color_pickcontainer').innerHTML = getColorPickerHTML('hover_color_pick','hover_color');

-	document.getElementById('visited_color_pickcontainer').innerHTML = getColorPickerHTML('visited_color_pick','visited_color');

-	document.getElementById('active_color_pickcontainer').innerHTML = getColorPickerHTML('active_color_pick','active_color');

-	document.getElementById('textcolor_pickcontainer').innerHTML = getColorPickerHTML('textcolor_pick','textcolor');

-	document.getElementById('stylesheet_browsercontainer').innerHTML = getBrowserHTML('stylesheetbrowser','stylesheet','file','fullpage');

-	document.getElementById('link_href_pickcontainer').innerHTML = getBrowserHTML('link_href_browser','element_link_href','file','fullpage');

-	document.getElementById('script_src_pickcontainer').innerHTML = getBrowserHTML('script_src_browser','element_script_src','file','fullpage');

-	document.getElementById('bgimage_pickcontainer').innerHTML = getBrowserHTML('bgimage_browser','bgimage','image','fullpage');

-

-	// Resize some elements

-	if (isVisible('stylesheetbrowser'))

-		document.getElementById('stylesheet').style.width = '220px';

-

-	if (isVisible('link_href_browser'))

-		document.getElementById('element_link_href').style.width = '230px';

-

-	if (isVisible('bgimage_browser'))

-		document.getElementById('bgimage').style.width = '210px';

-

-	// Add iframe

-	dom.add(document.body, 'iframe', {id : 'documentIframe', src : 'javascript:""', style : {display : 'none'}});

-	doc = dom.get('documentIframe').contentWindow.document;

-	h = tinyMCEPopup.getWindowArg('head_html');

-

-	// Preprocess the HTML disable scripts and urls

-	h = h.replace(/<script>/gi, '<script type="text/javascript">');

-	h = h.replace(/type=([\"\'])?/gi, 'type=$1-mce-');

-	h = h.replace(/(src=|href=)/g, '_mce_$1');

-

-	// Write in the content in the iframe

-	doc.write(h + '</body></html>');

-	doc.close();

-

-	// Parse xml and doctype

-	xmlVer = getReItem(/<\?\s*?xml.*?version\s*?=\s*?"(.*?)".*?\?>/gi, h, 1);

-	xmlEnc = getReItem(/<\?\s*?xml.*?encoding\s*?=\s*?"(.*?)".*?\?>/gi, h, 1);

-	docType = getReItem(/<\!DOCTYPE.*?>/gi, h.replace(/\n/g, ''), 0).replace(/ +/g, ' ');

-	f.langcode.value = getReItem(/lang="(.*?)"/gi, h, 1);

-

-	// Parse title

-	if (e = doc.getElementsByTagName('title')[0])

-		el.metatitle.value = e.textContent || e.text;

-

-	// Parse meta

-	tinymce.each(doc.getElementsByTagName('meta'), function(n) {

-		var na = (n.getAttribute('name', 2) || '').toLowerCase(), va = n.getAttribute('content', 2), eq = n.getAttribute('httpEquiv', 2) || '';

-

-		e = el['meta' + na];

-

-		if (na == 'robots') {

-			selectByValue(f, 'metarobots', tinymce.trim(va), true, true);

-			return;

-		}

-

-		switch (eq.toLowerCase()) {

-			case "content-type":

-				tmp = getReItem(/charset\s*=\s*(.*)\s*/gi, va, 1);

-

-				// Override XML encoding

-				if (tmp != "")

-					xmlEnc = tmp;

-

-				return;

-		}

-

-		if (e)

-			e.value = va;

-	});

-

-	selectByValue(f, 'doctypes', docType, true, true);

-	selectByValue(f, 'docencoding', xmlEnc, true, true);

-	selectByValue(f, 'langdir', doc.body.getAttribute('dir', 2) || '', true, true);

-

-	if (xmlVer != '')

-		el.xml_pi.checked = true;

-

-	// Parse appearance

-

-	// Parse primary stylesheet

-	tinymce.each(doc.getElementsByTagName("link"), function(l) {

-		var m = l.getAttribute('media', 2) || '', t = l.getAttribute('type', 2) || '';

-

-		if (t == "-mce-text/css" && (m == "" || m == "screen" || m == "all") && (l.getAttribute('rel', 2) || '') == "stylesheet") {

-			f.stylesheet.value = l.getAttribute('_mce_href', 2) || '';

-			return false;

-		}

-	});

-

-	// Get from style elements

-	tinymce.each(doc.getElementsByTagName("style"), function(st) {

-		var tmp = parseStyleElement(st);

-

-		for (x=0; x<tmp.length; x++) {

-			if (tmp[x].rule.indexOf('a:visited') != -1 && tmp[x].data['color'])

-				f.visited_color.value = tmp[x].data['color'];

-

-			if (tmp[x].rule.indexOf('a:link') != -1 && tmp[x].data['color'])

-				f.link_color.value = tmp[x].data['color'];

-

-			if (tmp[x].rule.indexOf('a:active') != -1 && tmp[x].data['color'])

-				f.active_color.value = tmp[x].data['color'];

-		}

-	});

-

-	f.textcolor.value = tinyMCEPopup.dom.getAttrib(doc.body, "text");

-	f.active_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "alink");

-	f.link_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "link");

-	f.visited_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "vlink");

-	f.bgcolor.value = tinyMCEPopup.dom.getAttrib(doc.body, "bgcolor");

-	f.bgimage.value = tinyMCEPopup.dom.getAttrib(doc.body, "background");

-

-	// Get from style info

-	style = tinyMCEPopup.dom.parseStyle(tinyMCEPopup.dom.getAttrib(doc.body, 'style'));

-

-	if (style['font-family'])

-		selectByValue(f, 'fontface', style['font-family'], true, true);

-	else

-		selectByValue(f, 'fontface', ed.getParam("fullpage_default_fontface", ""), true, true);

-

-	if (style['font-size'])

-		selectByValue(f, 'fontsize', style['font-size'], true, true);

-	else

-		selectByValue(f, 'fontsize', ed.getParam("fullpage_default_fontsize", ""), true, true);

-

-	if (style['color'])

-		f.textcolor.value = convertRGBToHex(style['color']);

-

-	if (style['background-image'])

-		f.bgimage.value = style['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");

-

-	if (style['background-color'])

-		f.bgcolor.value = style['background-color'];

-

-	if (style['margin']) {

-		tmp = style['margin'].replace(/[^0-9 ]/g, '');

-		tmp = tmp.split(/ +/);

-		f.topmargin.value = tmp.length > 0 ? tmp[0] : '';

-		f.rightmargin.value = tmp.length > 1 ? tmp[1] : tmp[0];

-		f.bottommargin.value = tmp.length > 2 ? tmp[2] : tmp[0];

-		f.leftmargin.value = tmp.length > 3 ? tmp[3] : tmp[0];

-	}

-

-	if (style['margin-left'])

-		f.leftmargin.value = style['margin-left'].replace(/[^0-9]/g, '');

-

-	if (style['margin-right'])

-		f.rightmargin.value = style['margin-right'].replace(/[^0-9]/g, '');

-

-	if (style['margin-top'])

-		f.topmargin.value = style['margin-top'].replace(/[^0-9]/g, '');

-

-	if (style['margin-bottom'])

-		f.bottommargin.value = style['margin-bottom'].replace(/[^0-9]/g, '');

-

-	f.style.value = tinyMCEPopup.dom.serializeStyle(style);

-

-	// Update colors

-	updateColor('textcolor_pick', 'textcolor');

-	updateColor('bgcolor_pick', 'bgcolor');

-	updateColor('visited_color_pick', 'visited_color');

-	updateColor('active_color_pick', 'active_color');

-	updateColor('link_color_pick', 'link_color');

-}

-

-function getReItem(r, s, i) {

-	var c = r.exec(s);

-

-	if (c && c.length > i)

-		return c[i];

-

-	return '';

-}

-

-function updateAction() {

-	var f = document.forms[0], nl, i, h, v, s, head, html, l, tmp, addlink = true, ser;

-

-	head = doc.getElementsByTagName('head')[0];

-

-	// Fix scripts without a type

-	nl = doc.getElementsByTagName('script');

-	for (i=0; i<nl.length; i++) {

-		if (tinyMCEPopup.dom.getAttrib(nl[i], '_mce_type') == '')

-			nl[i].setAttribute('_mce_type', 'text/javascript');

-	}

-

-	// Get primary stylesheet

-	nl = doc.getElementsByTagName("link");

-	for (i=0; i<nl.length; i++) {

-		l = nl[i];

-

-		tmp = tinyMCEPopup.dom.getAttrib(l, 'media');

-

-		if (tinyMCEPopup.dom.getAttrib(l, '_mce_type') == "text/css" && (tmp == "" || tmp == "screen" || tmp == "all") && tinyMCEPopup.dom.getAttrib(l, 'rel') == "stylesheet") {

-			addlink = false;

-

-			if (f.stylesheet.value == '')

-				l.parentNode.removeChild(l);

+(function() {

+	tinyMCEPopup.requireLangPack();

+

+	var defaultDocTypes = 

+		'XHTML 1.0 Transitional=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">,' +

+		'XHTML 1.0 Frameset=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">,' +

+		'XHTML 1.0 Strict=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">,' +

+		'XHTML 1.1=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">,' +

+		'HTML 4.01 Transitional=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">,' +

+		'HTML 4.01 Strict=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">,' +

+		'HTML 4.01 Frameset=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">';

+

+	var defaultEncodings = 

+		'Western european (iso-8859-1)=iso-8859-1,' +

+		'Central European (iso-8859-2)=iso-8859-2,' +

+		'Unicode (UTF-8)=utf-8,' +

+		'Chinese traditional (Big5)=big5,' +

+		'Cyrillic (iso-8859-5)=iso-8859-5,' +

+		'Japanese (iso-2022-jp)=iso-2022-jp,' +

+		'Greek (iso-8859-7)=iso-8859-7,' +

+		'Korean (iso-2022-kr)=iso-2022-kr,' +

+		'ASCII (us-ascii)=us-ascii';

+

+	var defaultFontNames = 'Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings';

+	var defaultFontSizes = '10px,11px,12px,13px,14px,15px,16px';

+

+	function setVal(id, value) {

+		var elm = document.getElementById(id);

+

+		if (elm) {

+			value = value || '';

+

+			if (elm.nodeName == "SELECT")

+				selectByValue(document.forms[0], id, value);

+			else if (elm.type == "checkbox")

+				elm.checked = !!value;

 			else

-				l.setAttribute('_mce_href', f.stylesheet.value);

-

-			break;

+				elm.value = value;

 		}

-	}

-

-	// Add new link

-	if (f.stylesheet.value != '') {

-		l = doc.createElement('link');

-

-		l.setAttribute('type', 'text/css');

-		l.setAttribute('_mce_href', f.stylesheet.value);

-		l.setAttribute('rel', 'stylesheet');

-

-		head.appendChild(l);

-	}

-

-	setMeta(head, 'keywords', f.metakeywords.value);

-	setMeta(head, 'description', f.metadescription.value);

-	setMeta(head, 'author', f.metaauthor.value);

-	setMeta(head, 'copyright', f.metacopyright.value);

-	setMeta(head, 'robots', getSelectValue(f, 'metarobots'));

-	setMeta(head, 'Content-Type', getSelectValue(f, 'docencoding'));

-

-	doc.body.dir = getSelectValue(f, 'langdir');

-	doc.body.style.cssText = f.style.value;

-

-	doc.body.setAttribute('vLink', f.visited_color.value);

-	doc.body.setAttribute('link', f.link_color.value);

-	doc.body.setAttribute('text', f.textcolor.value);

-	doc.body.setAttribute('aLink', f.active_color.value);

+	};

 

-	doc.body.style.fontFamily = getSelectValue(f, 'fontface');

-	doc.body.style.fontSize = getSelectValue(f, 'fontsize');

-	doc.body.style.backgroundColor = f.bgcolor.value;

+	function getVal(id) {

+		var elm = document.getElementById(id);

 

-	if (f.leftmargin.value != '')

-		doc.body.style.marginLeft = f.leftmargin.value + 'px';

+		if (elm.nodeName == "SELECT")

+			return elm.options[elm.selectedIndex].value;

 

-	if (f.rightmargin.value != '')

-		doc.body.style.marginRight = f.rightmargin.value + 'px';

+		if (elm.type == "checkbox")

+			return elm.checked;

 

-	if (f.bottommargin.value != '')

-		doc.body.style.marginBottom = f.bottommargin.value + 'px';

+		return elm.value;

+	};

 

-	if (f.topmargin.value != '')

-		doc.body.style.marginTop = f.topmargin.value + 'px';

+	window.FullPageDialog = {

+		changedStyle : function() {

+			var val, styles = tinyMCEPopup.editor.dom.parseStyle(getVal('style'));

 

-	html = doc.getElementsByTagName('html')[0];

-	html.setAttribute('lang', f.langcode.value);

-	html.setAttribute('xml:lang', f.langcode.value);

+			setVal('fontface', styles['font-face']);

+			setVal('fontsize', styles['font-size']);

+			setVal('textcolor', styles['color']);

 

-	if (f.bgimage.value != '')

-		doc.body.style.backgroundImage = "url('" + f.bgimage.value + "')";

-	else

-		doc.body.style.backgroundImage = '';

-

-	ser = tinyMCEPopup.editor.plugins.fullpage._createSerializer();

-	ser.setRules('-title,meta[http-equiv|name|content],base[href|target],link[href|rel|type|title|media],style[type],script[type|language|src],html[lang|xml::lang|xmlns],body[style|dir|vlink|link|text|alink],head');

-

-	h = ser.serialize(doc.documentElement);

-	h = h.substring(0, h.lastIndexOf('</body>'));

-

-	if (h.indexOf('<title>') == -1)

-		h = h.replace(/<head.*?>/, '$&\n' + '<title>' + tinyMCEPopup.dom.encode(f.metatitle.value) + '</title>');

-	else

-		h = h.replace(/<title>(.*?)<\/title>/, '<title>' + tinyMCEPopup.dom.encode(f.metatitle.value) + '</title>');

-

-	if ((v = getSelectValue(f, 'doctypes')) != '')

-		h = v + '\n' + h;

-

-	if (f.xml_pi.checked) {

-		s = '<?xml version="1.0"';

-

-		if ((v = getSelectValue(f, 'docencoding')) != '')

-			s += ' encoding="' + v + '"';

-

-		s += '?>\n';

-		h = s + h;

-	}

-

-	h = h.replace(/type=\"\-mce\-/gi, 'type="');

-

-	tinyMCEPopup.editor.plugins.fullpage.head = h;

-	tinyMCEPopup.editor.plugins.fullpage._setBodyAttribs(tinyMCEPopup.editor, {});

-	tinyMCEPopup.close();

-}

+			if (val = styles['background-image'])

+				setVal('bgimage', val.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1"));

+			else

+				setVal('bgimage', '');

+

+			setVal('bgcolor', styles['background-color']);

+

+			// Reset margin form elements

+			setVal('topmargin', '');

+			setVal('rightmargin', '');

+			setVal('bottommargin', '');

+			setVal('leftmargin', '');

+

+			// Expand margin

+			if (val = styles['margin']) {

+				val = val.split(' ');

+				styles['margin-top'] = val[0] || '';

+				styles['margin-right'] = val[1] || val[0] || '';

+				styles['margin-bottom'] = val[2] || val[0] || '';

+				styles['margin-left'] = val[3] || val[0] || '';

+			}

+

+			if (val = styles['margin-top'])

+				setVal('topmargin', val.replace(/px/, ''));

+

+			if (val = styles['margin-right'])

+				setVal('rightmargin', val.replace(/px/, ''));

+

+			if (val = styles['margin-bottom'])

+				setVal('bottommargin', val.replace(/px/, ''));

+

+			if (val = styles['margin-left'])

+				setVal('leftmargin', val.replace(/px/, ''));

+

+			updateColor('bgcolor_pick', 'bgcolor');

+			updateColor('textcolor_pick', 'textcolor');

+		},

+

+		changedStyleProp : function() {

+			var val, dom = tinyMCEPopup.editor.dom, styles = dom.parseStyle(getVal('style'));

+	

+			styles['font-face'] = getVal('fontface');

+			styles['font-size'] = getVal('fontsize');

+			styles['color'] = getVal('textcolor');

+			styles['background-color'] = getVal('bgcolor');

+

+			if (val = getVal('bgimage'))

+				styles['background-image'] = "url('" + val + "')";

+			else

+				styles['background-image'] = '';

 

-function changedStyleField(field) {

-}

+			delete styles['margin'];

 

-function setMeta(he, k, v) {

-	var nl, i, m;

+			if (val = getVal('topmargin'))

+				styles['margin-top'] = val + "px";

+			else

+				styles['margin-top'] = '';

 

-	nl = he.getElementsByTagName('meta');

-	for (i=0; i<nl.length; i++) {

-		if (k == 'Content-Type' && tinyMCEPopup.dom.getAttrib(nl[i], 'http-equiv') == k) {

-			if (v == '')

-				nl[i].parentNode.removeChild(nl[i]);

+			if (val = getVal('rightmargin'))

+				styles['margin-right'] = val + "px";

 			else

-				nl[i].setAttribute('content', "text/html; charset=" + v);

+				styles['margin-right'] = '';

 

-			return;

-		}

+			if (val = getVal('bottommargin'))

+				styles['margin-bottom'] = val + "px";

+			else

+				styles['margin-bottom'] = '';

 

-		if (tinyMCEPopup.dom.getAttrib(nl[i], 'name') == k) {

-			if (v == '')

-				nl[i].parentNode.removeChild(nl[i]);

+			if (val = getVal('leftmargin'))

+				styles['margin-left'] = val + "px";

 			else

-				nl[i].setAttribute('content', v);

-			return;

+				styles['margin-left'] = '';

+

+			// Serialize, parse and reserialize this will compress redundant styles

+			setVal('style', dom.serializeStyle(dom.parseStyle(dom.serializeStyle(styles))));

+			this.changedStyle();

+		},

+		

+		update : function() {

+			var data = {};

+

+			tinymce.each(tinyMCEPopup.dom.select('select,input,textarea'), function(node) {

+				data[node.id] = getVal(node.id);

+			});

+

+			tinyMCEPopup.editor.plugins.fullpage._dataToHtml(data);

+			tinyMCEPopup.close();

+		}

+	};

+	

+	function init() {

+		var form = document.forms[0], i, item, list, editor = tinyMCEPopup.editor;

+

+		// Setup doctype select box

+		list = editor.getParam("fullpage_doctypes", defaultDocTypes).split(',');

+		for (i = 0; i < list.length; i++) {

+			item = list[i].split('=');

+

+			if (item.length > 1)

+				addSelectValue(form, 'doctype', item[0], item[1]);

 		}

-	}

-

-	if (v == '')

-		return;

-

-	m = doc.createElement('meta');

-

-	if (k == 'Content-Type')

-		m.httpEquiv = k;

-	else

-		m.setAttribute('name', k);

-

-	m.setAttribute('content', v);

-	he.appendChild(m);

-}

-

-function parseStyleElement(e) {

-	var v = e.innerHTML;

-	var p, i, r;

-

-	v = v.replace(/<!--/gi, '');

-	v = v.replace(/-->/gi, '');

-	v = v.replace(/[\n\r]/gi, '');

-	v = v.replace(/\s+/gi, ' ');

-

-	r = [];

-	p = v.split(/{|}/);

-

-	for (i=0; i<p.length; i+=2) {

-		if (p[i] != "")

-			r[r.length] = {rule : tinymce.trim(p[i]), data : tinyMCEPopup.dom.parseStyle(p[i+1])};

-	}

-

-	return r;

-}

-

-function serializeStyleElement(d) {

-	var i, s, st;

-

-	s = '<!--\n';

-

-	for (i=0; i<d.length; i++) {

-		s += d[i].rule + ' {\n';

-

-		st = tinyMCE.serializeStyle(d[i].data);

 

-		if (st != '')

-			st += ';';

+		// Setup fonts select box

+		list = editor.getParam("fullpage_fonts", defaultFontNames).split(';');

+		for (i = 0; i < list.length; i++) {

+			item = list[i].split('=');

 

-		s += st.replace(/;/g, ';\n');

-		s += '}\n';

+			if (item.length > 1)

+				addSelectValue(form, 'fontface', item[0], item[1]);

+		}

 

-		if (i != d.length - 1)

-			s += '\n';

-	}

+		// Setup fontsize select box

+		list = editor.getParam("fullpage_fontsizes", defaultFontSizes).split(',');

+		for (i = 0; i < list.length; i++)

+			addSelectValue(form, 'fontsize', list[i], list[i]);

 

-	s += '\n-->';

+		// Setup encodings select box

+		list = editor.getParam("fullpage_encodings", defaultEncodings).split(',');

+		for (i = 0; i < list.length; i++) {

+			item = list[i].split('=');

 

-	return s;

-}

+			if (item.length > 1)

+				addSelectValue(form, 'docencoding', item[0], item[1]);

+		}

 

-tinyMCEPopup.onInit.add(init);

+		// Setup color pickers

+		document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');

+		document.getElementById('link_color_pickcontainer').innerHTML = getColorPickerHTML('link_color_pick','link_color');

+		document.getElementById('visited_color_pickcontainer').innerHTML = getColorPickerHTML('visited_color_pick','visited_color');

+		document.getElementById('active_color_pickcontainer').innerHTML = getColorPickerHTML('active_color_pick','active_color');

+		document.getElementById('textcolor_pickcontainer').innerHTML = getColorPickerHTML('textcolor_pick','textcolor');

+		document.getElementById('stylesheet_browsercontainer').innerHTML = getBrowserHTML('stylesheetbrowser','stylesheet','file','fullpage');

+		document.getElementById('bgimage_pickcontainer').innerHTML = getBrowserHTML('bgimage_browser','bgimage','image','fullpage');

+

+		// Resize some elements

+		if (isVisible('stylesheetbrowser'))

+			document.getElementById('stylesheet').style.width = '220px';

+

+		if (isVisible('link_href_browser'))

+			document.getElementById('element_link_href').style.width = '230px';

+

+		if (isVisible('bgimage_browser'))

+			document.getElementById('bgimage').style.width = '210px';

+

+		// Update form

+		tinymce.each(tinyMCEPopup.getWindowArg('data'), function(value, key) {

+			setVal(key, value);

+		});

+

+		FullPageDialog.changedStyle();

+

+		// Update colors

+		updateColor('textcolor_pick', 'textcolor');

+		updateColor('bgcolor_pick', 'bgcolor');

+		updateColor('visited_color_pick', 'visited_color');

+		updateColor('active_color_pick', 'active_color');

+		updateColor('link_color_pick', 'link_color');

+	};

+

+	tinyMCEPopup.onInit.add(init);

+})();

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js
index f5801b8b3..516edc74f 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js
@@ -1,85 +1 @@
-tinyMCE.addI18n('en.fullpage_dlg',{

-title:"Document properties",

-meta_tab:"General",

-appearance_tab:"Appearance",

-advanced_tab:"Advanced",

-meta_props:"Meta information",

-langprops:"Language and encoding",

-meta_title:"Title",

-meta_keywords:"Keywords",

-meta_description:"Description",

-meta_robots:"Robots",

-doctypes:"Doctype",

-langcode:"Language code",

-langdir:"Language direction",

-ltr:"Left to right",

-rtl:"Right to left",

-xml_pi:"XML declaration",

-encoding:"Character encoding",

-appearance_bgprops:"Background properties",

-appearance_marginprops:"Body margins",

-appearance_linkprops:"Link colors",

-appearance_textprops:"Text properties",

-bgcolor:"Background color",

-bgimage:"Background image",

-left_margin:"Left margin",

-right_margin:"Right margin",

-top_margin:"Top margin",

-bottom_margin:"Bottom margin",

-text_color:"Text color",

-font_size:"Font size",

-font_face:"Font face",

-link_color:"Link color",

-hover_color:"Hover color",

-visited_color:"Visited color",

-active_color:"Active color",

-textcolor:"Color",

-fontsize:"Font size",

-fontface:"Font family",

-meta_index_follow:"Index and follow the links",

-meta_index_nofollow:"Index and don't follow the links",

-meta_noindex_follow:"Do not index but follow the links",

-meta_noindex_nofollow:"Do not index and don\'t follow the links",

-appearance_style:"Stylesheet and style properties",

-stylesheet:"Stylesheet",

-style:"Style",

-author:"Author",

-copyright:"Copyright",

-add:"Add new element",

-remove:"Remove selected element",

-moveup:"Move selected element up",

-movedown:"Move selected element down",

-head_elements:"Head elements",

-info:"Information",

-add_title:"Title element",

-add_meta:"Meta element",

-add_script:"Script element",

-add_style:"Style element",

-add_link:"Link element",

-add_base:"Base element",

-add_comment:"Comment node",

-title_element:"Title element",

-script_element:"Script element",

-style_element:"Style element",

-base_element:"Base element",

-link_element:"Link element",

-meta_element:"Meta element",

-comment_element:"Comment",

-src:"Src",

-language:"Language",

-href:"Href",

-target:"Target",

-type:"Type",

-charset:"Charset",

-defer:"Defer",

-media:"Media",

-properties:"Properties",

-name:"Name",

-value:"Value",

-content:"Content",

-rel:"Rel",

-rev:"Rev",

-hreflang:"Href lang",

-general_props:"General",

-advanced_props:"Advanced"

-});
\ No newline at end of file
+tinyMCE.addI18n('en.fullpage_dlg',{title:"Document Properties","meta_tab":"General","appearance_tab":"Appearance","advanced_tab":"Advanced","meta_props":"Meta Information",langprops:"Language and Encoding","meta_title":"Title","meta_keywords":"Keywords","meta_description":"Description","meta_robots":"Robots",doctypes:"Doctype",langcode:"Language Code",langdir:"Language Direction",ltr:"Left to Right",rtl:"Right to Left","xml_pi":"XML Declaration",encoding:"Character Encoding","appearance_bgprops":"Background Properties","appearance_marginprops":"Body Margins","appearance_linkprops":"Link Colors","appearance_textprops":"Text Properties",bgcolor:"Background Color",bgimage:"Background Image","left_margin":"Left Margin","right_margin":"Right Margin","top_margin":"Top Margin","bottom_margin":"Bottom Margin","text_color":"Text Color","font_size":"Font Size","font_face":"Font Face","link_color":"Link Color","hover_color":"Hover Color","visited_color":"Visited Color","active_color":"Active Color",textcolor:"Color",fontsize:"Font Size",fontface:"Font Family","meta_index_follow":"Index and Follow the Links","meta_index_nofollow":"Index and Don\'t Follow the Links","meta_noindex_follow":"Do Not Index but Follow the Links","meta_noindex_nofollow":"Do Not Index and Don\'t Follow the Links","appearance_style":"Stylesheet and Style Properties",stylesheet:"Stylesheet",style:"Style",author:"Author",copyright:"Copyright",add:"Add New Element",remove:"Remove Selected Element",moveup:"Move Selected Element Up",movedown:"Move Selected Element Down","head_elements":"Head Elements",info:"Information","add_title":"Title Element","add_meta":"Meta Element","add_script":"Script Element","add_style":"Style Element","add_link":"Link Element","add_base":"Base Element","add_comment":"Comment Node","title_element":"Title Element","script_element":"Script Element","style_element":"Style Element","base_element":"Base Element","link_element":"Link Element","meta_element":"Meta Element","comment_element":"Comment",src:"Source",language:"Language",href:"HREF",target:"Target",type:"Type",charset:"Charset",defer:"Defer",media:"Media",properties:"Properties",name:"Name",value:"Value",content:"Content",rel:"Rel",rev:"Rev",hreflang:"HREF Lang","general_props":"General","advanced_props":"Advanced"});
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
index 4437bd266..a6456f89d 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(c,d){var e=this,f={},b;e.editor=c;c.addCommand("mceFullScreen",function(){var h,i=a.doc.documentElement;if(c.getParam("fullscreen_is_enabled")){if(c.getParam("fullscreen_new_window")){closeFullscreen()}else{a.win.setTimeout(function(){tinymce.dom.Event.remove(a.win,"resize",e.resizeFunc);tinyMCE.get(c.getParam("fullscreen_editor_id")).setContent(c.getContent({format:"raw"}),{format:"raw"});tinyMCE.remove(c);a.remove("mce_fullscreen_container");i.style.overflow=c.getParam("fullscreen_html_overflow");a.setStyle(a.doc.body,"overflow",c.getParam("fullscreen_overflow"));a.win.scrollTo(c.getParam("fullscreen_scrollx"),c.getParam("fullscreen_scrolly"));tinyMCE.settings=tinyMCE.oldSettings},10)}return}if(c.getParam("fullscreen_new_window")){h=a.win.open(d+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{h.resizeTo(screen.availWidth,screen.availHeight)}catch(g){}}else{tinyMCE.oldSettings=tinyMCE.settings;f.fullscreen_overflow=a.getStyle(a.doc.body,"overflow",1)||"auto";f.fullscreen_html_overflow=a.getStyle(i,"overflow",1);b=a.getViewPort();f.fullscreen_scrollx=b.x;f.fullscreen_scrolly=b.y;if(tinymce.isOpera&&f.fullscreen_overflow=="visible"){f.fullscreen_overflow="auto"}if(tinymce.isIE&&f.fullscreen_overflow=="scroll"){f.fullscreen_overflow="auto"}if(tinymce.isIE&&(f.fullscreen_html_overflow=="visible"||f.fullscreen_html_overflow=="scroll")){f.fullscreen_html_overflow="auto"}if(f.fullscreen_overflow=="0px"){f.fullscreen_overflow=""}a.setStyle(a.doc.body,"overflow","hidden");i.style.overflow="hidden";b=a.getViewPort();a.win.scrollTo(0,0);if(tinymce.isIE){b.h-=1}n=a.add(a.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+(tinymce.isIE6||(tinymce.isIE&&!a.boxModel)?"absolute":"fixed")+";top:0;left:0;width:"+b.w+"px;height:"+b.h+"px;z-index:200000;"});a.add(n,"div",{id:"mce_fullscreen"});tinymce.each(c.settings,function(j,k){f[k]=j});f.id="mce_fullscreen";f.width=n.clientWidth;f.height=n.clientHeight-15;f.fullscreen_is_enabled=true;f.fullscreen_editor_id=c.id;f.theme_advanced_resizing=false;f.save_onsavecallback=function(){c.setContent(tinyMCE.get(f.id).getContent({format:"raw"}),{format:"raw"});c.execCommand("mceSave")};tinymce.each(c.getParam("fullscreen_settings"),function(l,j){f[j]=l});if(f.theme_advanced_toolbar_location==="external"){f.theme_advanced_toolbar_location="top"}e.fullscreenEditor=new tinymce.Editor("mce_fullscreen",f);e.fullscreenEditor.onInit.add(function(){e.fullscreenEditor.setContent(c.getContent());e.fullscreenEditor.focus()});e.fullscreenEditor.render();e.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");e.fullscreenElement.update();e.resizeFunc=tinymce.dom.Event.add(a.win,"resize",function(){var m=tinymce.DOM.getViewPort(),k=e.fullscreenEditor,j,l;j=k.dom.getSize(k.getContainer().firstChild);l=k.dom.getSize(k.getContainer().getElementsByTagName("iframe")[0]);k.theme.resizeTo(m.w-j.w+l.w,m.h-j.h+l.h)})}});c.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});c.onNodeChange.add(function(h,g){g.setActive("fullscreen",h.getParam("fullscreen_is_enabled"))})},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();
\ No newline at end of file
+(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(d,e){var f=this,g={},c,b;f.editor=d;d.addCommand("mceFullScreen",function(){var i,j=a.doc.documentElement;if(d.getParam("fullscreen_is_enabled")){if(d.getParam("fullscreen_new_window")){closeFullscreen()}else{a.win.setTimeout(function(){tinymce.dom.Event.remove(a.win,"resize",f.resizeFunc);tinyMCE.get(d.getParam("fullscreen_editor_id")).setContent(d.getContent());tinyMCE.remove(d);a.remove("mce_fullscreen_container");j.style.overflow=d.getParam("fullscreen_html_overflow");a.setStyle(a.doc.body,"overflow",d.getParam("fullscreen_overflow"));a.win.scrollTo(d.getParam("fullscreen_scrollx"),d.getParam("fullscreen_scrolly"));tinyMCE.settings=tinyMCE.oldSettings},10)}return}if(d.getParam("fullscreen_new_window")){i=a.win.open(e+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{i.resizeTo(screen.availWidth,screen.availHeight)}catch(h){}}else{tinyMCE.oldSettings=tinyMCE.settings;g.fullscreen_overflow=a.getStyle(a.doc.body,"overflow",1)||"auto";g.fullscreen_html_overflow=a.getStyle(j,"overflow",1);c=a.getViewPort();g.fullscreen_scrollx=c.x;g.fullscreen_scrolly=c.y;if(tinymce.isOpera&&g.fullscreen_overflow=="visible"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&g.fullscreen_overflow=="scroll"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&(g.fullscreen_html_overflow=="visible"||g.fullscreen_html_overflow=="scroll")){g.fullscreen_html_overflow="auto"}if(g.fullscreen_overflow=="0px"){g.fullscreen_overflow=""}a.setStyle(a.doc.body,"overflow","hidden");j.style.overflow="hidden";c=a.getViewPort();a.win.scrollTo(0,0);if(tinymce.isIE){c.h-=1}if(tinymce.isIE6){b="absolute;top:"+c.y}else{b="fixed;top:0"}n=a.add(a.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+b+";left:0;width:"+c.w+"px;height:"+c.h+"px;z-index:200000;"});a.add(n,"div",{id:"mce_fullscreen"});tinymce.each(d.settings,function(k,l){g[l]=k});g.id="mce_fullscreen";g.width=n.clientWidth;g.height=n.clientHeight-15;g.fullscreen_is_enabled=true;g.fullscreen_editor_id=d.id;g.theme_advanced_resizing=false;g.save_onsavecallback=function(){d.setContent(tinyMCE.get(g.id).getContent());d.execCommand("mceSave")};tinymce.each(d.getParam("fullscreen_settings"),function(m,l){g[l]=m});if(g.theme_advanced_toolbar_location==="external"){g.theme_advanced_toolbar_location="top"}f.fullscreenEditor=new tinymce.Editor("mce_fullscreen",g);f.fullscreenEditor.onInit.add(function(){f.fullscreenEditor.setContent(d.getContent());f.fullscreenEditor.focus()});f.fullscreenEditor.render();f.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");f.fullscreenElement.update();f.resizeFunc=tinymce.dom.Event.add(a.win,"resize",function(){var o=tinymce.DOM.getViewPort(),l=f.fullscreenEditor,k,m;k=l.dom.getSize(l.getContainer().firstChild);m=l.dom.getSize(l.getContainer().getElementsByTagName("iframe")[0]);l.theme.resizeTo(o.w-k.w+m.w,o.h-k.h+m.h)})}});d.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});d.onNodeChange.add(function(i,h){h.setActive("fullscreen",i.getParam("fullscreen_is_enabled"))})},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
index 0efd9bbe5..afa4f9b46 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
@@ -13,7 +13,7 @@
 

 	tinymce.create('tinymce.plugins.FullScreenPlugin', {

 		init : function(ed, url) {

-			var t = this, s = {}, vp;

+			var t = this, s = {}, vp, posCss;

 

 			t.editor = ed;

 

@@ -27,7 +27,7 @@
 					else {

 						DOM.win.setTimeout(function() {

 							tinymce.dom.Event.remove(DOM.win, 'resize', t.resizeFunc);

-							tinyMCE.get(ed.getParam('fullscreen_editor_id')).setContent(ed.getContent({format : 'raw'}), {format : 'raw'});

+							tinyMCE.get(ed.getParam('fullscreen_editor_id')).setContent(ed.getContent());

 							tinyMCE.remove(ed);

 							DOM.remove('mce_fullscreen_container');

 							de.style.overflow = ed.getParam('fullscreen_html_overflow');

@@ -78,7 +78,15 @@
 					if (tinymce.isIE)

 						vp.h -= 1;

 

-					n = DOM.add(DOM.doc.body, 'div', {id : 'mce_fullscreen_container', style : 'position:' + (tinymce.isIE6 || (tinymce.isIE && !DOM.boxModel) ? 'absolute' : 'fixed') + ';top:0;left:0;width:' + vp.w + 'px;height:' + vp.h + 'px;z-index:200000;'});

+					// Use fixed position if it exists

+					if (tinymce.isIE6)

+						posCss = 'absolute;top:' + vp.y;

+					else

+						posCss = 'fixed;top:0';

+

+					n = DOM.add(DOM.doc.body, 'div', {

+						id : 'mce_fullscreen_container', 

+						style : 'position:' + posCss + ';left:0;width:' + vp.w + 'px;height:' + vp.h + 'px;z-index:200000;'});

 					DOM.add(n, 'div', {id : 'mce_fullscreen'});

 

 					tinymce.each(ed.settings, function(v, n) {

@@ -92,7 +100,7 @@
 					s.fullscreen_editor_id = ed.id;

 					s.theme_advanced_resizing = false;

 					s.save_onsavecallback = function() {

-						ed.setContent(tinyMCE.get(s.id).getContent({format : 'raw'}), {format : 'raw'});

+						ed.setContent(tinyMCE.get(s.id).getContent());

 						ed.execCommand('mceSave');

 					};

 

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm b/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
index 4c4f27e48..ffe528e41 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
@@ -1,7 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<!DOCTYPE html>

 <html xmlns="http://www.w3.org/1999/xhtml">

 <head>

 	<title></title>

+	<meta http-equiv="X-UA-Compatible" content="IE=edge" />

 	<script type="text/javascript" src="../../tiny_mce.js"></script>

 	<script type="text/javascript">

 		function patchCallback(settings, key) {

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin.js
index e9cba106c..e9cba106c 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js
index 1b2bb9846..1b2bb9846 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js
index 07ea477b7..8bb96f9cb 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js
@@ -1 +1 @@
-(function(){var d=tinymce.DOM,b=tinymce.dom.Element,a=tinymce.dom.Event,e=tinymce.each,c=tinymce.is;tinymce.create("tinymce.plugins.InlinePopups",{init:function(f,g){f.onBeforeRenderUI.add(function(){f.windowManager=new tinymce.InlineWindowManager(f);d.loadCSS(g+"/skins/"+(f.settings.inlinepopups_skin||"clearlooks2")+"/window.css")})},getInfo:function(){return{longname:"InlinePopups",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.create("tinymce.InlineWindowManager:tinymce.WindowManager",{InlineWindowManager:function(f){var g=this;g.parent(f);g.zIndex=300000;g.count=0;g.windows={}},open:function(r,j){var y=this,i,k="",q=y.editor,g=0,s=0,h,m,n,o,l,v,x;r=r||{};j=j||{};if(!r.inline){return y.parent(r,j)}if(!r.type){y.bookmark=q.selection.getBookmark(1)}i=d.uniqueId();h=d.getViewPort();r.width=parseInt(r.width||320);r.height=parseInt(r.height||240)+(tinymce.isIE?8:0);r.min_width=parseInt(r.min_width||150);r.min_height=parseInt(r.min_height||100);r.max_width=parseInt(r.max_width||2000);r.max_height=parseInt(r.max_height||2000);r.left=r.left||Math.round(Math.max(h.x,h.x+(h.w/2)-(r.width/2)));r.top=r.top||Math.round(Math.max(h.y,h.y+(h.h/2)-(r.height/2)));r.movable=r.resizable=true;j.mce_width=r.width;j.mce_height=r.height;j.mce_inline=true;j.mce_window_id=i;j.mce_auto_focus=r.auto_focus;y.features=r;y.params=j;y.onOpen.dispatch(y,r,j);if(r.type){k+=" mceModal";if(r.type){k+=" mce"+r.type.substring(0,1).toUpperCase()+r.type.substring(1)}r.resizable=false}if(r.statusbar){k+=" mceStatusbar"}if(r.resizable){k+=" mceResizable"}if(r.minimizable){k+=" mceMinimizable"}if(r.maximizable){k+=" mceMaximizable"}if(r.movable){k+=" mceMovable"}y._addAll(d.doc.body,["div",{id:i,"class":q.settings.inlinepopups_skin||"clearlooks2",style:"width:100px;height:100px"},["div",{id:i+"_wrapper","class":"mceWrapper"+k},["div",{id:i+"_top","class":"mceTop"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_title"},r.title||""]],["div",{id:i+"_middle","class":"mceMiddle"},["div",{id:i+"_left","class":"mceLeft"}],["span",{id:i+"_content"}],["div",{id:i+"_right","class":"mceRight"}]],["div",{id:i+"_bottom","class":"mceBottom"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_status"},"Content"]],["a",{"class":"mceMove",tabindex:"-1",href:"javascript:;"}],["a",{"class":"mceMin",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMax",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMed",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceClose",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{id:i+"_resize_n","class":"mceResize mceResizeN",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_s","class":"mceResize mceResizeS",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_w","class":"mceResize mceResizeW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_e","class":"mceResize mceResizeE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_nw","class":"mceResize mceResizeNW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_ne","class":"mceResize mceResizeNE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_sw","class":"mceResize mceResizeSW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_se","class":"mceResize mceResizeSE",tabindex:"-1",href:"javascript:;"}]]]);d.setStyles(i,{top:-10000,left:-10000});if(tinymce.isGecko){d.setStyle(i,"overflow","auto")}if(!r.type){g+=d.get(i+"_left").clientWidth;g+=d.get(i+"_right").clientWidth;s+=d.get(i+"_top").clientHeight;s+=d.get(i+"_bottom").clientHeight}d.setStyles(i,{top:r.top,left:r.left,width:r.width+g,height:r.height+s});x=r.url||r.file;if(x){if(tinymce.relaxedDomain){x+=(x.indexOf("?")==-1?"?":"&")+"mce_rdomain="+tinymce.relaxedDomain}x=tinymce._addVer(x)}if(!r.type){d.add(i+"_content","iframe",{id:i+"_ifr",src:'javascript:""',frameBorder:0,style:"border:0;width:10px;height:10px"});d.setStyles(i+"_ifr",{width:r.width,height:r.height});d.setAttrib(i+"_ifr","src",x)}else{d.add(i+"_wrapper","a",{id:i+"_ok","class":"mceButton mceOk",href:"javascript:;",onmousedown:"return false;"},"Ok");if(r.type=="confirm"){d.add(i+"_wrapper","a",{"class":"mceButton mceCancel",href:"javascript:;",onmousedown:"return false;"},"Cancel")}d.add(i+"_middle","div",{"class":"mceIcon"});d.setHTML(i+"_content",r.content.replace("\n","<br />"))}n=a.add(i,"mousedown",function(t){var u=t.target,f,p;f=y.windows[i];y.focus(i);if(u.nodeName=="A"||u.nodeName=="a"){if(u.className=="mceMax"){f.oldPos=f.element.getXY();f.oldSize=f.element.getSize();p=d.getViewPort();p.w-=2;p.h-=2;f.element.moveTo(p.x,p.y);f.element.resizeTo(p.w,p.h);d.setStyles(i+"_ifr",{width:p.w-f.deltaWidth,height:p.h-f.deltaHeight});d.addClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMed"){f.element.moveTo(f.oldPos.x,f.oldPos.y);f.element.resizeTo(f.oldSize.w,f.oldSize.h);f.iframeElement.resizeTo(f.oldSize.w-f.deltaWidth,f.oldSize.h-f.deltaHeight);d.removeClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMove"){return y._startDrag(i,t,u.className)}else{if(d.hasClass(u,"mceResize")){return y._startDrag(i,t,u.className.substring(13))}}}}}});o=a.add(i,"click",function(f){var p=f.target;y.focus(i);if(p.nodeName=="A"||p.nodeName=="a"){switch(p.className){case"mceClose":y.close(null,i);return a.cancel(f);case"mceButton mceOk":case"mceButton mceCancel":r.button_func(p.className=="mceButton mceOk");return a.cancel(f)}}});v=y.windows[i]={id:i,mousedown_func:n,click_func:o,element:new b(i,{blocker:1,container:q.getContainer()}),iframeElement:new b(i+"_ifr"),features:r,deltaWidth:g,deltaHeight:s};v.iframeElement.on("focus",function(){y.focus(i)});if(y.count==0&&y.editor.getParam("dialog_type","modal")=="modal"){d.add(d.doc.body,"div",{id:"mceModalBlocker","class":(y.editor.settings.inlinepopups_skin||"clearlooks2")+"_modalBlocker",style:{zIndex:y.zIndex-1}});d.show("mceModalBlocker")}else{d.setStyle("mceModalBlocker","z-index",y.zIndex-1)}if(tinymce.isIE6||/Firefox\/2\./.test(navigator.userAgent)||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceModalBlocker",{position:"absolute",left:h.x,top:h.y,width:h.w-2,height:h.h-2})}y.focus(i);y._fixIELayout(i,1);if(d.get(i+"_ok")){d.get(i+"_ok").focus()}y.count++;return v},focus:function(h){var g=this,f;if(f=g.windows[h]){f.zIndex=this.zIndex++;f.element.setStyle("zIndex",f.zIndex);f.element.update();h=h+"_wrapper";d.removeClass(g.lastId,"mceFocus");d.addClass(h,"mceFocus");g.lastId=h}},_addAll:function(k,h){var g,l,f=this,j=tinymce.DOM;if(c(h,"string")){k.appendChild(j.doc.createTextNode(h))}else{if(h.length){k=k.appendChild(j.create(h[0],h[1]));for(g=2;g<h.length;g++){f._addAll(k,h[g])}}}},_startDrag:function(v,G,E){var o=this,u,z,C=d.doc,f,l=o.windows[v],h=l.element,y=h.getXY(),x,q,F,g,A,s,r,j,i,m,k,n,B;g={x:0,y:0};A=d.getViewPort();A.w-=2;A.h-=2;j=G.screenX;i=G.screenY;m=k=n=B=0;u=a.add(C,"mouseup",function(p){a.remove(C,"mouseup",u);a.remove(C,"mousemove",z);if(f){f.remove()}h.moveBy(m,k);h.resizeBy(n,B);q=h.getSize();d.setStyles(v+"_ifr",{width:q.w-l.deltaWidth,height:q.h-l.deltaHeight});o._fixIELayout(v,1);return a.cancel(p)});if(E!="Move"){D()}function D(){if(f){return}o._fixIELayout(v,0);d.add(C.body,"div",{id:"mceEventBlocker","class":"mceEventBlocker "+(o.editor.settings.inlinepopups_skin||"clearlooks2"),style:{zIndex:o.zIndex+1}});if(tinymce.isIE6||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceEventBlocker",{position:"absolute",left:A.x,top:A.y,width:A.w-2,height:A.h-2})}f=new b("mceEventBlocker");f.update();x=h.getXY();q=h.getSize();s=g.x+x.x-A.x;r=g.y+x.y-A.y;d.add(f.get(),"div",{id:"mcePlaceHolder","class":"mcePlaceHolder",style:{left:s,top:r,width:q.w,height:q.h}});F=new b("mcePlaceHolder")}z=a.add(C,"mousemove",function(w){var p,H,t;D();p=w.screenX-j;H=w.screenY-i;switch(E){case"ResizeW":m=p;n=0-p;break;case"ResizeE":n=p;break;case"ResizeN":case"ResizeNW":case"ResizeNE":if(E=="ResizeNW"){m=p;n=0-p}else{if(E=="ResizeNE"){n=p}}k=H;B=0-H;break;case"ResizeS":case"ResizeSW":case"ResizeSE":if(E=="ResizeSW"){m=p;n=0-p}else{if(E=="ResizeSE"){n=p}}B=H;break;case"mceMove":m=p;k=H;break}if(n<(t=l.features.min_width-q.w)){if(m!==0){m+=n-t}n=t}if(B<(t=l.features.min_height-q.h)){if(k!==0){k+=B-t}B=t}n=Math.min(n,l.features.max_width-q.w);B=Math.min(B,l.features.max_height-q.h);m=Math.max(m,A.x-(s+A.x));k=Math.max(k,A.y-(r+A.y));m=Math.min(m,(A.w+A.x)-(s+q.w+A.x));k=Math.min(k,(A.h+A.y)-(r+q.h+A.y));if(m+k!==0){if(s+m<0){m=0}if(r+k<0){k=0}F.moveTo(s+m,r+k)}if(n+B!==0){F.resizeTo(q.w+n,q.h+B)}return a.cancel(w)});return a.cancel(G)},resizeBy:function(g,h,i){var f=this.windows[i];if(f){f.element.resizeBy(g,h);f.iframeElement.resizeBy(g,h)}},close:function(j,l){var h=this,g,k=d.doc,f=0,i,l;l=h._findId(l||j);if(!h.windows[l]){h.parent(j);return}h.count--;if(h.count==0){d.remove("mceModalBlocker")}if(g=h.windows[l]){h.onClose.dispatch(h);a.remove(k,"mousedown",g.mousedownFunc);a.remove(k,"click",g.clickFunc);a.clear(l);a.clear(l+"_ifr");d.setAttrib(l+"_ifr","src",'javascript:""');g.element.remove();delete h.windows[l];e(h.windows,function(m){if(m.zIndex>f){i=m;f=m.zIndex}});if(i){h.focus(i.id)}}},setTitle:function(f,g){var h;f=this._findId(f);if(h=d.get(f+"_title")){h.innerHTML=d.encode(g)}},alert:function(g,f,j){var i=this,h;h=i.open({title:i,type:"alert",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},confirm:function(g,f,j){var i=this,h;h=i.open({title:i,type:"confirm",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},_findId:function(f){var g=this;if(typeof(f)=="string"){return f}e(g.windows,function(h){var i=d.get(h.id+"_ifr");if(i&&f==i.contentWindow){f=h.id;return false}});return f},_fixIELayout:function(i,h){var f,g;if(!tinymce.isIE6){return}e(["n","s","w","e","nw","ne","sw","se"],function(j){var k=d.get(i+"_resize_"+j);d.setStyles(k,{width:h?k.clientWidth:"",height:h?k.clientHeight:"",cursor:d.getStyle(k,"cursor",1)});d.setStyle(i+"_bottom","bottom","-1px");k=0});if(f=this.windows[i]){f.element.hide();f.element.show();e(d.select("div,a",i),function(k,j){if(k.currentStyle.backgroundImage!="none"){g=new Image();g.src=k.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/,"$1")}});d.get(i).style.filter=""}}});tinymce.PluginManager.add("inlinepopups",tinymce.plugins.InlinePopups)})();
\ No newline at end of file
+(function(){var d=tinymce.DOM,b=tinymce.dom.Element,a=tinymce.dom.Event,e=tinymce.each,c=tinymce.is;tinymce.create("tinymce.plugins.InlinePopups",{init:function(f,g){f.onBeforeRenderUI.add(function(){f.windowManager=new tinymce.InlineWindowManager(f);d.loadCSS(g+"/skins/"+(f.settings.inlinepopups_skin||"clearlooks2")+"/window.css")})},getInfo:function(){return{longname:"InlinePopups",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.create("tinymce.InlineWindowManager:tinymce.WindowManager",{InlineWindowManager:function(f){var g=this;g.parent(f);g.zIndex=300000;g.count=0;g.windows={}},open:function(s,j){var z=this,i,k="",r=z.editor,g=0,v=0,h,m,o,q,l,x,y,n;s=s||{};j=j||{};if(!s.inline){return z.parent(s,j)}n=z._frontWindow();if(n&&d.get(n.id+"_ifr")){n.focussedElement=d.get(n.id+"_ifr").contentWindow.document.activeElement}if(!s.type){z.bookmark=r.selection.getBookmark(1)}i=d.uniqueId();h=d.getViewPort();s.width=parseInt(s.width||320);s.height=parseInt(s.height||240)+(tinymce.isIE?8:0);s.min_width=parseInt(s.min_width||150);s.min_height=parseInt(s.min_height||100);s.max_width=parseInt(s.max_width||2000);s.max_height=parseInt(s.max_height||2000);s.left=s.left||Math.round(Math.max(h.x,h.x+(h.w/2)-(s.width/2)));s.top=s.top||Math.round(Math.max(h.y,h.y+(h.h/2)-(s.height/2)));s.movable=s.resizable=true;j.mce_width=s.width;j.mce_height=s.height;j.mce_inline=true;j.mce_window_id=i;j.mce_auto_focus=s.auto_focus;z.features=s;z.params=j;z.onOpen.dispatch(z,s,j);if(s.type){k+=" mceModal";if(s.type){k+=" mce"+s.type.substring(0,1).toUpperCase()+s.type.substring(1)}s.resizable=false}if(s.statusbar){k+=" mceStatusbar"}if(s.resizable){k+=" mceResizable"}if(s.minimizable){k+=" mceMinimizable"}if(s.maximizable){k+=" mceMaximizable"}if(s.movable){k+=" mceMovable"}z._addAll(d.doc.body,["div",{id:i,role:"dialog","aria-labelledby":s.type?i+"_content":i+"_title","class":(r.settings.inlinepopups_skin||"clearlooks2")+(tinymce.isIE&&window.getSelection?" ie9":""),style:"width:100px;height:100px"},["div",{id:i+"_wrapper","class":"mceWrapper"+k},["div",{id:i+"_top","class":"mceTop"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_title"},s.title||""]],["div",{id:i+"_middle","class":"mceMiddle"},["div",{id:i+"_left","class":"mceLeft",tabindex:"0"}],["span",{id:i+"_content"}],["div",{id:i+"_right","class":"mceRight",tabindex:"0"}]],["div",{id:i+"_bottom","class":"mceBottom"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_status"},"Content"]],["a",{"class":"mceMove",tabindex:"-1",href:"javascript:;"}],["a",{"class":"mceMin",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMax",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMed",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceClose",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{id:i+"_resize_n","class":"mceResize mceResizeN",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_s","class":"mceResize mceResizeS",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_w","class":"mceResize mceResizeW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_e","class":"mceResize mceResizeE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_nw","class":"mceResize mceResizeNW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_ne","class":"mceResize mceResizeNE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_sw","class":"mceResize mceResizeSW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_se","class":"mceResize mceResizeSE",tabindex:"-1",href:"javascript:;"}]]]);d.setStyles(i,{top:-10000,left:-10000});if(tinymce.isGecko){d.setStyle(i,"overflow","auto")}if(!s.type){g+=d.get(i+"_left").clientWidth;g+=d.get(i+"_right").clientWidth;v+=d.get(i+"_top").clientHeight;v+=d.get(i+"_bottom").clientHeight}d.setStyles(i,{top:s.top,left:s.left,width:s.width+g,height:s.height+v});y=s.url||s.file;if(y){if(tinymce.relaxedDomain){y+=(y.indexOf("?")==-1?"?":"&")+"mce_rdomain="+tinymce.relaxedDomain}y=tinymce._addVer(y)}if(!s.type){d.add(i+"_content","iframe",{id:i+"_ifr",src:'javascript:""',frameBorder:0,style:"border:0;width:10px;height:10px"});d.setStyles(i+"_ifr",{width:s.width,height:s.height});d.setAttrib(i+"_ifr","src",y)}else{d.add(i+"_wrapper","a",{id:i+"_ok","class":"mceButton mceOk",href:"javascript:;",onmousedown:"return false;"},"Ok");if(s.type=="confirm"){d.add(i+"_wrapper","a",{"class":"mceButton mceCancel",href:"javascript:;",onmousedown:"return false;"},"Cancel")}d.add(i+"_middle","div",{"class":"mceIcon"});d.setHTML(i+"_content",s.content.replace("\n","<br />"));a.add(i,"keyup",function(f){var p=27;if(f.keyCode===p){s.button_func(false);return a.cancel(f)}});a.add(i,"keydown",function(f){var t,p=9;if(f.keyCode===p){t=d.select("a.mceCancel",i+"_wrapper")[0];if(t&&t!==f.target){t.focus()}else{d.get(i+"_ok").focus()}return a.cancel(f)}})}o=a.add(i,"mousedown",function(t){var u=t.target,f,p;f=z.windows[i];z.focus(i);if(u.nodeName=="A"||u.nodeName=="a"){if(u.className=="mceClose"){z.close(null,i);return a.cancel(t)}else{if(u.className=="mceMax"){f.oldPos=f.element.getXY();f.oldSize=f.element.getSize();p=d.getViewPort();p.w-=2;p.h-=2;f.element.moveTo(p.x,p.y);f.element.resizeTo(p.w,p.h);d.setStyles(i+"_ifr",{width:p.w-f.deltaWidth,height:p.h-f.deltaHeight});d.addClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMed"){f.element.moveTo(f.oldPos.x,f.oldPos.y);f.element.resizeTo(f.oldSize.w,f.oldSize.h);f.iframeElement.resizeTo(f.oldSize.w-f.deltaWidth,f.oldSize.h-f.deltaHeight);d.removeClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMove"){return z._startDrag(i,t,u.className)}else{if(d.hasClass(u,"mceResize")){return z._startDrag(i,t,u.className.substring(13))}}}}}}});q=a.add(i,"click",function(f){var p=f.target;z.focus(i);if(p.nodeName=="A"||p.nodeName=="a"){switch(p.className){case"mceClose":z.close(null,i);return a.cancel(f);case"mceButton mceOk":case"mceButton mceCancel":s.button_func(p.className=="mceButton mceOk");return a.cancel(f)}}});a.add([i+"_left",i+"_right"],"focus",function(p){var t=d.get(i+"_ifr");if(t){var f=t.contentWindow.document.body;var u=d.select(":input:enabled,*[tabindex=0]",f);if(p.target.id===(i+"_left")){u[u.length-1].focus()}else{u[0].focus()}}else{d.get(i+"_ok").focus()}});x=z.windows[i]={id:i,mousedown_func:o,click_func:q,element:new b(i,{blocker:1,container:r.getContainer()}),iframeElement:new b(i+"_ifr"),features:s,deltaWidth:g,deltaHeight:v};x.iframeElement.on("focus",function(){z.focus(i)});if(z.count==0&&z.editor.getParam("dialog_type","modal")=="modal"){d.add(d.doc.body,"div",{id:"mceModalBlocker","class":(z.editor.settings.inlinepopups_skin||"clearlooks2")+"_modalBlocker",style:{zIndex:z.zIndex-1}});d.show("mceModalBlocker");d.setAttrib(d.doc.body,"aria-hidden","true")}else{d.setStyle("mceModalBlocker","z-index",z.zIndex-1)}if(tinymce.isIE6||/Firefox\/2\./.test(navigator.userAgent)||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceModalBlocker",{position:"absolute",left:h.x,top:h.y,width:h.w-2,height:h.h-2})}d.setAttrib(i,"aria-hidden","false");z.focus(i);z._fixIELayout(i,1);if(d.get(i+"_ok")){d.get(i+"_ok").focus()}z.count++;return x},focus:function(h){var g=this,f;if(f=g.windows[h]){f.zIndex=this.zIndex++;f.element.setStyle("zIndex",f.zIndex);f.element.update();h=h+"_wrapper";d.removeClass(g.lastId,"mceFocus");d.addClass(h,"mceFocus");g.lastId=h;if(f.focussedElement){f.focussedElement.focus()}else{if(d.get(h+"_ok")){d.get(f.id+"_ok").focus()}else{if(d.get(f.id+"_ifr")){d.get(f.id+"_ifr").focus()}}}}},_addAll:function(k,h){var g,l,f=this,j=tinymce.DOM;if(c(h,"string")){k.appendChild(j.doc.createTextNode(h))}else{if(h.length){k=k.appendChild(j.create(h[0],h[1]));for(g=2;g<h.length;g++){f._addAll(k,h[g])}}}},_startDrag:function(v,G,E){var o=this,u,z,C=d.doc,f,l=o.windows[v],h=l.element,y=h.getXY(),x,q,F,g,A,s,r,j,i,m,k,n,B;g={x:0,y:0};A=d.getViewPort();A.w-=2;A.h-=2;j=G.screenX;i=G.screenY;m=k=n=B=0;u=a.add(C,"mouseup",function(p){a.remove(C,"mouseup",u);a.remove(C,"mousemove",z);if(f){f.remove()}h.moveBy(m,k);h.resizeBy(n,B);q=h.getSize();d.setStyles(v+"_ifr",{width:q.w-l.deltaWidth,height:q.h-l.deltaHeight});o._fixIELayout(v,1);return a.cancel(p)});if(E!="Move"){D()}function D(){if(f){return}o._fixIELayout(v,0);d.add(C.body,"div",{id:"mceEventBlocker","class":"mceEventBlocker "+(o.editor.settings.inlinepopups_skin||"clearlooks2"),style:{zIndex:o.zIndex+1}});if(tinymce.isIE6||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceEventBlocker",{position:"absolute",left:A.x,top:A.y,width:A.w-2,height:A.h-2})}f=new b("mceEventBlocker");f.update();x=h.getXY();q=h.getSize();s=g.x+x.x-A.x;r=g.y+x.y-A.y;d.add(f.get(),"div",{id:"mcePlaceHolder","class":"mcePlaceHolder",style:{left:s,top:r,width:q.w,height:q.h}});F=new b("mcePlaceHolder")}z=a.add(C,"mousemove",function(w){var p,H,t;D();p=w.screenX-j;H=w.screenY-i;switch(E){case"ResizeW":m=p;n=0-p;break;case"ResizeE":n=p;break;case"ResizeN":case"ResizeNW":case"ResizeNE":if(E=="ResizeNW"){m=p;n=0-p}else{if(E=="ResizeNE"){n=p}}k=H;B=0-H;break;case"ResizeS":case"ResizeSW":case"ResizeSE":if(E=="ResizeSW"){m=p;n=0-p}else{if(E=="ResizeSE"){n=p}}B=H;break;case"mceMove":m=p;k=H;break}if(n<(t=l.features.min_width-q.w)){if(m!==0){m+=n-t}n=t}if(B<(t=l.features.min_height-q.h)){if(k!==0){k+=B-t}B=t}n=Math.min(n,l.features.max_width-q.w);B=Math.min(B,l.features.max_height-q.h);m=Math.max(m,A.x-(s+A.x));k=Math.max(k,A.y-(r+A.y));m=Math.min(m,(A.w+A.x)-(s+q.w+A.x));k=Math.min(k,(A.h+A.y)-(r+q.h+A.y));if(m+k!==0){if(s+m<0){m=0}if(r+k<0){k=0}F.moveTo(s+m,r+k)}if(n+B!==0){F.resizeTo(q.w+n,q.h+B)}return a.cancel(w)});return a.cancel(G)},resizeBy:function(g,h,i){var f=this.windows[i];if(f){f.element.resizeBy(g,h);f.iframeElement.resizeBy(g,h)}},close:function(i,k){var g=this,f,j=d.doc,h,k;k=g._findId(k||i);if(!g.windows[k]){g.parent(i);return}g.count--;if(g.count==0){d.remove("mceModalBlocker");d.setAttrib(d.doc.body,"aria-hidden","false");g.editor.focus()}if(f=g.windows[k]){g.onClose.dispatch(g);a.remove(j,"mousedown",f.mousedownFunc);a.remove(j,"click",f.clickFunc);a.clear(k);a.clear(k+"_ifr");d.setAttrib(k+"_ifr","src",'javascript:""');f.element.remove();delete g.windows[k];h=g._frontWindow();if(h){g.focus(h.id)}}},_frontWindow:function(){var g,f=0;e(this.windows,function(h){if(h.zIndex>f){g=h;f=h.zIndex}});return g},setTitle:function(f,g){var h;f=this._findId(f);if(h=d.get(f+"_title")){h.innerHTML=d.encode(g)}},alert:function(g,f,j){var i=this,h;h=i.open({title:i,type:"alert",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},confirm:function(g,f,j){var i=this,h;h=i.open({title:i,type:"confirm",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},_findId:function(f){var g=this;if(typeof(f)=="string"){return f}e(g.windows,function(h){var i=d.get(h.id+"_ifr");if(i&&f==i.contentWindow){f=h.id;return false}});return f},_fixIELayout:function(i,h){var f,g;if(!tinymce.isIE6){return}e(["n","s","w","e","nw","ne","sw","se"],function(j){var k=d.get(i+"_resize_"+j);d.setStyles(k,{width:h?k.clientWidth:"",height:h?k.clientHeight:"",cursor:d.getStyle(k,"cursor",1)});d.setStyle(i+"_bottom","bottom","-1px");k=0});if(f=this.windows[i]){f.element.hide();f.element.show();e(d.select("div,a",i),function(k,j){if(k.currentStyle.backgroundImage!="none"){g=new Image();g.src=k.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/,"$1")}});d.get(i).style.filter=""}}});tinymce.PluginManager.add("inlinepopups",tinymce.plugins.InlinePopups)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
index e991683de..67123ca31 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
@@ -42,7 +42,7 @@
 		},

 

 		open : function(f, p) {

-			var t = this, id, opt = '', ed = t.editor, dw = 0, dh = 0, vp, po, mdf, clf, we, w, u;

+			var t = this, id, opt = '', ed = t.editor, dw = 0, dh = 0, vp, po, mdf, clf, we, w, u, parentWindow;

 

 			f = f || {};

 			p = p || {};

@@ -51,6 +51,11 @@
 			if (!f.inline)

 				return t.parent(f, p);

 

+			parentWindow = t._frontWindow();

+			if (parentWindow && DOM.get(parentWindow.id + '_ifr')) {

+				parentWindow.focussedElement = DOM.get(parentWindow.id + '_ifr').contentWindow.document.activeElement;

+			}

+			

 			// Only store selection if the type is a normal window

 			if (!f.type)

 				t.bookmark = ed.selection.getBookmark(1);

@@ -107,7 +112,7 @@
 

 			// Create DOM objects

 			t._addAll(DOM.doc.body, 

-				['div', {id : id, 'class' : ed.settings.inlinepopups_skin || 'clearlooks2', style : 'width:100px;height:100px'}, 

+				['div', {id : id, role : 'dialog', 'aria-labelledby': f.type ? id + '_content' : id + '_title', 'class' : (ed.settings.inlinepopups_skin || 'clearlooks2') + (tinymce.isIE && window.getSelection ? ' ie9' : ''), style : 'width:100px;height:100px'}, 

 					['div', {id : id + '_wrapper', 'class' : 'mceWrapper' + opt},

 						['div', {id : id + '_top', 'class' : 'mceTop'}, 

 							['div', {'class' : 'mceLeft'}],

@@ -117,9 +122,9 @@
 						],

 

 						['div', {id : id + '_middle', 'class' : 'mceMiddle'}, 

-							['div', {id : id + '_left', 'class' : 'mceLeft'}],

+							['div', {id : id + '_left', 'class' : 'mceLeft', tabindex : '0'}],

 							['span', {id : id + '_content'}],

-							['div', {id : id + '_right', 'class' : 'mceRight'}]

+							['div', {id : id + '_right', 'class' : 'mceRight', tabindex : '0'}]

 						],

 

 						['div', {id : id + '_bottom', 'class' : 'mceBottom'},

@@ -183,6 +188,27 @@
 

 				DOM.add(id + '_middle', 'div', {'class' : 'mceIcon'});

 				DOM.setHTML(id + '_content', f.content.replace('\n', '<br />'));

+				

+				Event.add(id, 'keyup', function(evt) {

+					var VK_ESCAPE = 27;

+					if (evt.keyCode === VK_ESCAPE) {

+						f.button_func(false);

+						return Event.cancel(evt);

+					}

+				});

+

+				Event.add(id, 'keydown', function(evt) {

+					var cancelButton, VK_TAB = 9;

+					if (evt.keyCode === VK_TAB) {

+						cancelButton = DOM.select('a.mceCancel', id + '_wrapper')[0];

+						if (cancelButton && cancelButton !== evt.target) {

+							cancelButton.focus();

+						} else {

+							DOM.get(id + '_ok').focus();

+						}

+						return Event.cancel(evt);

+					}

+				});

 			}

 

 			// Register events

@@ -193,7 +219,10 @@
 				t.focus(id);

 

 				if (n.nodeName == 'A' || n.nodeName == 'a') {

-					if (n.className == 'mceMax') {

+					if (n.className == 'mceClose') {

+						t.close(null, id);

+						return Event.cancel(e);

+					} else if (n.className == 'mceMax') {

 						w.oldPos = w.element.getXY();

 						w.oldSize = w.element.getSize();

 

@@ -239,7 +268,23 @@
 					}

 				}

 			});

-

+			

+			// Make sure the tab order loops within the dialog.

+			Event.add([id + '_left', id + '_right'], 'focus', function(evt) {

+				var iframe = DOM.get(id + '_ifr');

+				if (iframe) {

+					var body = iframe.contentWindow.document.body;

+					var focusable = DOM.select(':input:enabled,*[tabindex=0]', body);

+					if (evt.target.id === (id + '_left')) {

+						focusable[focusable.length - 1].focus();

+					} else {

+						focusable[0].focus();

+					}

+				} else {

+					DOM.get(id + '_ok').focus();

+				}

+			});

+			

 			// Add window

 			w = t.windows[id] = {

 				id : id,

@@ -265,19 +310,20 @@
 				});

 

 				DOM.show('mceModalBlocker'); // Reduces flicker in IE

+				DOM.setAttrib(DOM.doc.body, 'aria-hidden', 'true');

 			} else

 				DOM.setStyle('mceModalBlocker', 'z-index', t.zIndex - 1);

 

 			if (tinymce.isIE6 || /Firefox\/2\./.test(navigator.userAgent) || (tinymce.isIE && !DOM.boxModel))

 				DOM.setStyles('mceModalBlocker', {position : 'absolute', left : vp.x, top : vp.y, width : vp.w - 2, height : vp.h - 2});

 

+			DOM.setAttrib(id, 'aria-hidden', 'false');

 			t.focus(id);

 			t._fixIELayout(id, 1);

 

 			// Focus ok button

 			if (DOM.get(id + '_ok'))

 				DOM.get(id + '_ok').focus();

-

 			t.count++;

 

 			return w;

@@ -295,6 +341,14 @@
 				DOM.removeClass(t.lastId, 'mceFocus');

 				DOM.addClass(id, 'mceFocus');

 				t.lastId = id;

+				

+				if (w.focussedElement) {

+					w.focussedElement.focus();

+				} else if (DOM.get(id + '_ok')) {

+					DOM.get(w.id + '_ok').focus();

+				} else if (DOM.get(w.id + '_ifr')) {

+					DOM.get(w.id + '_ifr').focus();

+				}

 			}

 		},

 

@@ -478,7 +532,7 @@
 		},

 

 		close : function(win, id) {

-			var t = this, w, d = DOM.doc, ix = 0, fw, id;

+			var t = this, w, d = DOM.doc, fw, id;

 

 			id = t._findId(id || win);

 

@@ -490,8 +544,11 @@
 

 			t.count--;

 

-			if (t.count == 0)

+			if (t.count == 0) {

 				DOM.remove('mceModalBlocker');

+				DOM.setAttrib(DOM.doc.body, 'aria-hidden', 'false');

+				t.editor.focus();

+			}

 

 			if (w = t.windows[id]) {

 				t.onClose.dispatch(t);

@@ -504,18 +561,25 @@
 				w.element.remove();

 				delete t.windows[id];

 

-				// Find front most window and focus that

-				each (t.windows, function(w) {

-					if (w.zIndex > ix) {

-						fw = w;

-						ix = w.zIndex;

-					}

-				});

+				fw = t._frontWindow();

 

 				if (fw)

 					t.focus(fw.id);

 			}

 		},

+		

+		// Find front most window

+		_frontWindow : function() {

+			var fw, ix = 0;

+			// Find front most window and focus that

+			each (this.windows, function(w) {

+				if (w.zIndex > ix) {

+					fw = w;

+					ix = w.zIndex;

+				}

+			});

+			return fw;

+		},

 

 		setTitle : function(w, ti) {

 			var e;

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
index 94abd0876..219139857 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
index e671094cb..f957e49a3 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
index 6baf64ad3..6baf64ad3 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
index 497307a85..20acbbf7a 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
index c894b2e83..d5de1cc23 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
index c2a2ad454..c2a2ad454 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
index 43a735f22..0b4cc3682 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css
index 5e6fd7d3c..a50d4fc57 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css
+++ b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css
@@ -87,4 +87,4 @@
 .clearlooks2 .mceAlert .mceIcon {background:url(img/alert.gif)}
 .clearlooks2 .mceConfirm .mceOk {left:50%; top:auto; margin-left: -90px}
 .clearlooks2 .mceConfirm .mceCancel {left:50%; top:auto}
-.clearlooks2 .mceConfirm .mceIcon {background:url(img/confirm.gif)} 
\ No newline at end of file
+.clearlooks2 .mceConfirm .mceIcon {background:url(img/confirm.gif)}
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/template.htm b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/template.htm
index f9ec64219..f9ec64219 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/template.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/template.htm
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin.js
index 938ce6b17..938ce6b17 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
index 181c791ec..181c791ec 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js
index f88a6dd28..ca3857a74 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.Layer",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceInsertLayer",c._insertLayer,c);a.addCommand("mceMoveForward",function(){c._move(1)});a.addCommand("mceMoveBackward",function(){c._move(-1)});a.addCommand("mceMakeAbsolute",function(){c._toggleAbsolute()});a.addButton("moveforward",{title:"layer.forward_desc",cmd:"mceMoveForward"});a.addButton("movebackward",{title:"layer.backward_desc",cmd:"mceMoveBackward"});a.addButton("absolute",{title:"layer.absolute_desc",cmd:"mceMakeAbsolute"});a.addButton("insertlayer",{title:"layer.insertlayer_desc",cmd:"mceInsertLayer"});a.onInit.add(function(){if(tinymce.isIE){a.getDoc().execCommand("2D-Position",false,true)}});a.onNodeChange.add(c._nodeChange,c);a.onVisualAid.add(c._visualAid,c)},getInfo:function(){return{longname:"Layer",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,e){var c,d;c=this._getParentLayer(e);d=b.dom.getParent(e,"DIV,P,IMG");if(!d){a.setDisabled("absolute",1);a.setDisabled("moveforward",1);a.setDisabled("movebackward",1)}else{a.setDisabled("absolute",0);a.setDisabled("moveforward",!c);a.setDisabled("movebackward",!c);a.setActive("absolute",c&&c.style.position.toLowerCase()=="absolute")}},_visualAid:function(a,c,b){var d=a.dom;tinymce.each(d.select("div,p",c),function(f){if(/^(absolute|relative|static)$/i.test(f.style.position)){if(b){d.addClass(f,"mceItemVisualAid")}else{d.removeClass(f,"mceItemVisualAid")}}})},_move:function(h){var b=this.editor,f,g=[],e=this._getParentLayer(b.selection.getNode()),c=-1,j=-1,a;a=[];tinymce.walk(b.getBody(),function(d){if(d.nodeType==1&&/^(absolute|relative|static)$/i.test(d.style.position)){a.push(d)}},"childNodes");for(f=0;f<a.length;f++){g[f]=a[f].style.zIndex?parseInt(a[f].style.zIndex):0;if(c<0&&a[f]==e){c=f}}if(h<0){for(f=0;f<g.length;f++){if(g[f]<g[c]){j=f;break}}if(j>-1){a[c].style.zIndex=g[j];a[j].style.zIndex=g[c]}else{if(g[c]>0){a[c].style.zIndex=g[c]-1}}}else{for(f=0;f<g.length;f++){if(g[f]>g[c]){j=f;break}}if(j>-1){a[c].style.zIndex=g[j];a[j].style.zIndex=g[c]}else{a[c].style.zIndex=g[c]+1}}b.execCommand("mceRepaint")},_getParentLayer:function(a){return this.editor.dom.getParent(a,function(b){return b.nodeType==1&&/^(absolute|relative|static)$/i.test(b.style.position)})},_insertLayer:function(){var a=this.editor,b=a.dom.getPos(a.dom.getParent(a.selection.getNode(),"*"));a.dom.add(a.getBody(),"div",{style:{position:"absolute",left:b.x,top:(b.y>20?b.y:20),width:100,height:100},"class":"mceItemVisualAid"},a.selection.getContent()||a.getLang("layer.content"))},_toggleAbsolute:function(){var a=this.editor,b=this._getParentLayer(a.selection.getNode());if(!b){b=a.dom.getParent(a.selection.getNode(),"DIV,P,IMG")}if(b){if(b.style.position.toLowerCase()=="absolute"){a.dom.setStyles(b,{position:"",left:"",top:"",width:"",height:""});a.dom.removeClass(b,"mceItemVisualAid")}else{if(b.style.left==""){b.style.left=20+"px"}if(b.style.top==""){b.style.top=20+"px"}if(b.style.width==""){b.style.width=b.width?(b.width+"px"):"100px"}if(b.style.height==""){b.style.height=b.height?(b.height+"px"):"100px"}b.style.position="absolute";a.addVisual(a.getBody())}a.execCommand("mceRepaint");a.nodeChanged()}}});tinymce.PluginManager.add("layer",tinymce.plugins.Layer)})();
\ No newline at end of file
+(function(){function a(b){do{if(b.className&&b.className.indexOf("mceItemLayer")!=-1){return b}}while(b=b.parentNode)}tinymce.create("tinymce.plugins.Layer",{init:function(b,c){var d=this;d.editor=b;b.addCommand("mceInsertLayer",d._insertLayer,d);b.addCommand("mceMoveForward",function(){d._move(1)});b.addCommand("mceMoveBackward",function(){d._move(-1)});b.addCommand("mceMakeAbsolute",function(){d._toggleAbsolute()});b.addButton("moveforward",{title:"layer.forward_desc",cmd:"mceMoveForward"});b.addButton("movebackward",{title:"layer.backward_desc",cmd:"mceMoveBackward"});b.addButton("absolute",{title:"layer.absolute_desc",cmd:"mceMakeAbsolute"});b.addButton("insertlayer",{title:"layer.insertlayer_desc",cmd:"mceInsertLayer"});b.onInit.add(function(){var e=b.dom;if(tinymce.isIE){b.getDoc().execCommand("2D-Position",false,true)}});b.onMouseUp.add(function(f,h){var g=a(h.target);if(g){f.dom.setAttrib(g,"data-mce-style","")}});b.onMouseDown.add(function(f,j){var h=j.target,i=f.getDoc(),g;if(tinymce.isGecko){if(a(h)){if(i.designMode!=="on"){i.designMode="on";h=i.body;g=h.parentNode;g.removeChild(h);g.appendChild(h)}}else{if(i.designMode=="on"){i.designMode="off"}}}});b.onNodeChange.add(d._nodeChange,d);b.onVisualAid.add(d._visualAid,d)},getInfo:function(){return{longname:"Layer",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(c,b,f){var d,e;d=this._getParentLayer(f);e=c.dom.getParent(f,"DIV,P,IMG");if(!e){b.setDisabled("absolute",1);b.setDisabled("moveforward",1);b.setDisabled("movebackward",1)}else{b.setDisabled("absolute",0);b.setDisabled("moveforward",!d);b.setDisabled("movebackward",!d);b.setActive("absolute",d&&d.style.position.toLowerCase()=="absolute")}},_visualAid:function(b,d,c){var f=b.dom;tinymce.each(f.select("div,p",d),function(g){if(/^(absolute|relative|fixed)$/i.test(g.style.position)){if(c){f.addClass(g,"mceItemVisualAid")}else{f.removeClass(g,"mceItemVisualAid")}f.addClass(g,"mceItemLayer")}})},_move:function(j){var c=this.editor,g,h=[],f=this._getParentLayer(c.selection.getNode()),e=-1,k=-1,b;b=[];tinymce.walk(c.getBody(),function(d){if(d.nodeType==1&&/^(absolute|relative|static)$/i.test(d.style.position)){b.push(d)}},"childNodes");for(g=0;g<b.length;g++){h[g]=b[g].style.zIndex?parseInt(b[g].style.zIndex):0;if(e<0&&b[g]==f){e=g}}if(j<0){for(g=0;g<h.length;g++){if(h[g]<h[e]){k=g;break}}if(k>-1){b[e].style.zIndex=h[k];b[k].style.zIndex=h[e]}else{if(h[e]>0){b[e].style.zIndex=h[e]-1}}}else{for(g=0;g<h.length;g++){if(h[g]>h[e]){k=g;break}}if(k>-1){b[e].style.zIndex=h[k];b[k].style.zIndex=h[e]}else{b[e].style.zIndex=h[e]+1}}c.execCommand("mceRepaint")},_getParentLayer:function(b){return this.editor.dom.getParent(b,function(c){return c.nodeType==1&&/^(absolute|relative|static)$/i.test(c.style.position)})},_insertLayer:function(){var c=this.editor,e=c.dom,d=e.getPos(e.getParent(c.selection.getNode(),"*")),b=c.getBody();c.dom.add(b,"div",{style:{position:"absolute",left:d.x,top:(d.y>20?d.y:20),width:100,height:100},"class":"mceItemVisualAid mceItemLayer"},c.selection.getContent()||c.getLang("layer.content"));if(tinymce.isIE){e.setHTML(b,b.innerHTML)}},_toggleAbsolute:function(){var b=this.editor,c=this._getParentLayer(b.selection.getNode());if(!c){c=b.dom.getParent(b.selection.getNode(),"DIV,P,IMG")}if(c){if(c.style.position.toLowerCase()=="absolute"){b.dom.setStyles(c,{position:"",left:"",top:"",width:"",height:""});b.dom.removeClass(c,"mceItemVisualAid");b.dom.removeClass(c,"mceItemLayer")}else{if(c.style.left==""){c.style.left=20+"px"}if(c.style.top==""){c.style.top=20+"px"}if(c.style.width==""){c.style.width=c.width?(c.width+"px"):"100px"}if(c.style.height==""){c.style.height=c.height?(c.height+"px"):"100px"}c.style.position="absolute";b.dom.setAttrib(c,"data-mce-style","");b.addVisual(b.getBody())}b.execCommand("mceRepaint");b.nodeChanged()}}});tinymce.PluginManager.add("layer",tinymce.plugins.Layer)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
index d5aa86548..daed2806c 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
@@ -9,6 +9,14 @@
  */

 

 (function() {

+	function findParentLayer(node) {

+		do {

+			if (node.className && node.className.indexOf('mceItemLayer') != -1) {

+				return node;

+			}

+		} while (node = node.parentNode);

+	};

+

 	tinymce.create('tinymce.plugins.Layer', {

 		init : function(ed, url) {

 			var t = this;

@@ -37,10 +45,43 @@
 			ed.addButton('insertlayer', {title : 'layer.insertlayer_desc', cmd : 'mceInsertLayer'});

 

 			ed.onInit.add(function() {

+				var dom = ed.dom;

+

 				if (tinymce.isIE)

 					ed.getDoc().execCommand('2D-Position', false, true);

 			});

 

+			// Remove serialized styles when selecting a layer since it might be changed by a drag operation

+			ed.onMouseUp.add(function(ed, e) {

+				var layer = findParentLayer(e.target);

+	

+				if (layer) {

+					ed.dom.setAttrib(layer, 'data-mce-style', '');

+				}

+			});

+

+			// Fixes edit focus issues with layers on Gecko

+			// This will enable designMode while inside a layer and disable it when outside

+			ed.onMouseDown.add(function(ed, e) {

+				var node = e.target, doc = ed.getDoc(), parent;

+

+				if (tinymce.isGecko) {

+					if (findParentLayer(node)) {

+						if (doc.designMode !== 'on') {

+							doc.designMode = 'on';

+

+							// Repaint caret

+							node = doc.body;

+							parent = node.parentNode;

+							parent.removeChild(node);

+							parent.appendChild(node);

+						}

+					} else if (doc.designMode == 'on') {

+						doc.designMode = 'off';

+					}

+				}

+			});

+

 			ed.onNodeChange.add(t._nodeChange, t);

 			ed.onVisualAid.add(t._visualAid, t);

 		},

@@ -81,11 +122,13 @@
 			var dom = ed.dom;

 

 			tinymce.each(dom.select('div,p', e), function(e) {

-				if (/^(absolute|relative|static)$/i.test(e.style.position)) {

+				if (/^(absolute|relative|fixed)$/i.test(e.style.position)) {

 					if (s)

 						dom.addClass(e, 'mceItemVisualAid');

 					else

-						dom.removeClass(e, 'mceItemVisualAid');	

+						dom.removeClass(e, 'mceItemVisualAid');

+

+					dom.addClass(e, 'mceItemLayer');

 				}

 			});

 		},

@@ -153,9 +196,9 @@
 		},

 

 		_insertLayer : function() {

-			var ed = this.editor, p = ed.dom.getPos(ed.dom.getParent(ed.selection.getNode(), '*'));

+			var ed = this.editor, dom = ed.dom, p = dom.getPos(dom.getParent(ed.selection.getNode(), '*')), body = ed.getBody();

 

-			ed.dom.add(ed.getBody(), 'div', {

+			ed.dom.add(body, 'div', {

 				style : {

 					position : 'absolute',

 					left : p.x,

@@ -163,8 +206,12 @@
 					width : 100,

 					height : 100

 				},

-				'class' : 'mceItemVisualAid'

+				'class' : 'mceItemVisualAid mceItemLayer'

 			}, ed.selection.getContent() || ed.getLang('layer.content'));

+

+			// Workaround for IE where it messes up the JS engine if you insert a layer on IE 6,7

+			if (tinymce.isIE)

+				dom.setHTML(body, body.innerHTML);

 		},

 

 		_toggleAbsolute : function() {

@@ -184,6 +231,7 @@
 					});

 

 					ed.dom.removeClass(le, 'mceItemVisualAid');

+					ed.dom.removeClass(le, 'mceItemLayer');

 				} else {

 					if (le.style.left == "")

 						le.style.left = 20 + 'px';

@@ -198,6 +246,8 @@
 						le.style.height = le.height ? (le.height + 'px') : '100px';

 

 					le.style.position = "absolute";

+

+					ed.dom.setAttrib(le, 'data-mce-style', '');

 					ed.addVisual(ed.getBody());

 				}

 

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js
index 29d43c524..b3a4ce31c 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js
@@ -1 +1 @@
-(function(a){a.onAddEditor.addToTop(function(c,b){b.settings.inline_styles=false});a.create("tinymce.plugins.LegacyOutput",{init:function(b){b.onInit.add(function(){var c="p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img",e=a.explode(b.settings.font_size_style_values),d=b.serializer;b.formatter.register({alignleft:{selector:c,attributes:{align:"left"}},aligncenter:{selector:c,attributes:{align:"center"}},alignright:{selector:c,attributes:{align:"right"}},alignfull:{selector:c,attributes:{align:"full"}},bold:{inline:"b"},italic:{inline:"i"},underline:{inline:"u"},strikethrough:{inline:"strike"},fontname:{inline:"font",attributes:{face:"%value"}},fontsize:{inline:"font",attributes:{size:function(f){return a.inArray(e,f.value)+1}}},forecolor:{inline:"font",styles:{color:"%value"}},hilitecolor:{inline:"font",styles:{backgroundColor:"%value"}}});d._setup();a.each("b,i,u,strike".split(","),function(f){var g=d.rules[f];if(!g){d.addRules(f)}});if(!d.rules.font){d.addRules("font[face|size|color|style]")}a.each(c.split(","),function(f){var h=d.rules[f],g;if(h){a.each(h.attribs,function(j,i){if(i.name=="align"){g=true;return false}});if(!g){h.attribs.push({name:"align"})}}});b.onNodeChange.add(function(g,k){var j,f,h,i;f=g.dom.getParent(g.selection.getNode(),"font");if(f){h=f.face;i=f.size}if(j=k.get("fontselect")){j.select(function(l){return l==h})}if(j=k.get("fontsizeselect")){j.select(function(m){var l=a.inArray(e,m.fontSize);return l+1==i})}})})},getInfo:function(){return{longname:"LegacyOutput",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/legacyoutput",version:a.majorVersion+"."+a.minorVersion}}});a.PluginManager.add("legacyoutput",a.plugins.LegacyOutput)})(tinymce);
\ No newline at end of file
+(function(a){a.onAddEditor.addToTop(function(c,b){b.settings.inline_styles=false});a.create("tinymce.plugins.LegacyOutput",{init:function(b){b.onInit.add(function(){var c="p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img",e=a.explode(b.settings.font_size_style_values),d=b.schema;b.formatter.register({alignleft:{selector:c,attributes:{align:"left"}},aligncenter:{selector:c,attributes:{align:"center"}},alignright:{selector:c,attributes:{align:"right"}},alignfull:{selector:c,attributes:{align:"justify"}},bold:[{inline:"b",remove:"all"},{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}}],italic:[{inline:"i",remove:"all"},{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}}],underline:[{inline:"u",remove:"all"},{inline:"span",styles:{textDecoration:"underline"},exact:true}],strikethrough:[{inline:"strike",remove:"all"},{inline:"span",styles:{textDecoration:"line-through"},exact:true}],fontname:{inline:"font",attributes:{face:"%value"}},fontsize:{inline:"font",attributes:{size:function(f){return a.inArray(e,f.value)+1}}},forecolor:{inline:"font",styles:{color:"%value"}},hilitecolor:{inline:"font",styles:{backgroundColor:"%value"}}});a.each("b,i,u,strike".split(","),function(f){d.addValidElements(f+"[*]")});if(!d.getElementRule("font")){d.addValidElements("font[face|size|color|style]")}a.each(c.split(","),function(f){var h=d.getElementRule(f),g;if(h){if(!h.attributes.align){h.attributes.align={};h.attributesOrder.push("align")}}});b.onNodeChange.add(function(g,k){var j,f,h,i;f=g.dom.getParent(g.selection.getNode(),"font");if(f){h=f.face;i=f.size}if(j=k.get("fontselect")){j.select(function(l){return l==h})}if(j=k.get("fontsizeselect")){j.select(function(m){var l=a.inArray(e,m.fontSize);return l+1==i})}})})},getInfo:function(){return{longname:"LegacyOutput",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/legacyoutput",version:a.majorVersion+"."+a.minorVersion}}});a.PluginManager.add("legacyoutput",a.plugins.LegacyOutput)})(tinymce);
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
index e852da15e..e627ec76e 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
@@ -26,7 +26,7 @@
 			editor.onInit.add(function() {

 				var alignElements = 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img',

 					fontSizes = tinymce.explode(editor.settings.font_size_style_values),

-					serializer = editor.serializer;

+					schema = editor.schema;

 

 				// Override some internal formats to produce legacy elements and attributes

 				editor.formatter.register({

@@ -34,13 +34,27 @@
 					alignleft : {selector : alignElements, attributes : {align : 'left'}},

 					aligncenter : {selector : alignElements, attributes : {align : 'center'}},

 					alignright : {selector : alignElements, attributes : {align : 'right'}},

-					alignfull : {selector : alignElements, attributes : {align : 'full'}},

-

-					// Change the basic formatting elements to use deprecated element types

-					bold : {inline : 'b'},

-					italic : {inline : 'i'},

-					underline : {inline : 'u'},

-					strikethrough : {inline : 'strike'},

+					alignfull : {selector : alignElements, attributes : {align : 'justify'}},

+

+					// Change the basic formatting elements to use deprecated element types
+					bold : [

+						{inline : 'b', remove : 'all'},

+						{inline : 'strong', remove : 'all'},

+						{inline : 'span', styles : {fontWeight : 'bold'}}

+					],

+					italic : [

+						{inline : 'i', remove : 'all'},

+						{inline : 'em', remove : 'all'},

+						{inline : 'span', styles : {fontStyle : 'italic'}}

+					],

+					underline : [

+						{inline : 'u', remove : 'all'},

+						{inline : 'span', styles : {textDecoration : 'underline'}, exact : true}

+					],

+					strikethrough : [

+						{inline : 'strike', remove : 'all'},

+						{inline : 'span', styles : {textDecoration: 'line-through'}, exact : true}

+					],
 

 					// Change font size and font family to use the deprecated font element

 					fontname : {inline : 'font', attributes : {face : '%value'}},

@@ -58,35 +72,24 @@
 					hilitecolor : {inline : 'font', styles : {backgroundColor : '%value'}}

 				});

 

-				// Force parsing of the serializer rules

-				serializer._setup();

-

 				// Check that deprecated elements are allowed if not add them

 				tinymce.each('b,i,u,strike'.split(','), function(name) {

-					var rule = serializer.rules[name];

-

-					if (!rule)

-						serializer.addRules(name);

+					schema.addValidElements(name + '[*]');

 				});

 

 				// Add font element if it's missing

-				if (!serializer.rules["font"])

-					serializer.addRules("font[face|size|color|style]");

+				if (!schema.getElementRule("font"))

+					schema.addValidElements("font[face|size|color|style]");

 

 				// Add the missing and depreacted align attribute for the serialization engine

 				tinymce.each(alignElements.split(','), function(name) {

-					var rule = serializer.rules[name], found;

+					var rule = schema.getElementRule(name), found;

 

 					if (rule) {

-						tinymce.each(rule.attribs, function(name, attr) {

-							if (attr.name == 'align') {

-								found = true;

-								return false;

-							}

-						});

-

-						if (!found)

-							rule.attribs.push({name : 'align'});

+						if (!rule.attributes.align) {

+							rule.attributes.align = {};

+							rule.attributesOrder.push('align');

+						}

 					}

 				});

 

@@ -133,4 +136,4 @@
 

 	// Register plugin

 	tinymce.PluginManager.add('legacyoutput', tinymce.plugins.LegacyOutput);

-})(tinymce);
\ No newline at end of file
+})(tinymce);

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js
new file mode 100644
index 000000000..f07e37250
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var e=tinymce.each,r=tinymce.dom.Event,g;function p(t,s){while(t&&(t.nodeType===8||(t.nodeType===3&&/^[ \t\n\r]*$/.test(t.nodeValue)))){t=s(t)}return t}function b(s){return p(s,function(t){return t.previousSibling})}function i(s){return p(s,function(t){return t.nextSibling})}function d(s,u,t){return s.dom.getParent(u,function(v){return tinymce.inArray(t,v)!==-1})}function n(s){return s&&(s.tagName==="OL"||s.tagName==="UL")}function c(u,v){var t,w,s;t=b(u.lastChild);while(n(t)){w=t;t=b(w.previousSibling)}if(w){s=v.create("li",{style:"list-style-type: none;"});v.split(u,w);v.insertAfter(s,w);s.appendChild(w);s.appendChild(w);u=s.previousSibling}return u}function m(t,s,u){t=a(t,s,u);return o(t,s,u)}function a(u,s,v){var t=b(u.previousSibling);if(t){return h(t,u,s?t:false,v)}else{return u}}function o(u,t,v){var s=i(u.nextSibling);if(s){return h(u,s,t?s:false,v)}else{return u}}function h(u,s,t,v){if(l(u,s,!!t,v)){return f(u,s,t)}else{if(u&&u.tagName==="LI"&&n(s)){u.appendChild(s)}}return s}function l(u,t,s,v){if(!u||!t){return false}else{if(u.tagName==="LI"&&t.tagName==="LI"){return t.style.listStyleType==="none"||j(t)}else{if(n(u)){return(u.tagName===t.tagName&&(s||u.style.listStyleType===t.style.listStyleType))||q(t)}else{return v&&u.tagName==="P"&&t.tagName==="P"}}}}function q(t){var s=i(t.firstChild),u=b(t.lastChild);return s&&u&&n(t)&&s===u&&(n(s)||s.style.listStyleType==="none"||j(s))}function j(u){var t=i(u.firstChild),s=b(u.lastChild);return t&&s&&t===s&&n(t)}function f(w,v,s){var u=b(w.lastChild),t=i(v.firstChild);if(w.tagName==="P"){w.appendChild(w.ownerDocument.createElement("br"))}while(v.firstChild){w.appendChild(v.firstChild)}if(s){w.style.listStyleType=s.style.listStyleType}v.parentNode.removeChild(v);h(u,t,false);return w}function k(t,u){var s;if(!u.is(t,"li,ol,ul")){s=u.getParent(t,"li");if(s){t=s}}return t}tinymce.create("tinymce.plugins.Lists",{init:function(y){var v="TABBING";var s="EMPTY";var J="ESCAPE";var z="PARAGRAPH";var N="UNKNOWN";var x=N;function E(U){return U.keyCode===tinymce.VK.TAB&&!(U.altKey||U.ctrlKey)&&(y.queryCommandState("InsertUnorderedList")||y.queryCommandState("InsertOrderedList"))}function w(){var U=B();var W=U.parentNode.parentNode;var V=U.parentNode.lastChild===U;return V&&!t(W)&&P(U)}function t(U){if(n(U)){return U.parentNode&&U.parentNode.tagName==="LI"}else{return U.tagName==="LI"}}function F(){return y.selection.isCollapsed()&&P(B())}function B(){var U=y.selection.getStart();return((U.tagName=="BR"||U.tagName=="")&&U.parentNode.tagName=="LI")?U.parentNode:U}function P(U){var V=U.childNodes.length;if(U.tagName==="LI"){return V==0?true:V==1&&(U.firstChild.tagName==""||U.firstChild.tagName=="BR"||H(U))}return false}function H(U){var V=tinymce.grep(U.parentNode.childNodes,function(Y){return Y.tagName=="LI"});var W=U==V[V.length-1];var X=U.firstChild;return tinymce.isIE9&&W&&(X.nodeValue==String.fromCharCode(160)||X.nodeValue==String.fromCharCode(32))}function T(U){return U.keyCode===tinymce.VK.ENTER}function A(U){return T(U)&&!U.shiftKey}function M(U){if(E(U)){return v}else{if(A(U)&&w()){return N}else{if(A(U)&&F()){return s}else{return N}}}}function D(U,V){if(x==v||x==s||tinymce.isGecko&&x==J){r.cancel(V)}}function C(){var U=y.selection.getRng(true);var V=U.startContainer;if(V.nodeType==3){var W=V.nodeValue;if(tinymce.isIE9&&W.length>1&&W.charCodeAt(W.length-1)==32){return(U.endOffset==W.length-1)}else{return(U.endOffset==W.length)}}else{if(V.nodeType==1){return U.endOffset==V.childNodes.length}}return false}function I(){var W=y.selection.getNode();var V="h1,h2,h3,h4,h5,h6,p,div";var U=y.dom.is(W,V)&&W.parentNode.tagName==="LI"&&W.parentNode.lastChild===W;return y.selection.isCollapsed()&&U&&C()}function K(W,Y){if(A(Y)&&I()){var X=W.selection.getNode();var V=W.dom.create("li");var U=W.dom.getParent(X,"li");W.dom.insertAfter(V,U);if(tinymce.isIE6||tinymce.isIE7||tinyMCE.isIE8){W.selection.setCursorLocation(V,1)}else{W.selection.setCursorLocation(V,0)}Y.preventDefault()}}function u(X,Z){var ac;if(!tinymce.isGecko){return}var V=X.selection.getStart();if(Z.keyCode!=tinymce.VK.BACKSPACE||V.tagName!=="IMG"){return}function W(ag){var ah=ag.firstChild;var af=null;do{if(!ah){break}if(ah.tagName==="LI"){af=ah}}while(ah=ah.nextSibling);return af}function ae(ag,af){while(ag.childNodes.length>0){af.appendChild(ag.childNodes[0])}}ac=V.parentNode.previousSibling;if(!ac){return}var aa;if(ac.tagName==="UL"||ac.tagName==="OL"){aa=ac}else{if(ac.previousSibling&&(ac.previousSibling.tagName==="UL"||ac.previousSibling.tagName==="OL")){aa=ac.previousSibling}else{return}}var ad=W(aa);var U=X.dom.createRng();U.setStart(ad,1);U.setEnd(ad,1);X.selection.setRng(U);X.selection.collapse(true);var Y=X.selection.getBookmark();var ab=V.parentNode.cloneNode(true);if(ab.tagName==="P"||ab.tagName==="DIV"){ae(ab,ad)}else{ad.appendChild(ab)}V.parentNode.parentNode.removeChild(V.parentNode);X.selection.moveToBookmark(Y)}function G(U){var V=y.dom.getParent(U,"ol,ul");if(V!=null){var W=V.lastChild;y.selection.setCursorLocation(W,0)}}this.ed=y;y.addCommand("Indent",this.indent,this);y.addCommand("Outdent",this.outdent,this);y.addCommand("InsertUnorderedList",function(){this.applyList("UL","OL")},this);y.addCommand("InsertOrderedList",function(){this.applyList("OL","UL")},this);y.onInit.add(function(){y.editorCommands.addCommands({outdent:function(){var V=y.selection,W=y.dom;function U(X){X=W.getParent(X,W.isBlock);return X&&(parseInt(y.dom.getStyle(X,"margin-left")||0,10)+parseInt(y.dom.getStyle(X,"padding-left")||0,10))>0}return U(V.getStart())||U(V.getEnd())||y.queryCommandState("InsertOrderedList")||y.queryCommandState("InsertUnorderedList")}},"state")});y.onKeyUp.add(function(V,W){if(x==v){V.execCommand(W.shiftKey?"Outdent":"Indent",true,null);x=N;return r.cancel(W)}else{if(x==s){var U=B();var Y=V.settings.list_outdent_on_enter===true||W.shiftKey;V.execCommand(Y?"Outdent":"Indent",true,null);if(tinymce.isIE){G(U)}return r.cancel(W)}else{if(x==J){if(tinymce.isIE6||tinymce.isIE7||tinymce.isIE8){var X=V.getDoc().createTextNode("\uFEFF");V.selection.getNode().appendChild(X)}else{if(tinymce.isIE9||tinymce.isGecko){V.execCommand("Outdent");return r.cancel(W)}}}}}});function L(V,U){var W=y.getDoc().createTextNode("\uFEFF");V.insertBefore(W,U);y.selection.setCursorLocation(W,0);y.execCommand("mceRepaint")}function R(V,X){if(T(X)){var U=B();if(U){var W=U.parentNode;var Y=W&&W.parentNode;if(Y&&Y.nodeName=="LI"&&Y.firstChild==W&&U==W.firstChild){L(Y,W)}}}}function S(V,X){if(T(X)){var U=B();if(V.dom.select("ul li",U).length===1){var W=U.firstChild;L(U,W)}}}function Q(V,Z){function W(ad,aa){var ac=[];var ae=new tinymce.dom.TreeWalker(aa,ad);for(var ab=ae.current();ab;ab=ae.next()){if(V.dom.is(ab,"ol,ul,li")){ac.push(ab)}}return ac}if(Z.keyCode==tinymce.VK.BACKSPACE){var U=B();if(U){var Y=V.dom.getParent(U,"ol,ul");if(Y&&Y.firstChild===U){var X=W(Y,U);V.execCommand("Outdent",false,X);V.undoManager.add();return r.cancel(Z)}}}}function O(V,X){var U=B();if(X.keyCode===tinymce.VK.BACKSPACE&&V.dom.is(U,"li")&&U.parentNode.firstChild!==U){if(V.dom.select("ul,ol",U).length===1){var Z=U.previousSibling;V.dom.remove(V.dom.select("br",U));V.dom.remove(U,true);var W=tinymce.grep(Z.childNodes,function(aa){return aa.nodeType===3});if(W.length===1){var Y=W[0];V.selection.setCursorLocation(Y,Y.length)}V.undoManager.add();return r.cancel(X)}}}y.onKeyDown.add(function(U,V){x=M(V)});y.onKeyDown.add(D);y.onKeyDown.add(u);y.onKeyDown.add(K);if(tinymce.isGecko){y.onKeyUp.add(R)}if(tinymce.isIE8){y.onKeyUp.add(S)}if(tinymce.isGecko||tinymce.isWebKit){y.onKeyDown.add(Q)}if(tinymce.isWebKit){y.onKeyDown.add(O)}},applyList:function(y,v){var C=this,z=C.ed,I=z.dom,s=[],H=false,u=false,w=false,B,G=z.selection.getSelectedBlocks();function E(t){if(t&&t.tagName==="BR"){I.remove(t)}}function F(M){var N=I.create(y),t;function L(O){if(O.style.marginLeft||O.style.paddingLeft){C.adjustPaddingFunction(false)(O)}}if(M.tagName==="LI"){}else{if(M.tagName==="P"||M.tagName==="DIV"||M.tagName==="BODY"){K(M,function(P,O){J(P,O,M.tagName==="BODY"?null:P.parentNode);t=P.parentNode;L(t);E(O)});if(t){if(t.tagName==="LI"&&(M.tagName==="P"||G.length>1)){I.split(t.parentNode.parentNode,t.parentNode)}m(t.parentNode,true)}return}else{t=I.create("li");I.insertAfter(t,M);t.appendChild(M);L(M);M=t}}I.insertAfter(N,M);N.appendChild(M);m(N,true);s.push(M)}function J(P,L,N){var t,O=P,M;while(!I.isBlock(P.parentNode)&&P.parentNode!==I.getRoot()){P=I.split(P.parentNode,P.previousSibling);P=P.nextSibling;O=P}if(N){t=N.cloneNode(true);P.parentNode.insertBefore(t,P);while(t.firstChild){I.remove(t.firstChild)}t=I.rename(t,"li")}else{t=I.create("li");P.parentNode.insertBefore(t,P)}while(O&&O!=L){M=O.nextSibling;t.appendChild(O);O=M}if(t.childNodes.length===0){t.innerHTML='<br _mce_bogus="1" />'}F(t)}function K(Q,T){var N,R,O=3,L=1,t="br,ul,ol,p,div,h1,h2,h3,h4,h5,h6,table,blockquote,address,pre,form,center,dl";function P(X,U){var V=I.createRng(),W;g.keep=true;z.selection.moveToBookmark(g);g.keep=false;W=z.selection.getRng(true);if(!U){U=X.parentNode.lastChild}V.setStartBefore(X);V.setEndAfter(U);return !(V.compareBoundaryPoints(O,W)>0||V.compareBoundaryPoints(L,W)<=0)}function S(U){if(U.nextSibling){return U.nextSibling}if(!I.isBlock(U.parentNode)&&U.parentNode!==I.getRoot()){return S(U.parentNode)}}N=Q.firstChild;var M=false;e(I.select(t,Q),function(U){if(U.hasAttribute&&U.hasAttribute("_mce_bogus")){return true}if(P(N,U)){I.addClass(U,"_mce_tagged_br");N=S(U)}});M=(N&&P(N,undefined));N=Q.firstChild;e(I.select(t,Q),function(V){var U=S(V);if(V.hasAttribute&&V.hasAttribute("_mce_bogus")){return true}if(I.hasClass(V,"_mce_tagged_br")){T(N,V,R);R=null}else{R=V}N=U});if(M){T(N,undefined,R)}}function D(t){K(t,function(M,L,N){J(M,L);E(L);E(N)})}function A(t){if(tinymce.inArray(s,t)!==-1){return}if(t.parentNode.tagName===v){I.split(t.parentNode,t);F(t);o(t.parentNode,false)}s.push(t)}function x(M){var O,N,L,t;if(tinymce.inArray(s,M)!==-1){return}M=c(M,I);while(I.is(M.parentNode,"ol,ul,li")){I.split(M.parentNode,M)}s.push(M);M=I.rename(M,"p");L=m(M,false,z.settings.force_br_newlines);if(L===M){O=M.firstChild;while(O){if(I.isBlock(O)){O=I.split(O.parentNode,O);t=true;N=O.nextSibling&&O.nextSibling.firstChild}else{N=O.nextSibling;if(t&&O.tagName==="BR"){I.remove(O)}t=false}O=N}}}e(G,function(t){t=k(t,I);if(t.tagName===v||(t.tagName==="LI"&&t.parentNode.tagName===v)){u=true}else{if(t.tagName===y||(t.tagName==="LI"&&t.parentNode.tagName===y)){H=true}else{w=true}}});if(w&&!H||u||G.length===0){B={LI:A,H1:F,H2:F,H3:F,H4:F,H5:F,H6:F,P:F,BODY:F,DIV:G.length>1?F:D,defaultAction:D,elements:this.selectedBlocks()}}else{B={defaultAction:x,elements:this.selectedBlocks()}}this.process(B)},indent:function(){var u=this.ed,w=u.dom,x=[];function s(z){var y=w.create("li",{style:"list-style-type: none;"});w.insertAfter(y,z);return y}function t(B){var y=s(B),D=w.getParent(B,"ol,ul"),C=D.tagName,E=w.getStyle(D,"list-style-type"),A={},z;if(E!==""){A.style="list-style-type: "+E+";"}z=w.create(C,A);y.appendChild(z);return z}function v(z){if(!d(u,z,x)){z=c(z,w);var y=t(z);y.appendChild(z);m(y.parentNode,false);m(y,false);x.push(z)}}this.process({LI:v,defaultAction:this.adjustPaddingFunction(true),elements:this.selectedBlocks()})},outdent:function(y,x){var w=this,u=w.ed,z=u.dom,s=[];function A(t){var C,B,D;if(!d(u,t,s)){if(z.getStyle(t,"margin-left")!==""||z.getStyle(t,"padding-left")!==""){return w.adjustPaddingFunction(false)(t)}D=z.getStyle(t,"text-align",true);if(D==="center"||D==="right"){z.setStyle(t,"text-align","left");return}t=c(t,z);C=t.parentNode;B=t.parentNode.parentNode;if(B.tagName==="P"){z.split(B,t.parentNode)}else{z.split(C,t);if(B.tagName==="LI"){z.split(B,t)}else{if(!z.is(B,"ol,ul")){z.rename(t,"p")}}}s.push(t)}}var v=x&&tinymce.is(x,"array")?x:this.selectedBlocks();this.process({LI:A,defaultAction:this.adjustPaddingFunction(false),elements:v});e(s,m)},process:function(y){var F=this,w=F.ed.selection,z=F.ed.dom,E,u;function B(t){var s=tinymce.grep(t.childNodes,function(H){return !(H.nodeName==="BR"||H.nodeName==="SPAN"&&z.getAttrib(H,"data-mce-type")=="bookmark"||H.nodeType==3&&(H.nodeValue==String.fromCharCode(160)||H.nodeValue==""))});return s.length===0}function x(s){z.removeClass(s,"_mce_act_on");if(!s||s.nodeType!==1||E.length>1&&B(s)){return}s=k(s,z);var t=y[s.tagName];if(!t){t=y.defaultAction}t(s)}function v(s){F.splitSafeEach(s.childNodes,x)}function C(s,t){return t>=0&&s.hasChildNodes()&&t<s.childNodes.length&&s.childNodes[t].tagName==="BR"}function D(){var t=w.getNode();var s=z.getParent(t,"td");return s!==null}E=y.elements;u=w.getRng(true);if(!u.collapsed){if(C(u.endContainer,u.endOffset-1)){u.setEnd(u.endContainer,u.endOffset-1);w.setRng(u)}if(C(u.startContainer,u.startOffset)){u.setStart(u.startContainer,u.startOffset+1);w.setRng(u)}}if(tinymce.isIE8){var G=F.ed.selection.getNode();if(G.tagName==="LI"&&!(G.parentNode.lastChild===G)){var A=F.ed.getDoc().createTextNode("\uFEFF");G.appendChild(A)}}g=w.getBookmark();y.OL=y.UL=v;F.splitSafeEach(E,x);w.moveToBookmark(g);g=null;if(!D()){F.ed.execCommand("mceRepaint")}},splitSafeEach:function(t,s){if(tinymce.isGecko&&(/Firefox\/[12]\.[0-9]/.test(navigator.userAgent)||/Firefox\/3\.[0-4]/.test(navigator.userAgent))){this.classBasedEach(t,s)}else{e(t,s)}},classBasedEach:function(v,u){var w=this.ed.dom,s,t;e(v,function(x){w.addClass(x,"_mce_act_on")});s=w.select("._mce_act_on");while(s.length>0){t=s.shift();w.removeClass(t,"_mce_act_on");u(t);s=w.select("._mce_act_on")}},adjustPaddingFunction:function(u){var s,v,t=this.ed;s=t.settings.indentation;v=/[a-z%]+/i.exec(s);s=parseInt(s,10);return function(w){var y,x;y=parseInt(t.dom.getStyle(w,"margin-left")||0,10)+parseInt(t.dom.getStyle(w,"padding-left")||0,10);if(u){x=y+s}else{x=y-s}t.dom.setStyle(w,"padding-left","");t.dom.setStyle(w,"margin-left",x>0?x+v:"")}},selectedBlocks:function(){var s=this.ed;var t=s.selection.getSelectedBlocks();return t.length==0?[s.dom.getRoot()]:t},getInfo:function(){return{longname:"Lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/lists",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("lists",tinymce.plugins.Lists)}());
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js
new file mode 100644
index 000000000..fa10b7483
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js
@@ -0,0 +1,951 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2011, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	var each = tinymce.each, Event = tinymce.dom.Event, bookmark;

+

+	// Skips text nodes that only contain whitespace since they aren't semantically important.

+	function skipWhitespaceNodes(e, next) {

+		while (e && (e.nodeType === 8 || (e.nodeType === 3 && /^[ \t\n\r]*$/.test(e.nodeValue)))) {

+			e = next(e);

+		}

+		return e;

+	}

+

+	function skipWhitespaceNodesBackwards(e) {

+		return skipWhitespaceNodes(e, function(e) {

+			return e.previousSibling;

+		});

+	}

+

+	function skipWhitespaceNodesForwards(e) {

+		return skipWhitespaceNodes(e, function(e) {

+			return e.nextSibling;

+		});

+	}

+

+	function hasParentInList(ed, e, list) {

+		return ed.dom.getParent(e, function(p) {

+			return tinymce.inArray(list, p) !== -1;

+		});

+	}

+

+	function isList(e) {

+		return e && (e.tagName === 'OL' || e.tagName === 'UL');

+	}

+

+	function splitNestedLists(element, dom) {

+		var tmp, nested, wrapItem;

+		tmp = skipWhitespaceNodesBackwards(element.lastChild);

+		while (isList(tmp)) {

+			nested = tmp;

+			tmp = skipWhitespaceNodesBackwards(nested.previousSibling);

+		}

+		if (nested) {

+			wrapItem = dom.create('li', { style: 'list-style-type: none;'});

+			dom.split(element, nested);

+			dom.insertAfter(wrapItem, nested);

+			wrapItem.appendChild(nested);

+			wrapItem.appendChild(nested);

+			element = wrapItem.previousSibling;

+		}

+		return element;

+	}

+

+	function attemptMergeWithAdjacent(e, allowDifferentListStyles, mergeParagraphs) {

+		e = attemptMergeWithPrevious(e, allowDifferentListStyles, mergeParagraphs);

+		return attemptMergeWithNext(e, allowDifferentListStyles, mergeParagraphs);

+	}

+

+	function attemptMergeWithPrevious(e, allowDifferentListStyles, mergeParagraphs) {

+		var prev = skipWhitespaceNodesBackwards(e.previousSibling);

+		if (prev) {

+			return attemptMerge(prev, e, allowDifferentListStyles ? prev : false, mergeParagraphs);

+		} else {

+			return e;

+		}

+	}

+

+	function attemptMergeWithNext(e, allowDifferentListStyles, mergeParagraphs) {

+		var next = skipWhitespaceNodesForwards(e.nextSibling);

+		if (next) {

+			return attemptMerge(e, next, allowDifferentListStyles ? next : false, mergeParagraphs);

+		} else {

+			return e;

+		}

+	}

+

+	function attemptMerge(e1, e2, differentStylesMasterElement, mergeParagraphs) {

+		if (canMerge(e1, e2, !!differentStylesMasterElement, mergeParagraphs)) {

+			return merge(e1, e2, differentStylesMasterElement);

+		} else if (e1 && e1.tagName === 'LI' && isList(e2)) {

+			// Fix invalidly nested lists.

+			e1.appendChild(e2);

+		}

+		return e2;

+	}

+

+	function canMerge(e1, e2, allowDifferentListStyles, mergeParagraphs) {

+		if (!e1 || !e2) {

+			return false;

+		} else if (e1.tagName === 'LI' && e2.tagName === 'LI') {

+			return e2.style.listStyleType === 'none' || containsOnlyAList(e2);

+		} else if (isList(e1)) {

+			return (e1.tagName === e2.tagName && (allowDifferentListStyles || e1.style.listStyleType === e2.style.listStyleType)) || isListForIndent(e2);

+		} else return mergeParagraphs && e1.tagName === 'P' && e2.tagName === 'P';

+	}

+

+	function isListForIndent(e) {

+		var firstLI = skipWhitespaceNodesForwards(e.firstChild), lastLI = skipWhitespaceNodesBackwards(e.lastChild);

+		return firstLI && lastLI && isList(e) && firstLI === lastLI && (isList(firstLI) || firstLI.style.listStyleType === 'none' || containsOnlyAList(firstLI));

+	}

+

+	function containsOnlyAList(e) {

+		var firstChild = skipWhitespaceNodesForwards(e.firstChild), lastChild = skipWhitespaceNodesBackwards(e.lastChild);

+		return firstChild && lastChild && firstChild === lastChild && isList(firstChild);

+	}

+

+	function merge(e1, e2, masterElement) {

+		var lastOriginal = skipWhitespaceNodesBackwards(e1.lastChild), firstNew = skipWhitespaceNodesForwards(e2.firstChild);

+		if (e1.tagName === 'P') {

+			e1.appendChild(e1.ownerDocument.createElement('br'));

+		}

+		while (e2.firstChild) {

+			e1.appendChild(e2.firstChild);

+		}

+		if (masterElement) {

+			e1.style.listStyleType = masterElement.style.listStyleType;

+		}

+		e2.parentNode.removeChild(e2);

+		attemptMerge(lastOriginal, firstNew, false);

+		return e1;

+	}

+

+	function findItemToOperateOn(e, dom) {

+		var item;

+		if (!dom.is(e, 'li,ol,ul')) {

+			item = dom.getParent(e, 'li');

+			if (item) {

+				e = item;

+			}

+		}

+		return e;

+	}

+

+	tinymce.create('tinymce.plugins.Lists', {

+		init: function(ed) {

+			var LIST_TABBING = 'TABBING';

+			var LIST_EMPTY_ITEM = 'EMPTY';

+			var LIST_ESCAPE = 'ESCAPE';

+			var LIST_PARAGRAPH = 'PARAGRAPH';

+			var LIST_UNKNOWN = 'UNKNOWN';

+			var state = LIST_UNKNOWN;

+

+			function isTabInList(e) {

+				// Don't indent on Ctrl+Tab or Alt+Tab

+				return e.keyCode === tinymce.VK.TAB && !(e.altKey || e.ctrlKey) &&

+					(ed.queryCommandState('InsertUnorderedList') || ed.queryCommandState('InsertOrderedList'));

+			}

+

+			function isOnLastListItem() {

+				var li = getLi();

+				var grandParent = li.parentNode.parentNode;

+				var isLastItem = li.parentNode.lastChild === li;

+				return isLastItem && !isNestedList(grandParent) && isEmptyListItem(li);

+			}

+

+			function isNestedList(grandParent) {

+				if (isList(grandParent)) {

+					return grandParent.parentNode && grandParent.parentNode.tagName === 'LI';

+				} else {

+					return  grandParent.tagName === 'LI';

+				}

+			}

+

+			function isInEmptyListItem() {

+				return ed.selection.isCollapsed() && isEmptyListItem(getLi());

+			}

+

+			function getLi() {

+				var n = ed.selection.getStart();

+				// Get start will return BR if the LI only contains a BR or an empty element as we use these to fix caret position

+				return ((n.tagName == 'BR' || n.tagName == '') && n.parentNode.tagName == 'LI') ? n.parentNode : n;

+			}

+

+			function isEmptyListItem(li) {

+				var numChildren = li.childNodes.length;

+				if (li.tagName === 'LI') {

+					return numChildren == 0 ? true : numChildren == 1 && (li.firstChild.tagName == '' || li.firstChild.tagName == 'BR' || isEmptyIE9Li(li));

+				}

+				return false;

+			}

+

+			function isEmptyIE9Li(li) {

+				// only consider this to be last item if there is no list item content or that content is nbsp or space since IE9 creates these

+				var lis = tinymce.grep(li.parentNode.childNodes, function(n) {return n.tagName == 'LI'});

+				var isLastLi = li == lis[lis.length - 1];

+				var child = li.firstChild;

+				return tinymce.isIE9 && isLastLi && (child.nodeValue == String.fromCharCode(160) || child.nodeValue == String.fromCharCode(32));

+			}

+

+			function isEnter(e) {

+				return e.keyCode === tinymce.VK.ENTER;

+			}

+

+			function isEnterWithoutShift(e) {

+				return isEnter(e) && !e.shiftKey;

+			}

+

+			function getListKeyState(e) {

+				if (isTabInList(e)) {

+					return LIST_TABBING;

+				} else if (isEnterWithoutShift(e) && isOnLastListItem()) {

+					// Returns LIST_UNKNOWN since breaking out of lists is handled by the EnterKey.js logic now

+					//return LIST_ESCAPE;

+					return LIST_UNKNOWN;

+				} else if (isEnterWithoutShift(e) && isInEmptyListItem()) {

+					return LIST_EMPTY_ITEM;

+				} else {

+					return LIST_UNKNOWN;

+				}

+			}

+

+			function cancelDefaultEvents(ed, e) {

+				// list escape is done manually using outdent as it does not create paragraphs correctly in td's

+				if (state == LIST_TABBING || state == LIST_EMPTY_ITEM || tinymce.isGecko && state == LIST_ESCAPE) {

+					Event.cancel(e);

+				}

+			}

+

+			function isCursorAtEndOfContainer() {

+				var range = ed.selection.getRng(true);

+				var startContainer = range.startContainer;

+				if (startContainer.nodeType == 3) {

+					var value = startContainer.nodeValue;

+					if (tinymce.isIE9 && value.length > 1 && value.charCodeAt(value.length-1) == 32) {

+						// IE9 places a space on the end of the text in some cases so ignore last char

+						return (range.endOffset == value.length-1);

+					} else {

+						return (range.endOffset == value.length);

+					}

+				} else if (startContainer.nodeType == 1) {

+					return range.endOffset == startContainer.childNodes.length;

+				}

+				return false;

+			}

+

+			/*

+			 	If we are at the end of a list item surrounded with an element, pressing enter should create a

+			 	new list item instead without splitting the element e.g. don't want to create new P or H1 tag

+			  */

+			function isEndOfListItem() {

+				var node = ed.selection.getNode();

+				var validElements = 'h1,h2,h3,h4,h5,h6,p,div';

+				var isLastParagraphOfLi = ed.dom.is(node, validElements) && node.parentNode.tagName === 'LI' && node.parentNode.lastChild === node;

+				return ed.selection.isCollapsed() && isLastParagraphOfLi && isCursorAtEndOfContainer();

+			}

+

+			// Creates a new list item after the current selection's list item parent

+			function createNewLi(ed, e) {

+				if (isEnterWithoutShift(e) && isEndOfListItem()) {

+					var node = ed.selection.getNode();

+					var li = ed.dom.create("li");

+					var parentLi = ed.dom.getParent(node, 'li');

+					ed.dom.insertAfter(li, parentLi);

+

+					// Move caret to new list element.

+					if (tinymce.isIE6 || tinymce.isIE7 || tinyMCE.isIE8) {

+						// Removed this line since it would create an odd <&nbsp;> tag and placing the caret inside an empty LI is handled and should be handled by the selection logic

+						//li.appendChild(ed.dom.create("&nbsp;")); // IE needs an element within the bullet point

+						ed.selection.setCursorLocation(li, 1);

+					} else {

+						ed.selection.setCursorLocation(li, 0);

+					}

+					e.preventDefault();

+				}

+			}

+

+			function imageJoiningListItem(ed, e) {

+				var prevSibling;

+

+				if (!tinymce.isGecko)

+					return;

+

+				var n = ed.selection.getStart();

+				if (e.keyCode != tinymce.VK.BACKSPACE || n.tagName !== 'IMG')

+					return;

+

+				function lastLI(node) {

+					var child = node.firstChild;

+					var li = null;

+					do {

+						if (!child)

+							break;

+

+						if (child.tagName === 'LI')

+							li = child;

+					} while (child = child.nextSibling);

+

+					return li;

+				}

+

+				function addChildren(parentNode, destination) {

+					while (parentNode.childNodes.length > 0)

+						destination.appendChild(parentNode.childNodes[0]);

+				}

+

+				// Check if there is a previous sibling

+				prevSibling = n.parentNode.previousSibling;

+				if (!prevSibling)

+					return;

+

+				var ul;

+				if (prevSibling.tagName === 'UL' || prevSibling.tagName === 'OL')

+					ul = prevSibling;

+				else if (prevSibling.previousSibling && (prevSibling.previousSibling.tagName === 'UL' || prevSibling.previousSibling.tagName === 'OL'))

+					ul = prevSibling.previousSibling;

+				else

+					return;

+

+				var li = lastLI(ul);

+

+				// move the caret to the end of the list item

+				var rng = ed.dom.createRng();

+				rng.setStart(li, 1);

+				rng.setEnd(li, 1);

+				ed.selection.setRng(rng);

+				ed.selection.collapse(true);

+

+				// save a bookmark at the end of the list item

+				var bookmark = ed.selection.getBookmark();

+

+				// copy the image an its text to the list item

+				var clone = n.parentNode.cloneNode(true);

+				if (clone.tagName === 'P' || clone.tagName === 'DIV')

+					addChildren(clone, li);

+				else

+					li.appendChild(clone);

+

+				// remove the old copy of the image

+				n.parentNode.parentNode.removeChild(n.parentNode);

+

+				// move the caret where we saved the bookmark

+				ed.selection.moveToBookmark(bookmark);

+			}

+

+			// fix the cursor position to ensure it is correct in IE

+			function setCursorPositionToOriginalLi(li) {

+				var list = ed.dom.getParent(li, 'ol,ul');

+				if (list != null) {

+					var lastLi = list.lastChild;

+					// Removed this line since IE9 would report an DOM character error and placing the caret inside an empty LI is handled and should be handled by the selection logic

+					//lastLi.appendChild(ed.getDoc().createElement(''));

+					ed.selection.setCursorLocation(lastLi, 0);

+				}

+			}

+

+			this.ed = ed;

+			ed.addCommand('Indent', this.indent, this);

+			ed.addCommand('Outdent', this.outdent, this);

+			ed.addCommand('InsertUnorderedList', function() {

+				this.applyList('UL', 'OL');

+			}, this);

+			ed.addCommand('InsertOrderedList', function() {

+				this.applyList('OL', 'UL');

+			}, this);

+

+			ed.onInit.add(function() {

+				ed.editorCommands.addCommands({

+					'outdent': function() {

+						var sel = ed.selection, dom = ed.dom;

+

+						function hasStyleIndent(n) {

+							n = dom.getParent(n, dom.isBlock);

+							return n && (parseInt(ed.dom.getStyle(n, 'margin-left') || 0, 10) + parseInt(ed.dom.getStyle(n, 'padding-left') || 0, 10)) > 0;

+						}

+

+						return hasStyleIndent(sel.getStart()) || hasStyleIndent(sel.getEnd()) || ed.queryCommandState('InsertOrderedList') || ed.queryCommandState('InsertUnorderedList');

+					}

+				}, 'state');

+			});

+

+			ed.onKeyUp.add(function(ed, e) {

+				if (state == LIST_TABBING) {

+					ed.execCommand(e.shiftKey ? 'Outdent' : 'Indent', true, null);

+					state = LIST_UNKNOWN;

+					return Event.cancel(e);

+				} else if (state == LIST_EMPTY_ITEM) {

+					var li = getLi();

+					var shouldOutdent =  ed.settings.list_outdent_on_enter === true || e.shiftKey;

+					ed.execCommand(shouldOutdent ? 'Outdent' : 'Indent', true, null);

+					if (tinymce.isIE) {

+						setCursorPositionToOriginalLi(li);

+					}

+

+					return Event.cancel(e);

+				} else if (state == LIST_ESCAPE) {

+					if (tinymce.isIE6 || tinymce.isIE7 || tinymce.isIE8) {

+						// append a zero sized nbsp so that caret is positioned correctly in IE after escaping and applying formatting.

+						// if there is no text then applying formatting for e.g a H1 to the P tag immediately following list after

+						// escaping from it will cause the caret to be positioned on the last li instead of staying the in P tag.

+						var n = ed.getDoc().createTextNode('\uFEFF');

+						ed.selection.getNode().appendChild(n);

+					} else if (tinymce.isIE9 || tinymce.isGecko) {

+						// IE9 does not escape the list so we use outdent to do this and cancel the default behaviour

+						// Gecko does not create a paragraph outdenting inside a TD so default behaviour is cancelled and we outdent ourselves

+						ed.execCommand('Outdent');

+						return Event.cancel(e);

+					}

+				}

+			});

+

+			function fixListItem(parent, reference) {

+				// a zero-sized non-breaking space is placed in the empty list item so that the nested list is

+				// displayed on the below line instead of next to it

+				var n = ed.getDoc().createTextNode('\uFEFF');

+				parent.insertBefore(n, reference);

+				ed.selection.setCursorLocation(n, 0);

+				// repaint to remove rendering artifact. only visible when creating new list

+				ed.execCommand('mceRepaint');

+			}

+

+			function fixIndentedListItemForGecko(ed, e) {

+				if (isEnter(e)) {

+					var li = getLi();

+					if (li) {

+						var parent = li.parentNode;

+						var grandParent = parent && parent.parentNode;

+						if (grandParent && grandParent.nodeName == 'LI' && grandParent.firstChild == parent && li == parent.firstChild) {

+							fixListItem(grandParent, parent);

+						}

+					}

+				}

+			}

+

+			function fixIndentedListItemForIE8(ed, e) {

+				if (isEnter(e)) {

+					var li = getLi();

+					if (ed.dom.select('ul li', li).length === 1) {

+						var list = li.firstChild;

+						fixListItem(li, list);

+					}

+				}

+			}

+

+			function fixDeletingFirstCharOfList(ed, e) {

+				function listElements(list, li) {

+					var elements = [];

+					var walker = new tinymce.dom.TreeWalker(li, list);

+					for (var node = walker.current(); node; node = walker.next()) {

+						if (ed.dom.is(node, 'ol,ul,li')) {

+							elements.push(node);

+						}

+					}

+					return elements;

+				}

+

+				if (e.keyCode == tinymce.VK.BACKSPACE) {

+					var li = getLi();

+					if (li) {

+						var list = ed.dom.getParent(li, 'ol,ul');

+						if (list && list.firstChild === li) {

+							var elements = listElements(list, li);

+							ed.execCommand("Outdent", false, elements);

+							ed.undoManager.add();

+							return Event.cancel(e);

+						}

+					}

+				}

+			}

+

+			function fixDeletingEmptyLiInWebkit(ed, e) {

+				var li = getLi();

+				if (e.keyCode === tinymce.VK.BACKSPACE && ed.dom.is(li, 'li') && li.parentNode.firstChild!==li) {

+					if (ed.dom.select('ul,ol', li).length === 1) {

+						var prevLi = li.previousSibling;

+						ed.dom.remove(ed.dom.select('br', li));

+						ed.dom.remove(li, true);

+						var textNodes = tinymce.grep(prevLi.childNodes, function(n){ return n.nodeType === 3 });

+						if (textNodes.length === 1) {

+							var textNode = textNodes[0]

+							ed.selection.setCursorLocation(textNode, textNode.length);

+						}

+						ed.undoManager.add();

+						return Event.cancel(e);

+					}

+				}

+			}

+

+			ed.onKeyDown.add(function(_, e) { state = getListKeyState(e); });

+			ed.onKeyDown.add(cancelDefaultEvents);

+			ed.onKeyDown.add(imageJoiningListItem);

+			ed.onKeyDown.add(createNewLi);

+

+			if (tinymce.isGecko) {

+				ed.onKeyUp.add(fixIndentedListItemForGecko);

+			}

+			if (tinymce.isIE8) {

+				ed.onKeyUp.add(fixIndentedListItemForIE8);

+			}

+			if (tinymce.isGecko || tinymce.isWebKit) {

+				ed.onKeyDown.add(fixDeletingFirstCharOfList);

+			}

+			if (tinymce.isWebKit) {

+				ed.onKeyDown.add(fixDeletingEmptyLiInWebkit);

+			}

+		},

+

+		applyList: function(targetListType, oppositeListType) {

+			var t = this, ed = t.ed, dom = ed.dom, applied = [], hasSameType = false, hasOppositeType = false, hasNonList = false, actions,

+					selectedBlocks = ed.selection.getSelectedBlocks();

+

+			function cleanupBr(e) {

+				if (e && e.tagName === 'BR') {

+					dom.remove(e);

+				}

+			}

+

+			function makeList(element) {

+				var list = dom.create(targetListType), li;

+

+				function adjustIndentForNewList(element) {

+					// If there's a margin-left, outdent one level to account for the extra list margin.

+					if (element.style.marginLeft || element.style.paddingLeft) {

+						t.adjustPaddingFunction(false)(element);

+					}

+				}

+

+				if (element.tagName === 'LI') {

+					// No change required.

+				} else if (element.tagName === 'P' || element.tagName === 'DIV' || element.tagName === 'BODY') {

+					processBrs(element, function(startSection, br) {

+						doWrapList(startSection, br, element.tagName === 'BODY' ? null : startSection.parentNode);

+						li = startSection.parentNode;

+						adjustIndentForNewList(li);

+						cleanupBr(br);

+					});

+					if (li) {

+						if (li.tagName === 'LI' && (element.tagName === 'P' || selectedBlocks.length > 1)) {

+							dom.split(li.parentNode.parentNode, li.parentNode);

+						}

+						attemptMergeWithAdjacent(li.parentNode, true);

+					}

+					return;

+				} else {

+					// Put the list around the element.

+					li = dom.create('li');

+					dom.insertAfter(li, element);

+					li.appendChild(element);

+					adjustIndentForNewList(element);

+					element = li;

+				}

+				dom.insertAfter(list, element);

+				list.appendChild(element);

+				attemptMergeWithAdjacent(list, true);

+				applied.push(element);

+			}

+

+			function doWrapList(start, end, template) {

+				var li, n = start, tmp;

+				while (!dom.isBlock(start.parentNode) && start.parentNode !== dom.getRoot()) {

+					start = dom.split(start.parentNode, start.previousSibling);

+					start = start.nextSibling;

+					n = start;

+				}

+				if (template) {

+					li = template.cloneNode(true);

+					start.parentNode.insertBefore(li, start);

+					while (li.firstChild) dom.remove(li.firstChild);

+					li = dom.rename(li, 'li');

+				} else {

+					li = dom.create('li');

+					start.parentNode.insertBefore(li, start);

+				}

+				while (n && n != end) {

+					tmp = n.nextSibling;

+					li.appendChild(n);

+					n = tmp;

+				}

+				if (li.childNodes.length === 0) {

+					li.innerHTML = '<br _mce_bogus="1" />';

+				}

+				makeList(li);

+			}

+

+			function processBrs(element, callback) {

+				var startSection, previousBR, END_TO_START = 3, START_TO_END = 1,

+						breakElements = 'br,ul,ol,p,div,h1,h2,h3,h4,h5,h6,table,blockquote,address,pre,form,center,dl';

+

+				function isAnyPartSelected(start, end) {

+					var r = dom.createRng(), sel;

+					bookmark.keep = true;

+					ed.selection.moveToBookmark(bookmark);

+					bookmark.keep = false;

+					sel = ed.selection.getRng(true);

+					if (!end) {

+						end = start.parentNode.lastChild;

+					}

+					r.setStartBefore(start);

+					r.setEndAfter(end);

+					return !(r.compareBoundaryPoints(END_TO_START, sel) > 0 || r.compareBoundaryPoints(START_TO_END, sel) <= 0);

+				}

+

+				function nextLeaf(br) {

+					if (br.nextSibling)

+						return br.nextSibling;

+					if (!dom.isBlock(br.parentNode) && br.parentNode !== dom.getRoot())

+						return nextLeaf(br.parentNode);

+				}

+

+				// Split on BRs within the range and process those.

+				startSection = element.firstChild;

+				// First mark the BRs that have any part of the previous section selected.

+				var trailingContentSelected = false;

+				each(dom.select(breakElements, element), function(br) {

+					if (br.hasAttribute && br.hasAttribute('_mce_bogus')) {

+						return true; // Skip the bogus Brs that are put in to appease Firefox and Safari.

+					}

+					if (isAnyPartSelected(startSection, br)) {

+						dom.addClass(br, '_mce_tagged_br');

+						startSection = nextLeaf(br);

+					}

+				});

+				trailingContentSelected = (startSection && isAnyPartSelected(startSection, undefined));

+				startSection = element.firstChild;

+				each(dom.select(breakElements, element), function(br) {

+					// Got a section from start to br.

+					var tmp = nextLeaf(br);

+					if (br.hasAttribute && br.hasAttribute('_mce_bogus')) {

+						return true; // Skip the bogus Brs that are put in to appease Firefox and Safari.

+					}

+					if (dom.hasClass(br, '_mce_tagged_br')) {

+						callback(startSection, br, previousBR);

+						previousBR = null;

+					} else {

+						previousBR = br;

+					}

+					startSection = tmp;

+				});

+				if (trailingContentSelected) {

+					callback(startSection, undefined, previousBR);

+				}

+			}

+

+			function wrapList(element) {

+				processBrs(element, function(startSection, br, previousBR) {

+					// Need to indent this part

+					doWrapList(startSection, br);

+					cleanupBr(br);

+					cleanupBr(previousBR);

+				});

+			}

+

+			function changeList(element) {

+				if (tinymce.inArray(applied, element) !== -1) {

+					return;

+				}

+				if (element.parentNode.tagName === oppositeListType) {

+					dom.split(element.parentNode, element);

+					makeList(element);

+					attemptMergeWithNext(element.parentNode, false);

+				}

+				applied.push(element);

+			}

+

+			function convertListItemToParagraph(element) {

+				var child, nextChild, mergedElement, splitLast;

+				if (tinymce.inArray(applied, element) !== -1) {

+					return;

+				}

+				element = splitNestedLists(element, dom);

+				while (dom.is(element.parentNode, 'ol,ul,li')) {

+					dom.split(element.parentNode, element);

+				}

+				// Push the original element we have from the selection, not the renamed one.

+				applied.push(element);

+				element = dom.rename(element, 'p');

+				mergedElement = attemptMergeWithAdjacent(element, false, ed.settings.force_br_newlines);

+				if (mergedElement === element) {

+					// Now split out any block elements that can't be contained within a P.

+					// Manually iterate to ensure we handle modifications correctly (doesn't work with tinymce.each)

+					child = element.firstChild;

+					while (child) {

+						if (dom.isBlock(child)) {

+							child = dom.split(child.parentNode, child);

+							splitLast = true;

+							nextChild = child.nextSibling && child.nextSibling.firstChild;

+						} else {

+							nextChild = child.nextSibling;

+							if (splitLast && child.tagName === 'BR') {

+								dom.remove(child);

+							}

+							splitLast = false;

+						}

+						child = nextChild;

+					}

+				}

+			}

+

+			each(selectedBlocks, function(e) {

+				e = findItemToOperateOn(e, dom);

+				if (e.tagName === oppositeListType || (e.tagName === 'LI' && e.parentNode.tagName === oppositeListType)) {

+					hasOppositeType = true;

+				} else if (e.tagName === targetListType || (e.tagName === 'LI' && e.parentNode.tagName === targetListType)) {

+					hasSameType = true;

+				} else {

+					hasNonList = true;

+				}

+			});

+

+			if (hasNonList &&!hasSameType || hasOppositeType || selectedBlocks.length === 0) {

+				actions = {

+					'LI': changeList,

+					'H1': makeList,

+					'H2': makeList,

+					'H3': makeList,

+					'H4': makeList,

+					'H5': makeList,

+					'H6': makeList,

+					'P': makeList,

+					'BODY': makeList,

+					'DIV': selectedBlocks.length > 1 ? makeList : wrapList,

+					defaultAction: wrapList,

+					elements: this.selectedBlocks()

+				};

+			} else {

+				actions = {

+					defaultAction: convertListItemToParagraph,

+					elements: this.selectedBlocks()

+				};

+			}

+			this.process(actions);

+		},

+

+		indent: function() {

+			var ed = this.ed, dom = ed.dom, indented = [];

+

+			function createWrapItem(element) {

+				var wrapItem = dom.create('li', { style: 'list-style-type: none;'});

+				dom.insertAfter(wrapItem, element);

+				return wrapItem;

+			}

+

+			function createWrapList(element) {

+				var wrapItem = createWrapItem(element),

+						list = dom.getParent(element, 'ol,ul'),

+						listType = list.tagName,

+						listStyle = dom.getStyle(list, 'list-style-type'),

+						attrs = {},

+						wrapList;

+				if (listStyle !== '') {

+					attrs.style = 'list-style-type: ' + listStyle + ';';

+				}

+				wrapList = dom.create(listType, attrs);

+				wrapItem.appendChild(wrapList);

+				return wrapList;

+			}

+

+			function indentLI(element) {

+				if (!hasParentInList(ed, element, indented)) {

+					element = splitNestedLists(element, dom);

+					var wrapList = createWrapList(element);

+					wrapList.appendChild(element);

+					attemptMergeWithAdjacent(wrapList.parentNode, false);

+					attemptMergeWithAdjacent(wrapList, false);

+					indented.push(element);

+				}

+			}

+

+			this.process({

+				'LI': indentLI,

+				defaultAction: this.adjustPaddingFunction(true),

+				elements: this.selectedBlocks()

+			});

+

+		},

+

+		outdent: function(ui, elements) {

+			var t = this, ed = t.ed, dom = ed.dom, outdented = [];

+

+			function outdentLI(element) {

+				var listElement, targetParent, align;

+				if (!hasParentInList(ed, element, outdented)) {

+					if (dom.getStyle(element, 'margin-left') !== '' || dom.getStyle(element, 'padding-left') !== '') {

+						return t.adjustPaddingFunction(false)(element);

+					}

+					align = dom.getStyle(element, 'text-align', true);

+					if (align === 'center' || align === 'right') {

+						dom.setStyle(element, 'text-align', 'left');

+						return;

+					}

+					element = splitNestedLists(element, dom);

+					listElement = element.parentNode;

+					targetParent = element.parentNode.parentNode;

+					if (targetParent.tagName === 'P') {

+						dom.split(targetParent, element.parentNode);

+					} else {

+						dom.split(listElement, element);

+						if (targetParent.tagName === 'LI') {

+							// Nested list, need to split the LI and go back out to the OL/UL element.

+							dom.split(targetParent, element);

+						} else if (!dom.is(targetParent, 'ol,ul')) {

+							dom.rename(element, 'p');

+						}

+					}

+					outdented.push(element);

+				}

+			}

+

+			var listElements = elements && tinymce.is(elements, 'array') ? elements : this.selectedBlocks();

+			this.process({

+				'LI': outdentLI,

+				defaultAction: this.adjustPaddingFunction(false),

+				elements: listElements

+			});

+

+			each(outdented, attemptMergeWithAdjacent);

+		},

+

+		process: function(actions) {

+			var t = this, sel = t.ed.selection, dom = t.ed.dom, selectedBlocks, r;

+

+			function isEmptyElement(element) {

+				var excludeBrsAndBookmarks = tinymce.grep(element.childNodes, function(n) {

+					return !(n.nodeName === 'BR' || n.nodeName === 'SPAN' && dom.getAttrib(n, 'data-mce-type') == 'bookmark'

+							|| n.nodeType == 3 && (n.nodeValue == String.fromCharCode(160) || n.nodeValue == ''));

+				});

+				return excludeBrsAndBookmarks.length === 0;

+			}

+

+			function processElement(element) {

+				dom.removeClass(element, '_mce_act_on');

+				if (!element || element.nodeType !== 1 || selectedBlocks.length > 1 && isEmptyElement(element)) {

+					return;

+				}

+				element = findItemToOperateOn(element, dom);

+				var action = actions[element.tagName];

+				if (!action) {

+					action = actions.defaultAction;

+				}

+				action(element);

+			}

+

+			function recurse(element) {

+				t.splitSafeEach(element.childNodes, processElement);

+			}

+

+			function brAtEdgeOfSelection(container, offset) {

+				return offset >= 0 && container.hasChildNodes() && offset < container.childNodes.length &&

+						container.childNodes[offset].tagName === 'BR';

+			}

+

+			function isInTable() {

+				var n = sel.getNode();

+				var p = dom.getParent(n, 'td');

+				return p !== null;

+			}

+

+			selectedBlocks = actions.elements;

+

+			r = sel.getRng(true);

+			if (!r.collapsed) {

+				if (brAtEdgeOfSelection(r.endContainer, r.endOffset - 1)) {

+					r.setEnd(r.endContainer, r.endOffset - 1);

+					sel.setRng(r);

+				}

+				if (brAtEdgeOfSelection(r.startContainer, r.startOffset)) {

+					r.setStart(r.startContainer, r.startOffset + 1);

+					sel.setRng(r);

+				}

+			}

+

+

+			if (tinymce.isIE8) {

+				// append a zero sized nbsp so that caret is restored correctly using bookmark

+				var s = t.ed.selection.getNode();

+				if (s.tagName === 'LI' && !(s.parentNode.lastChild === s)) {

+					var i = t.ed.getDoc().createTextNode('\uFEFF');

+					s.appendChild(i);

+				}

+			}

+

+			bookmark = sel.getBookmark();

+			actions.OL = actions.UL = recurse;

+			t.splitSafeEach(selectedBlocks, processElement);

+			sel.moveToBookmark(bookmark);

+			bookmark = null;

+

+			// we avoid doing repaint in a table as this will move the caret out of the table in Firefox 3.6

+			if (!isInTable()) {

+				// Avoids table or image handles being left behind in Firefox.

+				t.ed.execCommand('mceRepaint');

+			}

+		},

+

+		splitSafeEach: function(elements, f) {

+			if (tinymce.isGecko && (/Firefox\/[12]\.[0-9]/.test(navigator.userAgent) ||

+					/Firefox\/3\.[0-4]/.test(navigator.userAgent))) {

+				this.classBasedEach(elements, f);

+			} else {

+				each(elements, f);

+			}

+		},

+

+		classBasedEach: function(elements, f) {

+			var dom = this.ed.dom, nodes, element;

+			// Mark nodes

+			each(elements, function(element) {

+				dom.addClass(element, '_mce_act_on');

+			});

+			nodes = dom.select('._mce_act_on');

+			while (nodes.length > 0) {

+				element = nodes.shift();

+				dom.removeClass(element, '_mce_act_on');

+				f(element);

+				nodes = dom.select('._mce_act_on');

+			}

+		},

+

+		adjustPaddingFunction: function(isIndent) {

+			var indentAmount, indentUnits, ed = this.ed;

+			indentAmount = ed.settings.indentation;

+			indentUnits = /[a-z%]+/i.exec(indentAmount);

+			indentAmount = parseInt(indentAmount, 10);

+			return function(element) {

+				var currentIndent, newIndentAmount;

+				currentIndent = parseInt(ed.dom.getStyle(element, 'margin-left') || 0, 10) + parseInt(ed.dom.getStyle(element, 'padding-left') || 0, 10);

+				if (isIndent) {

+					newIndentAmount = currentIndent + indentAmount;

+				} else {

+					newIndentAmount = currentIndent - indentAmount;

+				}

+				ed.dom.setStyle(element, 'padding-left', '');

+				ed.dom.setStyle(element, 'margin-left', newIndentAmount > 0 ? newIndentAmount + indentUnits : '');

+			};

+		},

+

+		selectedBlocks: function() {

+			var ed = this.ed

+			var selectedBlocks = ed.selection.getSelectedBlocks();

+			return selectedBlocks.length == 0 ? [ ed.dom.getRoot() ] : selectedBlocks;

+		},

+

+		getInfo: function() {

+			return {

+				longname : 'Lists',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/lists',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		}

+	});

+	tinymce.PluginManager.add("lists", tinymce.plugins.Lists);

+}());

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/media/css/content.css b/library/tinymce/jscripts/tiny_mce/plugins/media/css/content.css
deleted file mode 100755
index 1bf6a7586..000000000
--- a/library/tinymce/jscripts/tiny_mce/plugins/media/css/content.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.mceItemFlash, .mceItemShockWave, .mceItemQuickTime, .mceItemWindowsMedia, .mceItemRealMedia {border:1px dotted #cc0000; background-position:center; background-repeat:no-repeat; background-color:#ffffcc;}

-.mceItemShockWave {background-image: url(../img/shockwave.gif);}

-.mceItemFlash {background-image:url(../img/flash.gif);}

-.mceItemQuickTime {background-image:url(../img/quicktime.gif);}

-.mceItemWindowsMedia {background-image:url(../img/windowsmedia.gif);}

-.mceItemRealMedia {background-image:url(../img/realmedia.gif);}

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/media/css/media.css b/library/tinymce/jscripts/tiny_mce/plugins/media/css/media.css
index 2d087944d..0c45c7ff6 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/media/css/media.css
+++ b/library/tinymce/jscripts/tiny_mce/plugins/media/css/media.css
@@ -1,12 +1,12 @@
-#id, #name, #hspace, #vspace, #class_name, #align {	width: 100px }

+#id, #name, #hspace, #vspace, #class_name, #align { width: 100px }

 #hspace, #vspace { width: 50px }

 #flash_quality, #flash_align, #flash_scale, #flash_salign, #flash_wmode { width: 100px }

-#flash_base, #flash_flashvars { width: 240px }

+#flash_base, #flash_flashvars, #html5_altsource1, #html5_altsource2, #html5_poster { width: 240px }

 #width, #height { width: 40px }

 #src, #media_type { width: 250px }

 #class { width: 120px }

-#prev { margin: 0; border: 1px solid black; width: 380px; height: 230px; overflow: auto }

-.panel_wrapper div.current { height: 390px; overflow: auto }

+#prev { margin: 0; border: 1px solid black; width: 380px; height: 260px; overflow: auto }

+.panel_wrapper div.current { height: 420px; overflow: auto }

 #flash_options, #shockwave_options, #qt_options, #wmp_options, #rmp_options { display: none }

 .mceAddSelectValue { background-color: #DDDDDD }

 #qt_starttime, #qt_endtime, #qt_fov, #qt_href, #qt_moveid, #qt_moviename, #qt_node, #qt_pan, #qt_qtsrc, #qt_qtsrcchokespeed, #qt_target, #qt_tilt, #qt_urlsubstituten, #qt_volume { width: 70px }

@@ -14,3 +14,4 @@
 #rmp_console, #rmp_numloop, #rmp_controls, #rmp_scriptcallbacks { width: 70px }

 #shockwave_swvolume, #shockwave_swframe, #shockwave_swurl, #shockwave_swstretchvalign, #shockwave_swstretchhalign, #shockwave_swstretchstyle { width: 90px }

 #qt_qtsrc { width: 200px }

+iframe {border: 1px solid gray}

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js
index 4bbe367e3..37b4320bd 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.MediaPlugin",{init:function(b,c){var e=this;e.editor=b;e.url=c;function f(g){return/^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(g.className)}b.onPreInit.add(function(){b.serializer.addRules("param[name|value|_mce_value]")});b.addCommand("mceMedia",function(){b.windowManager.open({file:c+"/media.htm",width:430+parseInt(b.getLang("media.delta_width",0)),height:470+parseInt(b.getLang("media.delta_height",0)),inline:1},{plugin_url:c})});b.addButton("media",{title:"media.desc",cmd:"mceMedia"});b.onNodeChange.add(function(h,g,i){g.setActive("media",i.nodeName=="IMG"&&f(i))});b.onInit.add(function(){var g={mceItemFlash:"flash",mceItemShockWave:"shockwave",mceItemWindowsMedia:"windowsmedia",mceItemQuickTime:"quicktime",mceItemRealMedia:"realmedia"};b.selection.onSetContent.add(function(){e._spansToImgs(b.getBody())});b.selection.onBeforeSetContent.add(e._objectsToSpans,e);if(b.settings.content_css!==false){b.dom.loadCSS(c+"/css/content.css")}if(b.theme&&b.theme.onResolveName){b.theme.onResolveName.add(function(h,i){if(i.name=="img"){a(g,function(l,j){if(b.dom.hasClass(i.node,j)){i.name=l;i.title=b.dom.getAttrib(i.node,"title");return false}})}})}if(b&&b.plugins.contextmenu){b.plugins.contextmenu.onContextMenu.add(function(i,h,j){if(j.nodeName=="IMG"&&/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(j.className)){h.add({title:"media.edit",icon:"media",cmd:"mceMedia"})}})}});b.onBeforeSetContent.add(e._objectsToSpans,e);b.onSetContent.add(function(){e._spansToImgs(b.getBody())});b.onPreProcess.add(function(g,i){var h=g.dom;if(i.set){e._spansToImgs(i.node);a(h.select("IMG",i.node),function(k){var j;if(f(k)){j=e._parse(k.title);h.setAttrib(k,"width",h.getAttrib(k,"width",j.width||100));h.setAttrib(k,"height",h.getAttrib(k,"height",j.height||100))}})}if(i.get){a(h.select("IMG",i.node),function(m){var l,j,k;if(g.getParam("media_use_script")){if(f(m)){m.className=m.className.replace(/mceItem/g,"mceTemp")}return}switch(m.className){case"mceItemFlash":l="d27cdb6e-ae6d-11cf-96b8-444553540000";j="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0";k="application/x-shockwave-flash";break;case"mceItemShockWave":l="166b1bca-3f9c-11cf-8075-444553540000";j="http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0";k="application/x-director";break;case"mceItemWindowsMedia":l=g.getParam("media_wmp6_compatible")?"05589fa1-c356-11ce-bf01-00aa0055595a":"6bf52a52-394a-11d3-b153-00c04f79faa6";j="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701";k="application/x-mplayer2";break;case"mceItemQuickTime":l="02bf25d5-8c17-4b23-bc80-d3488abddc6b";j="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0";k="video/quicktime";break;case"mceItemRealMedia":l="cfcdaa03-8be4-11cf-b84b-0020afbbccfa";j="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0";k="audio/x-pn-realaudio-plugin";break}if(l){h.replace(e._buildObj({classid:l,codebase:j,type:k},m),m)}})}});b.onPostProcess.add(function(g,h){h.content=h.content.replace(/_mce_value=/g,"value=")});function d(g,h){h=new RegExp(h+'="([^"]+)"',"g").exec(g);return h?b.dom.decode(h[1]):""}b.onPostProcess.add(function(g,h){if(g.getParam("media_use_script")){h.content=h.content.replace(/<img[^>]+>/g,function(j){var i=d(j,"class");if(/^(mceTempFlash|mceTempShockWave|mceTempWindowsMedia|mceTempQuickTime|mceTempRealMedia)$/.test(i)){at=e._parse(d(j,"title"));at.width=d(j,"width");at.height=d(j,"height");j='<script type="text/javascript">write'+i.substring(7)+"({"+e._serialize(at)+"});<\/script>"}return j})}})},getInfo:function(){return{longname:"Media",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_objectsToSpans:function(b,e){var c=this,d=e.content;d=d.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi,function(g,f,i){var h=c._parse(i);return'<img class="mceItem'+f+'" title="'+b.dom.encode(i)+'" src="'+c.url+'/img/trans.gif" width="'+h.width+'" height="'+h.height+'" />'});d=d.replace(/<object([^>]*)>/gi,'<span class="mceItemObject" $1>');d=d.replace(/<embed([^>]*)\/?>/gi,'<span class="mceItemEmbed" $1></span>');d=d.replace(/<embed([^>]*)>/gi,'<span class="mceItemEmbed" $1>');d=d.replace(/<\/(object)([^>]*)>/gi,"</span>");d=d.replace(/<\/embed>/gi,"");d=d.replace(/<param([^>]*)>/gi,function(g,f){return"<span "+f.replace(/value=/gi,"_mce_value=")+' class="mceItemParam"></span>'});d=d.replace(/\/ class=\"mceItemParam\"><\/span>/gi,'class="mceItemParam"></span>');e.content=d},_buildObj:function(g,h){var d,c=this.editor,f=c.dom,e=this._parse(h.title),b;b=c.getParam("media_strict",true)&&g.type=="application/x-shockwave-flash";e.width=g.width=f.getAttrib(h,"width")||100;e.height=g.height=f.getAttrib(h,"height")||100;if(e.src){e.src=c.convertURL(e.src,"src",h)}if(b){d=f.create("span",{id:e.id,_mce_name:"object",type:"application/x-shockwave-flash",data:e.src,style:f.getAttrib(h,"style"),width:g.width,height:g.height})}else{d=f.create("span",{id:e.id,_mce_name:"object",classid:"clsid:"+g.classid,style:f.getAttrib(h,"style"),codebase:g.codebase,width:g.width,height:g.height})}a(e,function(j,i){if(!/^(width|height|codebase|classid|id|_cx|_cy)$/.test(i)){if(g.type=="application/x-mplayer2"&&i=="src"&&!e.url){i="url"}if(j){f.add(d,"span",{_mce_name:"param",name:i,_mce_value:j})}}});if(!b){f.add(d,"span",tinymce.extend({_mce_name:"embed",type:g.type,style:f.getAttrib(h,"style")},e))}return d},_spansToImgs:function(e){var d=this,f=d.editor.dom,b,c;a(f.select("span",e),function(g){if(f.getAttrib(g,"class")=="mceItemObject"){c=f.getAttrib(g,"classid").toLowerCase().replace(/\s+/g,"");switch(c){case"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000":f.replace(d._createImg("mceItemFlash",g),g);break;case"clsid:166b1bca-3f9c-11cf-8075-444553540000":f.replace(d._createImg("mceItemShockWave",g),g);break;case"clsid:6bf52a52-394a-11d3-b153-00c04f79faa6":case"clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95":case"clsid:05589fa1-c356-11ce-bf01-00aa0055595a":f.replace(d._createImg("mceItemWindowsMedia",g),g);break;case"clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b":f.replace(d._createImg("mceItemQuickTime",g),g);break;case"clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa":f.replace(d._createImg("mceItemRealMedia",g),g);break;default:f.replace(d._createImg("mceItemFlash",g),g)}return}if(f.getAttrib(g,"class")=="mceItemEmbed"){switch(f.getAttrib(g,"type")){case"application/x-shockwave-flash":f.replace(d._createImg("mceItemFlash",g),g);break;case"application/x-director":f.replace(d._createImg("mceItemShockWave",g),g);break;case"application/x-mplayer2":f.replace(d._createImg("mceItemWindowsMedia",g),g);break;case"video/quicktime":f.replace(d._createImg("mceItemQuickTime",g),g);break;case"audio/x-pn-realaudio-plugin":f.replace(d._createImg("mceItemRealMedia",g),g);break;default:f.replace(d._createImg("mceItemFlash",g),g)}}})},_createImg:function(c,h){var b,g=this.editor.dom,f={},e="",d;d=["id","name","width","height","bgcolor","align","flashvars","src","wmode","allowfullscreen","quality","data"];b=g.create("img",{src:this.url+"/img/trans.gif",width:g.getAttrib(h,"width")||100,height:g.getAttrib(h,"height")||100,style:g.getAttrib(h,"style"),"class":c});a(d,function(i){var j=g.getAttrib(h,i);if(j){f[i]=j}});a(g.select("span",h),function(i){if(g.hasClass(i,"mceItemParam")){f[g.getAttrib(i,"name")]=g.getAttrib(i,"_mce_value")}});if(f.movie){f.src=f.movie;delete f.movie}if(!f.src){f.src=f.data;delete f.data}h=g.select(".mceItemEmbed",h)[0];if(h){a(d,function(i){var j=g.getAttrib(h,i);if(j&&!f[i]){f[i]=j}})}delete f.width;delete f.height;b.title=this._serialize(f);return b},_parse:function(b){return tinymce.util.JSON.parse("{"+b+"}")},_serialize:function(b){return tinymce.util.JSON.serialize(b).replace(/[{}]/g,"")}});tinymce.PluginManager.add("media",tinymce.plugins.MediaPlugin)})();
\ No newline at end of file
+(function(){var d=tinymce.explode("id,name,width,height,style,align,class,hspace,vspace,bgcolor,type"),h=tinymce.makeMap(d.join(",")),b=tinymce.html.Node,f,a,g=tinymce.util.JSON,e;f=[["Flash","d27cdb6e-ae6d-11cf-96b8-444553540000","application/x-shockwave-flash","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["ShockWave","166b1bca-3f9c-11cf-8075-444553540000","application/x-director","http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],["WindowsMedia","6bf52a52-394a-11d3-b153-00c04f79faa6,22d6f312-b0f6-11d0-94ab-0080c74c7e95,05589fa1-c356-11ce-bf01-00aa0055595a","application/x-mplayer2","http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701"],["QuickTime","02bf25d5-8c17-4b23-bc80-d3488abddc6b","video/quicktime","http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],["RealMedia","cfcdaa03-8be4-11cf-b84b-0020afbbccfa","audio/x-pn-realaudio-plugin","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["Java","8ad9c840-044e-11d1-b3e9-00805f499d93","application/x-java-applet","http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],["Silverlight","dfeaf541-f3e1-4c24-acac-99c30715084a","application/x-silverlight-2"],["Iframe"],["Video"],["EmbeddedAudio"],["Audio"]];function c(m){var l,j,k;if(m&&!m.splice){j=[];for(k=0;true;k++){if(m[k]){j[k]=m[k]}else{break}}return j}return m}tinymce.create("tinymce.plugins.MediaPlugin",{init:function(n,j){var r=this,l={},m,p,q,k;function o(i){return i&&i.nodeName==="IMG"&&n.dom.hasClass(i,"mceItemMedia")}r.editor=n;r.url=j;a="";for(m=0;m<f.length;m++){k=f[m][0];q={name:k,clsids:tinymce.explode(f[m][1]||""),mimes:tinymce.explode(f[m][2]||""),codebase:f[m][3]};for(p=0;p<q.clsids.length;p++){l["clsid:"+q.clsids[p]]=q}for(p=0;p<q.mimes.length;p++){l[q.mimes[p]]=q}l["mceItem"+k]=q;l[k.toLowerCase()]=q;a+=(a?"|":"")+k}tinymce.each(n.getParam("media_types","video=mp4,m4v,ogv,webm;silverlight=xap;flash=swf,flv;shockwave=dcr;quicktime=mov,qt,mpg,mpeg;shockwave=dcr;windowsmedia=avi,wmv,wm,asf,asx,wmx,wvx;realmedia=rm,ra,ram;java=jar;audio=mp3,ogg").split(";"),function(v){var s,u,t;v=v.split(/=/);u=tinymce.explode(v[1].toLowerCase());for(s=0;s<u.length;s++){t=l[v[0].toLowerCase()];if(t){l[u[s]]=t}}});a=new RegExp("write("+a+")\\(([^)]+)\\)");r.lookup=l;n.onPreInit.add(function(){n.schema.addValidElements("object[id|style|width|height|classid|codebase|*],param[name|value],embed[id|style|width|height|type|src|*],video[*],audio[*],source[*]");n.parser.addNodeFilter("object,embed,video,audio,script,iframe",function(s){var t=s.length;while(t--){r.objectToImg(s[t])}});n.serializer.addNodeFilter("img",function(s,u,t){var v=s.length,w;while(v--){w=s[v];if((w.attr("class")||"").indexOf("mceItemMedia")!==-1){r.imgToObject(w,t)}}})});n.onInit.add(function(){if(n.theme&&n.theme.onResolveName){n.theme.onResolveName.add(function(i,s){if(s.name==="img"&&n.dom.hasClass(s.node,"mceItemMedia")){s.name="media"}})}if(n&&n.plugins.contextmenu){n.plugins.contextmenu.onContextMenu.add(function(s,t,i){if(i.nodeName==="IMG"&&i.className.indexOf("mceItemMedia")!==-1){t.add({title:"media.edit",icon:"media",cmd:"mceMedia"})}})}});n.addCommand("mceMedia",function(){var s,i;i=n.selection.getNode();if(o(i)){s=n.dom.getAttrib(i,"data-mce-json");if(s){s=g.parse(s);tinymce.each(d,function(t){var u=n.dom.getAttrib(i,t);if(u){s[t]=u}});s.type=r.getType(i.className).name.toLowerCase()}}if(!s){s={type:"flash",video:{sources:[]},params:{}}}n.windowManager.open({file:j+"/media.htm",width:430+parseInt(n.getLang("media.delta_width",0)),height:500+parseInt(n.getLang("media.delta_height",0)),inline:1},{plugin_url:j,data:s})});n.addButton("media",{title:"media.desc",cmd:"mceMedia"});n.onNodeChange.add(function(s,i,t){i.setActive("media",o(t))})},convertUrl:function(k,n){var j=this,m=j.editor,l=m.settings,o=l.url_converter,i=l.url_converter_scope||j;if(!k){return k}if(n){return m.documentBaseURI.toAbsolute(k)}return o.call(i,k,"src","object")},getInfo:function(){return{longname:"Media",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media",version:tinymce.majorVersion+"."+tinymce.minorVersion}},dataToImg:function(m,k){var r=this,o=r.editor,p=o.documentBaseURI,j,q,n,l;m.params.src=r.convertUrl(m.params.src,k);q=m.video.attrs;if(q){q.src=r.convertUrl(q.src,k)}if(q){q.poster=r.convertUrl(q.poster,k)}j=c(m.video.sources);if(j){for(l=0;l<j.length;l++){j[l].src=r.convertUrl(j[l].src,k)}}n=r.editor.dom.create("img",{id:m.id,style:m.style,align:m.align,hspace:m.hspace,vspace:m.vspace,src:r.editor.theme.url+"/img/trans.gif","class":"mceItemMedia mceItem"+r.getType(m.type).name,"data-mce-json":g.serialize(m,"'")});n.width=m.width||(m.type=="audio"?"300":"320");n.height=m.height||(m.type=="audio"?"32":"240");return n},dataToHtml:function(i,j){return this.editor.serializer.serialize(this.dataToImg(i,j),{forced_root_block:"",force_absolute:j})},htmlToData:function(k){var j,i,l;l={type:"flash",video:{sources:[]},params:{}};j=this.editor.parser.parse(k);i=j.getAll("img")[0];if(i){l=g.parse(i.attr("data-mce-json"));l.type=this.getType(i.attr("class")).name.toLowerCase();tinymce.each(d,function(m){var n=i.attr(m);if(n){l[m]=n}})}return l},getType:function(m){var k,j,l;j=tinymce.explode(m," ");for(k=0;k<j.length;k++){l=this.lookup[j[k]];if(l){return l}}},imgToObject:function(z,o){var u=this,p=u.editor,C,H,j,t,I,y,G,w,k,E,s,q,A,D,m,x,l,B,F;function r(i,n){var M,L,N,K,J;J=p.getParam("flash_video_player_url",u.convertUrl(u.url+"/moxieplayer.swf"));if(J){M=p.documentBaseURI;G.params.src=J;if(p.getParam("flash_video_player_absvideourl",true)){i=M.toAbsolute(i||"",true);n=M.toAbsolute(n||"",true)}N="";L=p.getParam("flash_video_player_flashvars",{url:"$url",poster:"$poster"});tinymce.each(L,function(P,O){P=P.replace(/\$url/,i||"");P=P.replace(/\$poster/,n||"");if(P.length>0){N+=(N?"&":"")+O+"="+escape(P)}});if(N.length){G.params.flashvars=N}K=p.getParam("flash_video_player_params",{allowfullscreen:true,allowscriptaccess:true});tinymce.each(K,function(P,O){G.params[O]=""+P})}}G=z.attr("data-mce-json");if(!G){return}G=g.parse(G);q=this.getType(z.attr("class"));B=z.attr("data-mce-style");if(!B){B=z.attr("style");if(B){B=p.dom.serializeStyle(p.dom.parseStyle(B,"img"))}}if(q.name==="Iframe"){x=new b("iframe",1);tinymce.each(d,function(i){var n=z.attr(i);if(i=="class"&&n){n=n.replace(/mceItem.+ ?/g,"")}if(n&&n.length>0){x.attr(i,n)}});for(I in G.params){x.attr(I,G.params[I])}x.attr({style:B,src:G.params.src});z.replace(x);return}if(this.editor.settings.media_use_script){x=new b("script",1).attr("type","text/javascript");y=new b("#text",3);y.value="write"+q.name+"("+g.serialize(tinymce.extend(G.params,{width:z.attr("width"),height:z.attr("height")}))+");";x.append(y);z.replace(x);return}if(q.name==="Video"&&G.video.sources[0]){C=new b("video",1).attr(tinymce.extend({id:z.attr("id"),width:z.attr("width"),height:z.attr("height"),style:B},G.video.attrs));if(G.video.attrs){l=G.video.attrs.poster}k=G.video.sources=c(G.video.sources);for(A=0;A<k.length;A++){if(/\.mp4$/.test(k[A].src)){m=k[A].src}}if(!k[0].type){C.attr("src",k[0].src);k.splice(0,1)}for(A=0;A<k.length;A++){w=new b("source",1).attr(k[A]);w.shortEnded=true;C.append(w)}if(m){r(m,l);q=u.getType("flash")}else{G.params.src=""}}if(q.name==="Audio"&&G.video.sources[0]){F=new b("audio",1).attr(tinymce.extend({id:z.attr("id"),width:z.attr("width"),height:z.attr("height"),style:B},G.video.attrs));if(G.video.attrs){l=G.video.attrs.poster}k=G.video.sources=c(G.video.sources);if(!k[0].type){F.attr("src",k[0].src);k.splice(0,1)}for(A=0;A<k.length;A++){w=new b("source",1).attr(k[A]);w.shortEnded=true;F.append(w)}G.params.src=""}if(q.name==="EmbeddedAudio"){j=new b("embed",1);j.shortEnded=true;j.attr({id:z.attr("id"),width:z.attr("width"),height:z.attr("height"),style:B,type:z.attr("type")});for(I in G.params){j.attr(I,G.params[I])}tinymce.each(d,function(i){if(G[i]&&i!="type"){j.attr(i,G[i])}});G.params.src=""}if(G.params.src){if(/\.flv$/i.test(G.params.src)){r(G.params.src,"")}if(o&&o.force_absolute){G.params.src=p.documentBaseURI.toAbsolute(G.params.src)}H=new b("object",1).attr({id:z.attr("id"),width:z.attr("width"),height:z.attr("height"),style:B});tinymce.each(d,function(i){var n=G[i];if(i=="class"&&n){n=n.replace(/mceItem.+ ?/g,"")}if(n&&i!="type"){H.attr(i,n)}});for(I in G.params){s=new b("param",1);s.shortEnded=true;y=G.params[I];if(I==="src"&&q.name==="WindowsMedia"){I="url"}s.attr({name:I,value:y});H.append(s)}if(this.editor.getParam("media_strict",true)){H.attr({data:G.params.src,type:q.mimes[0]})}else{H.attr({classid:"clsid:"+q.clsids[0],codebase:q.codebase});j=new b("embed",1);j.shortEnded=true;j.attr({id:z.attr("id"),width:z.attr("width"),height:z.attr("height"),style:B,type:q.mimes[0]});for(I in G.params){j.attr(I,G.params[I])}tinymce.each(d,function(i){if(G[i]&&i!="type"){j.attr(i,G[i])}});H.append(j)}if(G.object_html){y=new b("#text",3);y.raw=true;y.value=G.object_html;H.append(y)}if(C){C.append(H)}}if(C){if(G.video_html){y=new b("#text",3);y.raw=true;y.value=G.video_html;C.append(y)}}if(F){if(G.video_html){y=new b("#text",3);y.raw=true;y.value=G.video_html;F.append(y)}}var v=C||F||H||j;if(v){z.replace(v)}else{z.remove()}},objectToImg:function(C){var L,k,F,s,M,N,y,A,x,G,E,t,q,I,B,l,K,o,H=this.lookup,m,z,v=this.editor.settings.url_converter,n=this.editor.settings.url_converter_scope,w,r,D,j;function u(i){return new tinymce.html.Serializer({inner:true,validate:false}).serialize(i)}function J(O,i){return H[(O.attr(i)||"").toLowerCase()]}function p(O){var i=O.replace(/^.*\.([^.]+)$/,"$1");return H[i.toLowerCase()||""]}if(!C.parent){return}if(C.name==="script"){if(C.firstChild){m=a.exec(C.firstChild.value)}if(!m){return}o=m[1];K={video:{},params:g.parse(m[2])};A=K.params.width;x=K.params.height}K=K||{video:{},params:{}};M=new b("img",1);M.attr({src:this.editor.theme.url+"/img/trans.gif"});N=C.name;if(N==="video"||N=="audio"){F=C;L=C.getAll("object")[0];k=C.getAll("embed")[0];A=F.attr("width");x=F.attr("height");y=F.attr("id");K.video={attrs:{},sources:[]};z=K.video.attrs;for(N in F.attributes.map){z[N]=F.attributes.map[N]}B=C.attr("src");if(B){K.video.sources.push({src:v.call(n,B,"src",C.name)})}l=F.getAll("source");for(E=0;E<l.length;E++){B=l[E].remove();K.video.sources.push({src:v.call(n,B.attr("src"),"src","source"),type:B.attr("type"),media:B.attr("media")})}if(z.poster){z.poster=v.call(n,z.poster,"poster",C.name)}}if(C.name==="object"){L=C;k=C.getAll("embed")[0]}if(C.name==="embed"){k=C}if(C.name==="iframe"){s=C;o="Iframe"}if(L){A=A||L.attr("width");x=x||L.attr("height");G=G||L.attr("style");y=y||L.attr("id");w=w||L.attr("hspace");r=r||L.attr("vspace");D=D||L.attr("align");j=j||L.attr("bgcolor");K.name=L.attr("name");I=L.getAll("param");for(E=0;E<I.length;E++){q=I[E];N=q.remove().attr("name");if(!h[N]){K.params[N]=q.attr("value")}}K.params.src=K.params.src||L.attr("data")}if(k){A=A||k.attr("width");x=x||k.attr("height");G=G||k.attr("style");y=y||k.attr("id");w=w||k.attr("hspace");r=r||k.attr("vspace");D=D||k.attr("align");j=j||k.attr("bgcolor");for(N in k.attributes.map){if(!h[N]&&!K.params[N]){K.params[N]=k.attributes.map[N]}}}if(s){A=s.attr("width");x=s.attr("height");G=G||s.attr("style");y=s.attr("id");w=s.attr("hspace");r=s.attr("vspace");D=s.attr("align");j=s.attr("bgcolor");tinymce.each(d,function(i){M.attr(i,s.attr(i))});for(N in s.attributes.map){if(!h[N]&&!K.params[N]){K.params[N]=s.attributes.map[N]}}}if(K.params.movie){K.params.src=K.params.src||K.params.movie;delete K.params.movie}if(K.params.src){K.params.src=v.call(n,K.params.src,"src","object")}if(F){if(C.name==="video"){o=H.video.name}else{if(C.name==="audio"){o=H.audio.name}}}if(L&&!o){o=(J(L,"clsid")||J(L,"classid")||J(L,"type")||{}).name}if(k&&!o){o=(J(k,"type")||p(K.params.src)||{}).name}if(k&&o=="EmbeddedAudio"){K.params.type=k.attr("type")}C.replace(M);if(k){k.remove()}if(L){t=u(L.remove());if(t){K.object_html=t}}if(F){t=u(F.remove());if(t){K.video_html=t}}K.hspace=w;K.vspace=r;K.align=D;K.bgcolor=j;M.attr({id:y,"class":"mceItemMedia mceItem"+(o||"Flash"),style:G,width:A||(C.name=="audio"?"300":"320"),height:x||(C.name=="audio"?"32":"240"),hspace:w,vspace:r,align:D,bgcolor:j,"data-mce-json":g.serialize(K,"'")})}});tinymce.PluginManager.add("media",tinymce.plugins.MediaPlugin)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
index fc84e5b6c..ea79db18a 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
@@ -9,187 +9,211 @@
  */

 

 (function() {

-	var each = tinymce.each;

+	var rootAttributes = tinymce.explode('id,name,width,height,style,align,class,hspace,vspace,bgcolor,type'), excludedAttrs = tinymce.makeMap(rootAttributes.join(',')), Node = tinymce.html.Node,

+		mediaTypes, scriptRegExp, JSON = tinymce.util.JSON, mimeTypes;

+

+	// Media types supported by this plugin

+	mediaTypes = [

+		// Type, clsid:s, mime types, codebase

+		["Flash", "d27cdb6e-ae6d-11cf-96b8-444553540000", "application/x-shockwave-flash", "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],

+		["ShockWave", "166b1bca-3f9c-11cf-8075-444553540000", "application/x-director", "http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],

+		["WindowsMedia", "6bf52a52-394a-11d3-b153-00c04f79faa6,22d6f312-b0f6-11d0-94ab-0080c74c7e95,05589fa1-c356-11ce-bf01-00aa0055595a", "application/x-mplayer2", "http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701"],

+		["QuickTime", "02bf25d5-8c17-4b23-bc80-d3488abddc6b", "video/quicktime", "http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],

+		["RealMedia", "cfcdaa03-8be4-11cf-b84b-0020afbbccfa", "audio/x-pn-realaudio-plugin", "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],

+		["Java", "8ad9c840-044e-11d1-b3e9-00805f499d93", "application/x-java-applet", "http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],

+		["Silverlight", "dfeaf541-f3e1-4c24-acac-99c30715084a", "application/x-silverlight-2"],

+		["Iframe"],

+		["Video"],

+		["EmbeddedAudio"],

+		["Audio"]

+	];

+

+	function toArray(obj) {

+		var undef, out, i;

+

+		if (obj && !obj.splice) {

+			out = [];

+

+			for (i = 0; true; i++) {

+				if (obj[i])

+					out[i] = obj[i];

+				else

+					break;

+			}

+

+			return out;

+		}

+

+		return obj;

+	};

 

 	tinymce.create('tinymce.plugins.MediaPlugin', {

 		init : function(ed, url) {

-			var t = this;

-			

-			t.editor = ed;

-			t.url = url;

+			var self = this, lookup = {}, i, y, item, name;

 

-			function isMediaElm(n) {

-				return /^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(n.className);

+			function isMediaImg(node) {

+				return node && node.nodeName === 'IMG' && ed.dom.hasClass(node, 'mceItemMedia');

 			};

 

-			ed.onPreInit.add(function() {

-				// Force in _value parameter this extra parameter is required for older Opera versions

-				ed.serializer.addRules('param[name|value|_mce_value]');

-			});

+			self.editor = ed;

+			self.url = url;

 

-			// Register commands

-			ed.addCommand('mceMedia', function() {

-				ed.windowManager.open({

-					file : url + '/media.htm',

-					width : 430 + parseInt(ed.getLang('media.delta_width', 0)),

-					height : 470 + parseInt(ed.getLang('media.delta_height', 0)),

-					inline : 1

-				}, {

-					plugin_url : url

-				});

-			});

+			// Parse media types into a lookup table

+			scriptRegExp = '';

+			for (i = 0; i < mediaTypes.length; i++) {

+				name = mediaTypes[i][0];

 

-			// Register buttons

-			ed.addButton('media', {title : 'media.desc', cmd : 'mceMedia'});

+				item = {

+					name : name,

+					clsids : tinymce.explode(mediaTypes[i][1] || ''),

+					mimes : tinymce.explode(mediaTypes[i][2] || ''),

+					codebase : mediaTypes[i][3]

+				};

 

-			ed.onNodeChange.add(function(ed, cm, n) {

-				cm.setActive('media', n.nodeName == 'IMG' && isMediaElm(n));

+				for (y = 0; y < item.clsids.length; y++)

+					lookup['clsid:' + item.clsids[y]] = item;

+

+				for (y = 0; y < item.mimes.length; y++)

+					lookup[item.mimes[y]] = item;

+

+				lookup['mceItem' + name] = item;

+				lookup[name.toLowerCase()] = item;

+

+				scriptRegExp += (scriptRegExp ? '|' : '') + name;

+			}

+

+			// Handle the media_types setting

+			tinymce.each(ed.getParam("media_types",

+				"video=mp4,m4v,ogv,webm;" +

+				"silverlight=xap;" +

+				"flash=swf,flv;" +

+				"shockwave=dcr;" +

+				"quicktime=mov,qt,mpg,mpeg;" +

+				"shockwave=dcr;" +

+				"windowsmedia=avi,wmv,wm,asf,asx,wmx,wvx;" +

+				"realmedia=rm,ra,ram;" +

+				"java=jar;" +

+				"audio=mp3,ogg"

+			).split(';'), function(item) {

+				var i, extensions, type;

+

+				item = item.split(/=/);

+				extensions = tinymce.explode(item[1].toLowerCase());

+				for (i = 0; i < extensions.length; i++) {

+					type = lookup[item[0].toLowerCase()];

+

+					if (type)

+						lookup[extensions[i]] = type;

+				}

 			});

 

-			ed.onInit.add(function() {

-				var lo = {

-					mceItemFlash : 'flash',

-					mceItemShockWave : 'shockwave',

-					mceItemWindowsMedia : 'windowsmedia',

-					mceItemQuickTime : 'quicktime',

-					mceItemRealMedia : 'realmedia'

-				};

+			scriptRegExp = new RegExp('write(' + scriptRegExp + ')\\(([^)]+)\\)');

+			self.lookup = lookup;

+

+			ed.onPreInit.add(function() {

+				// Allow video elements

+				ed.schema.addValidElements('object[id|style|width|height|classid|codebase|*],param[name|value],embed[id|style|width|height|type|src|*],video[*],audio[*],source[*]');

+

+				// Convert video elements to image placeholder

+				ed.parser.addNodeFilter('object,embed,video,audio,script,iframe', function(nodes) {

+					var i = nodes.length;

 

-				ed.selection.onSetContent.add(function() {

-					t._spansToImgs(ed.getBody());

+					while (i--)

+						self.objectToImg(nodes[i]);

 				});

 

-				ed.selection.onBeforeSetContent.add(t._objectsToSpans, t);

+				// Convert image placeholders to video elements

+				ed.serializer.addNodeFilter('img', function(nodes, name, args) {

+					var i = nodes.length, node;

 

-				if (ed.settings.content_css !== false)

-					ed.dom.loadCSS(url + "/css/content.css");

+					while (i--) {

+						node = nodes[i];

+						if ((node.attr('class') || '').indexOf('mceItemMedia') !== -1)

+							self.imgToObject(node, args);

+					}

+				});

+			});

 

+			ed.onInit.add(function() {

+				// Display "media" instead of "img" in element path

 				if (ed.theme && ed.theme.onResolveName) {

-					ed.theme.onResolveName.add(function(th, o) {

-						if (o.name == 'img') {

-							each(lo, function(v, k) {

-								if (ed.dom.hasClass(o.node, k)) {

-									o.name = v;

-									o.title = ed.dom.getAttrib(o.node, 'title');

-									return false;

-								}

-							});

-						}

+					ed.theme.onResolveName.add(function(theme, path_object) {

+						if (path_object.name === 'img' && ed.dom.hasClass(path_object.node, 'mceItemMedia'))

+							path_object.name = 'media';

 					});

 				}

 

+				// Add contect menu if it's loaded

 				if (ed && ed.plugins.contextmenu) {

-					ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {

-						if (e.nodeName == 'IMG' && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(e.className)) {

-							m.add({title : 'media.edit', icon : 'media', cmd : 'mceMedia'});

-						}

+					ed.plugins.contextmenu.onContextMenu.add(function(plugin, menu, element) {

+						if (element.nodeName === 'IMG' && element.className.indexOf('mceItemMedia') !== -1)

+							menu.add({title : 'media.edit', icon : 'media', cmd : 'mceMedia'});

 					});

 				}

 			});

 

-			ed.onBeforeSetContent.add(t._objectsToSpans, t);

-

-			ed.onSetContent.add(function() {

-				t._spansToImgs(ed.getBody());

-			});

+			// Register commands

+			ed.addCommand('mceMedia', function() {

+				var data, img;

 

-			ed.onPreProcess.add(function(ed, o) {

-				var dom = ed.dom;

+				img = ed.selection.getNode();

+				if (isMediaImg(img)) {

+					data = ed.dom.getAttrib(img, 'data-mce-json');

+					if (data) {

+						data = JSON.parse(data);

 

-				if (o.set) {

-					t._spansToImgs(o.node);

+						// Add some extra properties to the data object

+						tinymce.each(rootAttributes, function(name) {

+							var value = ed.dom.getAttrib(img, name);

 

-					each(dom.select('IMG', o.node), function(n) {

-						var p;

+							if (value)

+								data[name] = value;

+						});

 

-						if (isMediaElm(n)) {

-							p = t._parse(n.title);

-							dom.setAttrib(n, 'width', dom.getAttrib(n, 'width', p.width || 100));

-							dom.setAttrib(n, 'height', dom.getAttrib(n, 'height', p.height || 100));

-						}

-					});

+						data.type = self.getType(img.className).name.toLowerCase();

+					}

 				}

 

-				if (o.get) {

-					each(dom.select('IMG', o.node), function(n) {

-						var ci, cb, mt;

-

-						if (ed.getParam('media_use_script')) {

-							if (isMediaElm(n))

-								n.className = n.className.replace(/mceItem/g, 'mceTemp');

-

-							return;

-						}

-

-						switch (n.className) {

-							case 'mceItemFlash':

-								ci = 'd27cdb6e-ae6d-11cf-96b8-444553540000';

-								cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';

-								mt = 'application/x-shockwave-flash';

-								break;

-

-							case 'mceItemShockWave':

-								ci = '166b1bca-3f9c-11cf-8075-444553540000';

-								cb = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';

-								mt = 'application/x-director';

-								break;

-

-							case 'mceItemWindowsMedia':

-								ci = ed.getParam('media_wmp6_compatible') ? '05589fa1-c356-11ce-bf01-00aa0055595a' : '6bf52a52-394a-11d3-b153-00c04f79faa6';

-								cb = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';

-								mt = 'application/x-mplayer2';

-								break;

-

-							case 'mceItemQuickTime':

-								ci = '02bf25d5-8c17-4b23-bc80-d3488abddc6b';

-								cb = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';

-								mt = 'video/quicktime';

-								break;

-

-							case 'mceItemRealMedia':

-								ci = 'cfcdaa03-8be4-11cf-b84b-0020afbbccfa';

-								cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';

-								mt = 'audio/x-pn-realaudio-plugin';

-								break;

-						}

-

-						if (ci) {

-							dom.replace(t._buildObj({

-								classid : ci,

-								codebase : cb,

-								type : mt

-							}, n), n);

-						}

-					});

+				if (!data) {

+					data = {

+						type : 'flash',

+						video: {sources:[]},

+						params: {}

+					};

 				}

-			});

 

-			ed.onPostProcess.add(function(ed, o) {

-				o.content = o.content.replace(/_mce_value=/g, 'value=');

+				ed.windowManager.open({

+					file : url + '/media.htm',

+					width : 430 + parseInt(ed.getLang('media.delta_width', 0)),

+					height : 500 + parseInt(ed.getLang('media.delta_height', 0)),

+					inline : 1

+				}, {

+					plugin_url : url,

+					data : data

+				});

 			});

 

-			function getAttr(s, n) {

-				n = new RegExp(n + '=\"([^\"]+)\"', 'g').exec(s);

+			// Register buttons

+			ed.addButton('media', {title : 'media.desc', cmd : 'mceMedia'});

 

-				return n ? ed.dom.decode(n[1]) : '';

-			};

+			// Update media selection status

+			ed.onNodeChange.add(function(ed, cm, node) {

+				cm.setActive('media', isMediaImg(node));

+			});

+		},

 

-			ed.onPostProcess.add(function(ed, o) {

-				if (ed.getParam('media_use_script')) {

-					o.content = o.content.replace(/<img[^>]+>/g, function(im) {

-						var cl = getAttr(im, 'class');

+		convertUrl : function(url, force_absolute) {

+			var self = this, editor = self.editor, settings = editor.settings,

+				urlConverter = settings.url_converter,

+				urlConverterScope = settings.url_converter_scope || self;

 

-						if (/^(mceTempFlash|mceTempShockWave|mceTempWindowsMedia|mceTempQuickTime|mceTempRealMedia)$/.test(cl)) {

-							at = t._parse(getAttr(im, 'title'));

-							at.width = getAttr(im, 'width');

-							at.height = getAttr(im, 'height');

-							im = '<script type="text/javascript">write' + cl.substring(7) + '({' + t._serialize(at) + '});</script>';

-						}

+			if (!url)

+				return url;

 

-						return im;

-					});

-				}

-			});

+			if (force_absolute)

+				return editor.documentBaseURI.toAbsolute(url);

+

+			return urlConverter.call(urlConverterScope, url, 'src', 'object');

 		},

 

 		getInfo : function() {

@@ -202,213 +226,665 @@
 			};

 		},

 

-		// Private methods

-		_objectsToSpans : function(ed, o) {

-			var t = this, h = o.content;

+		/**

+		 * Converts the JSON data object to an img node.

+		 */

+		dataToImg : function(data, force_absolute) {

+			var self = this, editor = self.editor, baseUri = editor.documentBaseURI, sources, attrs, img, i;

 

-			h = h.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi, function(a, b, c) {

-				var o = t._parse(c);

+			data.params.src = self.convertUrl(data.params.src, force_absolute);

 

-				return '<img class="mceItem' + b + '" title="' + ed.dom.encode(c) + '" src="' + t.url + '/img/trans.gif" width="' + o.width + '" height="' + o.height + '" />'

+			attrs = data.video.attrs;

+			if (attrs)

+				attrs.src = self.convertUrl(attrs.src, force_absolute);

+

+			if (attrs)

+				attrs.poster = self.convertUrl(attrs.poster, force_absolute);

+

+			sources = toArray(data.video.sources);

+			if (sources) {

+				for (i = 0; i < sources.length; i++)

+					sources[i].src = self.convertUrl(sources[i].src, force_absolute);

+			}

+

+			img = self.editor.dom.create('img', {

+				id : data.id,

+				style : data.style,

+				align : data.align,

+				hspace : data.hspace,

+				vspace : data.vspace,

+				src : self.editor.theme.url + '/img/trans.gif',

+				'class' : 'mceItemMedia mceItem' + self.getType(data.type).name,

+				'data-mce-json' : JSON.serialize(data, "'")

 			});

 

-			h = h.replace(/<object([^>]*)>/gi, '<span class="mceItemObject" $1>');

-			h = h.replace(/<embed([^>]*)\/?>/gi, '<span class="mceItemEmbed" $1></span>');

-			h = h.replace(/<embed([^>]*)>/gi, '<span class="mceItemEmbed" $1>');

-			h = h.replace(/<\/(object)([^>]*)>/gi, '</span>');

-			h = h.replace(/<\/embed>/gi, '');

-			h = h.replace(/<param([^>]*)>/gi, function(a, b) {return '<span ' + b.replace(/value=/gi, '_mce_value=') + ' class="mceItemParam"></span>'});

-			h = h.replace(/\/ class=\"mceItemParam\"><\/span>/gi, 'class="mceItemParam"></span>');

+			img.width = data.width || (data.type == 'audio' ? "300" : "320");

+			img.height = data.height || (data.type == 'audio' ? "32" : "240");

+

+			return img;

+		},

+

+		/**

+		 * Converts the JSON data object to a HTML string.

+		 */

+		dataToHtml : function(data, force_absolute) {

+			return this.editor.serializer.serialize(this.dataToImg(data, force_absolute), {forced_root_block : '', force_absolute : force_absolute});

+		},

+

+		/**

+		 * Converts the JSON data object to a HTML string.

+		 */

+		htmlToData : function(html) {

+			var fragment, img, data;

+

+			data = {

+				type : 'flash',

+				video: {sources:[]},

+				params: {}

+			};

+

+			fragment = this.editor.parser.parse(html);

+			img = fragment.getAll('img')[0];

+

+			if (img) {

+				data = JSON.parse(img.attr('data-mce-json'));

+				data.type = this.getType(img.attr('class')).name.toLowerCase();

+

+				// Add some extra properties to the data object

+				tinymce.each(rootAttributes, function(name) {

+					var value = img.attr(name);

 

-			o.content = h;

+					if (value)

+						data[name] = value;

+				});

+			}

+

+			return data;

+		},

+

+		/**

+		 * Get type item by extension, class, clsid or mime type.

+		 *

+		 * @method getType

+		 * @param {String} value Value to get type item by.

+		 * @return {Object} Type item object or undefined.

+		 */

+		getType : function(value) {

+			var i, values, typeItem;

+

+			// Find type by checking the classes

+			values = tinymce.explode(value, ' ');

+			for (i = 0; i < values.length; i++) {

+				typeItem = this.lookup[values[i]];

+

+				if (typeItem)

+					return typeItem;

+			}

 		},

 

-		_buildObj : function(o, n) {

-			var ob, ed = this.editor, dom = ed.dom, p = this._parse(n.title), stc;

-			

-			stc = ed.getParam('media_strict', true) && o.type == 'application/x-shockwave-flash';

-

-			p.width = o.width = dom.getAttrib(n, 'width') || 100;

-			p.height = o.height = dom.getAttrib(n, 'height') || 100;

-

-			if (p.src)

-				p.src = ed.convertURL(p.src, 'src', n);

-

-			if (stc) {

-				ob = dom.create('span', {

-					id : p.id,

-					_mce_name : 'object',

-					type : 'application/x-shockwave-flash',

-					data : p.src,

-					style : dom.getAttrib(n, 'style'),

-					width : o.width,

-					height : o.height

+		/**

+		 * Converts a tinymce.html.Node image element to video/object/embed.

+		 */

+		imgToObject : function(node, args) {

+			var self = this, editor = self.editor, video, object, embed, iframe, name, value, data,

+				source, sources, params, param, typeItem, i, item, mp4Source, replacement,

+				posterSrc, style, audio;

+

+			// Adds the flash player

+			function addPlayer(video_src, poster_src) {

+				var baseUri, flashVars, flashVarsOutput, params, flashPlayer;

+

+				flashPlayer = editor.getParam('flash_video_player_url', self.convertUrl(self.url + '/moxieplayer.swf'));

+				if (flashPlayer) {

+					baseUri = editor.documentBaseURI;

+					data.params.src = flashPlayer;

+

+					// Convert the movie url to absolute urls

+					if (editor.getParam('flash_video_player_absvideourl', true)) {

+						video_src = baseUri.toAbsolute(video_src || '', true);

+						poster_src = baseUri.toAbsolute(poster_src || '', true);

+					}

+

+					// Generate flash vars

+					flashVarsOutput = '';

+					flashVars = editor.getParam('flash_video_player_flashvars', {url : '$url', poster : '$poster'});

+					tinymce.each(flashVars, function(value, name) {

+						// Replace $url and $poster variables in flashvars value

+						value = value.replace(/\$url/, video_src || '');

+						value = value.replace(/\$poster/, poster_src || '');

+

+						if (value.length > 0)

+							flashVarsOutput += (flashVarsOutput ? '&' : '') + name + '=' + escape(value);

+					});

+

+					if (flashVarsOutput.length)

+						data.params.flashvars = flashVarsOutput;

+

+					params = editor.getParam('flash_video_player_params', {

+						allowfullscreen: true,

+						allowscriptaccess: true

+					});

+

+					tinymce.each(params, function(value, name) {

+						data.params[name] = "" + value;

+					});

+				}

+			};

+

+			data = node.attr('data-mce-json');

+			if (!data)

+				return;

+

+			data = JSON.parse(data);

+			typeItem = this.getType(node.attr('class'));

+

+			style = node.attr('data-mce-style')

+			if (!style) {

+				style = node.attr('style');

+

+				if (style)

+					style = editor.dom.serializeStyle(editor.dom.parseStyle(style, 'img'));

+			}

+

+			// Handle iframe

+			if (typeItem.name === 'Iframe') {

+				replacement = new Node('iframe', 1);

+

+				tinymce.each(rootAttributes, function(name) {

+					var value = node.attr(name);

+

+					if (name == 'class' && value)

+						value = value.replace(/mceItem.+ ?/g, '');

+

+					if (value && value.length > 0)

+						replacement.attr(name, value);

 				});

-			} else {

-				ob = dom.create('span', {

-					id : p.id,

-					_mce_name : 'object',

-					classid : "clsid:" + o.classid,

-					style : dom.getAttrib(n, 'style'),

-					codebase : o.codebase,

-					width : o.width,

-					height : o.height

+

+				for (name in data.params)

+					replacement.attr(name, data.params[name]);

+

+				replacement.attr({

+					style: style,

+					src: data.params.src

 				});

+

+				node.replace(replacement);

+

+				return;

 			}

 

-			each (p, function(v, k) {

-				if (!/^(width|height|codebase|classid|id|_cx|_cy)$/.test(k)) {

-					// Use url instead of src in IE for Windows media

-					if (o.type == 'application/x-mplayer2' && k == 'src' && !p.url)

-						k = 'url';

+			// Handle scripts

+			if (this.editor.settings.media_use_script) {

+				replacement = new Node('script', 1).attr('type', 'text/javascript');

+

+				value = new Node('#text', 3);

+				value.value = 'write' + typeItem.name + '(' + JSON.serialize(tinymce.extend(data.params, {

+					width: node.attr('width'),

+					height: node.attr('height')

+				})) + ');';

+

+				replacement.append(value);

+				node.replace(replacement);

 

-					if (v)

-						dom.add(ob, 'span', {_mce_name : 'param', name : k, '_mce_value' : v});

+				return;

+			}

+

+			// Add HTML5 video element

+			if (typeItem.name === 'Video' && data.video.sources[0]) {

+				// Create new object element

+				video = new Node('video', 1).attr(tinymce.extend({

+					id : node.attr('id'),

+					width: node.attr('width'),

+					height: node.attr('height'),

+					style : style

+				}, data.video.attrs));

+

+				// Get poster source and use that for flash fallback

+				if (data.video.attrs)

+					posterSrc = data.video.attrs.poster;

+

+				sources = data.video.sources = toArray(data.video.sources);

+				for (i = 0; i < sources.length; i++) {

+					if (/\.mp4$/.test(sources[i].src))

+						mp4Source = sources[i].src;

 				}

-			});

 

-			if (!stc)

-				dom.add(ob, 'span', tinymce.extend({_mce_name : 'embed', type : o.type, style : dom.getAttrib(n, 'style')}, p));

+				if (!sources[0].type) {

+					video.attr('src', sources[0].src);

+					sources.splice(0, 1);

+				}

 

-			return ob;

-		},

+				for (i = 0; i < sources.length; i++) {

+					source = new Node('source', 1).attr(sources[i]);

+					source.shortEnded = true;

+					video.append(source);

+				}

 

-		_spansToImgs : function(p) {

-			var t = this, dom = t.editor.dom, im, ci;

+				// Create flash fallback for video if we have a mp4 source

+				if (mp4Source) {

+					addPlayer(mp4Source, posterSrc);

+					typeItem = self.getType('flash');

+				} else

+					data.params.src = '';

+			}

 

-			each(dom.select('span', p), function(n) {

-				// Convert object into image

-				if (dom.getAttrib(n, 'class') == 'mceItemObject') {

-					ci = dom.getAttrib(n, "classid").toLowerCase().replace(/\s+/g, '');

+			// Add HTML5 audio element

+			if (typeItem.name === 'Audio' && data.video.sources[0]) {

+				// Create new object element

+				audio = new Node('audio', 1).attr(tinymce.extend({

+					id : node.attr('id'),

+					width: node.attr('width'),

+					height: node.attr('height'),

+					style : style

+				}, data.video.attrs));

+

+				// Get poster source and use that for flash fallback

+				if (data.video.attrs)

+					posterSrc = data.video.attrs.poster;

+

+				sources = data.video.sources = toArray(data.video.sources);

+				if (!sources[0].type) {

+					audio.attr('src', sources[0].src);

+					sources.splice(0, 1);

+				}

 

-					switch (ci) {

-						case 'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000':

-							dom.replace(t._createImg('mceItemFlash', n), n);

-							break;

+				for (i = 0; i < sources.length; i++) {

+					source = new Node('source', 1).attr(sources[i]);

+					source.shortEnded = true;

+					audio.append(source);

+				}

 

-						case 'clsid:166b1bca-3f9c-11cf-8075-444553540000':

-							dom.replace(t._createImg('mceItemShockWave', n), n);

-							break;

+				data.params.src = '';

+			}

 

-						case 'clsid:6bf52a52-394a-11d3-b153-00c04f79faa6':

-						case 'clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95':

-						case 'clsid:05589fa1-c356-11ce-bf01-00aa0055595a':

-							dom.replace(t._createImg('mceItemWindowsMedia', n), n);

-							break;

+			if (typeItem.name === 'EmbeddedAudio') {

+				embed = new Node('embed', 1);

+				embed.shortEnded = true;

+				embed.attr({

+					id: node.attr('id'),

+					width: node.attr('width'),

+					height: node.attr('height'),

+					style : style,

+					type: node.attr('type')

+				});

 

-						case 'clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b':

-							dom.replace(t._createImg('mceItemQuickTime', n), n);

-							break;

+				for (name in data.params)

+					embed.attr(name, data.params[name]);

 

-						case 'clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa':

-							dom.replace(t._createImg('mceItemRealMedia', n), n);

-							break;

+				tinymce.each(rootAttributes, function(name) {

+					if (data[name] && name != 'type')

+						embed.attr(name, data[name]);

+				});

 

-						default:

-							dom.replace(t._createImg('mceItemFlash', n), n);

-					}

-					

-					return;

+				data.params.src = '';

+			}

+

+			// Do we have a params src then we can generate object

+			if (data.params.src) {

+				// Is flv movie add player for it

+				if (/\.flv$/i.test(data.params.src))

+					addPlayer(data.params.src, '');

+

+				if (args && args.force_absolute)

+					data.params.src = editor.documentBaseURI.toAbsolute(data.params.src);

+

+				// Create new object element

+				object = new Node('object', 1).attr({

+					id : node.attr('id'),

+					width: node.attr('width'),

+					height: node.attr('height'),

+					style : style

+				});

+

+				tinymce.each(rootAttributes, function(name) {

+					var value = data[name];

+

+					if (name == 'class' && value)

+						value = value.replace(/mceItem.+ ?/g, '');

+

+					if (value && name != 'type')

+						object.attr(name, value);

+				});

+

+				// Add params

+				for (name in data.params) {

+					param = new Node('param', 1);

+					param.shortEnded = true;

+					value = data.params[name];

+

+					// Windows media needs to use url instead of src for the media URL

+					if (name === 'src' && typeItem.name === 'WindowsMedia')

+						name = 'url';

+

+					param.attr({name: name, value: value});

+					object.append(param);

 				}

 

-				// Convert embed into image

-				if (dom.getAttrib(n, 'class') == 'mceItemEmbed') {

-					switch (dom.getAttrib(n, 'type')) {

-						case 'application/x-shockwave-flash':

-							dom.replace(t._createImg('mceItemFlash', n), n);

-							break;

+				// Setup add type and classid if strict is disabled

+				if (this.editor.getParam('media_strict', true)) {

+					object.attr({

+						data: data.params.src,

+						type: typeItem.mimes[0]

+					});

+				} else {

+					object.attr({

+						classid: "clsid:" + typeItem.clsids[0],

+						codebase: typeItem.codebase

+					});

 

-						case 'application/x-director':

-							dom.replace(t._createImg('mceItemShockWave', n), n);

-							break;

+					embed = new Node('embed', 1);

+					embed.shortEnded = true;

+					embed.attr({

+						id: node.attr('id'),

+						width: node.attr('width'),

+						height: node.attr('height'),

+						style : style,

+						type: typeItem.mimes[0]

+					});

 

-						case 'application/x-mplayer2':

-							dom.replace(t._createImg('mceItemWindowsMedia', n), n);

-							break;

+					for (name in data.params)

+						embed.attr(name, data.params[name]);

 

-						case 'video/quicktime':

-							dom.replace(t._createImg('mceItemQuickTime', n), n);

-							break;

+					tinymce.each(rootAttributes, function(name) {

+						if (data[name] && name != 'type')

+							embed.attr(name, data[name]);

+					});

 

-						case 'audio/x-pn-realaudio-plugin':

-							dom.replace(t._createImg('mceItemRealMedia', n), n);

-							break;

+					object.append(embed);

+				}

 

-						default:

-							dom.replace(t._createImg('mceItemFlash', n), n);

-					}

-				}			

-			});

+				// Insert raw HTML

+				if (data.object_html) {

+					value = new Node('#text', 3);

+					value.raw = true;

+					value.value = data.object_html;

+					object.append(value);

+				}

+

+				// Append object to video element if it exists

+				if (video)

+					video.append(object);

+			}

+

+			if (video) {

+				// Insert raw HTML

+				if (data.video_html) {

+					value = new Node('#text', 3);

+					value.raw = true;

+					value.value = data.video_html;

+					video.append(value);

+				}

+			}

+

+			if (audio) {

+				// Insert raw HTML

+				if (data.video_html) {

+					value = new Node('#text', 3);

+					value.raw = true;

+					value.value = data.video_html;

+					audio.append(value);

+				}

+			}

+

+			var n = video || audio || object || embed;

+			if (n)

+				node.replace(n);

+			else

+				node.remove();

 		},

 

-		_createImg : function(cl, n) {

-			var im, dom = this.editor.dom, pa = {}, ti = '', args;

+		/**

+		 * Converts a tinymce.html.Node video/object/embed to an img element.

+		 *

+		 * The video/object/embed will be converted into an image placeholder with a JSON data attribute like this:

+		 * <img class="mceItemMedia mceItemFlash" width="100" height="100" data-mce-json="{..}" />

+		 *

+		 * The JSON structure will be like this:

+		 * {'params':{'flashvars':'something','quality':'high','src':'someurl'}, 'video':{'sources':[{src: 'someurl', type: 'video/mp4'}]}}

+		 */

+		objectToImg : function(node) {

+			var object, embed, video, iframe, img, name, id, width, height, style, i, html,

+				param, params, source, sources, data, type, lookup = this.lookup,

+				matches, attrs, urlConverter = this.editor.settings.url_converter,

+				urlConverterScope = this.editor.settings.url_converter_scope,

+				hspace, vspace, align, bgcolor;

+

+			function getInnerHTML(node) {

+				return new tinymce.html.Serializer({

+					inner: true,

+					validate: false

+				}).serialize(node);

+			};

 

-			args = ['id', 'name', 'width', 'height', 'bgcolor', 'align', 'flashvars', 'src', 'wmode', 'allowfullscreen', 'quality', 'data'];	

+			function lookupAttribute(o, attr) {

+				return lookup[(o.attr(attr) || '').toLowerCase()];

+			}

 

-			// Create image

-			im = dom.create('img', {

-				src : this.url + '/img/trans.gif',

-				width : dom.getAttrib(n, 'width') || 100,

-				height : dom.getAttrib(n, 'height') || 100,

-				style : dom.getAttrib(n, 'style'),

-				'class' : cl

-			});

+			function lookupExtension(src) {

+				var ext = src.replace(/^.*\.([^.]+)$/, '$1');

+				return lookup[ext.toLowerCase() || ''];

+			}

 

-			// Setup base parameters

-			each(args, function(na) {

-				var v = dom.getAttrib(n, na);

+			// If node isn't in document

+			if (!node.parent)

+				return;

 

-				if (v)

-					pa[na] = v;

-			});

+			// Handle media scripts

+			if (node.name === 'script') {

+				if (node.firstChild)

+					matches = scriptRegExp.exec(node.firstChild.value);

+

+				if (!matches)

+					return;

+

+				type = matches[1];

+				data = {video : {}, params : JSON.parse(matches[2])};

+				width = data.params.width;

+				height = data.params.height;

+			}

 

-			// Add optional parameters

-			each(dom.select('span', n), function(n) {

-				if (dom.hasClass(n, 'mceItemParam'))

-					pa[dom.getAttrib(n, 'name')] = dom.getAttrib(n, '_mce_value');

+			// Setup data objects

+			data = data || {

+				video : {},

+				params : {}

+			};

+

+			// Setup new image object

+			img = new Node('img', 1);

+			img.attr({

+				src : this.editor.theme.url + '/img/trans.gif'

 			});

 

-			// Use src not movie

-			if (pa.movie) {

-				pa.src = pa.movie;

-				delete pa.movie;

+			// Video element

+			name = node.name;

+			if (name === 'video' || name == 'audio') {

+				video = node;

+				object = node.getAll('object')[0];

+				embed = node.getAll('embed')[0];

+				width = video.attr('width');

+				height = video.attr('height');

+				id = video.attr('id');

+				data.video = {attrs : {}, sources : []};

+

+				// Get all video attributes

+				attrs = data.video.attrs;

+				for (name in video.attributes.map)

+					attrs[name] = video.attributes.map[name];

+

+				source = node.attr('src');

+				if (source)

+					data.video.sources.push({src : urlConverter.call(urlConverterScope, source, 'src', node.name)});

+

+				// Get all sources

+				sources = video.getAll("source");

+				for (i = 0; i < sources.length; i++) {

+					source = sources[i].remove();

+

+					data.video.sources.push({

+						src: urlConverter.call(urlConverterScope, source.attr('src'), 'src', 'source'),

+						type: source.attr('type'),

+						media: source.attr('media')

+					});

+				}

+

+				// Convert the poster URL

+				if (attrs.poster)

+					attrs.poster = urlConverter.call(urlConverterScope, attrs.poster, 'poster', node.name);

+			}

+

+			// Object element

+			if (node.name === 'object') {

+				object = node;

+				embed = node.getAll('embed')[0];

+			}

+

+			// Embed element

+			if (node.name === 'embed')

+				embed = node;

+

+			// Iframe element

+			if (node.name === 'iframe') {

+				iframe = node;

+				type = 'Iframe';

 			}

 

-			// No src try data

-			if (!pa.src) {

-				pa.src = pa.data;

-				delete pa.data;

+			if (object) {

+				// Get width/height

+				width = width || object.attr('width');

+				height = height || object.attr('height');

+				style = style || object.attr('style');

+				id = id || object.attr('id');

+				hspace = hspace || object.attr('hspace');

+				vspace = vspace || object.attr('vspace');

+				align = align || object.attr('align');

+				bgcolor = bgcolor || object.attr('bgcolor');

+				data.name = object.attr('name');

+

+				// Get all object params

+				params = object.getAll("param");

+				for (i = 0; i < params.length; i++) {

+					param = params[i];

+					name = param.remove().attr('name');

+

+					if (!excludedAttrs[name])

+						data.params[name] = param.attr('value');

+				}

+

+				data.params.src = data.params.src || object.attr('data');

 			}

 

-			// Merge with embed args

-			n = dom.select('.mceItemEmbed', n)[0];

-			if (n) {

-				each(args, function(na) {

-					var v = dom.getAttrib(n, na);

+			if (embed) {

+				// Get width/height

+				width = width || embed.attr('width');

+				height = height || embed.attr('height');

+				style = style || embed.attr('style');

+				id = id || embed.attr('id');

+				hspace = hspace || embed.attr('hspace');

+				vspace = vspace || embed.attr('vspace');

+				align = align || embed.attr('align');

+				bgcolor = bgcolor || embed.attr('bgcolor');

+

+				// Get all embed attributes

+				for (name in embed.attributes.map) {

+					if (!excludedAttrs[name] && !data.params[name])

+						data.params[name] = embed.attributes.map[name];

+				}

+			}

 

-					if (v && !pa[na])

-						pa[na] = v;

+			if (iframe) {

+				// Get width/height

+				width = iframe.attr('width');

+				height = iframe.attr('height');

+				style = style || iframe.attr('style');

+				id = iframe.attr('id');

+				hspace = iframe.attr('hspace');

+				vspace = iframe.attr('vspace');

+				align = iframe.attr('align');

+				bgcolor = iframe.attr('bgcolor');

+

+				tinymce.each(rootAttributes, function(name) {

+					img.attr(name, iframe.attr(name));

 				});

+

+				// Get all iframe attributes

+				for (name in iframe.attributes.map) {

+					if (!excludedAttrs[name] && !data.params[name])

+						data.params[name] = iframe.attributes.map[name];

+				}

 			}

 

-			delete pa.width;

-			delete pa.height;

+			// Use src not movie

+			if (data.params.movie) {

+				data.params.src = data.params.src || data.params.movie;

+				delete data.params.movie;

+			}

 

-			im.title = this._serialize(pa);

+			// Convert the URL to relative/absolute depending on configuration

+			if (data.params.src)

+				data.params.src = urlConverter.call(urlConverterScope, data.params.src, 'src', 'object');

 

-			return im;

-		},

+			if (video) {

+				if (node.name === 'video')

+					type = lookup.video.name;

+				else if (node.name === 'audio')

+					type = lookup.audio.name;

+			}

 

-		_parse : function(s) {

-			return tinymce.util.JSON.parse('{' + s + '}');

-		},

+			if (object && !type)

+				type = (lookupAttribute(object, 'clsid') || lookupAttribute(object, 'classid') || lookupAttribute(object, 'type') || {}).name;

+

+			if (embed && !type)

+				type = (lookupAttribute(embed, 'type') || lookupExtension(data.params.src) || {}).name;

 

-		_serialize : function(o) {

-			return tinymce.util.JSON.serialize(o).replace(/[{}]/g, '');

+			// for embedded audio we preserve the original specified type

+			if (embed && type == 'EmbeddedAudio') {

+				data.params.type = embed.attr('type');

+			}

+

+			// Replace the video/object/embed element with a placeholder image containing the data

+			node.replace(img);

+

+			// Remove embed

+			if (embed)

+				embed.remove();

+

+			// Serialize the inner HTML of the object element

+			if (object) {

+				html = getInnerHTML(object.remove());

+

+				if (html)

+					data.object_html = html;

+			}

+

+			// Serialize the inner HTML of the video element

+			if (video) {

+				html = getInnerHTML(video.remove());

+

+				if (html)

+					data.video_html = html;

+			}

+

+			data.hspace = hspace;

+			data.vspace = vspace;

+			data.align = align;

+			data.bgcolor = bgcolor;

+

+			// Set width/height of placeholder

+			img.attr({

+				id : id,

+				'class' : 'mceItemMedia mceItem' + (type || 'Flash'),

+				style : style,

+				width : width || (node.name == 'audio' ? "300" : "320"),

+				height : height || (node.name == 'audio' ? "32" : "240"),

+				hspace : hspace,

+				vspace : vspace,

+				align : align,

+				bgcolor : bgcolor,

+				"data-mce-json" : JSON.serialize(data, "'")

+			});

 		}

 	});

 

 	// Register plugin

 	tinymce.PluginManager.add('media', tinymce.plugins.MediaPlugin);

-})();
\ No newline at end of file
+})();

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif b/library/tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif
deleted file mode 100755
index cb192e6ce..000000000
--- a/library/tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif
+++ /dev/null
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf b/library/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf
deleted file mode 100755
index 042c2ab96..000000000
--- a/library/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf
+++ /dev/null
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif b/library/tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif
deleted file mode 100755
index 3b0499145..000000000
--- a/library/tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif
+++ /dev/null
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif b/library/tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif
deleted file mode 100755
index 5f235dfc7..000000000
--- a/library/tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif
+++ /dev/null
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/media/js/embed.js b/library/tinymce/jscripts/tiny_mce/plugins/media/js/embed.js
index f8dc81052..f8dc81052 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/media/js/embed.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/media/js/embed.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/media/js/media.js b/library/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
index 86cfa9856..733c5f6c2 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
@@ -1,630 +1,470 @@
-tinyMCEPopup.requireLangPack();

+(function() {

+	var url;

 

-var oldWidth, oldHeight, ed, url;

+	if (url = tinyMCEPopup.getParam("media_external_list_url"))

+		document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');

 

-if (url = tinyMCEPopup.getParam("media_external_list_url"))

-	document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');

-

-function init() {

-	var pl = "", f, val;

-	var type = "flash", fe, i;

-

-	ed = tinyMCEPopup.editor;

-

-	tinyMCEPopup.resizeToInnerSize();

-	f = document.forms[0]

-

-	fe = ed.selection.getNode();

-	if (/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(ed.dom.getAttrib(fe, 'class'))) {

-		pl = fe.title;

-

-		switch (ed.dom.getAttrib(fe, 'class')) {

-			case 'mceItemFlash':

-				type = 'flash';

-				break;

-

-			case 'mceItemFlashVideo':

-				type = 'flv';

-				break;

-

-			case 'mceItemShockWave':

-				type = 'shockwave';

-				break;

-

-			case 'mceItemWindowsMedia':

-				type = 'wmp';

-				break;

-

-			case 'mceItemQuickTime':

-				type = 'qt';

-				break;

-

-			case 'mceItemRealMedia':

-				type = 'rmp';

-				break;

-		}

-

-		document.forms[0].insert.value = ed.getLang('update', 'Insert', true); 

-	}

-

-	document.getElementById('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');

-	document.getElementById('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','qt_qtsrc','media','media');

-	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');

-

-	var html = getMediaListHTML('medialist','src','media','media');

-	if (html == "")

-		document.getElementById("linklistrow").style.display = 'none';

-	else

-		document.getElementById("linklistcontainer").innerHTML = html;

-

-	// Resize some elements

-	if (isVisible('filebrowser'))

-		document.getElementById('src').style.width = '230px';

-

-	// Setup form

-	if (pl != "") {

-		pl = tinyMCEPopup.editor.plugins.media._parse(pl);

-

-		switch (type) {

-			case "flash":

-				setBool(pl, 'flash', 'play');

-				setBool(pl, 'flash', 'loop');

-				setBool(pl, 'flash', 'menu');

-				setBool(pl, 'flash', 'swliveconnect');

-				setStr(pl, 'flash', 'quality');

-				setStr(pl, 'flash', 'scale');

-				setStr(pl, 'flash', 'salign');

-				setStr(pl, 'flash', 'wmode');

-				setStr(pl, 'flash', 'base');

-				setStr(pl, 'flash', 'flashvars');

-			break;

-

-			case "qt":

-				setBool(pl, 'qt', 'loop');

-				setBool(pl, 'qt', 'autoplay');

-				setBool(pl, 'qt', 'cache');

-				setBool(pl, 'qt', 'controller');

-				setBool(pl, 'qt', 'correction');

-				setBool(pl, 'qt', 'enablejavascript');

-				setBool(pl, 'qt', 'kioskmode');

-				setBool(pl, 'qt', 'autohref');

-				setBool(pl, 'qt', 'playeveryframe');

-				setBool(pl, 'qt', 'tarsetcache');

-				setStr(pl, 'qt', 'scale');

-				setStr(pl, 'qt', 'starttime');

-				setStr(pl, 'qt', 'endtime');

-				setStr(pl, 'qt', 'tarset');

-				setStr(pl, 'qt', 'qtsrcchokespeed');

-				setStr(pl, 'qt', 'volume');

-				setStr(pl, 'qt', 'qtsrc');

-			break;

-

-			case "shockwave":

-				setBool(pl, 'shockwave', 'sound');

-				setBool(pl, 'shockwave', 'progress');

-				setBool(pl, 'shockwave', 'autostart');

-				setBool(pl, 'shockwave', 'swliveconnect');

-				setStr(pl, 'shockwave', 'swvolume');

-				setStr(pl, 'shockwave', 'swstretchstyle');

-				setStr(pl, 'shockwave', 'swstretchhalign');

-				setStr(pl, 'shockwave', 'swstretchvalign');

-			break;

-

-			case "wmp":

-				setBool(pl, 'wmp', 'autostart');

-				setBool(pl, 'wmp', 'enabled');

-				setBool(pl, 'wmp', 'enablecontextmenu');

-				setBool(pl, 'wmp', 'fullscreen');

-				setBool(pl, 'wmp', 'invokeurls');

-				setBool(pl, 'wmp', 'mute');

-				setBool(pl, 'wmp', 'stretchtofit');

-				setBool(pl, 'wmp', 'windowlessvideo');

-				setStr(pl, 'wmp', 'balance');

-				setStr(pl, 'wmp', 'baseurl');

-				setStr(pl, 'wmp', 'captioningid');

-				setStr(pl, 'wmp', 'currentmarker');

-				setStr(pl, 'wmp', 'currentposition');

-				setStr(pl, 'wmp', 'defaultframe');

-				setStr(pl, 'wmp', 'playcount');

-				setStr(pl, 'wmp', 'rate');

-				setStr(pl, 'wmp', 'uimode');

-				setStr(pl, 'wmp', 'volume');

-			break;

-

-			case "rmp":

-				setBool(pl, 'rmp', 'autostart');

-				setBool(pl, 'rmp', 'loop');

-				setBool(pl, 'rmp', 'autogotourl');

-				setBool(pl, 'rmp', 'center');

-				setBool(pl, 'rmp', 'imagestatus');

-				setBool(pl, 'rmp', 'maintainaspect');

-				setBool(pl, 'rmp', 'nojava');

-				setBool(pl, 'rmp', 'prefetch');

-				setBool(pl, 'rmp', 'shuffle');

-				setStr(pl, 'rmp', 'console');

-				setStr(pl, 'rmp', 'controls');

-				setStr(pl, 'rmp', 'numloop');

-				setStr(pl, 'rmp', 'scriptcallbacks');

-			break;

-		}

-

-		setStr(pl, null, 'src');

-		setStr(pl, null, 'id');

-		setStr(pl, null, 'name');

-		setStr(pl, null, 'vspace');

-		setStr(pl, null, 'hspace');

-		setStr(pl, null, 'bgcolor');

-		setStr(pl, null, 'align');

-		setStr(pl, null, 'width');

-		setStr(pl, null, 'height');

-

-		if ((val = ed.dom.getAttrib(fe, "width")) != "")

-			pl.width = f.width.value = val;

-

-		if ((val = ed.dom.getAttrib(fe, "height")) != "")

-			pl.height = f.height.value = val;

-

-		oldWidth = pl.width ? parseInt(pl.width) : 0;

-		oldHeight = pl.height ? parseInt(pl.height) : 0;

-	} else

-		oldWidth = oldHeight = 0;

-

-	selectByValue(f, 'media_type', type);

-	changedType(type);

-	updateColor('bgcolor_pick', 'bgcolor');

-

-	TinyMCE_EditableSelects.init();

-	generatePreview();

-}

-

-function insertMedia() {

-	var fe, f = document.forms[0], h;

-

-	tinyMCEPopup.restoreSelection();

-

-	if (!AutoValidator.validate(f)) {

-		tinyMCEPopup.alert(ed.getLang('invalid_data'));

-		return false;

+	function get(id) {

+		return document.getElementById(id);

 	}

 

-	f.width.value = f.width.value == "" ? 100 : f.width.value;

-	f.height.value = f.height.value == "" ? 100 : f.height.value;

+	function clone(obj) {

+		var i, len, copy, attr;

 

-	fe = ed.selection.getNode();

-	if (fe != null && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(ed.dom.getAttrib(fe, 'class'))) {

-		switch (f.media_type.options[f.media_type.selectedIndex].value) {

-			case "flash":

-				fe.className = "mceItemFlash";

-				break;

+		if (null == obj || "object" != typeof obj)

+			return obj;

 

-			case "flv":

-				fe.className = "mceItemFlashVideo";

-				break;

+		// Handle Array

+		if ('length' in obj) {

+			copy = [];

 

-			case "shockwave":

-				fe.className = "mceItemShockWave";

-				break;

-

-			case "qt":

-				fe.className = "mceItemQuickTime";

-				break;

-

-			case "wmp":

-				fe.className = "mceItemWindowsMedia";

-				break;

+			for (i = 0, len = obj.length; i < len; ++i) {

+				copy[i] = clone(obj[i]);

+			}

 

-			case "rmp":

-				fe.className = "mceItemRealMedia";

-				break;

+			return copy;

 		}

 

-		if (fe.width != f.width.value || fe.height != f.height.value)

-			ed.execCommand('mceRepaint');

-

-		fe.title = serializeParameters();

-		fe.width = f.width.value;

-		fe.height = f.height.value;

-		fe.style.width = f.width.value + (f.width.value.indexOf('%') == -1 ? 'px' : '');

-		fe.style.height = f.height.value + (f.height.value.indexOf('%') == -1 ? 'px' : '');

-		fe.align = f.align.options[f.align.selectedIndex].value;

-	} else {

-		h = '<img src="' + tinyMCEPopup.getWindowArg("plugin_url") + '/img/trans.gif"' ;

-

-		switch (f.media_type.options[f.media_type.selectedIndex].value) {

-			case "flash":

-				h += ' class="mceItemFlash"';

-				break;

-

-			case "flv":

-				h += ' class="mceItemFlashVideo"';

-				break;

-

-			case "shockwave":

-				h += ' class="mceItemShockWave"';

-				break;

-

-			case "qt":

-				h += ' class="mceItemQuickTime"';

-				break;

-

-			case "wmp":

-				h += ' class="mceItemWindowsMedia"';

-				break;

-

-			case "rmp":

-				h += ' class="mceItemRealMedia"';

-				break;

+		// Handle Object

+		copy = {};

+		for (attr in obj) {

+			if (obj.hasOwnProperty(attr))

+				copy[attr] = clone(obj[attr]);

 		}

 

-		h += ' title="' + serializeParameters() + '"';

-		h += ' width="' + f.width.value + '"';

-		h += ' height="' + f.height.value + '"';

-		h += ' align="' + f.align.options[f.align.selectedIndex].value + '"';

-

-		h += ' />';

-

-		ed.execCommand('mceInsertContent', false, h);

+		return copy;

 	}

 

-	tinyMCEPopup.close();

-}

+	function getVal(id) {

+		var elm = get(id);

 

-function updatePreview() {

-	var f = document.forms[0], type;

+		if (elm.nodeName == "SELECT")

+			return elm.options[elm.selectedIndex].value;

 

-	f.width.value = f.width.value || '320';

-	f.height.value = f.height.value || '240';

+		if (elm.type == "checkbox")

+			return elm.checked;

 

-	type = getType(f.src.value);

-	selectByValue(f, 'media_type', type);

-	changedType(type);

-	generatePreview();

-}

-

-function getMediaListHTML() {

-	if (typeof(tinyMCEMediaList) != "undefined" && tinyMCEMediaList.length > 0) {

-		var html = "";

-

-		html += '<select id="linklist" name="linklist" style="width: 250px" onchange="this.form.src.value=this.options[this.selectedIndex].value;updatePreview();">';

-		html += '<option value="">---</option>';

-

-		for (var i=0; i<tinyMCEMediaList.length; i++)

-			html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';

-

-		html += '</select>';

-

-		return html;

+		return elm.value;

 	}

 

-	return "";

-}

-

-function getType(v) {

-	var fo, i, c, el, x, f = document.forms[0];

-

-	fo = ed.getParam("media_types", "flash=swf;flv=flv;shockwave=dcr;qt=mov,qt,mpg,mp3,mp4,mpeg;shockwave=dcr;wmp=avi,wmv,wm,asf,asx,wmx,wvx;rmp=rm,ra,ram").split(';');

-

-	// YouTube

-	if (v.match(/watch\?v=(.+)(.*)/)) {

-		f.width.value = '425';

-		f.height.value = '350';

-		f.src.value = 'http://www.youtube.com/v/' + v.match(/v=(.*)(.*)/)[0].split('=')[1];

-		return 'flash';

-	}

-

-	// Google video

-	if (v.indexOf('http://video.google.com/videoplay?docid=') == 0) {

-		f.width.value = '425';

-		f.height.value = '326';

-		f.src.value = 'http://video.google.com/googleplayer.swf?docId=' + v.substring('http://video.google.com/videoplay?docid='.length) + '&hl=en';

-		return 'flash';

-	}

-

-	for (i=0; i<fo.length; i++) {

-		c = fo[i].split('=');

-

-		el = c[1].split(',');

-		for (x=0; x<el.length; x++)

-		if (v.indexOf('.' + el[x]) != -1)

-			return c[0];

-	}

-

-	return null;

-}

-

-function switchType(v) {

-	var t = getType(v), d = document, f = d.forms[0];

-

-	if (!t)

-		return;

-

-	selectByValue(d.forms[0], 'media_type', t);

-	changedType(t);

-

-	// Update qtsrc also

-	if (t == 'qt' && f.src.value.toLowerCase().indexOf('rtsp://') != -1) {

-		alert(ed.getLang("media_qt_stream_warn"));

-

-		if (f.qt_qtsrc.value == '')

-			f.qt_qtsrc.value = f.src.value;

-	}

-}

-

-function changedType(t) {

-	var d = document;

-

-	d.getElementById('flash_options').style.display = 'none';

-	d.getElementById('flv_options').style.display = 'none';

-	d.getElementById('qt_options').style.display = 'none';

-	d.getElementById('shockwave_options').style.display = 'none';

-	d.getElementById('wmp_options').style.display = 'none';

-	d.getElementById('rmp_options').style.display = 'none';

-

-	if (t)

-		d.getElementById(t + '_options').style.display = 'block';

-}

-

-function serializeParameters() {

-	var d = document, f = d.forms[0], s = '';

-

-	switch (f.media_type.options[f.media_type.selectedIndex].value) {

-		case "flash":

-			s += getBool('flash', 'play', true);

-			s += getBool('flash', 'loop', true);

-			s += getBool('flash', 'menu', true);

-			s += getBool('flash', 'swliveconnect', false);

-			s += getStr('flash', 'quality');

-			s += getStr('flash', 'scale');

-			s += getStr('flash', 'salign');

-			s += getStr('flash', 'wmode');

-			s += getStr('flash', 'base');

-			s += getStr('flash', 'flashvars');

-		break;

-

-		case "qt":

-			s += getBool('qt', 'loop', false);

-			s += getBool('qt', 'autoplay', true);

-			s += getBool('qt', 'cache', false);

-			s += getBool('qt', 'controller', true);

-			s += getBool('qt', 'correction', false, 'none', 'full');

-			s += getBool('qt', 'enablejavascript', false);

-			s += getBool('qt', 'kioskmode', false);

-			s += getBool('qt', 'autohref', false);

-			s += getBool('qt', 'playeveryframe', false);

-			s += getBool('qt', 'targetcache', false);

-			s += getStr('qt', 'scale');

-			s += getStr('qt', 'starttime');

-			s += getStr('qt', 'endtime');

-			s += getStr('qt', 'target');

-			s += getStr('qt', 'qtsrcchokespeed');

-			s += getStr('qt', 'volume');

-			s += getStr('qt', 'qtsrc');

-		break;

-

-		case "shockwave":

-			s += getBool('shockwave', 'sound');

-			s += getBool('shockwave', 'progress');

-			s += getBool('shockwave', 'autostart');

-			s += getBool('shockwave', 'swliveconnect');

-			s += getStr('shockwave', 'swvolume');

-			s += getStr('shockwave', 'swstretchstyle');

-			s += getStr('shockwave', 'swstretchhalign');

-			s += getStr('shockwave', 'swstretchvalign');

-		break;

-

-		case "wmp":

-			s += getBool('wmp', 'autostart', true);

-			s += getBool('wmp', 'enabled', false);

-			s += getBool('wmp', 'enablecontextmenu', true);

-			s += getBool('wmp', 'fullscreen', false);

-			s += getBool('wmp', 'invokeurls', true);

-			s += getBool('wmp', 'mute', false);

-			s += getBool('wmp', 'stretchtofit', false);

-			s += getBool('wmp', 'windowlessvideo', false);

-			s += getStr('wmp', 'balance');

-			s += getStr('wmp', 'baseurl');

-			s += getStr('wmp', 'captioningid');

-			s += getStr('wmp', 'currentmarker');

-			s += getStr('wmp', 'currentposition');

-			s += getStr('wmp', 'defaultframe');

-			s += getStr('wmp', 'playcount');

-			s += getStr('wmp', 'rate');

-			s += getStr('wmp', 'uimode');

-			s += getStr('wmp', 'volume');

-		break;

-

-		case "rmp":

-			s += getBool('rmp', 'autostart', false);

-			s += getBool('rmp', 'loop', false);

-			s += getBool('rmp', 'autogotourl', true);

-			s += getBool('rmp', 'center', false);

-			s += getBool('rmp', 'imagestatus', true);

-			s += getBool('rmp', 'maintainaspect', false);

-			s += getBool('rmp', 'nojava', false);

-			s += getBool('rmp', 'prefetch', false);

-			s += getBool('rmp', 'shuffle', false);

-			s += getStr('rmp', 'console');

-			s += getStr('rmp', 'controls');

-			s += getStr('rmp', 'numloop');

-			s += getStr('rmp', 'scriptcallbacks');

-		break;

+	function setVal(id, value, name) {

+		if (typeof(value) != 'undefined' && value != null) {

+			var elm = get(id);

+

+			if (elm.nodeName == "SELECT")

+				selectByValue(document.forms[0], id, value);

+			else if (elm.type == "checkbox") {

+				if (typeof(value) == 'string') {

+					value = value.toLowerCase();

+					value = (!name && value === 'true') || (name && value === name.toLowerCase());

+				}

+				elm.checked = !!value;

+			} else

+				elm.value = value;

+		}

 	}

 

-	s += getStr(null, 'id');

-	s += getStr(null, 'name');

-	s += getStr(null, 'src');

-	s += getStr(null, 'align');

-	s += getStr(null, 'bgcolor');

-	s += getInt(null, 'vspace');

-	s += getInt(null, 'hspace');

-	s += getStr(null, 'width');

-	s += getStr(null, 'height');

-

-	s = s.length > 0 ? s.substring(0, s.length - 1) : s;

-

-	return s;

-}

-

-function setBool(pl, p, n) {

-	if (typeof(pl[n]) == "undefined")

-		return;

-

-	document.forms[0].elements[p + "_" + n].checked = pl[n] != 'false';

-}

-

-function setStr(pl, p, n) {

-	var f = document.forms[0], e = f.elements[(p != null ? p + "_" : '') + n];

-

-	if (typeof(pl[n]) == "undefined")

-		return;

+	window.Media = {

+		init : function() {

+			var html, editor, self = this;

 

-	if (e.type == "text")

-		e.value = pl[n];

-	else

-		selectByValue(f, (p != null ? p + "_" : '') + n, pl[n]);

-}

+			self.editor = editor = tinyMCEPopup.editor;

 

-function getBool(p, n, d, tv, fv) {

-	var v = document.forms[0].elements[p + "_" + n].checked;

+			// Setup file browsers and color pickers

+			get('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');

+			get('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','quicktime_qtsrc','media','media');

+			get('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');

+			get('video_altsource1_filebrowser').innerHTML = getBrowserHTML('video_filebrowser_altsource1','video_altsource1','media','media');

+			get('video_altsource2_filebrowser').innerHTML = getBrowserHTML('video_filebrowser_altsource2','video_altsource2','media','media');

+			get('audio_altsource1_filebrowser').innerHTML = getBrowserHTML('audio_filebrowser_altsource1','audio_altsource1','media','media');

+			get('audio_altsource2_filebrowser').innerHTML = getBrowserHTML('audio_filebrowser_altsource2','audio_altsource2','media','media');

+			get('video_poster_filebrowser').innerHTML = getBrowserHTML('filebrowser_poster','video_poster','media','image');

 

-	tv = typeof(tv) == 'undefined' ? 'true' : "'" + jsEncode(tv) + "'";

-	fv = typeof(fv) == 'undefined' ? 'false' : "'" + jsEncode(fv) + "'";

+			html = self.getMediaListHTML('medialist', 'src', 'media', 'media');

+			if (html == "")

+				get("linklistrow").style.display = 'none';

+			else

+				get("linklistcontainer").innerHTML = html;

 

-	return (v == d) ? '' : n + (v ? ':' + tv + ',' : ":\'" + fv + "\',");

-}

+			if (isVisible('filebrowser'))

+				get('src').style.width = '230px';

+

+			if (isVisible('video_filebrowser_altsource1'))

+				get('video_altsource1').style.width = '220px';

+

+			if (isVisible('video_filebrowser_altsource2'))

+				get('video_altsource2').style.width = '220px';

+

+			if (isVisible('audio_filebrowser_altsource1'))

+				get('audio_altsource1').style.width = '220px';

+

+			if (isVisible('audio_filebrowser_altsource2'))

+				get('audio_altsource2').style.width = '220px';

+

+			if (isVisible('filebrowser_poster'))

+				get('video_poster').style.width = '220px';

+

+			editor.dom.setOuterHTML(get('media_type'), self.getMediaTypeHTML(editor));

+

+			self.setDefaultDialogSettings(editor);

+			self.data = clone(tinyMCEPopup.getWindowArg('data'));

+			self.dataToForm();

+			self.preview();

+

+			updateColor('bgcolor_pick', 'bgcolor');

+		},

+

+		insert : function() {

+			var editor = tinyMCEPopup.editor;

+

+			this.formToData();

+			editor.execCommand('mceRepaint');

+			tinyMCEPopup.restoreSelection();

+			editor.selection.setNode(editor.plugins.media.dataToImg(this.data));

+			tinyMCEPopup.close();

+		},

+

+		preview : function() {

+			get('prev').innerHTML = this.editor.plugins.media.dataToHtml(this.data, true);

+		},

+

+		moveStates : function(to_form, field) {

+			var data = this.data, editor = this.editor,

+				mediaPlugin = editor.plugins.media, ext, src, typeInfo, defaultStates, src;

+

+			defaultStates = {

+				// QuickTime

+				quicktime_autoplay : true,

+				quicktime_controller : true,

+

+				// Flash

+				flash_play : true,

+				flash_loop : true,

+				flash_menu : true,

+

+				// WindowsMedia

+				windowsmedia_autostart : true,

+				windowsmedia_enablecontextmenu : true,

+				windowsmedia_invokeurls : true,

+

+				// RealMedia

+				realmedia_autogotourl : true,

+				realmedia_imagestatus : true

+			};

+

+			function parseQueryParams(str) {

+				var out = {};

+

+				if (str) {

+					tinymce.each(str.split('&'), function(item) {

+						var parts = item.split('=');

+

+						out[unescape(parts[0])] = unescape(parts[1]);

+					});

+				}

+

+				return out;

+			};

+

+			function setOptions(type, names) {

+				var i, name, formItemName, value, list;

+

+				if (type == data.type || type == 'global') {

+					names = tinymce.explode(names);

+					for (i = 0; i < names.length; i++) {

+						name = names[i];

+						formItemName = type == 'global' ? name : type + '_' + name;

+

+						if (type == 'global')

+						list = data;

+					else if (type == 'video' || type == 'audio') {

+							list = data.video.attrs;

+

+							if (!list && !to_form)

+							data.video.attrs = list = {};

+						} else

+						list = data.params;

+

+						if (list) {

+							if (to_form) {

+								setVal(formItemName, list[name], type == 'video' || type == 'audio' ? name : '');

+							} else {

+								delete list[name];

+

+								value = getVal(formItemName);

+								if ((type == 'video' || type == 'audio') && value === true)

+									value = name;

+

+								if (defaultStates[formItemName]) {

+									if (value !== defaultStates[formItemName]) {

+										value = "" + value;

+										list[name] = value;

+									}

+								} else if (value) {

+									value = "" + value;

+									list[name] = value;

+								}

+							}

+						}

+					}

+				}

+			}

 

-function getStr(p, n, d) {

-	var e = document.forms[0].elements[(p != null ? p + "_" : "") + n];

-	var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value;

+			if (!to_form) {

+				data.type = get('media_type').options[get('media_type').selectedIndex].value;

+				data.width = getVal('width');

+				data.height = getVal('height');

 

-	if (n == 'src')

-		v = tinyMCEPopup.editor.convertURL(v, 'src', null);

+				// Switch type based on extension

+				src = getVal('src');

+				if (field == 'src') {

+					ext = src.replace(/^.*\.([^.]+)$/, '$1');

+					if (typeInfo = mediaPlugin.getType(ext))

+						data.type = typeInfo.name.toLowerCase();

 

-	return ((n == d || v == '') ? '' : n + ":'" + jsEncode(v) + "',");

-}

+					setVal('media_type', data.type);

+				}

 

-function getInt(p, n, d) {

-	var e = document.forms[0].elements[(p != null ? p + "_" : "") + n];

-	var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value;

+				if (data.type == "video" || data.type == "audio") {

+					if (!data.video.sources)

+						data.video.sources = [];

 

-	return ((n == d || v == '') ? '' : n + ":" + v.replace(/[^0-9]+/g, '') + ",");

-}

+					data.video.sources[0] = {src: getVal('src')};

+				}

+			}

 

-function jsEncode(s) {

-	s = s.replace(new RegExp('\\\\', 'g'), '\\\\');

-	s = s.replace(new RegExp('"', 'g'), '\\"');

-	s = s.replace(new RegExp("'", 'g'), "\\'");

+			// Hide all fieldsets and show the one active

+			get('video_options').style.display = 'none';

+			get('audio_options').style.display = 'none';

+			get('flash_options').style.display = 'none';

+			get('quicktime_options').style.display = 'none';

+			get('shockwave_options').style.display = 'none';

+			get('windowsmedia_options').style.display = 'none';

+			get('realmedia_options').style.display = 'none';

+			get('embeddedaudio_options').style.display = 'none';

+

+			if (get(data.type + '_options'))

+				get(data.type + '_options').style.display = 'block';

+

+			setVal('media_type', data.type);

+

+			setOptions('flash', 'play,loop,menu,swliveconnect,quality,scale,salign,wmode,base,flashvars');

+			setOptions('quicktime', 'loop,autoplay,cache,controller,correction,enablejavascript,kioskmode,autohref,playeveryframe,targetcache,scale,starttime,endtime,target,qtsrcchokespeed,volume,qtsrc');

+			setOptions('shockwave', 'sound,progress,autostart,swliveconnect,swvolume,swstretchstyle,swstretchhalign,swstretchvalign');

+			setOptions('windowsmedia', 'autostart,enabled,enablecontextmenu,fullscreen,invokeurls,mute,stretchtofit,windowlessvideo,balance,baseurl,captioningid,currentmarker,currentposition,defaultframe,playcount,rate,uimode,volume');

+			setOptions('realmedia', 'autostart,loop,autogotourl,center,imagestatus,maintainaspect,nojava,prefetch,shuffle,console,controls,numloop,scriptcallbacks');

+			setOptions('video', 'poster,autoplay,loop,muted,preload,controls');

+			setOptions('audio', 'autoplay,loop,preload,controls');

+			setOptions('embeddedaudio', 'autoplay,loop,controls');

+			setOptions('global', 'id,name,vspace,hspace,bgcolor,align,width,height');

+

+			if (to_form) {

+				if (data.type == 'video') {

+					if (data.video.sources[0])

+						setVal('src', data.video.sources[0].src);

+

+					src = data.video.sources[1];

+					if (src)

+						setVal('video_altsource1', src.src);

+

+					src = data.video.sources[2];

+					if (src)

+						setVal('video_altsource2', src.src);

+                } else if (data.type == 'audio') {

+                    if (data.video.sources[0])

+                        setVal('src', data.video.sources[0].src);

+                    

+                    src = data.video.sources[1];

+                    if (src)

+                        setVal('audio_altsource1', src.src);

+                    

+                    src = data.video.sources[2];

+                    if (src)

+                        setVal('audio_altsource2', src.src);

+				} else {

+					// Check flash vars

+					if (data.type == 'flash') {

+						tinymce.each(editor.getParam('flash_video_player_flashvars', {url : '$url', poster : '$poster'}), function(value, name) {

+							if (value == '$url')

+								data.params.src = parseQueryParams(data.params.flashvars)[name] || data.params.src || '';

+						});

+					}

+

+					setVal('src', data.params.src);

+				}

+			} else {

+				src = getVal("src");

+

+				// YouTube *NEW*

+				if (src.match(/youtu.be\/[a-z1-9.-_]+/)) {

+					data.width = 425;

+					data.height = 350;

+					data.params.frameborder = '0';

+					data.type = 'iframe';

+					src = 'http://www.youtube.com/embed/' + src.match(/youtu.be\/([a-z1-9.-_]+)/)[1];

+					setVal('src', src);

+					setVal('media_type', data.type);

+				}

+

+				// YouTube

+				if (src.match(/youtube.com(.+)v=([^&]+)/)) {

+					data.width = 425;

+					data.height = 350;

+					data.params.frameborder = '0';

+					data.type = 'iframe';

+					src = 'http://www.youtube.com/embed/' + src.match(/v=([^&]+)/)[1];

+					setVal('src', src);

+					setVal('media_type', data.type);

+				}

+

+				// Google video

+				if (src.match(/video.google.com(.+)docid=([^&]+)/)) {

+					data.width = 425;

+					data.height = 326;

+					data.type = 'flash';

+					src = 'http://video.google.com/googleplayer.swf?docId=' + src.match(/docid=([^&]+)/)[1] + '&hl=en';

+					setVal('src', src);

+					setVal('media_type', data.type);

+				}

+

+				if (data.type == 'video') {

+					if (!data.video.sources)

+						data.video.sources = [];

+

+					data.video.sources[0] = {src : src};

+

+					src = getVal("video_altsource1");

+					if (src)

+						data.video.sources[1] = {src : src};

+

+					src = getVal("video_altsource2");

+					if (src)

+						data.video.sources[2] = {src : src};

+                } else if (data.type == 'audio') {

+                    if (!data.video.sources)

+                        data.video.sources = [];

+                    

+                    data.video.sources[0] = {src : src};

+                    

+                    src = getVal("audio_altsource1");

+                    if (src)

+                        data.video.sources[1] = {src : src};

+                    

+                    src = getVal("audio_altsource2");

+                    if (src)

+                        data.video.sources[2] = {src : src};

+				} else

+					data.params.src = src;

+

+				// Set default size

+                setVal('width', data.width || (data.type == 'audio' ? 300 : 320));

+                setVal('height', data.height || (data.type == 'audio' ? 32 : 240));

+			}

+		},

+

+		dataToForm : function() {

+			this.moveStates(true);

+		},

+

+		formToData : function(field) {

+			if (field == "width" || field == "height")

+				this.changeSize(field);

+

+			if (field == 'source') {

+				this.moveStates(false, field);

+				setVal('source', this.editor.plugins.media.dataToHtml(this.data));

+				this.panel = 'source';

+			} else {

+				if (this.panel == 'source') {

+					this.data = clone(this.editor.plugins.media.htmlToData(getVal('source')));

+					this.dataToForm();

+					this.panel = '';

+				}

+

+				this.moveStates(false, field);

+				this.preview();

+			}

+		},

+

+		beforeResize : function() {

+            this.width = parseInt(getVal('width') || (this.data.type == 'audio' ? "300" : "320"), 10);

+            this.height = parseInt(getVal('height') || (this.data.type == 'audio' ? "32" : "240"), 10);

+		},

+

+		changeSize : function(type) {

+			var width, height, scale, size;

+

+			if (get('constrain').checked) {

+                width = parseInt(getVal('width') || (this.data.type == 'audio' ? "300" : "320"), 10);

+                height = parseInt(getVal('height') || (this.data.type == 'audio' ? "32" : "240"), 10);

+

+				if (type == 'width') {

+					this.height = Math.round((width / this.width) * height);

+					setVal('height', this.height);

+				} else {

+					this.width = Math.round((height / this.height) * width);

+					setVal('width', this.width);

+				}

+			}

+		},

 

-	return s;

-}

+		getMediaListHTML : function() {

+			if (typeof(tinyMCEMediaList) != "undefined" && tinyMCEMediaList.length > 0) {

+				var html = "";

 

-function generatePreview(c) {

-	var f = document.forms[0], p = document.getElementById('prev'), h = '', cls, pl, n, type, codebase, wp, hp, nw, nh;

+				html += '<select id="linklist" name="linklist" style="width: 250px" onchange="this.form.src.value=this.options[this.selectedIndex].value;Media.formToData(\'src\');">';

+				html += '<option value="">---</option>';

 

-	p.innerHTML = '<!-- x --->';

+				for (var i=0; i<tinyMCEMediaList.length; i++)

+					html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';

 

-	nw = parseInt(f.width.value);

-	nh = parseInt(f.height.value);

+				html += '</select>';

 

-	if (f.width.value != "" && f.height.value != "") {

-		if (f.constrain.checked) {

-			if (c == 'width' && oldWidth != 0) {

-				wp = nw / oldWidth;

-				nh = Math.round(wp * nh);

-				f.height.value = nh;

-			} else if (c == 'height' && oldHeight != 0) {

-				hp = nh / oldHeight;

-				nw = Math.round(hp * nw);

-				f.width.value = nw;

+				return html;

 			}

-		}

-	}

 

-	if (f.width.value != "")

-		oldWidth = nw;

-

-	if (f.height.value != "")

-		oldHeight = nh;

-

-	// After constrain

-	pl = serializeParameters();

-

-	switch (f.media_type.options[f.media_type.selectedIndex].value) {

-		case "flash":

-			cls = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';

-			codebase = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';

-			type = 'application/x-shockwave-flash';

-			break;

-

-		case "shockwave":

-			cls = 'clsid:166B1BCA-3F9C-11CF-8075-444553540000';

-			codebase = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';

-			type = 'application/x-director';

-			break;

-

-		case "qt":

-			cls = 'clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B';

-			codebase = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';

-			type = 'video/quicktime';

-			break;

-

-		case "wmp":

-			cls = ed.getParam('media_wmp6_compatible') ? 'clsid:05589FA1-C356-11CE-BF01-00AA0055595A' : 'clsid:6BF52A52-394A-11D3-B153-00C04F79FAA6';

-			codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';

-			type = 'application/x-mplayer2';

-			break;

-

-		case "rmp":

-			cls = 'clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA';

-			codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';

-			type = 'audio/x-pn-realaudio-plugin';

-			break;

-	}

+			return "";

+		},

 

-	if (pl == '') {

-		p.innerHTML = '';

-		return;

-	}

+		getMediaTypeHTML : function(editor) {

+			function option(media_type, element) {

+				if (!editor.schema.getElementRule(element || media_type)) {

+					return '';

+				}

 

-	pl = tinyMCEPopup.editor.plugins.media._parse(pl);

+				return '<option value="'+media_type+'">'+tinyMCEPopup.editor.translate("media_dlg."+media_type)+'</option>'

+			}

 

-	if (!pl.src) {

-		p.innerHTML = '';

-		return;

-	}

+			var html = "";

 

-	pl.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(pl.src);

-	pl.width = !pl.width ? 100 : pl.width;

-	pl.height = !pl.height ? 100 : pl.height;

-	pl.id = !pl.id ? 'obj' : pl.id;

-	pl.name = !pl.name ? 'eobj' : pl.name;

-	pl.align = !pl.align ? '' : pl.align;

+			html += '<select id="media_type" name="media_type" onchange="Media.formToData(\'type\');">';

+			html += option("video");

+			html += option("audio");

+			html += option("flash", "object");

+			html += option("quicktime", "object");

+			html += option("shockwave", "object");

+			html += option("windowsmedia", "object");

+			html += option("realmedia", "object");

+			html += option("iframe");

 

-	// Avoid annoying warning about insecure items

-	if (!tinymce.isIE || document.location.protocol != 'https:') {

-		h += '<object classid="' + cls + '" codebase="' + codebase + '" width="' + pl.width + '" height="' + pl.height + '" id="' + pl.id + '" name="' + pl.name + '" align="' + pl.align + '">';

+			if (editor.getParam('media_embedded_audio', false)) {

+				html += option('embeddedaudio', "object");

+			}

 

-		for (n in pl) {

-			h += '<param name="' + n + '" value="' + pl[n] + '">';

+			html += '</select>';

+			return html;

+		},

 

-			// Add extra url parameter if it's an absolute URL

-			if (n == 'src' && pl[n].indexOf('://') != -1)

-				h += '<param name="url" value="' + pl[n] + '" />';

+		setDefaultDialogSettings : function(editor) {

+			var defaultDialogSettings = editor.getParam("media_dialog_defaults", {});

+			tinymce.each(defaultDialogSettings, function(v, k) {

+				setVal(k, v);

+			});

 		}

-	}

-

-	h += '<embed type="' + type + '" ';

-

-	for (n in pl)

-		h += n + '="' + pl[n] + '" ';

-

-	h += '></embed>';

-

-	// Avoid annoying warning about insecure items

-	if (!tinymce.isIE || document.location.protocol != 'https:')

-		h += '</object>';

-

-	p.innerHTML = "<!-- x --->" + h;

-}

+	};

 

-tinyMCEPopup.onInit.add(init);

+	tinyMCEPopup.requireLangPack();

+	tinyMCEPopup.onInit.add(function() {

+		Media.init();

+	});

+})();

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js
index 6d0a996f7..ecef3a801 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js
@@ -1,103 +1 @@
-tinyMCE.addI18n('en.media_dlg',{

-title:"Insert / edit embedded media",

-general:"General",

-advanced:"Advanced",

-file:"File/URL",

-list:"List",

-size:"Dimensions",

-preview:"Preview",

-constrain_proportions:"Constrain proportions",

-type:"Type",

-id:"Id",

-name:"Name",

-class_name:"Class",

-vspace:"V-Space",

-hspace:"H-Space",

-play:"Auto play",

-loop:"Loop",

-menu:"Show menu",

-quality:"Quality",

-scale:"Scale",

-align:"Align",

-salign:"SAlign",

-wmode:"WMode",

-bgcolor:"Background",

-base:"Base",

-flashvars:"Flashvars",

-liveconnect:"SWLiveConnect",

-autohref:"AutoHREF",

-cache:"Cache",

-hidden:"Hidden",

-controller:"Controller",

-kioskmode:"Kiosk mode",

-playeveryframe:"Play every frame",

-targetcache:"Target cache",

-correction:"No correction",

-enablejavascript:"Enable JavaScript",

-starttime:"Start time",

-endtime:"End time",

-href:"Href",

-qtsrcchokespeed:"Choke speed",

-target:"Target",

-volume:"Volume",

-autostart:"Auto start",

-enabled:"Enabled",

-fullscreen:"Fullscreen",

-invokeurls:"Invoke URLs",

-mute:"Mute",

-stretchtofit:"Stretch to fit",

-windowlessvideo:"Windowless video",

-balance:"Balance",

-baseurl:"Base URL",

-captioningid:"Captioning id",

-currentmarker:"Current marker",

-currentposition:"Current position",

-defaultframe:"Default frame",

-playcount:"Play count",

-rate:"Rate",

-uimode:"UI Mode",

-flash_options:"Flash options",

-qt_options:"Quicktime options",

-wmp_options:"Windows media player options",

-rmp_options:"Real media player options",

-shockwave_options:"Shockwave options",

-autogotourl:"Auto goto URL",

-center:"Center",

-imagestatus:"Image status",

-maintainaspect:"Maintain aspect",

-nojava:"No java",

-prefetch:"Prefetch",

-shuffle:"Shuffle",

-console:"Console",

-numloop:"Num loops",

-controls:"Controls",

-scriptcallbacks:"Script callbacks",

-swstretchstyle:"Stretch style",

-swstretchhalign:"Stretch H-Align",

-swstretchvalign:"Stretch V-Align",

-sound:"Sound",

-progress:"Progress",

-qtsrc:"QT Src",

-qt_stream_warn:"Streamed rtsp resources should be added to the QT Src field under the advanced tab.\nYou should also add a non streamed version to the Src field..",

-align_top:"Top",

-align_right:"Right",

-align_bottom:"Bottom",

-align_left:"Left",

-align_center:"Center",

-align_top_left:"Top left",

-align_top_right:"Top right",

-align_bottom_left:"Bottom left",

-align_bottom_right:"Bottom right",

-flv_options:"Flash video options",

-flv_scalemode:"Scale mode",

-flv_buffer:"Buffer",

-flv_startimage:"Start image",

-flv_starttime:"Start time",

-flv_defaultvolume:"Default volumne",

-flv_hiddengui:"Hidden GUI",

-flv_autostart:"Auto start",

-flv_loop:"Loop",

-flv_showscalemodes:"Show scale modes",

-flv_smoothvideo:"Smooth video",

-flv_jscallback:"JS Callback"

-});
\ No newline at end of file
+tinyMCE.addI18n('en.media_dlg',{list:"List",file:"File/URL",advanced:"Advanced",general:"General",title:"Insert/Edit Embedded Media","align_top_left":"Top Left","align_center":"Center","align_left":"Left","align_bottom":"Bottom","align_right":"Right","align_top":"Top","qt_stream_warn":"Streamed RTSP resources should be added to the QT Source field under the Advanced tab.\nYou should also add a non-streamed version to the Source field.",qtsrc:"QT Source",progress:"Progress",sound:"Sound",swstretchvalign:"Stretch V-Align",swstretchhalign:"Stretch H-Align",swstretchstyle:"Stretch Style",scriptcallbacks:"Script Callbacks","align_top_right":"Top Right",uimode:"UI Mode",rate:"Rate",playcount:"Play Count",defaultframe:"Default Frame",currentposition:"Current Position",currentmarker:"Current Marker",captioningid:"Captioning ID",baseurl:"Base URL",balance:"Balance",windowlessvideo:"Windowless Video",stretchtofit:"Stretch to Fit",mute:"Mute",invokeurls:"Invoke URLs",fullscreen:"Full Screen",enabled:"Enabled",autostart:"Auto Start",volume:"Volume",target:"Target",qtsrcchokespeed:"Choke Speed",href:"HREF",endtime:"End Time",starttime:"Start Time",enablejavascript:"Enable JavaScript",correction:"No Correction",targetcache:"Target Cache",playeveryframe:"Play Every Frame",kioskmode:"Kiosk Mode",controller:"Controller",menu:"Show Menu",loop:"Loop",play:"Auto Play",hspace:"H-Space",vspace:"V-Space","class_name":"Class",name:"Name",id:"ID",type:"Type",size:"Dimensions",preview:"Preview","constrain_proportions":"Constrain Proportions",controls:"Controls",numloop:"Num Loops",console:"Console",cache:"Cache",autohref:"Auto HREF",liveconnect:"SWLiveConnect",flashvars:"Flash Vars",base:"Base",bgcolor:"Background",wmode:"WMode",salign:"SAlign",align:"Align",scale:"Scale",quality:"Quality",shuffle:"Shuffle",prefetch:"Prefetch",nojava:"No Java",maintainaspect:"Maintain Aspect",imagestatus:"Image Status",center:"Center",autogotourl:"Auto Goto URL","shockwave_options":"Shockwave Options","rmp_options":"Real Media Player Options","wmp_options":"Windows Media Player Options","qt_options":"QuickTime Options","flash_options":"Flash Options",hidden:"Hidden","align_bottom_left":"Bottom Left","align_bottom_right":"Bottom Right","html5_video_options":"HTML5 Video Options",altsource1:"Alternative source 1",altsource2:"Alternative source 2",preload:"Preload",poster:"Poster",source:"Source","html5_audio_options":"Audio Options","preload_none":"Don\'t Preload","preload_metadata":"Preload video metadata","preload_auto":"Let user\'s browser decide", "embedded_audio_options":"Embedded Audio Options", video:"HTML5 Video", audio:"HTML5 Audio", flash:"Flash", quicktime:"QuickTime", shockwave:"Shockwave", windowsmedia:"Windows Media", realmedia:"Real Media", iframe:"Iframe", embeddedaudio:"Embedded Audio" }); 
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/media/media.htm b/library/tinymce/jscripts/tiny_mce/plugins/media/media.htm
index 73a903f7c..957d83a68 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/media/media.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/media/media.htm
@@ -10,12 +10,13 @@
 	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

 	<link href="css/media.css" rel="stylesheet" type="text/css" />

 </head>

-<body style="display: none">

-    <form onsubmit="insertMedia();return false;" action="#">

-		<div class="tabs">

+<body style="display: none" role="application">

+<form onsubmit="Media.insert();return false;" action="#">

+		<div class="tabs" role="presentation">

 			<ul>

-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');generatePreview();" onmousedown="return false;">{#media_dlg.general}</a></span></li>

-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#media_dlg.advanced}</a></span></li>

+				<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');Media.formToData();" onmousedown="return false;">{#media_dlg.general}</a></span></li>

+				<li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');Media.formToData();" onmousedown="return false;">{#media_dlg.advanced}</a></span></li>

+				<li id="source_tab" aria-controls="source_panel"><span><a href="javascript:mcTabs.displayTab('source_tab','source_panel');Media.formToData('source');" onmousedown="return false;">{#media_dlg.source}</a></span></li>

 			</ul>

 		</div>

 

@@ -24,28 +25,21 @@
 				<fieldset>

 					<legend>{#media_dlg.general}</legend>

 

-					<table border="0" cellpadding="4" cellspacing="0">

+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">

 							<tr>

 								<td><label for="media_type">{#media_dlg.type}</label></td>

 								<td>

-									<select id="media_type" name="media_type" onchange="changedType(this.value);generatePreview();">

-										<option value="flash">Flash</option>

-										<!-- <option value="flv">Flash video (FLV)</option> -->

-										<option value="qt">Quicktime</option>

-										<option value="shockwave">Shockwave</option>

-										<option value="wmp">Windows Media</option>

-										<option value="rmp">Real Media</option>

-									</select>

+									<select id="media_type"></select>

 								</td>

 							</tr>

 							<tr>

 							<td><label for="src">{#media_dlg.file}</label></td>

-							  <td>

-									<table border="0" cellspacing="0" cellpadding="0">

-									  <tr>

-										<td><input id="src" name="src" type="text" value="" class="mceFocus" onchange="switchType(this.value);generatePreview();" /></td>

+								<td>

+									<table role="presentation" border="0" cellspacing="0" cellpadding="0">

+									<tr>

+										<td><input id="src" name="src" type="text" value="" class="mceFocus" onchange="Media.formToData();" /></td>

 										<td id="filebrowsercontainer">&nbsp;</td>

-									  </tr>

+									</tr>

 									</table>

 								</td>

 							</tr>

@@ -56,10 +50,10 @@
 							<tr>

 								<td><label for="width">{#media_dlg.size}</label></td>

 								<td>

-									<table border="0" cellpadding="0" cellspacing="0">

+									<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 										<tr>

-											<td><input type="text" id="width" name="width" value="" class="size" onchange="generatePreview('width');" /> x <input type="text" id="height" name="height" value="" class="size"  onchange="generatePreview('height');" /></td>

-											<td>&nbsp;&nbsp;<input id="constrain" type="checkbox" name="constrain" class="checkbox" /></td>

+											<td><input type="text" id="width" name="width" value="" class="size" onchange="Media.formToData('width');" onfocus="Media.beforeResize();" /> x <input type="text" id="height" name="height" value="" class="size" onfocus="Media.beforeResize();" onchange="Media.formToData('height');" /></td>

+											<td>&nbsp;&nbsp;<input id="constrain" type="checkbox" name="constrain" class="checkbox" checked="checked" /></td>

 											<td><label id="constrainlabel" for="constrain">{#media_dlg.constrain_proportions}</label></td>

 										</tr>

 									</table>

@@ -78,18 +72,18 @@
 				<fieldset>

 					<legend>{#media_dlg.advanced}</legend>

 

-					<table border="0" cellpadding="4" cellspacing="0" width="100%">

+					<table role="presentation" border="0" cellpadding="4" cellspacing="0" width="100%">

 						<tr>

 							<td><label for="id">{#media_dlg.id}</label></td>

-							<td><input type="text" id="id" name="id" onchange="generatePreview();" /></td>

+							<td><input type="text" id="id" name="id" onchange="Media.formToData();" /></td>

 							<td><label for="name">{#media_dlg.name}</label></td>

-							<td><input type="text" id="name" name="name" onchange="generatePreview();" /></td>

+							<td><input type="text" id="name" name="name" onchange="Media.formToData();" /></td>

 						</tr>

 

 						<tr>

 							<td><label for="align">{#media_dlg.align}</label></td>

 							<td>

-								<select id="align" name="align" onchange="generatePreview();">

+								<select id="align" name="align" onchange="Media.formToData();">

 									<option value="">{#not_set}</option> 

 									<option value="top">{#media_dlg.align_top}</option>

 									<option value="right">{#media_dlg.align_right}</option>

@@ -100,9 +94,9 @@
 

 							<td><label for="bgcolor">{#media_dlg.bgcolor}</label></td>

 							<td>

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');generatePreview();" /></td>

+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');Media.formToData();" /></td>

 										<td id="bgcolor_pickcontainer">&nbsp;</td>

 									</tr>

 								</table>

@@ -111,192 +105,284 @@
 

 						<tr>

 							<td><label for="vspace">{#media_dlg.vspace}</label></td>

-							<td><input type="text" id="vspace" name="vspace" class="number" onchange="generatePreview();" /></td>

+							<td><input type="text" id="vspace" name="vspace" class="number" onchange="Media.formToData();" /></td>

 							<td><label for="hspace">{#media_dlg.hspace}</label></td>

-							<td><input type="text" id="hspace" name="hspace" class="number" onchange="generatePreview();" /></td>

+							<td><input type="text" id="hspace" name="hspace" class="number" onchange="Media.formToData();" /></td>

 						</tr>

 					</table>

 				</fieldset>

 

-				<fieldset id="flash_options">

-					<legend>{#media_dlg.flash_options}</legend>

+				<fieldset id="video_options">

+					<legend>{#media_dlg.html5_video_options}</legend>

 

-					<table border="0" cellpadding="4" cellspacing="0">

+					<table role="presentation">

 						<tr>

-							<td><label for="flash_quality">{#media_dlg.quality}</label></td>

+							<td><label for="video_altsource1">{#media_dlg.altsource1}</label></td>

 							<td>

-								<select id="flash_quality" name="flash_quality" onchange="generatePreview();">

-									<option value="">{#not_set}</option> 

-									<option value="high">high</option>

-									<option value="low">low</option>

-									<option value="autolow">autolow</option>

-									<option value="autohigh">autohigh</option>

-									<option value="best">best</option>

-								</select>

+								<table role="presentation" border="0" cellspacing="0" cellpadding="0">

+									<tr>

+										<td><input type="text" id="video_altsource1" name="video_altsource1" onchange="Media.formToData();" style="width: 240px" /></td>

+										<td id="video_altsource1_filebrowser">&nbsp;</td>

+									</tr>

+								</table>

 							</td>

+						</tr>

 

-							<td><label for="flash_scale">{#media_dlg.scale}</label></td>

+						<tr>

+							<td><label for="video_altsource2">{#media_dlg.altsource2}</label></td>

 							<td>

-								<select id="flash_scale" name="flash_scale" onchange="generatePreview();">

-									<option value="">{#not_set}</option> 

-									<option value="showall">showall</option>

-									<option value="noborder">noborder</option>

-									<option value="exactfit">exactfit</option>

-									<option value="noscale">noscale</option>

-								</select>

+								<table role="presentation" border="0" cellspacing="0" cellpadding="0">

+									<tr>

+										<td><input type="text" id="video_altsource2" name="video_altsource2" onchange="Media.formToData();" style="width: 240px" /></td>

+										<td id="video_altsource2_filebrowser">&nbsp;</td>

+									</tr>

+								</table>

 							</td>

 						</tr>

 

 						<tr>

-							<td><label for="flash_wmode">{#media_dlg.wmode}</label></td>

+							<td><label for="video_poster">{#media_dlg.poster}</label></td>

 							<td>

-								<select id="flash_wmode" name="flash_wmode" onchange="generatePreview();">

-									<option value="">{#not_set}</option> 

-									<option value="window">window</option>

-									<option value="opaque">opaque</option>

-									<option value="transparent">transparent</option>

-								</select>

+								<table role="presentation" border="0" cellspacing="0" cellpadding="0">

+									<tr>

+										<td><input type="text" id="video_poster" name="video_poster" onchange="Media.formToData();" style="width: 240px" /></td>

+										<td id="video_poster_filebrowser">&nbsp;</td>

+									</tr>

+								</table>

 							</td>

+						</tr>

 

-							<td><label for="flash_salign">{#media_dlg.salign}</label></td>

+						<tr>

+							<td><label for="video_preload">{#media_dlg.preload}</label></td>

 							<td>

-								<select id="flash_salign" name="flash_salign" onchange="generatePreview();">

-									<option value="">{#not_set}</option> 

-									<option value="l">{#media_dlg.align_left}</option>

-									<option value="t">{#media_dlg.align_top}</option>

-									<option value="r">{#media_dlg.align_right}</option>

-									<option value="b">{#media_dlg.align_bottom}</option>

-									<option value="tl">{#media_dlg.align_top_left}</option>

-									<option value="tr">{#media_dlg.align_top_right}</option>

-									<option value="bl">{#media_dlg.align_bottom_left}</option>

-									<option value="br">{#media_dlg.align_bottom_right}</option>

+								<select id="video_preload" name="video_preload" onchange="Media.formToData();">

+									<option value="none">{#media_dlg.preload_none}</option> 

+									<option value="metadata">{#media_dlg.preload_metadata}</option>

+									<option value="auto">{#media_dlg.preload_auto}</option>

 								</select>

 							</td>

 						</tr>

+					</table>

 

+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">

 						<tr>

-							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+							<td>

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="flash_play" name="flash_play" checked="checked" onchange="generatePreview();" /></td>

-										<td><label for="flash_play">{#media_dlg.play}</label></td>

+										<td><input type="checkbox" class="checkbox" id="video_autoplay" name="video_autoplay" onchange="Media.formToData();" /></td>

+										<td><label for="video_autoplay">{#media_dlg.play}</label></td>

 									</tr>

 								</table>

 							</td>

 

-							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+							<td>

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="flash_loop" name="flash_loop" checked="checked" onchange="generatePreview();" /></td>

-										<td><label for="flash_loop">{#media_dlg.loop}</label></td>

+										<td><input type="checkbox" class="checkbox" id="video_muted" name="video_muted" onchange="Media.formToData();" /></td>

+										<td><label for="video_muted">{#media_dlg.mute}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td>

+									<table role="presentation" border="0" cellpadding="0" cellspacing="0">

+											<tr>

+													<td><input type="checkbox" class="checkbox" id="video_loop" name="video_loop" onchange="Media.formToData();" /></td>

+													<td><label for="video_loop">{#media_dlg.loop}</label></td>

+											</tr>

+									</table>

+							</td>

+

+							<td>

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="video_controls" name="video_controls" onchange="Media.formToData();" /></td>

+										<td><label for="video_controls">{#media_dlg.controls}</label></td>

 									</tr>

 								</table>

 							</td>

 						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset id="embeddedaudio_options">

+					<legend>{#media_dlg.embedded_audio_options}</legend>

 

+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">

 						<tr>

-							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+							<td>

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="flash_menu" name="flash_menu" checked="checked" onchange="generatePreview();" /></td>

-										<td><label for="flash_menu">{#media_dlg.menu}</label></td>

+										<td><input type="checkbox" class="checkbox" id="embeddedaudio_autoplay" name="audio_autoplay" onchange="Media.formToData();" /></td>

+										<td><label for="audio_autoplay">{#media_dlg.play}</label></td>

 									</tr>

 								</table>

 							</td>

 

-							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+							<td>

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="flash_swliveconnect" name="flash_swliveconnect" onchange="generatePreview();" /></td>

-										<td><label for="flash_swliveconnect">{#media_dlg.liveconnect}</label></td>

+										<td><input type="checkbox" class="checkbox" id="embeddedaudio_loop" name="audio_loop" onchange="Media.formToData();" /></td>

+										<td><label for="audio_loop">{#media_dlg.loop}</label></td>

 									</tr>

 								</table>

 							</td>

-						</tr>

-					</table>

-

-					<table>

-						<tr>

-							<td><label for="flash_base">{#media_dlg.base}</label></td>

-							<td><input type="text" id="flash_base" name="flash_base" onchange="generatePreview();" /></td>

-						</tr>

 

-						<tr>

-							<td><label for="flash_flashvars">{#media_dlg.flashvars}</label></td>

-							<td><input type="text" id="flash_flashvars" name="flash_flashvars" onchange="generatePreview();" /></td>

+							<td>

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="embeddedaudio_controls" name="audio_controls" onchange="Media.formToData();" /></td>

+										<td><label for="audio_controls">{#media_dlg.controls}</label></td>

+									</tr>

+								</table>

+							</td>

 						</tr>

 					</table>

 				</fieldset>

 

-				<fieldset id="flv_options">

-					<legend>{#media_dlg.flv_options}</legend>

+				<fieldset id="audio_options">

+					<legend>{#media_dlg.html5_audio_options}</legend>

 

-					<table border="0" cellpadding="4" cellspacing="0">

+					<table role="presentation">

 						<tr>

-							<td><label for="flv_scalemode">{#media_dlg.flv_scalemode}</label></td>

+							<td><label for="audio_altsource1">{#media_dlg.altsource1}</label></td>

 							<td>

-								<select id="flv_scalemode" name="flv_scalemode" onchange="generatePreview();">

-									<option value="">{#not_set}</option> 

-									<option value="none">none</option>

-									<option value="double">double</option>

-									<option value="full">full</option>

-								</select>

+								<table role="presentation" border="0" cellspacing="0" cellpadding="0">

+									<tr>

+										<td><input type="text" id="audio_altsource1" name="audio_altsource1" onchange="Media.formToData();" style="width: 240px" /></td>

+										<td id="audio_altsource1_filebrowser">&nbsp;</td>

+									</tr>

+								</table>

 							</td>

-

-							<td><label for="flv_buffer">{#media_dlg.flv_buffer}</label></td>

-							<td><input type="text" id="flv_buffer" name="flv_buffer" onchange="generatePreview();" /></td>

 						</tr>

 

 						<tr>

-							<td><label for="flv_startimage">{#media_dlg.flv_startimage}</label></td>

-							<td><input type="text" id="flv_startimage" name="flv_startimage" onchange="generatePreview();" /></td>

-

-							<td><label for="flv_starttime">{#media_dlg.flv_starttime}</label></td>

-							<td><input type="text" id="flv_starttime" name="flv_starttime" onchange="generatePreview();" /></td>

+							<td><label for="audio_altsource2">{#media_dlg.altsource2}</label></td>

+							<td>

+								<table role="presentation" border="0" cellspacing="0" cellpadding="0">

+									<tr>

+										<td><input type="text" id="audio_altsource2" name="audio_altsource2" onchange="Media.formToData();" style="width: 240px" /></td>

+										<td id="audio_altsource2_filebrowser">&nbsp;</td>

+									</tr>

+								</table>

+							</td>

 						</tr>

 

 						<tr>

-							<td><label for="flv_defaultvolume">{#media_dlg.flv_defaultvolume}</label></td>

-							<td><input type="text" id="flv_defaultvolume" name="flv_defaultvolume" onchange="generatePreview();" /></td>

-

-

+							<td><label for="audio_preload">{#media_dlg.preload}</label></td>

+							<td>

+								<select id="audio_preload" name="audio_preload" onchange="Media.formToData();">

+									<option value="none">{#media_dlg.preload_none}</option>

+									<option value="metadata">{#media_dlg.preload_metadata}</option>

+									<option value="auto">{#media_dlg.preload_auto}</option>

+								</select>

+							</td>

 						</tr>

+					</table>

 

+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">

 						<tr>

-							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+							<td>

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="flv_hiddengui" name="flv_hiddengui" checked="checked" onchange="generatePreview();" /></td>

-										<td><label for="flv_hiddengui">{#media_dlg.flv_hiddengui}</label></td>

+										<td><input type="checkbox" class="checkbox" id="audio_autoplay" name="audio_autoplay" onchange="Media.formToData();" /></td>

+										<td><label for="audio_autoplay">{#media_dlg.play}</label></td>

 									</tr>

 								</table>

 							</td>

 

-							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+							<td>

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="audio_loop" name="audio_loop" onchange="Media.formToData();" /></td>

+										<td><label for="audio_loop">{#media_dlg.loop}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td>

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="flv_autostart" name="flv_autostart" checked="checked" onchange="generatePreview();" /></td>

-										<td><label for="flv_autostart">{#media_dlg.flv_autostart}</label></td>

+										<td><input type="checkbox" class="checkbox" id="audio_controls" name="audio_controls" onchange="Media.formToData();" /></td>

+										<td><label for="audio_controls">{#media_dlg.controls}</label></td>

 									</tr>

 								</table>

 							</td>

 						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset id="flash_options">

+					<legend>{#media_dlg.flash_options}</legend>

+

+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td><label for="flash_quality">{#media_dlg.quality}</label></td>

+							<td>

+								<select id="flash_quality" name="flash_quality" onchange="Media.formToData();">

+									<option value="">{#not_set}</option> 

+									<option value="high">high</option>

+									<option value="low">low</option>

+									<option value="autolow">autolow</option>

+									<option value="autohigh">autohigh</option>

+									<option value="best">best</option>

+								</select>

+							</td>

+

+							<td><label for="flash_scale">{#media_dlg.scale}</label></td>

+							<td>

+								<select id="flash_scale" name="flash_scale" onchange="Media.formToData();">

+									<option value="">{#not_set}</option> 

+									<option value="showall">showall</option>

+									<option value="noborder">noborder</option>

+									<option value="exactfit">exactfit</option>

+									<option value="noscale">noscale</option>

+								</select>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="flash_wmode">{#media_dlg.wmode}</label></td>

+							<td>

+								<select id="flash_wmode" name="flash_wmode" onchange="Media.formToData();">

+									<option value="">{#not_set}</option> 

+									<option value="window">window</option>

+									<option value="opaque">opaque</option>

+									<option value="transparent">transparent</option>

+								</select>

+							</td>

+

+							<td><label for="flash_salign">{#media_dlg.salign}</label></td>

+							<td>

+								<select id="flash_salign" name="flash_salign" onchange="Media.formToData();">

+									<option value="">{#not_set}</option> 

+									<option value="l">{#media_dlg.align_left}</option>

+									<option value="t">{#media_dlg.align_top}</option>

+									<option value="r">{#media_dlg.align_right}</option>

+									<option value="b">{#media_dlg.align_bottom}</option>

+									<option value="tl">{#media_dlg.align_top_left}</option>

+									<option value="tr">{#media_dlg.align_top_right}</option>

+									<option value="bl">{#media_dlg.align_bottom_left}</option>

+									<option value="br">{#media_dlg.align_bottom_right}</option>

+								</select>

+							</td>

+						</tr>

 

 						<tr>

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="flv_loop" name="flv_loop" checked="checked" onchange="generatePreview();" /></td>

-										<td><label for="flv_loop">{#media_dlg.flv_loop}</label></td>

+										<td><input type="checkbox" class="checkbox" id="flash_play" name="flash_play" checked="checked" onchange="Media.formToData();" /></td>

+										<td><label for="flash_play">{#media_dlg.play}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="flv_showscalemodes" name="flv_showscalemodes" onchange="generatePreview();" /></td>

-										<td><label for="flv_showscalemodes">{#media_dlg.flv_showscalemodes}</label></td>

+										<td><input type="checkbox" class="checkbox" id="flash_loop" name="flash_loop" checked="checked" onchange="Media.formToData();" /></td>

+										<td><label for="flash_loop">{#media_dlg.loop}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -304,45 +390,57 @@
 

 						<tr>

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="flv_smoothvideo" name="flash_flv_flv_smoothvideosmoothvideo" checked="checked" onchange="generatePreview();" /></td>

-										<td><label for="flv_smoothvideo">{#media_dlg.flv_smoothvideo}</label></td>

+										<td><input type="checkbox" class="checkbox" id="flash_menu" name="flash_menu" checked="checked" onchange="Media.formToData();" /></td>

+										<td><label for="flash_menu">{#media_dlg.menu}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="flv_jscallback" name="flv_jscallback" onchange="generatePreview();" /></td>

-										<td><label for="flv_jscallback">{#media_dlg.flv_jscallback}</label></td>

+										<td><input type="checkbox" class="checkbox" id="flash_swliveconnect" name="flash_swliveconnect" onchange="Media.formToData();" /></td>

+										<td><label for="flash_swliveconnect">{#media_dlg.liveconnect}</label></td>

 									</tr>

 								</table>

 							</td>

 						</tr>

 					</table>

+

+					<table role="presentation">

+						<tr>

+							<td><label for="flash_base">{#media_dlg.base}</label></td>

+							<td><input type="text" id="flash_base" name="flash_base" onchange="Media.formToData();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="flash_flashvars">{#media_dlg.flashvars}</label></td>

+							<td><input type="text" id="flash_flashvars" name="flash_flashvars" onchange="Media.formToData();" /></td>

+						</tr>

+					</table>

 				</fieldset>

 

-				<fieldset id="qt_options">

+				<fieldset id="quicktime_options">

 					<legend>{#media_dlg.qt_options}</legend>

 

-					<table border="0" cellpadding="4" cellspacing="0">

+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">

 						<tr>

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="qt_loop" name="qt_loop" onchange="generatePreview();" /></td>

-										<td><label for="qt_loop">{#media_dlg.loop}</label></td>

+										<td><input type="checkbox" class="checkbox" id="quicktime_loop" name="quicktime_loop" onchange="Media.formToData();" /></td>

+										<td><label for="quicktime_loop">{#media_dlg.loop}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="qt_autoplay" name="qt_autoplay" checked="checked" onchange="generatePreview();" /></td>

-										<td><label for="qt_autoplay">{#media_dlg.play}</label></td>

+										<td><input type="checkbox" class="checkbox" id="quicktime_autoplay" name="quicktime_autoplay" checked="checked" onchange="Media.formToData();" /></td>

+										<td><label for="quicktime_autoplay">{#media_dlg.play}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -350,19 +448,19 @@
 

 						<tr>

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="qt_cache" name="qt_cache" onchange="generatePreview();" /></td>

-										<td><label for="qt_cache">{#media_dlg.cache}</label></td>

+										<td><input type="checkbox" class="checkbox" id="quicktime_cache" name="quicktime_cache" onchange="Media.formToData();" /></td>

+										<td><label for="quicktime_cache">{#media_dlg.cache}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="qt_controller" name="qt_controller" checked="checked" onchange="generatePreview();" /></td>

-										<td><label for="qt_controller">{#media_dlg.controller}</label></td>

+										<td><input type="checkbox" class="checkbox" id="quicktime_controller" name="quicktime_controller" checked="checked" onchange="Media.formToData();" /></td>

+										<td><label for="quicktime_controller">{#media_dlg.controller}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -370,19 +468,19 @@
 

 						<tr>

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="qt_correction" name="qt_correction" onchange="generatePreview();" /></td>

-										<td><label for="qt_correction">{#media_dlg.correction}</label></td>

+										<td><input type="checkbox" class="checkbox" id="quicktime_correction" name="quicktime_correction" onchange="Media.formToData();" /></td>

+										<td><label for="quicktime_correction">{#media_dlg.correction}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="qt_enablejavascript" name="qt_enablejavascript" onchange="generatePreview();" /></td>

-										<td><label for="qt_enablejavascript">{#media_dlg.enablejavascript}</label></td>

+										<td><input type="checkbox" class="checkbox" id="quicktime_enablejavascript" name="quicktime_enablejavascript" onchange="Media.formToData();" /></td>

+										<td><label for="quicktime_enablejavascript">{#media_dlg.enablejavascript}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -390,19 +488,19 @@
 

 						<tr>

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="qt_kioskmode" name="qt_kioskmode" onchange="generatePreview();" /></td>

-										<td><label for="qt_kioskmode">{#media_dlg.kioskmode}</label></td>

+										<td><input type="checkbox" class="checkbox" id="quicktime_kioskmode" name="quicktime_kioskmode" onchange="Media.formToData();" /></td>

+										<td><label for="quicktime_kioskmode">{#media_dlg.kioskmode}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="qt_autohref" name="qt_autohref" onchange="generatePreview();" /></td>

-										<td><label for="qt_autohref">{#media_dlg.autohref}</label></td>

+										<td><input type="checkbox" class="checkbox" id="quicktime_autohref" name="quicktime_autohref" onchange="Media.formToData();" /></td>

+										<td><label for="quicktime_autohref">{#media_dlg.autohref}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -410,27 +508,27 @@
 

 						<tr>

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="qt_playeveryframe" name="qt_playeveryframe" onchange="generatePreview();" /></td>

-										<td><label for="qt_playeveryframe">{#media_dlg.playeveryframe}</label></td>

+										<td><input type="checkbox" class="checkbox" id="quicktime_playeveryframe" name="quicktime_playeveryframe" onchange="Media.formToData();" /></td>

+										<td><label for="quicktime_playeveryframe">{#media_dlg.playeveryframe}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="qt_targetcache" name="qt_targetcache" onchange="generatePreview();" /></td>

-										<td><label for="qt_targetcache">{#media_dlg.targetcache}</label></td>

+										<td><input type="checkbox" class="checkbox" id="quicktime_targetcache" name="quicktime_targetcache" onchange="Media.formToData();" /></td>

+										<td><label for="quicktime_targetcache">{#media_dlg.targetcache}</label></td>

 									</tr>

 								</table>

 							</td>

 						</tr>

 

 						<tr>

-							<td><label for="qt_scale">{#media_dlg.scale}</label></td>

-							<td><select id="qt_scale" name="qt_scale" class="mceEditableSelect" onchange="generatePreview();">

+							<td><label for="quicktime_scale">{#media_dlg.scale}</label></td>

+							<td><select id="quicktime_scale" name="quicktime_scale" class="mceEditableSelect" onchange="Media.formToData();">

 									<option value="">{#not_set}</option> 

 									<option value="tofit">tofit</option>

 									<option value="aspect">aspect</option>

@@ -441,62 +539,62 @@
 						</tr>

 

 						<tr>

-							<td><label for="qt_starttime">{#media_dlg.starttime}</label></td>

-							<td><input type="text" id="qt_starttime" name="qt_starttime" onchange="generatePreview();" /></td>

+							<td><label for="quicktime_starttime">{#media_dlg.starttime}</label></td>

+							<td><input type="text" id="quicktime_starttime" name="quicktime_starttime" onchange="Media.formToData();" /></td>

 

-							<td><label for="qt_endtime">{#media_dlg.endtime}</label></td>

-							<td><input type="text" id="qt_endtime" name="qt_endtime" onchange="generatePreview();" /></td>

+							<td><label for="quicktime_endtime">{#media_dlg.endtime}</label></td>

+							<td><input type="text" id="quicktime_endtime" name="quicktime_endtime" onchange="Media.formToData();" /></td>

 						</tr>

 

 						<tr>

-							<td><label for="qt_target">{#media_dlg.target}</label></td>

-							<td><input type="text" id="qt_target" name="qt_target" onchange="generatePreview();" /></td>

+							<td><label for="quicktime_target">{#media_dlg.target}</label></td>

+							<td><input type="text" id="quicktime_target" name="quicktime_target" onchange="Media.formToData();" /></td>

 

-							<td><label for="qt_href">{#media_dlg.href}</label></td>

-							<td><input type="text" id="qt_href" name="qt_href" onchange="generatePreview();" /></td>

+							<td><label for="quicktime_href">{#media_dlg.href}</label></td>

+							<td><input type="text" id="quicktime_href" name="quicktime_href" onchange="Media.formToData();" /></td>

 						</tr>

 

 						<tr>

-							<td><label for="qt_qtsrcchokespeed">{#media_dlg.qtsrcchokespeed}</label></td>

-							<td><input type="text" id="qt_qtsrcchokespeed" name="qt_qtsrcchokespeed" onchange="generatePreview();" /></td>

+							<td><label for="quicktime_qtsrcchokespeed">{#media_dlg.qtsrcchokespeed}</label></td>

+							<td><input type="text" id="quicktime_qtsrcchokespeed" name="quicktime_qtsrcchokespeed" onchange="Media.formToData();" /></td>

 

-							<td><label for="qt_volume">{#media_dlg.volume}</label></td>

-							<td><input type="text" id="qt_volume" name="qt_volume" onchange="generatePreview();" /></td>

+							<td><label for="quicktime_volume">{#media_dlg.volume}</label></td>

+							<td><input type="text" id="quicktime_volume" name="quicktime_volume" onchange="Media.formToData();" /></td>

 						</tr>

 

 						<tr>

-							<td><label for="qt_qtsrc">{#media_dlg.qtsrc}</label></td>

+							<td><label for="quicktime_qtsrc">{#media_dlg.qtsrc}</label></td>

 							<td colspan="4">

-							<table border="0" cellspacing="0" cellpadding="0">

-								  <tr>

-									<td><input type="text" id="qt_qtsrc" name="qt_qtsrc" onchange="generatePreview();" /></td>

-									<td id="qtsrcfilebrowsercontainer">&nbsp;</td>

-								  </tr>

-							</table>

+								<table role="presentation" border="0" cellspacing="0" cellpadding="0">

+									<tr>

+										<td><input type="text" id="quicktime_qtsrc" name="quicktime_qtsrc" onchange="Media.formToData();" /></td>

+										<td id="qtsrcfilebrowsercontainer">&nbsp;</td>

+									</tr>

+								</table>

 							</td>

 						</tr>

 					</table>

 				</fieldset>

 

-				<fieldset id="wmp_options">

+				<fieldset id="windowsmedia_options">

 					<legend>{#media_dlg.wmp_options}</legend>

 

-					<table border="0" cellpadding="4" cellspacing="0">

+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">

 						<tr>

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="wmp_autostart" name="wmp_autostart" checked="checked" onchange="generatePreview();" /></td>

-										<td><label for="wmp_autostart">{#media_dlg.autostart}</label></td>

+										<td><input type="checkbox" class="checkbox" id="windowsmedia_autostart" name="windowsmedia_autostart" checked="checked" onchange="Media.formToData();" /></td>

+										<td><label for="windowsmedia_autostart">{#media_dlg.autostart}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="wmp_enabled" name="wmp_enabled" onchange="generatePreview();" /></td>

-										<td><label for="wmp_enabled">{#media_dlg.enabled}</label></td>

+										<td><input type="checkbox" class="checkbox" id="windowsmedia_enabled" name="windowsmedia_enabled" onchange="Media.formToData();" /></td>

+										<td><label for="windowsmedia_enabled">{#media_dlg.enabled}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -504,19 +602,19 @@
 

 						<tr>

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="wmp_enablecontextmenu" name="wmp_enablecontextmenu" checked="checked" onchange="generatePreview();" /></td>

-										<td><label for="wmp_enablecontextmenu">{#media_dlg.menu}</label></td>

+										<td><input type="checkbox" class="checkbox" id="windowsmedia_enablecontextmenu" name="windowsmedia_enablecontextmenu" checked="checked" onchange="Media.formToData();" /></td>

+										<td><label for="windowsmedia_enablecontextmenu">{#media_dlg.menu}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="wmp_fullscreen" name="wmp_fullscreen" onchange="generatePreview();" /></td>

-										<td><label for="wmp_fullscreen">{#media_dlg.fullscreen}</label></td>

+										<td><input type="checkbox" class="checkbox" id="windowsmedia_fullscreen" name="windowsmedia_fullscreen" onchange="Media.formToData();" /></td>

+										<td><label for="windowsmedia_fullscreen">{#media_dlg.fullscreen}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -524,19 +622,19 @@
 

 						<tr>

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="wmp_invokeurls" name="wmp_invokeurls" checked="checked" onchange="generatePreview();" /></td>

-										<td><label for="wmp_invokeurls">{#media_dlg.invokeurls}</label></td>

+										<td><input type="checkbox" class="checkbox" id="windowsmedia_invokeurls" name="windowsmedia_invokeurls" checked="checked" onchange="Media.formToData();" /></td>

+										<td><label for="windowsmedia_invokeurls">{#media_dlg.invokeurls}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="wmp_mute" name="wmp_mute" onchange="generatePreview();" /></td>

-										<td><label for="wmp_mute">{#media_dlg.mute}</label></td>

+										<td><input type="checkbox" class="checkbox" id="windowsmedia_mute" name="windowsmedia_mute" onchange="Media.formToData();" /></td>

+										<td><label for="windowsmedia_mute">{#media_dlg.mute}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -544,86 +642,86 @@
 

 						<tr>

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="wmp_stretchtofit" name="wmp_stretchtofit" onchange="generatePreview();" /></td>

-										<td><label for="wmp_stretchtofit">{#media_dlg.stretchtofit}</label></td>

+										<td><input type="checkbox" class="checkbox" id="windowsmedia_stretchtofit" name="windowsmedia_stretchtofit" onchange="Media.formToData();" /></td>

+										<td><label for="windowsmedia_stretchtofit">{#media_dlg.stretchtofit}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="wmp_windowlessvideo" name="wmp_windowlessvideo" onchange="generatePreview();" /></td>

-										<td><label for="wmp_windowlessvideo">{#media_dlg.windowlessvideo}</label></td>

+										<td><input type="checkbox" class="checkbox" id="windowsmedia_windowlessvideo" name="windowsmedia_windowlessvideo" onchange="Media.formToData();" /></td>

+										<td><label for="windowsmedia_windowlessvideo">{#media_dlg.windowlessvideo}</label></td>

 									</tr>

 								</table>

 							</td>

 						</tr>

 

 						<tr>

-							<td><label for="wmp_balance">{#media_dlg.balance}</label></td>

-							<td><input type="text" id="wmp_balance" name="wmp_balance" onchange="generatePreview();" /></td>

+							<td><label for="windowsmedia_balance">{#media_dlg.balance}</label></td>

+							<td><input type="text" id="windowsmedia_balance" name="windowsmedia_balance" onchange="Media.formToData();" /></td>

 

-							<td><label for="wmp_baseurl">{#media_dlg.baseurl}</label></td>

-							<td><input type="text" id="wmp_baseurl" name="wmp_baseurl" onchange="generatePreview();" /></td>

+							<td><label for="windowsmedia_baseurl">{#media_dlg.baseurl}</label></td>

+							<td><input type="text" id="windowsmedia_baseurl" name="windowsmedia_baseurl" onchange="Media.formToData();" /></td>

 						</tr>

 

 						<tr>

-							<td><label for="wmp_captioningid">{#media_dlg.captioningid}</label></td>

-							<td><input type="text" id="wmp_captioningid" name="wmp_captioningid" onchange="generatePreview();" /></td>

+							<td><label for="windowsmedia_captioningid">{#media_dlg.captioningid}</label></td>

+							<td><input type="text" id="windowsmedia_captioningid" name="windowsmedia_captioningid" onchange="Media.formToData();" /></td>

 

-							<td><label for="wmp_currentmarker">{#media_dlg.currentmarker}</label></td>

-							<td><input type="text" id="wmp_currentmarker" name="wmp_currentmarker" onchange="generatePreview();" /></td>

+							<td><label for="windowsmedia_currentmarker">{#media_dlg.currentmarker}</label></td>

+							<td><input type="text" id="windowsmedia_currentmarker" name="windowsmedia_currentmarker" onchange="Media.formToData();" /></td>

 						</tr>

 

 						<tr>

-							<td><label for="wmp_currentposition">{#media_dlg.currentposition}</label></td>

-							<td><input type="text" id="wmp_currentposition" name="wmp_currentposition" onchange="generatePreview();" /></td>

+							<td><label for="windowsmedia_currentposition">{#media_dlg.currentposition}</label></td>

+							<td><input type="text" id="windowsmedia_currentposition" name="windowsmedia_currentposition" onchange="Media.formToData();" /></td>

 

-							<td><label for="wmp_defaultframe">{#media_dlg.defaultframe}</label></td>

-							<td><input type="text" id="wmp_defaultframe" name="wmp_defaultframe" onchange="generatePreview();" /></td>

+							<td><label for="windowsmedia_defaultframe">{#media_dlg.defaultframe}</label></td>

+							<td><input type="text" id="windowsmedia_defaultframe" name="windowsmedia_defaultframe" onchange="Media.formToData();" /></td>

 						</tr>

 

 						<tr>

-							<td><label for="wmp_playcount">{#media_dlg.playcount}</label></td>

-							<td><input type="text" id="wmp_playcount" name="wmp_playcount" onchange="generatePreview();" /></td>

+							<td><label for="windowsmedia_playcount">{#media_dlg.playcount}</label></td>

+							<td><input type="text" id="windowsmedia_playcount" name="windowsmedia_playcount" onchange="Media.formToData();" /></td>

 

-							<td><label for="wmp_rate">{#media_dlg.rate}</label></td>

-							<td><input type="text" id="wmp_rate" name="wmp_rate" onchange="generatePreview();" /></td>

+							<td><label for="windowsmedia_rate">{#media_dlg.rate}</label></td>

+							<td><input type="text" id="windowsmedia_rate" name="windowsmedia_rate" onchange="Media.formToData();" /></td>

 						</tr>

 

 						<tr>

-							<td><label for="wmp_uimode">{#media_dlg.uimode}</label></td>

-							<td><input type="text" id="wmp_uimode" name="wmp_uimode" onchange="generatePreview();" /></td>

+							<td><label for="windowsmedia_uimode">{#media_dlg.uimode}</label></td>

+							<td><input type="text" id="windowsmedia_uimode" name="windowsmedia_uimode" onchange="Media.formToData();" /></td>

 

-							<td><label for="wmp_volume">{#media_dlg.volume}</label></td>

-							<td><input type="text" id="wmp_volume" name="wmp_volume" onchange="generatePreview();" /></td>

+							<td><label for="windowsmedia_volume">{#media_dlg.volume}</label></td>

+							<td><input type="text" id="windowsmedia_volume" name="windowsmedia_volume" onchange="Media.formToData();" /></td>

 						</tr>

 

 					</table>

 				</fieldset>

 

-				<fieldset id="rmp_options">

+				<fieldset id="realmedia_options">

 					<legend>{#media_dlg.rmp_options}</legend>

 

-					<table border="0" cellpadding="4" cellspacing="0">

+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">

 						<tr>

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="rmp_autostart" name="rmp_autostart" onchange="generatePreview();" /></td>

-										<td><label for="rmp_autostart">{#media_dlg.autostart}</label></td>

+										<td><input type="checkbox" class="checkbox" id="realmedia_autostart" name="realmedia_autostart" onchange="Media.formToData();" /></td>

+										<td><label for="realmedia_autostart">{#media_dlg.autostart}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="rmp_loop" name="rmp_loop" onchange="generatePreview();" /></td>

-										<td><label for="rmp_loop">{#media_dlg.loop}</label></td>

+										<td><input type="checkbox" class="checkbox" id="realmedia_loop" name="realmedia_loop" onchange="Media.formToData();" /></td>

+										<td><label for="realmedia_loop">{#media_dlg.loop}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -631,19 +729,19 @@
 

 						<tr>

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="rmp_autogotourl" name="rmp_autogotourl" checked="checked" onchange="generatePreview();" /></td>

-										<td><label for="rmp_autogotourl">{#media_dlg.autogotourl}</label></td>

+										<td><input type="checkbox" class="checkbox" id="realmedia_autogotourl" name="realmedia_autogotourl" checked="checked" onchange="Media.formToData();" /></td>

+										<td><label for="realmedia_autogotourl">{#media_dlg.autogotourl}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="rmp_center" name="rmp_center" onchange="generatePreview();" /></td>

-										<td><label for="rmp_center">{#media_dlg.center}</label></td>

+										<td><input type="checkbox" class="checkbox" id="realmedia_center" name="realmedia_center" onchange="Media.formToData();" /></td>

+										<td><label for="realmedia_center">{#media_dlg.center}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -651,19 +749,19 @@
 

 						<tr>

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="rmp_imagestatus" name="rmp_imagestatus" checked="checked" onchange="generatePreview();" /></td>

-										<td><label for="rmp_imagestatus">{#media_dlg.imagestatus}</label></td>

+										<td><input type="checkbox" class="checkbox" id="realmedia_imagestatus" name="realmedia_imagestatus" checked="checked" onchange="Media.formToData();" /></td>

+										<td><label for="realmedia_imagestatus">{#media_dlg.imagestatus}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="rmp_maintainaspect" name="rmp_maintainaspect" onchange="generatePreview();" /></td>

-										<td><label for="rmp_maintainaspect">{#media_dlg.maintainaspect}</label></td>

+										<td><input type="checkbox" class="checkbox" id="realmedia_maintainaspect" name="realmedia_maintainaspect" onchange="Media.formToData();" /></td>

+										<td><label for="realmedia_maintainaspect">{#media_dlg.maintainaspect}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -671,19 +769,19 @@
 

 						<tr>

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="rmp_nojava" name="rmp_nojava" onchange="generatePreview();" /></td>

-										<td><label for="rmp_nojava">{#media_dlg.nojava}</label></td>

+										<td><input type="checkbox" class="checkbox" id="realmedia_nojava" name="realmedia_nojava" onchange="Media.formToData();" /></td>

+										<td><label for="realmedia_nojava">{#media_dlg.nojava}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="rmp_prefetch" name="rmp_prefetch" onchange="generatePreview();" /></td>

-										<td><label for="rmp_prefetch">{#media_dlg.prefetch}</label></td>

+										<td><input type="checkbox" class="checkbox" id="realmedia_prefetch" name="realmedia_prefetch" onchange="Media.formToData();" /></td>

+										<td><label for="realmedia_prefetch">{#media_dlg.prefetch}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -691,10 +789,10 @@
 

 						<tr>

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="rmp_shuffle" name="rmp_shuffle" onchange="generatePreview();" /></td>

-										<td><label for="rmp_shuffle">{#media_dlg.shuffle}</label></td>

+										<td><input type="checkbox" class="checkbox" id="realmedia_shuffle" name="realmedia_shuffle" onchange="Media.formToData();" /></td>

+										<td><label for="realmedia_shuffle">{#media_dlg.shuffle}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -705,19 +803,19 @@
 						</tr>

 

 						<tr>

-							<td><label for="rmp_console">{#media_dlg.console}</label></td>

-							<td><input type="text" id="rmp_console" name="rmp_console" onchange="generatePreview();" /></td>

+							<td><label for="realmedia_console">{#media_dlg.console}</label></td>

+							<td><input type="text" id="realmedia_console" name="realmedia_console" onchange="Media.formToData();" /></td>

 

-							<td><label for="rmp_controls">{#media_dlg.controls}</label></td>

-							<td><input type="text" id="rmp_controls" name="rmp_controls" onchange="generatePreview();" /></td>

+							<td><label for="realmedia_controls">{#media_dlg.controls}</label></td>

+							<td><input type="text" id="realmedia_controls" name="realmedia_controls" onchange="Media.formToData();" /></td>

 						</tr>

 

 						<tr>

-							<td><label for="rmp_numloop">{#media_dlg.numloop}</label></td>

-							<td><input type="text" id="rmp_numloop" name="rmp_numloop" onchange="generatePreview();" /></td>

+							<td><label for="realmedia_numloop">{#media_dlg.numloop}</label></td>

+							<td><input type="text" id="realmedia_numloop" name="realmedia_numloop" onchange="Media.formToData();" /></td>

 

-							<td><label for="rmp_scriptcallbacks">{#media_dlg.scriptcallbacks}</label></td>

-							<td><input type="text" id="rmp_scriptcallbacks" name="rmp_scriptcallbacks" onchange="generatePreview();" /></td>

+							<td><label for="realmedia_scriptcallbacks">{#media_dlg.scriptcallbacks}</label></td>

+							<td><input type="text" id="realmedia_scriptcallbacks" name="realmedia_scriptcallbacks" onchange="Media.formToData();" /></td>

 						</tr>

 					</table>

 				</fieldset>

@@ -725,11 +823,11 @@
 				<fieldset id="shockwave_options">

 					<legend>{#media_dlg.shockwave_options}</legend>

 

-					<table border="0" cellpadding="4" cellspacing="0">

+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">

 						<tr>

 							<td><label for="shockwave_swstretchstyle">{#media_dlg.swstretchstyle}</label></td>

 							<td>

-								<select id="shockwave_swstretchstyle" name="shockwave_swstretchstyle" onchange="generatePreview();">

+								<select id="shockwave_swstretchstyle" name="shockwave_swstretchstyle" onchange="Media.formToData();">

 									<option value="none">{#not_set}</option>

 									<option value="meet">Meet</option>

 									<option value="fill">Fill</option>

@@ -738,13 +836,13 @@
 							</td>

 

 							<td><label for="shockwave_swvolume">{#media_dlg.volume}</label></td>

-							<td><input type="text" id="shockwave_swvolume" name="shockwave_swvolume" onchange="generatePreview();" /></td>

+							<td><input type="text" id="shockwave_swvolume" name="shockwave_swvolume" onchange="Media.formToData();" /></td>

 						</tr>

 

 						<tr>

 							<td><label for="shockwave_swstretchhalign">{#media_dlg.swstretchhalign}</label></td>

 							<td>

-								<select id="shockwave_swstretchhalign" name="shockwave_swstretchhalign" onchange="generatePreview();">

+								<select id="shockwave_swstretchhalign" name="shockwave_swstretchhalign" onchange="Media.formToData();">

 									<option value="none">{#not_set}</option>

 									<option value="left">{#media_dlg.align_left}</option>

 									<option value="center">{#media_dlg.align_center}</option>

@@ -754,7 +852,7 @@
 

 							<td><label for="shockwave_swstretchvalign">{#media_dlg.swstretchvalign}</label></td>

 							<td>

-								<select id="shockwave_swstretchvalign" name="shockwave_swstretchvalign" onchange="generatePreview();">

+								<select id="shockwave_swstretchvalign" name="shockwave_swstretchvalign" onchange="Media.formToData();">

 									<option value="none">{#not_set}</option>

 									<option value="meet">Meet</option>

 									<option value="fill">Fill</option>

@@ -765,18 +863,18 @@
 

 						<tr>

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="shockwave_autostart" name="shockwave_autostart" onchange="generatePreview();" checked="checked" /></td>

+										<td><input type="checkbox" class="checkbox" id="shockwave_autostart" name="shockwave_autostart" onchange="Media.formToData();" checked="checked" /></td>

 										<td><label for="shockwave_autostart">{#media_dlg.autostart}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="shockwave_sound" name="shockwave_sound" onchange="generatePreview();" checked="checked" /></td>

+										<td><input type="checkbox" class="checkbox" id="shockwave_sound" name="shockwave_sound" onchange="Media.formToData();" checked="checked" /></td>

 										<td><label for="shockwave_sound">{#media_dlg.sound}</label></td>

 									</tr>

 								</table>

@@ -786,18 +884,18 @@
 

 						<tr>

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="shockwave_swliveconnect" name="shockwave_swliveconnect" onchange="generatePreview();" /></td>

+										<td><input type="checkbox" class="checkbox" id="shockwave_swliveconnect" name="shockwave_swliveconnect" onchange="Media.formToData();" /></td>

 										<td><label for="shockwave_swliveconnect">{#media_dlg.liveconnect}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td colspan="2">

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="shockwave_progress" name="shockwave_progress" onchange="generatePreview();" checked="checked" /></td>

+										<td><input type="checkbox" class="checkbox" id="shockwave_progress" name="shockwave_progress" onchange="Media.formToData();" checked="checked" /></td>

 										<td><label for="shockwave_progress">{#media_dlg.progress}</label></td>

 									</tr>

 								</table>

@@ -806,6 +904,13 @@
 					</table>

 				</fieldset>

 			</div>

+

+			<div id="source_panel" class="panel">

+				<fieldset>

+					<legend>{#media_dlg.source}</legend>

+					<textarea id="source" style="width: 99%; height: 390px"></textarea>

+				</fieldset>

+			</div>

 		</div>

 

 		<div class="mceActionPanel">

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/media/moxieplayer.swf b/library/tinymce/jscripts/tiny_mce/plugins/media/moxieplayer.swf
new file mode 100644
index 000000000..585d772d6
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/plugins/media/moxieplayer.swf
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js
index f2dbbff2b..687f54866 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.Nonbreaking",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceNonBreaking",function(){a.execCommand("mceInsertContent",false,(a.plugins.visualchars&&a.plugins.visualchars.state)?'<span class="mceItemHidden mceVisualNbsp">&middot;</span>':"&nbsp;")});a.addButton("nonbreaking",{title:"nonbreaking.nonbreaking_desc",cmd:"mceNonBreaking"});if(a.getParam("nonbreaking_force_tab")){a.onKeyDown.add(function(d,f){if(tinymce.isIE&&f.keyCode==9){d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");tinymce.dom.Event.cancel(f)}})}},getInfo:function(){return{longname:"Nonbreaking space",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/nonbreaking",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("nonbreaking",tinymce.plugins.Nonbreaking)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.Nonbreaking",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceNonBreaking",function(){a.execCommand("mceInsertContent",false,(a.plugins.visualchars&&a.plugins.visualchars.state)?'<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">&nbsp;</span>':"&nbsp;")});a.addButton("nonbreaking",{title:"nonbreaking.nonbreaking_desc",cmd:"mceNonBreaking"});if(a.getParam("nonbreaking_force_tab")){a.onKeyDown.add(function(d,f){if(f.keyCode==9){f.preventDefault();d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking")}})}},getInfo:function(){return{longname:"Nonbreaking space",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/nonbreaking",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("nonbreaking",tinymce.plugins.Nonbreaking)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
index e3b078bfa..d492fbefe 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
@@ -17,7 +17,7 @@
 

 			// Register commands

 			ed.addCommand('mceNonBreaking', function() {

-				ed.execCommand('mceInsertContent', false, (ed.plugins.visualchars && ed.plugins.visualchars.state) ? '<span class="mceItemHidden mceVisualNbsp">&middot;</span>' : '&nbsp;');

+				ed.execCommand('mceInsertContent', false, (ed.plugins.visualchars && ed.plugins.visualchars.state) ? '<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">&nbsp;</span>' : '&nbsp;');

 			});

 

 			// Register buttons

@@ -25,11 +25,12 @@
 

 			if (ed.getParam('nonbreaking_force_tab')) {

 				ed.onKeyDown.add(function(ed, e) {

-					if (tinymce.isIE && e.keyCode == 9) {

+					if (e.keyCode == 9) {

+						e.preventDefault();

+	

 						ed.execCommand('mceNonBreaking');

 						ed.execCommand('mceNonBreaking');

 						ed.execCommand('mceNonBreaking');

-						tinymce.dom.Event.cancel(e);

 					}

 				});

 			}

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js
index 9945cd858..e7f301dbc 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.dom.Event;tinymce.create("tinymce.plugins.NonEditablePlugin",{init:function(d,e){var f=this,c,b;f.editor=d;c=d.getParam("noneditable_editable_class","mceEditable");b=d.getParam("noneditable_noneditable_class","mceNonEditable");d.onNodeChange.addToTop(function(h,g,k){var j,i;j=h.dom.getParent(h.selection.getStart(),function(l){return h.dom.hasClass(l,b)});i=h.dom.getParent(h.selection.getEnd(),function(l){return h.dom.hasClass(l,b)});if(j||i){f._setDisabled(1);return false}else{f._setDisabled(0)}})},getInfo:function(){return{longname:"Non editable elements",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_block:function(c,d){var b=d.keyCode;if((b>32&&b<41)||(b>111&&b<124)){return}return a.cancel(d)},_setDisabled:function(d){var c=this,b=c.editor;tinymce.each(b.controlManager.controls,function(e){e.setDisabled(d)});if(d!==c.disabled){if(d){b.onKeyDown.addToTop(c._block);b.onKeyPress.addToTop(c._block);b.onKeyUp.addToTop(c._block);b.onPaste.addToTop(c._block)}else{b.onKeyDown.remove(c._block);b.onKeyPress.remove(c._block);b.onKeyUp.remove(c._block);b.onPaste.remove(c._block)}c.disabled=d}}});tinymce.PluginManager.add("noneditable",tinymce.plugins.NonEditablePlugin)})();
\ No newline at end of file
+(function(){var c=tinymce.dom.TreeWalker;var a="contenteditable",d="data-mce-"+a;var e=tinymce.VK;function b(n){var j=n.dom,p=n.selection,r,o="mce_noneditablecaret";r=tinymce.isGecko?"\u200B":"\uFEFF";function m(t){var s;if(t.nodeType===1){s=t.getAttribute(d);if(s&&s!=="inherit"){return s}s=t.contentEditable;if(s!=="inherit"){return s}}return null}function g(s){var t;while(s){t=m(s);if(t){return t==="false"?s:null}s=s.parentNode}}function l(s){while(s){if(s.id===o){return s}s=s.parentNode}}function k(s){var t;if(s){t=new c(s,s);for(s=t.current();s;s=t.next()){if(s.nodeType===3){return s}}}}function f(v,u){var s,t;if(m(v)==="false"){if(j.isBlock(v)){p.select(v);return}}t=j.createRng();if(m(v)==="true"){if(!v.firstChild){v.appendChild(n.getDoc().createTextNode("\u00a0"))}v=v.firstChild;u=true}s=j.create("span",{id:o,"data-mce-bogus":true},r);if(u){v.parentNode.insertBefore(s,v)}else{j.insertAfter(s,v)}t.setStart(s.firstChild,1);t.collapse(true);p.setRng(t);return s}function i(s){var v,t,u;if(s){rng=p.getRng(true);rng.setStartBefore(s);rng.setEndBefore(s);v=k(s);if(v&&v.nodeValue.charAt(0)==r){v=v.deleteData(0,1)}j.remove(s,true);p.setRng(rng)}else{t=l(p.getStart());while((s=j.get(o))&&s!==u){if(t!==s){v=k(s);if(v&&v.nodeValue.charAt(0)==r){v=v.deleteData(0,1)}j.remove(s,true)}u=s}}}function q(){var s,w,u,t,v;function x(B,D){var A,F,E,C,z;A=t.startContainer;F=t.startOffset;if(A.nodeType==3){z=A.nodeValue.length;if((F>0&&F<z)||(D?F==z:F==0)){return}}else{if(F<A.childNodes.length){var G=!D&&F>0?F-1:F;A=A.childNodes[G];if(A.hasChildNodes()){A=A.firstChild}}else{return !D?B:null}}E=new c(A,B);while(C=E[D?"prev":"next"]()){if(C.nodeType===3&&C.nodeValue.length>0){return}else{if(m(C)==="true"){return C}}}return B}i();u=p.isCollapsed();s=g(p.getStart());w=g(p.getEnd());if(s||w){t=p.getRng(true);if(u){s=s||w;var y=p.getStart();if(v=x(s,true)){f(v,true)}else{if(v=x(s,false)){f(v,false)}else{p.select(s)}}}else{t=p.getRng(true);if(s){t.setStartBefore(s)}if(w){t.setEndAfter(w)}p.setRng(t)}}}function h(y,A){var E=A.keyCode,w,B,C,u;function t(G,F){while(G=G[F?"previousSibling":"nextSibling"]){if(G.nodeType!==3||G.nodeValue.length>0){return G}}}function x(F,G){p.select(F);p.collapse(G)}C=p.getStart();u=p.getEnd();w=g(C)||g(u);if(w&&(E<112||E>124)&&E!=e.DELETE&&E!=e.BACKSPACE){A.preventDefault();if(E==e.LEFT||E==e.RIGHT){var v=E==e.LEFT;if(y.dom.isBlock(w)){var z=v?w.previousSibling:w.nextSibling;var s=new c(z,z);var D=v?s.prev():s.next();x(D,!v)}else{x(w,v)}}}else{if(E==e.LEFT||E==e.RIGHT||E==e.BACKSPACE||E==e.DELETE){B=l(C);if(B){if(E==e.LEFT||E==e.BACKSPACE){w=t(B,true);if(w&&m(w)==="false"){A.preventDefault();if(E==e.LEFT){x(w,true)}else{j.remove(w)}}else{i(B)}}if(E==e.RIGHT||E==e.DELETE){w=t(B);if(w&&m(w)==="false"){A.preventDefault();if(E==e.RIGHT){x(w,false)}else{j.remove(w)}}else{i(B)}}}}}}n.onMouseDown.addToTop(function(s,u){var t=s.selection.getNode();if(m(t)==="false"&&t==u.target){u.preventDefault()}});n.onMouseUp.addToTop(q);n.onKeyDown.addToTop(h);n.onKeyUp.addToTop(q)}tinymce.create("tinymce.plugins.NonEditablePlugin",{init:function(h,j){var g,f,i;g=" "+tinymce.trim(h.getParam("noneditable_editable_class","mceEditable"))+" ";f=" "+tinymce.trim(h.getParam("noneditable_noneditable_class","mceNonEditable"))+" ";i=h.getParam("noneditable_regexp");if(i&&!i.length){i=[i]}h.onPreInit.add(function(){b(h);if(i){h.onBeforeSetContent.add(function(l,m){var n=i.length,o=m.content,k=tinymce.trim(f);if(m.format=="raw"){return}while(n--){o=o.replace(i[n],function(){var p=arguments;return'<span class="'+k+'" data-mce-content="'+l.dom.encode(p[0])+'">'+l.dom.encode(typeof(p[1])==="string"?p[1]:p[0])+"</span>"})}m.content=o})}h.parser.addAttributeFilter("class",function(k){var l=k.length,m,n;while(l--){n=k[l];m=" "+n.attr("class")+" ";if(m.indexOf(g)!==-1){n.attr(d,"true")}else{if(m.indexOf(f)!==-1){n.attr(d,"false")}}}});h.serializer.addAttributeFilter(d,function(k,l){var m=k.length,n;while(m--){n=k[m];if(i&&n.attr("data-mce-content")){n.name="#text";n.type=3;n.raw=true;n.value=n.attr("data-mce-content")}else{n.attr(a,null);n.attr(d,null)}}});h.parser.addAttributeFilter(a,function(k,l){var m=k.length,n;while(m--){n=k[m];n.attr(d,n.attr(a));n.attr(a,null)}})})},getInfo:function(){return{longname:"Non editable elements",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("noneditable",tinymce.plugins.NonEditablePlugin)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js
index 656c971b8..c87d241bd 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js
@@ -9,34 +9,416 @@
  */

 

 (function() {

-	var Event = tinymce.dom.Event;

+	var TreeWalker = tinymce.dom.TreeWalker;

+	var externalName = 'contenteditable', internalName = 'data-mce-' + externalName;

+	var VK = tinymce.VK;

+

+	function handleContentEditableSelection(ed) {

+		var dom = ed.dom, selection = ed.selection, invisibleChar, caretContainerId = 'mce_noneditablecaret';

+

+		// Setup invisible character use zero width space on Gecko since it doesn't change the height of the container

+		invisibleChar = tinymce.isGecko ? '\u200B' : '\uFEFF';

+

+		// Returns the content editable state of a node "true/false" or null

+		function getContentEditable(node) {

+			var contentEditable;

+

+			// Ignore non elements

+			if (node.nodeType === 1) {

+				// Check for fake content editable

+				contentEditable = node.getAttribute(internalName);

+				if (contentEditable && contentEditable !== "inherit") {

+					return contentEditable;

+				}

+

+				// Check for real content editable

+				contentEditable = node.contentEditable;

+				if (contentEditable !== "inherit") {

+					return contentEditable;

+				}

+			}

+

+			return null;

+		};

+

+		// Returns the noneditable parent or null if there is a editable before it or if it wasn't found

+		function getNonEditableParent(node) {

+			var state;

+

+			while (node) {

+				state = getContentEditable(node);

+				if (state) {

+					return state  === "false" ? node : null;

+				}

+

+				node = node.parentNode;

+			}

+		};

+

+		// Get caret container parent for the specified node

+		function getParentCaretContainer(node) {

+			while (node) {

+				if (node.id === caretContainerId) {

+					return node;

+				}

+

+				node = node.parentNode;

+			}

+		};

+

+		// Finds the first text node in the specified node

+		function findFirstTextNode(node) {

+			var walker;

+

+			if (node) {

+				walker = new TreeWalker(node, node);

+

+				for (node = walker.current(); node; node = walker.next()) {

+					if (node.nodeType === 3) {

+						return node;

+					}

+				}

+			}

+		};

+

+		// Insert caret container before/after target or expand selection to include block

+		function insertCaretContainerOrExpandToBlock(target, before) {

+			var caretContainer, rng;

+

+			// Select block

+			if (getContentEditable(target) === "false") {

+				if (dom.isBlock(target)) {

+					selection.select(target);

+					return;

+				}

+			}

+

+			rng = dom.createRng();

+

+			if (getContentEditable(target) === "true") {

+				if (!target.firstChild) {

+					target.appendChild(ed.getDoc().createTextNode('\u00a0'));

+				}

+

+				target = target.firstChild;

+				before = true;

+			}

+

+			//caretContainer = dom.create('span', {id: caretContainerId, 'data-mce-bogus': true, style:'border: 1px solid red'}, invisibleChar);

+			caretContainer = dom.create('span', {id: caretContainerId, 'data-mce-bogus': true}, invisibleChar);

+

+			if (before) {

+				target.parentNode.insertBefore(caretContainer, target);

+			} else {

+				dom.insertAfter(caretContainer, target);

+			}

+

+			rng.setStart(caretContainer.firstChild, 1);

+			rng.collapse(true);

+			selection.setRng(rng);

+

+			return caretContainer;

+		};

+

+		// Removes any caret container except the one we might be in

+		function removeCaretContainer(caretContainer) {

+			var child, currentCaretContainer, lastContainer;

+

+			if (caretContainer) {

+					rng = selection.getRng(true);

+					rng.setStartBefore(caretContainer);

+					rng.setEndBefore(caretContainer);

+

+					child = findFirstTextNode(caretContainer);

+					if (child && child.nodeValue.charAt(0) == invisibleChar) {

+						child = child.deleteData(0, 1);

+					}

+

+					dom.remove(caretContainer, true);

+

+					selection.setRng(rng);

+			} else {

+				currentCaretContainer = getParentCaretContainer(selection.getStart());

+				while ((caretContainer = dom.get(caretContainerId)) && caretContainer !== lastContainer) {

+					if (currentCaretContainer !== caretContainer) {

+						child = findFirstTextNode(caretContainer);

+						if (child && child.nodeValue.charAt(0) == invisibleChar) {

+							child = child.deleteData(0, 1);

+						}

+

+						dom.remove(caretContainer, true);

+					}

+

+					lastContainer = caretContainer;

+				}

+			}

+		};

+

+		// Modifies the selection to include contentEditable false elements or insert caret containers

+		function moveSelection() {

+			var nonEditableStart, nonEditableEnd, isCollapsed, rng, element;

+

+			// Checks if there is any contents to the left/right side of caret returns the noneditable element or any editable element if it finds one inside

+			function hasSideContent(element, left) {

+				var container, offset, walker, node, len;

+

+				container = rng.startContainer;

+				offset = rng.startOffset;

+

+				// If endpoint is in middle of text node then expand to beginning/end of element

+				if (container.nodeType == 3) {

+					len = container.nodeValue.length;

+					if ((offset > 0 && offset < len) || (left ? offset == len : offset == 0)) {

+						return;

+					}

+				} else {

+					// Can we resolve the node by index

+					if (offset < container.childNodes.length) {

+						// Browser represents caret position as the offset at the start of an element. When moving right

+						// this is the element we are moving into so we consider our container to be child node at offset-1

+						var pos = !left && offset > 0 ? offset-1 : offset;

+						container = container.childNodes[pos];

+						if (container.hasChildNodes()) {

+							container = container.firstChild;

+						}

+					} else {

+						// If not then the caret is at the last position in it's container and the caret container should be inserted after the noneditable element

+						return !left ? element : null;

+					}

+				}

+

+				// Walk left/right to look for contents

+				walker = new TreeWalker(container, element);

+				while (node = walker[left ? 'prev' : 'next']()) {

+					if (node.nodeType === 3 && node.nodeValue.length > 0) {

+						return;

+					} else if (getContentEditable(node) === "true") {

+						// Found contentEditable=true element return this one to we can move the caret inside it

+						return node;

+					}

+				}

+

+				return element;

+			};

+

+			// Remove any existing caret containers

+			removeCaretContainer();

+

+			// Get noneditable start/end elements

+			isCollapsed = selection.isCollapsed();

+			nonEditableStart = getNonEditableParent(selection.getStart());

+			nonEditableEnd = getNonEditableParent(selection.getEnd());

+

+			// Is any fo the range endpoints noneditable

+			if (nonEditableStart || nonEditableEnd) {

+				rng = selection.getRng(true);

+

+				// If it's a caret selection then look left/right to see if we need to move the caret out side or expand

+				if (isCollapsed) {

+					nonEditableStart = nonEditableStart || nonEditableEnd;

+					var start = selection.getStart();

+					if (element = hasSideContent(nonEditableStart, true)) {

+						// We have no contents to the left of the caret then insert a caret container before the noneditable element

+						insertCaretContainerOrExpandToBlock(element, true);

+					} else if (element = hasSideContent(nonEditableStart, false)) {

+						// We have no contents to the right of the caret then insert a caret container after the noneditable element

+						insertCaretContainerOrExpandToBlock(element, false);

+					} else {

+						// We are in the middle of a noneditable so expand to select it

+						selection.select(nonEditableStart);

+					}

+				} else {

+					rng = selection.getRng(true);

+

+					// Expand selection to include start non editable element

+					if (nonEditableStart) {

+						rng.setStartBefore(nonEditableStart);

+					}

+

+					// Expand selection to include end non editable element

+					if (nonEditableEnd) {

+						rng.setEndAfter(nonEditableEnd);

+					}

+

+					selection.setRng(rng);

+				}

+			}

+		};

+

+		function handleKey(ed, e) {

+			var keyCode = e.keyCode, nonEditableParent, caretContainer, startElement, endElement;

+

+			function getNonEmptyTextNodeSibling(node, prev) {

+				while (node = node[prev ? 'previousSibling' : 'nextSibling']) {

+					if (node.nodeType !== 3 || node.nodeValue.length > 0) {

+						return node;

+					}

+				}

+			};

+

+			function positionCaretOnElement(element, start) {

+				selection.select(element);

+				selection.collapse(start);

+			}

+

+			startElement = selection.getStart()

+			endElement = selection.getEnd();

+

+			// Disable all key presses in contentEditable=false except delete or backspace

+			nonEditableParent = getNonEditableParent(startElement) || getNonEditableParent(endElement);

+			if (nonEditableParent && (keyCode < 112 || keyCode > 124) && keyCode != VK.DELETE && keyCode != VK.BACKSPACE) {

+				e.preventDefault();

+

+				// Arrow left/right select the element and collapse left/right

+				if (keyCode == VK.LEFT || keyCode == VK.RIGHT) {

+					var left = keyCode == VK.LEFT;

+					// If a block element find previous or next element to position the caret

+					if (ed.dom.isBlock(nonEditableParent)) {

+						var targetElement = left ? nonEditableParent.previousSibling : nonEditableParent.nextSibling;

+						var walker = new TreeWalker(targetElement, targetElement);

+						var caretElement = left ? walker.prev() : walker.next();

+						positionCaretOnElement(caretElement, !left);

+					} else {

+						positionCaretOnElement(nonEditableParent, left);

+					}

+				}

+			} else {

+				// Is arrow left/right, backspace or delete

+				if (keyCode == VK.LEFT || keyCode == VK.RIGHT || keyCode == VK.BACKSPACE || keyCode == VK.DELETE) {

+					caretContainer = getParentCaretContainer(startElement);

+					if (caretContainer) {

+						// Arrow left or backspace

+						if (keyCode == VK.LEFT || keyCode == VK.BACKSPACE) {

+							nonEditableParent = getNonEmptyTextNodeSibling(caretContainer, true);

+

+							if (nonEditableParent && getContentEditable(nonEditableParent) === "false") {

+								e.preventDefault();

+

+								if (keyCode == VK.LEFT) {

+									positionCaretOnElement(nonEditableParent, true);

+								} else {

+									dom.remove(nonEditableParent);

+								}

+							} else {

+								removeCaretContainer(caretContainer);

+							}

+						}

+

+						// Arrow right or delete

+						if (keyCode == VK.RIGHT || keyCode == VK.DELETE) {

+							nonEditableParent = getNonEmptyTextNodeSibling(caretContainer);

+

+							if (nonEditableParent && getContentEditable(nonEditableParent) === "false") {

+								e.preventDefault();

+

+								if (keyCode == VK.RIGHT) {

+									positionCaretOnElement(nonEditableParent, false);

+								} else {

+									dom.remove(nonEditableParent);

+								}

+							} else {

+								removeCaretContainer(caretContainer);

+							}

+						}

+					}

+				}

+			}

+		};

+

+		ed.onMouseDown.addToTop(function(ed, e){

+			// prevent collapsing selection to caret when clicking in a non-editable section

+			var node = ed.selection.getNode();

+			if (getContentEditable(node) === "false" && node == e.target) {

+				e.preventDefault();

+			}

+		});

+		ed.onMouseUp.addToTop(moveSelection);

+		ed.onKeyDown.addToTop(handleKey);

+		ed.onKeyUp.addToTop(moveSelection);

+	};

 

 	tinymce.create('tinymce.plugins.NonEditablePlugin', {

 		init : function(ed, url) {

-			var t = this, editClass, nonEditClass;

+			var editClass, nonEditClass, nonEditableRegExps;

+

+			editClass = " " + tinymce.trim(ed.getParam("noneditable_editable_class", "mceEditable")) + " ";

+			nonEditClass = " " + tinymce.trim(ed.getParam("noneditable_noneditable_class", "mceNonEditable")) + " ";

+

+			// Setup noneditable regexps array

+			nonEditableRegExps = ed.getParam("noneditable_regexp");

+			if (nonEditableRegExps && !nonEditableRegExps.length) {

+				nonEditableRegExps = [nonEditableRegExps];

+			}

+

+			ed.onPreInit.add(function() {

+				handleContentEditableSelection(ed);

+

+				if (nonEditableRegExps) {

+					ed.onBeforeSetContent.add(function(ed, args) {

+						var i = nonEditableRegExps.length, content = args.content, cls = tinymce.trim(nonEditClass);

+

+						// Don't replace the variables when raw is used for example on undo/redo

+						if (args.format == "raw") {

+							return;

+						}

 

-			t.editor = ed;

-			editClass = ed.getParam("noneditable_editable_class", "mceEditable");

-			nonEditClass = ed.getParam("noneditable_noneditable_class", "mceNonEditable");

+						while (i--) {

+							content = content.replace(nonEditableRegExps[i], function() {

+								var args = arguments;

 

-			ed.onNodeChange.addToTop(function(ed, cm, n) {

-				var sc, ec;

+								return '<span class="' + cls + '" data-mce-content="' + ed.dom.encode(args[0]) + '">' + ed.dom.encode(typeof(args[1]) === "string" ? args[1] : args[0]) + '</span>';

+							});

+						}

 

-				// Block if start or end is inside a non editable element

-				sc = ed.dom.getParent(ed.selection.getStart(), function(n) {

-					return ed.dom.hasClass(n, nonEditClass);

+						args.content = content;

+					});

+				}

+				

+				// Apply contentEditable true/false on elements with the noneditable/editable classes

+				ed.parser.addAttributeFilter('class', function(nodes) {

+					var i = nodes.length, className, node;

+

+					while (i--) {

+						node = nodes[i];

+						className = " " + node.attr("class") + " ";

+

+						if (className.indexOf(editClass) !== -1) {

+							node.attr(internalName, "true");

+						} else if (className.indexOf(nonEditClass) !== -1) {

+							node.attr(internalName, "false");

+						}

+					}

 				});

 

-				ec = ed.dom.getParent(ed.selection.getEnd(), function(n) {

-					return ed.dom.hasClass(n, nonEditClass);

+				// Remove internal name

+				ed.serializer.addAttributeFilter(internalName, function(nodes, name) {

+					var i = nodes.length, node;

+

+					while (i--) {

+						node = nodes[i];

+

+						if (nonEditableRegExps && node.attr('data-mce-content')) {

+							node.name = "#text";

+							node.type = 3;

+							node.raw = true;

+							node.value = node.attr('data-mce-content');

+						} else {

+							node.attr(externalName, null);

+							node.attr(internalName, null);

+						}

+					}

 				});

 

-				// Block or unblock

-				if (sc || ec) {

-					t._setDisabled(1);

-					return false;

-				} else

-					t._setDisabled(0);

+				// Convert external name into internal name

+				ed.parser.addAttributeFilter(externalName, function(nodes, name) {

+					var i = nodes.length, node;

+

+					while (i--) {

+						node = nodes[i];

+						node.attr(internalName, node.attr(externalName));

+						node.attr(externalName, null);

+					}

+				});

 			});

 		},

 

@@ -48,40 +430,6 @@
 				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable',

 				version : tinymce.majorVersion + "." + tinymce.minorVersion

 			};

-		},

-

-		_block : function(ed, e) {

-			var k = e.keyCode;

-

-			// Don't block arrow keys, pg up/down, and F1-F12

-			if ((k > 32 && k < 41) || (k > 111 && k < 124))

-				return;

-

-			return Event.cancel(e);

-		},

-

-		_setDisabled : function(s) {

-			var t = this, ed = t.editor;

-

-			tinymce.each(ed.controlManager.controls, function(c) {

-				c.setDisabled(s);

-			});

-

-			if (s !== t.disabled) {

-				if (s) {

-					ed.onKeyDown.addToTop(t._block);

-					ed.onKeyPress.addToTop(t._block);

-					ed.onKeyUp.addToTop(t._block);

-					ed.onPaste.addToTop(t._block);

-				} else {

-					ed.onKeyDown.remove(t._block);

-					ed.onKeyPress.remove(t._block);

-					ed.onKeyUp.remove(t._block);

-					ed.onPaste.remove(t._block);

-				}

-

-				t.disabled = s;

-			}

 		}

 	});

 

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css b/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css
deleted file mode 100755
index c949d58cc..000000000
--- a/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css
+++ /dev/null
@@ -1 +0,0 @@
-.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../img/pagebreak.gif) no-repeat center top;}
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js
index a212f6963..35085e8ad 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.PageBreakPlugin",{init:function(b,d){var f='<img src="'+d+'/img/trans.gif" class="mcePageBreak mceItemNoResize" />',a="mcePageBreak",c=b.getParam("pagebreak_separator","<!-- pagebreak -->"),e;e=new RegExp(c.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,function(g){return"\\"+g}),"g");b.addCommand("mcePageBreak",function(){b.execCommand("mceInsertContent",0,f)});b.addButton("pagebreak",{title:"pagebreak.desc",cmd:a});b.onInit.add(function(){if(b.settings.content_css!==false){b.dom.loadCSS(d+"/css/content.css")}if(b.theme.onResolveName){b.theme.onResolveName.add(function(g,h){if(h.node.nodeName=="IMG"&&b.dom.hasClass(h.node,a)){h.name="pagebreak"}})}});b.onClick.add(function(g,h){h=h.target;if(h.nodeName==="IMG"&&g.dom.hasClass(h,a)){g.selection.select(h)}});b.onNodeChange.add(function(h,g,i){g.setActive("pagebreak",i.nodeName==="IMG"&&h.dom.hasClass(i,a))});b.onBeforeSetContent.add(function(g,h){h.content=h.content.replace(e,f)});b.onPostProcess.add(function(g,h){if(h.get){h.content=h.content.replace(/<img[^>]+>/g,function(i){if(i.indexOf('class="mcePageBreak')!==-1){i=c}return i})}})},getInfo:function(){return{longname:"PageBreak",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/pagebreak",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("pagebreak",tinymce.plugins.PageBreakPlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.PageBreakPlugin",{init:function(b,d){var f='<img src="'+b.theme.url+'/img/trans.gif" class="mcePageBreak mceItemNoResize" />',a="mcePageBreak",c=b.getParam("pagebreak_separator","<!-- pagebreak -->"),e;e=new RegExp(c.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,function(g){return"\\"+g}),"g");b.addCommand("mcePageBreak",function(){b.execCommand("mceInsertContent",0,f)});b.addButton("pagebreak",{title:"pagebreak.desc",cmd:a});b.onInit.add(function(){if(b.theme.onResolveName){b.theme.onResolveName.add(function(g,h){if(h.node.nodeName=="IMG"&&b.dom.hasClass(h.node,a)){h.name="pagebreak"}})}});b.onClick.add(function(g,h){h=h.target;if(h.nodeName==="IMG"&&g.dom.hasClass(h,a)){g.selection.select(h)}});b.onNodeChange.add(function(h,g,i){g.setActive("pagebreak",i.nodeName==="IMG"&&h.dom.hasClass(i,a))});b.onBeforeSetContent.add(function(g,h){h.content=h.content.replace(e,f)});b.onPostProcess.add(function(g,h){if(h.get){h.content=h.content.replace(/<img[^>]+>/g,function(i){if(i.indexOf('class="mcePageBreak')!==-1){i=c}return i})}})},getInfo:function(){return{longname:"PageBreak",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/pagebreak",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("pagebreak",tinymce.plugins.PageBreakPlugin)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js
index 4e1eb0a7a..a094c1916 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js
@@ -11,7 +11,7 @@
 (function() {

 	tinymce.create('tinymce.plugins.PageBreakPlugin', {

 		init : function(ed, url) {

-			var pb = '<img src="' + url + '/img/trans.gif" class="mcePageBreak mceItemNoResize" />', cls = 'mcePageBreak', sep = ed.getParam('pagebreak_separator', '<!-- pagebreak -->'), pbRE;

+			var pb = '<img src="' + ed.theme.url + '/img/trans.gif" class="mcePageBreak mceItemNoResize" />', cls = 'mcePageBreak', sep = ed.getParam('pagebreak_separator', '<!-- pagebreak -->'), pbRE;

 

 			pbRE = new RegExp(sep.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g, function(a) {return '\\' + a;}), 'g');

 

@@ -24,9 +24,6 @@
 			ed.addButton('pagebreak', {title : 'pagebreak.desc', cmd : cls});

 

 			ed.onInit.add(function() {

-				if (ed.settings.content_css !== false)

-					ed.dom.loadCSS(url + "/css/content.css");

-

 				if (ed.theme.onResolveName) {

 					ed.theme.onResolveName.add(function(th, o) {

 						if (o.node.nodeName == 'IMG' && ed.dom.hasClass(o.node, cls))

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif b/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif
deleted file mode 100755
index 388486517..000000000
--- a/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif
+++ /dev/null
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
index 3e7b2504f..e47a5c630 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
@@ -1 +1 @@
-(function(){var c=tinymce.each,d=null,a={paste_auto_cleanup_on_paste:true,paste_block_drop:false,paste_retain_style_properties:"none",paste_strip_class_attributes:"mso",paste_remove_spans:false,paste_remove_styles:false,paste_remove_styles_if_webkit:true,paste_convert_middot_lists:true,paste_convert_headers_to_strong:false,paste_dialog_width:"450",paste_dialog_height:"400",paste_text_use_dialog:false,paste_text_sticky:false,paste_text_notifyalways:false,paste_text_linebreaktype:"p",paste_text_replacements:[[/\u2026/g,"..."],[/[\x93\x94\u201c\u201d]/g,'"'],[/[\x60\x91\x92\u2018\u2019]/g,"'"]]};function b(e,f){return e.getParam(f,a[f])}tinymce.create("tinymce.plugins.PastePlugin",{init:function(e,f){var g=this;g.editor=e;g.url=f;g.onPreProcess=new tinymce.util.Dispatcher(g);g.onPostProcess=new tinymce.util.Dispatcher(g);g.onPreProcess.add(g._preProcess);g.onPostProcess.add(g._postProcess);g.onPreProcess.add(function(j,k){e.execCallback("paste_preprocess",j,k)});g.onPostProcess.add(function(j,k){e.execCallback("paste_postprocess",j,k)});e.pasteAsPlainText=false;function i(l,j){var k=e.dom;g.onPreProcess.dispatch(g,l);l.node=k.create("div",0,l.content);g.onPostProcess.dispatch(g,l);l.content=e.serializer.serialize(l.node,{getInner:1});if((!j)&&(e.pasteAsPlainText)){g._insertPlainText(e,k,l.content);if(!b(e,"paste_text_sticky")){e.pasteAsPlainText=false;e.controlManager.setActive("pastetext",false)}}else{if(/<(p|h[1-6]|ul|ol)/.test(l.content)){g._insertBlockContent(e,k,l.content)}else{g._insert(l.content)}}}e.addCommand("mceInsertClipboardContent",function(j,k){i(k,true)});if(!b(e,"paste_text_use_dialog")){e.addCommand("mcePasteText",function(k,j){var l=tinymce.util.Cookie;e.pasteAsPlainText=!e.pasteAsPlainText;e.controlManager.setActive("pastetext",e.pasteAsPlainText);if((e.pasteAsPlainText)&&(!l.get("tinymcePasteText"))){if(b(e,"paste_text_sticky")){e.windowManager.alert(e.translate("paste.plaintext_mode_sticky"))}else{e.windowManager.alert(e.translate("paste.plaintext_mode_sticky"))}if(!b(e,"paste_text_notifyalways")){l.set("tinymcePasteText","1",new Date(new Date().getFullYear()+1,12,31))}}})}e.addButton("pastetext",{title:"paste.paste_text_desc",cmd:"mcePasteText"});e.addButton("selectall",{title:"paste.selectall_desc",cmd:"selectall"});function h(s){var m,q,k,l=e.selection,p=e.dom,r=e.getBody(),j;if(e.pasteAsPlainText&&(s.clipboardData||p.doc.dataTransfer)){s.preventDefault();i({content:(s.clipboardData||p.doc.dataTransfer).getData("Text")},true);return}if(p.get("_mcePaste")){return}m=p.add(r,"div",{id:"_mcePaste","class":"mcePaste"},"\uFEFF");if(r!=e.getDoc().body){j=p.getPos(e.selection.getStart(),r).y}else{j=r.scrollTop}p.setStyles(m,{position:"absolute",left:-10000,top:j,width:1,height:1,overflow:"hidden"});if(tinymce.isIE){k=p.doc.body.createTextRange();k.moveToElementText(m);k.execCommand("Paste");p.remove(m);if(m.innerHTML==="\uFEFF"){e.execCommand("mcePasteWord");s.preventDefault();return}i({content:m.innerHTML});return tinymce.dom.Event.cancel(s)}else{function o(n){n.preventDefault()}p.bind(e.getDoc(),"mousedown",o);p.bind(e.getDoc(),"keydown",o);q=e.selection.getRng();m=m.firstChild;k=e.getDoc().createRange();k.setStart(m,0);k.setEnd(m,1);l.setRng(k);window.setTimeout(function(){var t="",n=p.select("div.mcePaste");c(n,function(u){c(p.select("div.mcePaste",u),function(v){p.remove(v,1)});c(p.select("span.Apple-style-span",u),function(v){p.remove(v,1)});t+=u.innerHTML});c(n,function(u){p.remove(u)});if(q){l.setRng(q)}i({content:t});p.unbind(e.getDoc(),"mousedown",o);p.unbind(e.getDoc(),"keydown",o)},0)}}if(b(e,"paste_auto_cleanup_on_paste")){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){e.onKeyDown.add(function(j,k){if(((tinymce.isMac?k.metaKey:k.ctrlKey)&&k.keyCode==86)||(k.shiftKey&&k.keyCode==45)){h(k)}})}else{e.onPaste.addToTop(function(j,k){return h(k)})}}if(b(e,"paste_block_drop")){e.onInit.add(function(){e.dom.bind(e.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(j){j.preventDefault();j.stopPropagation();return false})})}g._legacySupport()},getInfo:function(){return{longname:"Paste text/word",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_preProcess:function(i,f){var l=this.editor,k=f.content,q=tinymce.grep,p=tinymce.explode,g=tinymce.trim,m,j;function e(h){c(h,function(o){if(o.constructor==RegExp){k=k.replace(o,"")}else{k=k.replace(o[0],o[1])}})}if(/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(k)||f.wordContent){f.wordContent=true;e([/^\s*(&nbsp;)+/gi,/(&nbsp;|<br[^>]*>)+\s*$/gi]);if(b(l,"paste_convert_headers_to_strong")){k=k.replace(/<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi,"<p><strong>$1</strong></p>")}if(b(l,"paste_convert_middot_lists")){e([[/<!--\[if !supportLists\]-->/gi,"$&__MCE_ITEM__"],[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi,"$1__MCE_ITEM__"]])}e([/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\u00a0"]]);do{m=k.length;k=k.replace(/(<[a-z][^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1")}while(m!=k.length);if(b(l,"paste_retain_style_properties").replace(/^none$/i,"").length==0){k=k.replace(/<\/?span[^>]*>/gi,"")}else{e([[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(o,h){return(h.length>0)?h.replace(/./," ").slice(Math.floor(h.length/2)).split("").join("\u00a0"):""}],[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,function(u,h,t){var v=[],o=0,r=p(g(t).replace(/&quot;/gi,"'"),";");c(r,function(s){var w,y,z=p(s,":");function x(A){return A+((A!=="0")&&(/\d$/.test(A)))?"px":""}if(z.length==2){w=z[0].toLowerCase();y=z[1].toLowerCase();switch(w){case"mso-padding-alt":case"mso-padding-top-alt":case"mso-padding-right-alt":case"mso-padding-bottom-alt":case"mso-padding-left-alt":case"mso-margin-alt":case"mso-margin-top-alt":case"mso-margin-right-alt":case"mso-margin-bottom-alt":case"mso-margin-left-alt":case"mso-table-layout-alt":case"mso-height":case"mso-width":case"mso-vertical-align-alt":v[o++]=w.replace(/^mso-|-alt$/g,"")+":"+x(y);return;case"horiz-align":v[o++]="text-align:"+y;return;case"vert-align":v[o++]="vertical-align:"+y;return;case"font-color":case"mso-foreground":v[o++]="color:"+y;return;case"mso-background":case"mso-highlight":v[o++]="background:"+y;return;case"mso-default-height":v[o++]="min-height:"+x(y);return;case"mso-default-width":v[o++]="min-width:"+x(y);return;case"mso-padding-between-alt":v[o++]="border-collapse:separate;border-spacing:"+x(y);return;case"text-line-through":if((y=="single")||(y=="double")){v[o++]="text-decoration:line-through"}return;case"mso-zero-height":if(y=="yes"){v[o++]="display:none"}return}if(/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(w)){return}v[o++]=w+":"+z[1]}});if(o>0){return h+' style="'+v.join(";")+'"'}else{return h}}]])}}if(b(l,"paste_convert_headers_to_strong")){e([[/<h[1-6][^>]*>/gi,"<p><strong>"],[/<\/h[1-6][^>]*>/gi,"</strong></p>"]])}j=b(l,"paste_strip_class_attributes");if(j!=="none"){function n(r,o){if(j==="all"){return""}var h=q(p(o.replace(/^(["'])(.*)\1$/,"$2")," "),function(s){return(/^(?!mso)/i.test(s))});return h.length?' class="'+h.join(" ")+'"':""}k=k.replace(/ class="([^"]+)"/gi,n);k=k.replace(/ class=(\w+)/gi,n)}if(b(l,"paste_remove_spans")){k=k.replace(/<\/?span[^>]*>/gi,"")}f.content=k},_postProcess:function(h,j){var g=this,f=g.editor,i=f.dom,e;if(j.wordContent){c(i.select("a",j.node),function(k){if(!k.href||k.href.indexOf("#_Toc")!=-1){i.remove(k,1)}});if(b(f,"paste_convert_middot_lists")){g._convertLists(h,j)}e=b(f,"paste_retain_style_properties");if((tinymce.is(e,"string"))&&(e!=="all")&&(e!=="*")){e=tinymce.explode(e.replace(/^none$/i,""));c(i.select("*",j.node),function(n){var o={},l=0,m,p,k;if(e){for(m=0;m<e.length;m++){p=e[m];k=i.getStyle(n,p);if(k){o[p]=k;l++}}}i.setAttrib(n,"style","");if(e&&l>0){i.setStyles(n,o)}else{if(n.nodeName=="SPAN"&&!n.className){i.remove(n,true)}}})}}if(b(f,"paste_remove_styles")||(b(f,"paste_remove_styles_if_webkit")&&tinymce.isWebKit)){c(i.select("*[style]",j.node),function(k){k.removeAttribute("style");k.removeAttribute("_mce_style")})}else{if(tinymce.isWebKit){c(i.select("*",j.node),function(k){k.removeAttribute("_mce_style")})}}},_convertLists:function(h,f){var j=h.editor.dom,i,m,e=-1,g,n=[],l,k;c(j.select("p",f.node),function(u){var r,v="",t,s,o,q;for(r=u.firstChild;r&&r.nodeType==3;r=r.nextSibling){v+=r.nodeValue}v=u.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/&nbsp;/g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o]\s*\u00a0*/.test(v)){t="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0{2,}/.test(v)){t="ol"}if(t){g=parseFloat(u.style.marginLeft||0);if(g>e){n.push(g)}if(!i||t!=l){i=j.create(t);j.insertAfter(i,u)}else{if(g>e){i=m.appendChild(j.create(t))}else{if(g<e){o=tinymce.inArray(n,g);q=j.getParents(i.parentNode,t);i=q[q.length-1-o]||i}}}c(j.select("span",u),function(w){var p=w.innerHTML.replace(/<\/?\w+[^>]*>/gi,"");if(t=="ul"&&/^[\u2022\u00b7\u00a7\u00d8o]/.test(p)){j.remove(w)}else{if(/^[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(p)){j.remove(w)}}});s=u.innerHTML;if(t=="ul"){s=u.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o]\s*(&nbsp;|\u00a0)+\s*/,"")}else{s=u.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*\w+\.(&nbsp;|\u00a0)+\s*/,"")}m=i.appendChild(j.create("li",0,s));j.remove(u);e=g;l=t}else{i=e=0}});k=f.node.innerHTML;if(k.indexOf("__MCE_ITEM__")!=-1){f.node.innerHTML=k.replace(/__MCE_ITEM__/g,"")}},_insertBlockContent:function(l,h,m){var f,j,g=l.selection,q,n,e,o,i,k="mce_marker";function p(t){var s;if(tinymce.isIE){s=l.getDoc().body.createTextRange();s.moveToElementText(t);s.collapse(false);s.select()}else{g.select(t,1);g.collapse(false)}}this._insert('<span id="'+k+'">&nbsp;</span>',1);j=h.get(k);f=h.getParent(j,"p,h1,h2,h3,h4,h5,h6,ul,ol,th,td");if(f&&!/TD|TH/.test(f.nodeName)){j=h.split(f,j);c(h.create("div",0,m).childNodes,function(r){q=j.parentNode.insertBefore(r.cloneNode(true),j)});p(q)}else{h.setOuterHTML(j,m);g.select(l.getBody(),1);g.collapse(0)}while(n=h.get(k)){h.remove(n)}n=g.getStart();e=h.getViewPort(l.getWin());o=l.dom.getPos(n).y;i=n.clientHeight;if(o<e.y||o+i>e.y+e.h){l.getDoc().body.scrollTop=o<e.y?o:o-e.h+25}},_insert:function(g,e){var f=this.editor,i=f.selection.getRng();if(!f.selection.isCollapsed()&&i.startContainer!=i.endContainer){f.getDoc().execCommand("Delete",false,null)}f.execCommand(tinymce.isGecko?"insertHTML":"mceInsertContent",false,g,{skip_undo:e})},_insertPlainText:function(j,x,v){var t,u,l,k,r,e,p,f,n=j.getWin(),z=j.getDoc(),s=j.selection,m=tinymce.is,y=tinymce.inArray,g=b(j,"paste_text_linebreaktype"),o=b(j,"paste_text_replacements");function q(h){c(h,function(i){if(i.constructor==RegExp){v=v.replace(i,"")}else{v=v.replace(i[0],i[1])}})}if((typeof(v)==="string")&&(v.length>0)){if(!d){d=("34,quot,38,amp,39,apos,60,lt,62,gt,"+j.serializer.settings.entities).split(",")}if(/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(v)){q([/[\n\r]+/g])}else{q([/\r+/g])}q([[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi,"\n\n"],[/<br[^>]*>|<\/tr>/gi,"\n"],[/<\/t[dh]>\s*<t[dh][^>]*>/gi,"\t"],/<[a-z!\/?][^>]*>/gi,[/&nbsp;/gi," "],[/&(#\d+|[a-z0-9]{1,10});/gi,function(i,h){if(h.charAt(0)==="#"){return String.fromCharCode(h.slice(1))}else{return((i=y(d,h))>0)?String.fromCharCode(d[i-1]):" "}}],[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi,"$1"],[/\n{3,}/g,"\n\n"],/^\s+|\s+$/g]);v=x.encode(v);if(!s.isCollapsed()){z.execCommand("Delete",false,null)}if(m(o,"array")||(m(o,"array"))){q(o)}else{if(m(o,"string")){q(new RegExp(o,"gi"))}}if(g=="none"){q([[/\n+/g," "]])}else{if(g=="br"){q([[/\n/g,"<br />"]])}else{q([/^\s+|\s+$/g,[/\n\n/g,"</p><p>"],[/\n/g,"<br />"]])}}if((l=v.indexOf("</p><p>"))!=-1){k=v.lastIndexOf("</p><p>");r=s.getNode();e=[];do{if(r.nodeType==1){if(r.nodeName=="TD"||r.nodeName=="BODY"){break}e[e.length]=r}}while(r=r.parentNode);if(e.length>0){p=v.substring(0,l);f="";for(t=0,u=e.length;t<u;t++){p+="</"+e[t].nodeName.toLowerCase()+">";f+="<"+e[e.length-t-1].nodeName.toLowerCase()+">"}if(l==k){v=p+f+v.substring(l+7)}else{v=p+v.substring(l+4,k+4)+f+v.substring(k+7)}}}j.execCommand("mceInsertRawHTML",false,v+'<span id="_plain_text_marker">&nbsp;</span>');window.setTimeout(function(){var h=x.get("_plain_text_marker"),B,i,A,w;s.select(h,false);z.execCommand("Delete",false,null);h=null;B=s.getStart();i=x.getViewPort(n);A=x.getPos(B).y;w=B.clientHeight;if((A<i.y)||(A+w>i.y+i.h)){z.body.scrollTop=A<i.y?A:A-i.h+25}},0)}},_legacySupport:function(){var f=this,e=f.editor;e.addCommand("mcePasteWord",function(){e.windowManager.open({file:f.url+"/pasteword.htm",width:parseInt(b(e,"paste_dialog_width")),height:parseInt(b(e,"paste_dialog_height")),inline:1})});if(b(e,"paste_text_use_dialog")){e.addCommand("mcePasteText",function(){e.windowManager.open({file:f.url+"/pastetext.htm",width:parseInt(b(e,"paste_dialog_width")),height:parseInt(b(e,"paste_dialog_height")),inline:1})})}e.addButton("pasteword",{title:"paste.paste_word_desc",cmd:"mcePasteWord"})}});tinymce.PluginManager.add("paste",tinymce.plugins.PastePlugin)})();
\ No newline at end of file
+(function(){var c=tinymce.each,a={paste_auto_cleanup_on_paste:true,paste_enable_default_filters:true,paste_block_drop:false,paste_retain_style_properties:"none",paste_strip_class_attributes:"mso",paste_remove_spans:false,paste_remove_styles:false,paste_remove_styles_if_webkit:true,paste_convert_middot_lists:true,paste_convert_headers_to_strong:false,paste_dialog_width:"450",paste_dialog_height:"400",paste_text_use_dialog:false,paste_text_sticky:false,paste_text_sticky_default:false,paste_text_notifyalways:false,paste_text_linebreaktype:"combined",paste_text_replacements:[[/\u2026/g,"..."],[/[\x93\x94\u201c\u201d]/g,'"'],[/[\x60\x91\x92\u2018\u2019]/g,"'"]]};function b(d,e){return d.getParam(e,a[e])}tinymce.create("tinymce.plugins.PastePlugin",{init:function(d,e){var f=this;f.editor=d;f.url=e;f.onPreProcess=new tinymce.util.Dispatcher(f);f.onPostProcess=new tinymce.util.Dispatcher(f);f.onPreProcess.add(f._preProcess);f.onPostProcess.add(f._postProcess);f.onPreProcess.add(function(i,j){d.execCallback("paste_preprocess",i,j)});f.onPostProcess.add(function(i,j){d.execCallback("paste_postprocess",i,j)});d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){return false}});d.pasteAsPlainText=b(d,"paste_text_sticky_default");function h(l,j){var k=d.dom,i;f.onPreProcess.dispatch(f,l);l.node=k.create("div",0,l.content);if(tinymce.isGecko){i=d.selection.getRng(true);if(i.startContainer==i.endContainer&&i.startContainer.nodeType==3){if(l.node.childNodes.length===1&&/^(p|h[1-6]|pre)$/i.test(l.node.firstChild.nodeName)&&l.content.indexOf("__MCE_ITEM__")===-1){k.remove(l.node.firstChild,true)}}}f.onPostProcess.dispatch(f,l);l.content=d.serializer.serialize(l.node,{getInner:1,forced_root_block:""});if((!j)&&(d.pasteAsPlainText)){f._insertPlainText(l.content);if(!b(d,"paste_text_sticky")){d.pasteAsPlainText=false;d.controlManager.setActive("pastetext",false)}}else{f._insert(l.content)}}d.addCommand("mceInsertClipboardContent",function(i,j){h(j,true)});if(!b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(j,i){var k=tinymce.util.Cookie;d.pasteAsPlainText=!d.pasteAsPlainText;d.controlManager.setActive("pastetext",d.pasteAsPlainText);if((d.pasteAsPlainText)&&(!k.get("tinymcePasteText"))){if(b(d,"paste_text_sticky")){d.windowManager.alert(d.translate("paste.plaintext_mode_sticky"))}else{d.windowManager.alert(d.translate("paste.plaintext_mode"))}if(!b(d,"paste_text_notifyalways")){k.set("tinymcePasteText","1",new Date(new Date().getFullYear()+1,12,31))}}})}d.addButton("pastetext",{title:"paste.paste_text_desc",cmd:"mcePasteText"});d.addButton("selectall",{title:"paste.selectall_desc",cmd:"selectall"});function g(s){var l,p,j,t,k=d.selection,o=d.dom,q=d.getBody(),i,r;if(s.clipboardData||o.doc.dataTransfer){r=(s.clipboardData||o.doc.dataTransfer).getData("Text");if(d.pasteAsPlainText){s.preventDefault();h({content:o.encode(r).replace(/\r?\n/g,"<br />")});return}}if(o.get("_mcePaste")){return}l=o.add(q,"div",{id:"_mcePaste","class":"mcePaste","data-mce-bogus":"1"},"\uFEFF\uFEFF");if(q!=d.getDoc().body){i=o.getPos(d.selection.getStart(),q).y}else{i=q.scrollTop+o.getViewPort(d.getWin()).y}o.setStyles(l,{position:"absolute",left:tinymce.isGecko?-40:0,top:i-25,width:1,height:1,overflow:"hidden"});if(tinymce.isIE){t=k.getRng();j=o.doc.body.createTextRange();j.moveToElementText(l);j.execCommand("Paste");o.remove(l);if(l.innerHTML==="\uFEFF\uFEFF"){d.execCommand("mcePasteWord");s.preventDefault();return}k.setRng(t);k.setContent("");setTimeout(function(){h({content:l.innerHTML})},0);return tinymce.dom.Event.cancel(s)}else{function m(n){n.preventDefault()}o.bind(d.getDoc(),"mousedown",m);o.bind(d.getDoc(),"keydown",m);p=d.selection.getRng();l=l.firstChild;j=d.getDoc().createRange();j.setStart(l,0);j.setEnd(l,2);k.setRng(j);window.setTimeout(function(){var u="",n;if(!o.select("div.mcePaste > div.mcePaste").length){n=o.select("div.mcePaste");c(n,function(w){var v=w.firstChild;if(v&&v.nodeName=="DIV"&&v.style.marginTop&&v.style.backgroundColor){o.remove(v,1)}c(o.select("span.Apple-style-span",w),function(x){o.remove(x,1)});c(o.select("br[data-mce-bogus]",w),function(x){o.remove(x)});if(w.parentNode.className!="mcePaste"){u+=w.innerHTML}})}else{u="<p>"+o.encode(r).replace(/\r?\n\r?\n/g,"</p><p>").replace(/\r?\n/g,"<br />")+"</p>"}c(o.select("div.mcePaste"),function(v){o.remove(v)});if(p){k.setRng(p)}h({content:u});o.unbind(d.getDoc(),"mousedown",m);o.unbind(d.getDoc(),"keydown",m)},0)}}if(b(d,"paste_auto_cleanup_on_paste")){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){g(j)}})}else{d.onPaste.addToTop(function(i,j){return g(j)})}}d.onInit.add(function(){d.controlManager.setActive("pastetext",d.pasteAsPlainText);if(b(d,"paste_block_drop")){d.dom.bind(d.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(i){i.preventDefault();i.stopPropagation();return false})}});f._legacySupport()},getInfo:function(){return{longname:"Paste text/word",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_preProcess:function(g,e){var k=this.editor,j=e.content,p=tinymce.grep,n=tinymce.explode,f=tinymce.trim,l,i;function d(h){c(h,function(o){if(o.constructor==RegExp){j=j.replace(o,"")}else{j=j.replace(o[0],o[1])}})}if(k.settings.paste_enable_default_filters==false){return}if(tinymce.isIE&&document.documentMode>=9){d([[/(?:<br>&nbsp;[\s\r\n]+|<br>)*(<\/?(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)[^>]*>)(?:<br>&nbsp;[\s\r\n]+|<br>)*/g,"$1"]]);d([[/<br><br>/g,"<BR><BR>"],[/<br>/g," "],[/<BR><BR>/g,"<br>"]])}if(/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(j)||e.wordContent){e.wordContent=true;d([/^\s*(&nbsp;)+/gi,/(&nbsp;|<br[^>]*>)+\s*$/gi]);if(b(k,"paste_convert_headers_to_strong")){j=j.replace(/<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi,"<p><strong>$1</strong></p>")}if(b(k,"paste_convert_middot_lists")){d([[/<!--\[if !supportLists\]-->/gi,"$&__MCE_ITEM__"],[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi,"$1__MCE_ITEM__"],[/(<p[^>]+(?:MsoListParagraph)[^>]+>)/gi,"$1__MCE_ITEM__"]])}d([/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\u00a0"]]);do{l=j.length;j=j.replace(/(<[a-z][^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1")}while(l!=j.length);if(b(k,"paste_retain_style_properties").replace(/^none$/i,"").length==0){j=j.replace(/<\/?span[^>]*>/gi,"")}else{d([[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(o,h){return(h.length>0)?h.replace(/./," ").slice(Math.floor(h.length/2)).split("").join("\u00a0"):""}],[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,function(t,h,r){var u=[],o=0,q=n(f(r).replace(/&quot;/gi,"'"),";");c(q,function(s){var w,y,z=n(s,":");function x(A){return A+((A!=="0")&&(/\d$/.test(A)))?"px":""}if(z.length==2){w=z[0].toLowerCase();y=z[1].toLowerCase();switch(w){case"mso-padding-alt":case"mso-padding-top-alt":case"mso-padding-right-alt":case"mso-padding-bottom-alt":case"mso-padding-left-alt":case"mso-margin-alt":case"mso-margin-top-alt":case"mso-margin-right-alt":case"mso-margin-bottom-alt":case"mso-margin-left-alt":case"mso-table-layout-alt":case"mso-height":case"mso-width":case"mso-vertical-align-alt":u[o++]=w.replace(/^mso-|-alt$/g,"")+":"+x(y);return;case"horiz-align":u[o++]="text-align:"+y;return;case"vert-align":u[o++]="vertical-align:"+y;return;case"font-color":case"mso-foreground":u[o++]="color:"+y;return;case"mso-background":case"mso-highlight":u[o++]="background:"+y;return;case"mso-default-height":u[o++]="min-height:"+x(y);return;case"mso-default-width":u[o++]="min-width:"+x(y);return;case"mso-padding-between-alt":u[o++]="border-collapse:separate;border-spacing:"+x(y);return;case"text-line-through":if((y=="single")||(y=="double")){u[o++]="text-decoration:line-through"}return;case"mso-zero-height":if(y=="yes"){u[o++]="display:none"}return}if(/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(w)){return}u[o++]=w+":"+z[1]}});if(o>0){return h+' style="'+u.join(";")+'"'}else{return h}}]])}}if(b(k,"paste_convert_headers_to_strong")){d([[/<h[1-6][^>]*>/gi,"<p><strong>"],[/<\/h[1-6][^>]*>/gi,"</strong></p>"]])}d([[/Version:[\d.]+\nStartHTML:\d+\nEndHTML:\d+\nStartFragment:\d+\nEndFragment:\d+/gi,""]]);i=b(k,"paste_strip_class_attributes");if(i!=="none"){function m(q,o){if(i==="all"){return""}var h=p(n(o.replace(/^(["'])(.*)\1$/,"$2")," "),function(r){return(/^(?!mso)/i.test(r))});return h.length?' class="'+h.join(" ")+'"':""}j=j.replace(/ class="([^"]+)"/gi,m);j=j.replace(/ class=([\-\w]+)/gi,m)}if(b(k,"paste_remove_spans")){j=j.replace(/<\/?span[^>]*>/gi,"")}e.content=j},_postProcess:function(g,i){var f=this,e=f.editor,h=e.dom,d;if(e.settings.paste_enable_default_filters==false){return}if(i.wordContent){c(h.select("a",i.node),function(j){if(!j.href||j.href.indexOf("#_Toc")!=-1){h.remove(j,1)}});if(b(e,"paste_convert_middot_lists")){f._convertLists(g,i)}d=b(e,"paste_retain_style_properties");if((tinymce.is(d,"string"))&&(d!=="all")&&(d!=="*")){d=tinymce.explode(d.replace(/^none$/i,""));c(h.select("*",i.node),function(m){var n={},k=0,l,o,j;if(d){for(l=0;l<d.length;l++){o=d[l];j=h.getStyle(m,o);if(j){n[o]=j;k++}}}h.setAttrib(m,"style","");if(d&&k>0){h.setStyles(m,n)}else{if(m.nodeName=="SPAN"&&!m.className){h.remove(m,true)}}})}}if(b(e,"paste_remove_styles")||(b(e,"paste_remove_styles_if_webkit")&&tinymce.isWebKit)){c(h.select("*[style]",i.node),function(j){j.removeAttribute("style");j.removeAttribute("data-mce-style")})}else{if(tinymce.isWebKit){c(h.select("*",i.node),function(j){j.removeAttribute("data-mce-style")})}}},_convertLists:function(g,e){var i=g.editor.dom,h,l,d=-1,f,m=[],k,j;c(i.select("p",e.node),function(t){var q,u="",s,r,n,o;for(q=t.firstChild;q&&q.nodeType==3;q=q.nextSibling){u+=q.nodeValue}u=t.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/&nbsp;/g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*\u00a0*/.test(u)){s="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0+/.test(u)){s="ol"}if(s){f=parseFloat(t.style.marginLeft||0);if(f>d){m.push(f)}if(!h||s!=k){h=i.create(s);i.insertAfter(h,t)}else{if(f>d){h=l.appendChild(i.create(s))}else{if(f<d){n=tinymce.inArray(m,f);o=i.getParents(h.parentNode,s);h=o[o.length-1-n]||h}}}c(i.select("span",t),function(v){var p=v.innerHTML.replace(/<\/?\w+[^>]*>/gi,"");if(s=="ul"&&/^__MCE_ITEM__[\u2022\u00b7\u00a7\u00d8o\u25CF]/.test(p)){i.remove(v)}else{if(/^__MCE_ITEM__[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(p)){i.remove(v)}}});r=t.innerHTML;if(s=="ul"){r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*(&nbsp;|\u00a0)+\s*/,"")}else{r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*\w+\.(&nbsp;|\u00a0)+\s*/,"")}l=h.appendChild(i.create("li",0,r));i.remove(t);d=f;k=s}else{h=d=0}});j=e.node.innerHTML;if(j.indexOf("__MCE_ITEM__")!=-1){e.node.innerHTML=j.replace(/__MCE_ITEM__/g,"")}},_insert:function(f,d){var e=this.editor,g=e.selection.getRng();if(!e.selection.isCollapsed()&&g.startContainer!=g.endContainer){e.getDoc().execCommand("Delete",false,null)}e.execCommand("mceInsertContent",false,f,{skip_undo:d})},_insertPlainText:function(g){var d=this.editor,e=b(d,"paste_text_linebreaktype"),i=b(d,"paste_text_replacements"),f=tinymce.is;function h(j){c(j,function(k){if(k.constructor==RegExp){g=g.replace(k,"")}else{g=g.replace(k[0],k[1])}})}if((typeof(g)==="string")&&(g.length>0)){if(/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(g)){h([/[\n\r]+/g])}else{h([/\r+/g])}h([[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi,"\n\n"],[/<br[^>]*>|<\/tr>/gi,"\n"],[/<\/t[dh]>\s*<t[dh][^>]*>/gi,"\t"],/<[a-z!\/?][^>]*>/gi,[/&nbsp;/gi," "],[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi,"$1"],[/\n{3,}/g,"\n\n"]]);g=d.dom.decode(tinymce.html.Entities.encodeRaw(g));if(f(i,"array")){h(i)}else{if(f(i,"string")){h(new RegExp(i,"gi"))}}if(e=="none"){h([[/\n+/g," "]])}else{if(e=="br"){h([[/\n/g,"<br />"]])}else{if(e=="p"){h([[/\n+/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"]])}else{h([[/\n\n/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"],[/\n/g,"<br />"]])}}}d.execCommand("mceInsertContent",false,g)}},_legacySupport:function(){var e=this,d=e.editor;d.addCommand("mcePasteWord",function(){d.windowManager.open({file:e.url+"/pasteword.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})});if(b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(){d.windowManager.open({file:e.url+"/pastetext.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})})}d.addButton("pasteword",{title:"paste.paste_word_desc",cmd:"mcePasteWord"})}});tinymce.PluginManager.add("paste",tinymce.plugins.PastePlugin)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
index 4c3bf6542..73fe7fe9a 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
@@ -10,9 +10,9 @@
 

 (function() {

 	var each = tinymce.each,

-		entities = null,

 		defs = {

 			paste_auto_cleanup_on_paste : true,

+			paste_enable_default_filters : true,

 			paste_block_drop : false,

 			paste_retain_style_properties : "none",

 			paste_strip_class_attributes : "mso",

@@ -25,8 +25,9 @@
 			paste_dialog_height : "400",

 			paste_text_use_dialog : false,

 			paste_text_sticky : false,

+			paste_text_sticky_default : false,

 			paste_text_notifyalways : false,

-			paste_text_linebreaktype : "p",

+			paste_text_linebreaktype : "combined",

 			paste_text_replacements : [

 				[/\u2026/g, "..."],

 				[/[\x93\x94\u201c\u201d]/g, '"'],

@@ -63,13 +64,19 @@
 				ed.execCallback('paste_postprocess', pl, o);

 			});

 

+			ed.onKeyDown.addToTop(function(ed, e) {

+				// Block ctrl+v from adding an undo level since the default logic in tinymce.Editor will add that

+				if (((tinymce.isMac ? e.metaKey : e.ctrlKey) && e.keyCode == 86) || (e.shiftKey && e.keyCode == 45))

+					return false; // Stop other listeners

+			});

+

 			// Initialize plain text flag

-			ed.pasteAsPlainText = false;

+			ed.pasteAsPlainText = getParam(ed, 'paste_text_sticky_default');

 

 			// This function executes the process handlers and inserts the contents

 			// force_rich overrides plain text mode set by user, important for pasting with execCommand

 			function process(o, force_rich) {

-				var dom = ed.dom;

+				var dom = ed.dom, rng;

 

 				// Execute pre process handlers

 				t.onPreProcess.dispatch(t, o);

@@ -77,23 +84,31 @@
 				// Create DOM structure

 				o.node = dom.create('div', 0, o.content);

 

+				// If pasting inside the same element and the contents is only one block

+				// remove the block and keep the text since Firefox will copy parts of pre and h1-h6 as a pre element

+				if (tinymce.isGecko) {

+					rng = ed.selection.getRng(true);

+					if (rng.startContainer == rng.endContainer && rng.startContainer.nodeType == 3) {

+						// Is only one block node and it doesn't contain word stuff

+						if (o.node.childNodes.length === 1 && /^(p|h[1-6]|pre)$/i.test(o.node.firstChild.nodeName) && o.content.indexOf('__MCE_ITEM__') === -1)

+							dom.remove(o.node.firstChild, true);

+					}

+				}

+

 				// Execute post process handlers

 				t.onPostProcess.dispatch(t, o);

 

 				// Serialize content

-				o.content = ed.serializer.serialize(o.node, {getInner : 1});

+				o.content = ed.serializer.serialize(o.node, {getInner : 1, forced_root_block : ''});

 

 				// Plain text option active?

 				if ((!force_rich) && (ed.pasteAsPlainText)) {

-					t._insertPlainText(ed, dom, o.content);

+					t._insertPlainText(o.content);

 

 					if (!getParam(ed, "paste_text_sticky")) {

 						ed.pasteAsPlainText = false;

 						ed.controlManager.setActive("pastetext", false);

 					}

-				} else if (/<(p|h[1-6]|ul|ol)/.test(o.content)) {

-					// Handle insertion of contents containing block elements separately

-					t._insertBlockContent(ed, dom, o.content);

 				} else {

 					t._insert(o.content);

 				}

@@ -115,7 +130,7 @@
 						if (getParam(ed, "paste_text_sticky")) {

 							ed.windowManager.alert(ed.translate('paste.plaintext_mode_sticky'));

 						} else {

-							ed.windowManager.alert(ed.translate('paste.plaintext_mode_sticky'));

+							ed.windowManager.alert(ed.translate('paste.plaintext_mode'));

 						}

 

 						if (!getParam(ed, "paste_text_notifyalways")) {

@@ -132,38 +147,46 @@
 			// hidden div and placing the caret inside it and after the browser paste

 			// is done it grabs that contents and processes that

 			function grabContent(e) {

-				var n, or, rng, sel = ed.selection, dom = ed.dom, body = ed.getBody(), posY;

+				var n, or, rng, oldRng, sel = ed.selection, dom = ed.dom, body = ed.getBody(), posY, textContent;

 

 				// Check if browser supports direct plaintext access

-				if (ed.pasteAsPlainText && (e.clipboardData || dom.doc.dataTransfer)) {

-					e.preventDefault();

-					process({content : (e.clipboardData || dom.doc.dataTransfer).getData('Text')}, true);

-					return;

+				if (e.clipboardData || dom.doc.dataTransfer) {

+					textContent = (e.clipboardData || dom.doc.dataTransfer).getData('Text');

+

+					if (ed.pasteAsPlainText) {

+						e.preventDefault();

+						process({content : dom.encode(textContent).replace(/\r?\n/g, '<br />')});

+						return;

+					}

 				}

 

 				if (dom.get('_mcePaste'))

 					return;

 

 				// Create container to paste into

-				n = dom.add(body, 'div', {id : '_mcePaste', 'class' : 'mcePaste'}, '\uFEFF');

+				n = dom.add(body, 'div', {id : '_mcePaste', 'class' : 'mcePaste', 'data-mce-bogus' : '1'}, '\uFEFF\uFEFF');

 

 				// If contentEditable mode we need to find out the position of the closest element

 				if (body != ed.getDoc().body)

 					posY = dom.getPos(ed.selection.getStart(), body).y;

 				else

-					posY = body.scrollTop;

+					posY = body.scrollTop + dom.getViewPort(ed.getWin()).y;

 

 				// Styles needs to be applied after the element is added to the document since WebKit will otherwise remove all styles

+				// If also needs to be in view on IE or the paste would fail

 				dom.setStyles(n, {

 					position : 'absolute',

-					left : -10000,

-					top : posY,

+					left : tinymce.isGecko ? -40 : 0, // Need to move it out of site on Gecko since it will othewise display a ghost resize rect for the div

+					top : posY - 25,

 					width : 1,

 					height : 1,

 					overflow : 'hidden'

 				});

 

 				if (tinymce.isIE) {

+					// Store away the old range

+					oldRng = sel.getRng();

+

 					// Select the container

 					rng = dom.doc.body.createTextRange();

 					rng.moveToElementText(n);

@@ -174,14 +197,23 @@
 

 					// Check if the contents was changed, if it wasn't then clipboard extraction failed probably due

 					// to IE security settings so we pass the junk though better than nothing right

-					if (n.innerHTML === '\uFEFF') {

+					if (n.innerHTML === '\uFEFF\uFEFF') {

 						ed.execCommand('mcePasteWord');

 						e.preventDefault();

 						return;

 					}

 

-					// Process contents

-					process({content : n.innerHTML});

+					// Restore the old range and clear the contents before pasting

+					sel.setRng(oldRng);

+					sel.setContent('');

+

+					// For some odd reason we need to detach the the mceInsertContent call from the paste event

+					// It's like IE has a reference to the parent element that you paste in and the selection gets messed up

+					// when it tries to restore the selection

+					setTimeout(function() {

+						// Process contents

+						process({content : n.innerHTML});

+					}, 0);

 

 					// Block the real paste event

 					return tinymce.dom.Event.cancel(e);

@@ -196,34 +228,52 @@
 

 					or = ed.selection.getRng();

 

-					// Move caret into hidden div

+					// Move select contents inside DIV

 					n = n.firstChild;

 					rng = ed.getDoc().createRange();

 					rng.setStart(n, 0);

-					rng.setEnd(n, 1);

+					rng.setEnd(n, 2);

 					sel.setRng(rng);

 

 					// Wait a while and grab the pasted contents

 					window.setTimeout(function() {

-						var h = '', nl = dom.select('div.mcePaste');

+						var h = '', nl;

 

-						// WebKit will split the div into multiple ones so this will loop through then all and join them to get the whole HTML string

-						each(nl, function(n) {

-							// WebKit duplicates the divs so we need to remove them

-							each(dom.select('div.mcePaste', n), function(n) {

-								dom.remove(n, 1);

-							});

+						// Paste divs duplicated in paste divs seems to happen when you paste plain text so lets first look for that broken behavior in WebKit

+						if (!dom.select('div.mcePaste > div.mcePaste').length) {

+							nl = dom.select('div.mcePaste');

 

-							// Remove apply style spans

-							each(dom.select('span.Apple-style-span', n), function(n) {

-								dom.remove(n, 1);

-							});

+							// WebKit will split the div into multiple ones so this will loop through then all and join them to get the whole HTML string

+							each(nl, function(n) {

+								var child = n.firstChild;

 

-							h += n.innerHTML;

-						});

+								// WebKit inserts a DIV container with lots of odd styles

+								if (child && child.nodeName == 'DIV' && child.style.marginTop && child.style.backgroundColor) {

+									dom.remove(child, 1);

+								}

+

+								// Remove apply style spans

+								each(dom.select('span.Apple-style-span', n), function(n) {

+									dom.remove(n, 1);

+								});

+

+								// Remove bogus br elements

+								each(dom.select('br[data-mce-bogus]', n), function(n) {

+									dom.remove(n);

+								});

+

+								// WebKit will make a copy of the DIV for each line of plain text pasted and insert them into the DIV

+								if (n.parentNode.className != 'mcePaste')

+									h += n.innerHTML;

+							});

+						} else {

+							// Found WebKit weirdness so force the content into paragraphs this seems to happen when you paste plain text from Nodepad etc

+							// So this logic will replace double enter with paragraphs and single enter with br so it kind of looks the same

+							h = '<p>' + dom.encode(textContent).replace(/\r?\n\r?\n/g, '</p><p>').replace(/\r?\n/g, '<br />') + '</p>';

+						}

 

 						// Remove the nodes

-						each(nl, function(n) {

+						each(dom.select('div.mcePaste'), function(n) {

 							dom.remove(n);

 						});

 

@@ -244,7 +294,7 @@
 			if (getParam(ed, "paste_auto_cleanup_on_paste")) {

 				// Is it's Opera or older FF use key handler

 				if (tinymce.isOpera || /Firefox\/2/.test(navigator.userAgent)) {

-					ed.onKeyDown.add(function(ed, e) {

+					ed.onKeyDown.addToTop(function(ed, e) {

 						if (((tinymce.isMac ? e.metaKey : e.ctrlKey) && e.keyCode == 86) || (e.shiftKey && e.keyCode == 45))

 							grabContent(e);

 					});

@@ -256,17 +306,19 @@
 				}

 			}

 

-			// Block all drag/drop events

-			if (getParam(ed, "paste_block_drop")) {

-				ed.onInit.add(function() {

+			ed.onInit.add(function() {

+				ed.controlManager.setActive("pastetext", ed.pasteAsPlainText);

+

+				// Block all drag/drop events

+				if (getParam(ed, "paste_block_drop")) {

 					ed.dom.bind(ed.getBody(), ['dragend', 'dragover', 'draggesture', 'dragdrop', 'drop', 'drag'], function(e) {

 						e.preventDefault();

 						e.stopPropagation();

 

 						return false;

 					});

-				});

-			}

+				}

+			});

 

 			// Add legacy support

 			t._legacySupport();

@@ -283,8 +335,6 @@
 		},

 

 		_preProcess : function(pl, o) {

-			//console.log('Before preprocess:' + o.content);

-

 			var ed = this.editor,

 				h = o.content,

 				grep = tinymce.grep,

@@ -292,6 +342,8 @@
 				trim = tinymce.trim,

 				len, stripClass;

 

+			//console.log('Before preprocess:' + o.content);

+

 			function process(items) {

 				each(items, function(v) {

 					// Remove or replace

@@ -301,6 +353,23 @@
 						h = h.replace(v[0], v[1]);

 				});

 			}

+			

+			if (ed.settings.paste_enable_default_filters == false) {

+				return;

+			}

+

+			// IE9 adds BRs before/after block elements when contents is pasted from word or for example another browser

+			if (tinymce.isIE && document.documentMode >= 9) {

+				// IE9 adds BRs before/after block elements when contents is pasted from word or for example another browser

+				process([[/(?:<br>&nbsp;[\s\r\n]+|<br>)*(<\/?(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)[^>]*>)(?:<br>&nbsp;[\s\r\n]+|<br>)*/g, '$1']]);

+

+				// IE9 also adds an extra BR element for each soft-linefeed and it also adds a BR for each word wrap break

+				process([

+					[/<br><br>/g, '<BR><BR>'], // Replace multiple BR elements with uppercase BR to keep them intact

+					[/<br>/g, ' '], // Replace single br elements with space since they are word wrap BR:s

+					[/<BR><BR>/g, '<br>'] // Replace back the double brs but into a single BR

+				]);

+			}

 

 			// Detect Word content and process it more aggressive

 			if (/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(h) || o.wordContent) {

@@ -320,7 +389,8 @@
 				if (getParam(ed, "paste_convert_middot_lists")) {

 					process([

 						[/<!--\[if !supportLists\]-->/gi, '$&__MCE_ITEM__'],					// Convert supportLists to a list item marker

-						[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi, '$1__MCE_ITEM__']		// Convert mso-list and symbol spans to item markers

+						[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi, '$1__MCE_ITEM__'],		// Convert mso-list and symbol spans to item markers

+						[/(<p[^>]+(?:MsoListParagraph)[^>]+>)/gi, '$1__MCE_ITEM__']				// Convert mso-list and symbol paragraphs to item markers (FF)

 					]);

 				}

 

@@ -472,6 +542,11 @@
 				]);

 			}

 

+			process([

+				// Copy paste from Java like Open Office will produce this junk on FF

+				[/Version:[\d.]+\nStartHTML:\d+\nEndHTML:\d+\nStartFragment:\d+\nEndFragment:\d+/gi, '']

+			]);

+

 			// Class attribute options are: leave all as-is ("none"), remove all ("all"), or remove only those starting with mso ("mso").

 			// Note:-  paste_strip_class_attributes: "none", verify_css_classes: true is also a good variation.

 			stripClass = getParam(ed, "paste_strip_class_attributes");

@@ -491,7 +566,7 @@
 				};

 

 				h = h.replace(/ class="([^"]+)"/gi, removeClasses);

-				h = h.replace(/ class=(\w+)/gi, removeClasses);

+				h = h.replace(/ class=([\-\w]+)/gi, removeClasses);

 			}

 

 			// Remove spans option

@@ -510,6 +585,10 @@
 		_postProcess : function(pl, o) {

 			var t = this, ed = t.editor, dom = ed.dom, styleProps;

 

+			if (ed.settings.paste_enable_default_filters == false) {

+				return;

+			}

+			

 			if (o.wordContent) {

 				// Remove named anchors or TOC links

 				each(dom.select('a', o.node), function(a) {

@@ -561,14 +640,14 @@
 			if (getParam(ed, "paste_remove_styles") || (getParam(ed, "paste_remove_styles_if_webkit") && tinymce.isWebKit)) {

 				each(dom.select('*[style]', o.node), function(el) {

 					el.removeAttribute('style');

-					el.removeAttribute('_mce_style');

+					el.removeAttribute('data-mce-style');

 				});

 			} else {

 				if (tinymce.isWebKit) {

 					// We need to compress the styles on WebKit since if you paste <img border="0" /> it will become <img border="0" style="... lots of junk ..." />

 					// Removing the mce_style that contains the real value will force the Serializer engine to compress the styles

 					each(dom.select('*', o.node), function(el) {

-						el.removeAttribute('_mce_style');

+						el.removeAttribute('data-mce-style');

 					});

 				}

 			}

@@ -591,11 +670,11 @@
 				val = p.innerHTML.replace(/<\/?\w+[^>]*>/gi, '').replace(/&nbsp;/g, '\u00a0');

 

 				// Detect unordered lists look for bullets

-				if (/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o]\s*\u00a0*/.test(val))

+				if (/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*\u00a0*/.test(val))

 					type = 'ul';

 

 				// Detect ordered lists 1., a. or ixv.

-				if (/^__MCE_ITEM__\s*\w+\.\s*\u00a0{2,}/.test(val))

+				if (/^__MCE_ITEM__\s*\w+\.\s*\u00a0+/.test(val))

 					type = 'ol';

 

 				// Check if node value matches the list pattern: o&nbsp;&nbsp;

@@ -625,9 +704,9 @@
 						var html = span.innerHTML.replace(/<\/?\w+[^>]*>/gi, '');

 

 						// Remove span with the middot or the number

-						if (type == 'ul' && /^[\u2022\u00b7\u00a7\u00d8o]/.test(html))

+						if (type == 'ul' && /^__MCE_ITEM__[\u2022\u00b7\u00a7\u00d8o\u25CF]/.test(html))

 							dom.remove(span);

-						else if (/^[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(html))

+						else if (/^__MCE_ITEM__[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(html))

 							dom.remove(span);

 					});

 

@@ -635,7 +714,7 @@
 

 					// Remove middot/list items

 					if (type == 'ul')

-						html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^[\u2022\u00b7\u00a7\u00d8o]\s*(&nbsp;|\u00a0)+\s*/, '');

+						html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*(&nbsp;|\u00a0)+\s*/, '');

 					else

 						html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^\s*\w+\.(&nbsp;|\u00a0)+\s*/, '');

 

@@ -656,65 +735,6 @@
 		},

 

 		/**

-		 * This method will split the current block parent and insert the contents inside the split position.

-		 * This logic can be improved so text nodes at the start/end remain in the start/end block elements

-		 */

-		_insertBlockContent : function(ed, dom, content) {

-			var parentBlock, marker, sel = ed.selection, last, elm, vp, y, elmHeight, markerId = 'mce_marker';

-

-			function select(n) {

-				var r;

-

-				if (tinymce.isIE) {

-					r = ed.getDoc().body.createTextRange();

-					r.moveToElementText(n);

-					r.collapse(false);

-					r.select();

-				} else {

-					sel.select(n, 1);

-					sel.collapse(false);

-				}

-			}

-

-			// Insert a marker for the caret position

-			this._insert('<span id="' + markerId + '">&nbsp;</span>', 1);

-			marker = dom.get(markerId);

-			parentBlock = dom.getParent(marker, 'p,h1,h2,h3,h4,h5,h6,ul,ol,th,td');

-

-			// If it's a parent block but not a table cell

-			if (parentBlock && !/TD|TH/.test(parentBlock.nodeName)) {

-				// Split parent block

-				marker = dom.split(parentBlock, marker);

-

-				// Insert nodes before the marker

-				each(dom.create('div', 0, content).childNodes, function(n) {

-					last = marker.parentNode.insertBefore(n.cloneNode(true), marker);

-				});

-

-				// Move caret after marker

-				select(last);

-			} else {

-				dom.setOuterHTML(marker, content);

-				sel.select(ed.getBody(), 1);

-				sel.collapse(0);

-			}

-

-			// Remove marker if it's left

-			while (elm = dom.get(markerId))

-				dom.remove(elm);

-

-			// Get element, position and height

-			elm = sel.getStart();

-			vp = dom.getViewPort(ed.getWin());

-			y = ed.dom.getPos(elm).y;

-			elmHeight = elm.clientHeight;

-

-			// Is element within viewport if not then scroll it into view

-			if (y < vp.y || y + elmHeight > vp.y + vp.h)

-				ed.getDoc().body.scrollTop = y < vp.y ? y : y - vp.h + 25;

-		},

-

-		/**

 		 * Inserts the specified contents at the caret position.

 		 */

 		_insert : function(h, skip_undo) {

@@ -724,8 +744,7 @@
 			if (!ed.selection.isCollapsed() && r.startContainer != r.endContainer)

 				ed.getDoc().execCommand('Delete', false, null);

 

-			// It's better to use the insertHTML method on Gecko since it will combine paragraphs correctly before inserting the contents

-			ed.execCommand(tinymce.isGecko ? 'insertHTML' : 'mceInsertContent', false, h, {skip_undo : skip_undo});

+			ed.execCommand('mceInsertContent', false, h, {skip_undo : skip_undo});

 		},

 

 		/**

@@ -737,31 +756,24 @@
 		 * plugin, and requires minimal changes to add the new functionality.

 		 * Speednet - June 2009

 		 */

-		_insertPlainText : function(ed, dom, h) {

-			var i, len, pos, rpos, node, breakElms, before, after,

-				w = ed.getWin(),

-				d = ed.getDoc(),

-				sel = ed.selection,

-				is = tinymce.is,

-				inArray = tinymce.inArray,

+		_insertPlainText : function(content) {

+			var ed = this.editor,

 				linebr = getParam(ed, "paste_text_linebreaktype"),

-				rl = getParam(ed, "paste_text_replacements");

+				rl = getParam(ed, "paste_text_replacements"),

+				is = tinymce.is;

 

 			function process(items) {

 				each(items, function(v) {

 					if (v.constructor == RegExp)

-						h = h.replace(v, "");

+						content = content.replace(v, "");

 					else

-						h = h.replace(v[0], v[1]);

+						content = content.replace(v[0], v[1]);

 				});

 			};

 

-			if ((typeof(h) === "string") && (h.length > 0)) {

-				if (!entities)

-					entities = ("34,quot,38,amp,39,apos,60,lt,62,gt," + ed.serializer.settings.entities).split(",");

-

+			if ((typeof(content) === "string") && (content.length > 0)) {

 				// If HTML content with line-breaking tags, then remove all cr/lf chars because only tags will break a line

-				if (/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(h)) {

+				if (/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(content)) {

 					process([

 						/[\n\r]+/g

 					]);

@@ -778,128 +790,47 @@
 					[/<\/t[dh]>\s*<t[dh][^>]*>/gi, "\t"],		// Table cells get tabs betweem them

 					/<[a-z!\/?][^>]*>/gi,						// Delete all remaining tags

 					[/&nbsp;/gi, " "],							// Convert non-break spaces to regular spaces (remember, *plain text*)

-					[

-						// HTML entity

-						/&(#\d+|[a-z0-9]{1,10});/gi,

-

-						// Replace with actual character

-						function(e, s) {

-							if (s.charAt(0) === "#") {

-								return String.fromCharCode(s.slice(1));

-							}

-							else {

-								return ((e = inArray(entities, s)) > 0)? String.fromCharCode(entities[e-1]) : " ";

-							}

-						}

-					],

-					[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi, "$1"],	// Cool little RegExp deletes whitespace around linebreak chars.

-					[/\n{3,}/g, "\n\n"],							// Max. 2 consecutive linebreaks

-					/^\s+|\s+$/g									// Trim the front & back

+					[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi, "$1"],// Cool little RegExp deletes whitespace around linebreak chars.

+					[/\n{3,}/g, "\n\n"]							// Max. 2 consecutive linebreaks

 				]);

 

-				h = dom.encode(h);

-

-				// Delete any highlighted text before pasting

-				if (!sel.isCollapsed()) {

-					d.execCommand("Delete", false, null);

-				}

+				content = ed.dom.decode(tinymce.html.Entities.encodeRaw(content));

 

 				// Perform default or custom replacements

-				if (is(rl, "array") || (is(rl, "array"))) {

+				if (is(rl, "array")) {

 					process(rl);

-				}

-				else if (is(rl, "string")) {

+				} else if (is(rl, "string")) {

 					process(new RegExp(rl, "gi"));

 				}

 

 				// Treat paragraphs as specified in the config

 				if (linebr == "none") {

+					// Convert all line breaks to space

 					process([

 						[/\n+/g, " "]

 					]);

-				}

-				else if (linebr == "br") {

+				} else if (linebr == "br") {

+					// Convert all line breaks to <br />

 					process([

 						[/\n/g, "<br />"]

 					]);

-				}

-				else {

+				} else if (linebr == "p") {

+					// Convert all line breaks to <p>...</p>

+					process([

+						[/\n+/g, "</p><p>"],

+						[/^(.*<\/p>)(<p>)$/, '<p>$1']

+					]);

+				} else {

+					// defaults to "combined"

+					// Convert single line breaks to <br /> and double line breaks to <p>...</p>

 					process([

-						/^\s+|\s+$/g,

 						[/\n\n/g, "</p><p>"],

+						[/^(.*<\/p>)(<p>)$/, '<p>$1'],

 						[/\n/g, "<br />"]

 					]);

 				}

 

-				// This next piece of code handles the situation where we're pasting more than one paragraph of plain

-				// text, and we are pasting the content into the middle of a block node in the editor.  The block

-				// node gets split at the selection point into "Para A" and "Para B" (for the purposes of explaining).

-				// The first paragraph of the pasted text is appended to "Para A", and the last paragraph of the

-				// pasted text is prepended to "Para B".  Any other paragraphs of pasted text are placed between

-				// "Para A" and "Para B".  This code solves a host of problems with the original plain text plugin and

-				// now handles styles correctly.  (Pasting plain text into a styled paragraph is supposed to make the

-				// plain text take the same style as the existing paragraph.)

-				if ((pos = h.indexOf("</p><p>")) != -1) {

-					rpos = h.lastIndexOf("</p><p>");

-					node = sel.getNode(); 

-					breakElms = [];		// Get list of elements to break 

-

-					do {

-						if (node.nodeType == 1) {

-							// Don't break tables and break at body

-							if (node.nodeName == "TD" || node.nodeName == "BODY") {

-								break;

-							}

-

-							breakElms[breakElms.length] = node;

-						}

-					} while (node = node.parentNode);

-

-					// Are we in the middle of a block node?

-					if (breakElms.length > 0) {

-						before = h.substring(0, pos);

-						after = "";

-

-						for (i=0, len=breakElms.length; i<len; i++) {

-							before += "</" + breakElms[i].nodeName.toLowerCase() + ">";

-							after += "<" + breakElms[breakElms.length-i-1].nodeName.toLowerCase() + ">";

-						}

-

-						if (pos == rpos) {

-							h = before + after + h.substring(pos+7);

-						}

-						else {

-							h = before + h.substring(pos+4, rpos+4) + after + h.substring(rpos+7);

-						}

-					}

-				}

-

-				// Insert content at the caret, plus add a marker for repositioning the caret

-				ed.execCommand("mceInsertRawHTML", false, h + '<span id="_plain_text_marker">&nbsp;</span>');

-

-				// Reposition the caret to the marker, which was placed immediately after the inserted content.

-				// Needs to be done asynchronously (in window.setTimeout) or else it doesn't work in all browsers.

-				// The second part of the code scrolls the content up if the caret is positioned off-screen.

-				// This is only necessary for WebKit browsers, but it doesn't hurt to use for all.

-				window.setTimeout(function() {

-					var marker = dom.get('_plain_text_marker'),

-						elm, vp, y, elmHeight;

-

-					sel.select(marker, false);

-					d.execCommand("Delete", false, null);

-					marker = null;

-

-					// Get element, position and height

-					elm = sel.getStart();

-					vp = dom.getViewPort(w);

-					y = dom.getPos(elm).y;

-					elmHeight = elm.clientHeight;

-

-					// Is element within viewport if not then scroll it into view

-					if ((y < vp.y) || (y + elmHeight > vp.y + vp.h)) {

-						d.body.scrollTop = y < vp.y ? y : y - vp.h + 25;

-					}

-				}, 0);

+				ed.execCommand('mceInsertContent', false, content);

 			}

 		},

 

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js b/library/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js
index c524f9eb0..c524f9eb0 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js b/library/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js
index a52731c36..a52731c36 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js
index eeac77896..bc74daf85 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js
@@ -1,5 +1 @@
-tinyMCE.addI18n('en.paste_dlg',{

-text_title:"Use CTRL+V on your keyboard to paste the text into the window.",

-text_linebreaks:"Keep linebreaks",

-word_title:"Use CTRL+V on your keyboard to paste the text into the window."

-});
\ No newline at end of file
+tinyMCE.addI18n('en.paste_dlg',{"word_title":"Use Ctrl+V on your keyboard to paste the text into the window.","text_linebreaks":"Keep Linebreaks","text_title":"Use Ctrl+V on your keyboard to paste the text into the window."});
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/paste/pastetext.htm b/library/tinymce/jscripts/tiny_mce/plugins/paste/pastetext.htm
index b65594547..b65594547 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/paste/pastetext.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/paste/pastetext.htm
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm b/library/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm
index 0f6bb4121..0f6bb4121 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin.js
index 507909c5f..507909c5f 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js
index 80f00f0d9..80f00f0d9 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/preview/example.html b/library/tinymce/jscripts/tiny_mce/plugins/preview/example.html
index b2c3d90ce..b2c3d90ce 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/preview/example.html
+++ b/library/tinymce/jscripts/tiny_mce/plugins/preview/example.html
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js b/library/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js
index f8dc81052..f8dc81052 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/preview/preview.html b/library/tinymce/jscripts/tiny_mce/plugins/preview/preview.html
index 67e7b142f..67e7b142f 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/preview/preview.html
+++ b/library/tinymce/jscripts/tiny_mce/plugins/preview/preview.html
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin.js
index b5b3a55ed..b5b3a55ed 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js
index 3933fe656..3933fe656 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin.js
index 8e9399667..8e9399667 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js
index f5a3de8f5..f5a3de8f5 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css
index ecdf58c7b..ecdf58c7b 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css
+++ b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js
index cd9c985b7..165bc12df 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.SearchReplacePlugin",{init:function(a,c){function b(d){a.windowManager.open({file:c+"/searchreplace.htm",width:420+parseInt(a.getLang("searchreplace.delta_width",0)),height:170+parseInt(a.getLang("searchreplace.delta_height",0)),inline:1,auto_focus:0},{mode:d,search_string:a.selection.getContent({format:"text"}),plugin_url:c})}a.addCommand("mceSearch",function(){b("search")});a.addCommand("mceReplace",function(){b("replace")});a.addButton("search",{title:"searchreplace.search_desc",cmd:"mceSearch"});a.addButton("replace",{title:"searchreplace.replace_desc",cmd:"mceReplace"});a.addShortcut("ctrl+f","searchreplace.search_desc","mceSearch")},getInfo:function(){return{longname:"Search/Replace",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("searchreplace",tinymce.plugins.SearchReplacePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.SearchReplacePlugin",{init:function(a,c){function b(d){window.focus();a.windowManager.open({file:c+"/searchreplace.htm",width:420+parseInt(a.getLang("searchreplace.delta_width",0)),height:170+parseInt(a.getLang("searchreplace.delta_height",0)),inline:1,auto_focus:0},{mode:d,search_string:a.selection.getContent({format:"text"}),plugin_url:c})}a.addCommand("mceSearch",function(){b("search")});a.addCommand("mceReplace",function(){b("replace")});a.addButton("search",{title:"searchreplace.search_desc",cmd:"mceSearch"});a.addButton("replace",{title:"searchreplace.replace_desc",cmd:"mceReplace"});a.addShortcut("ctrl+f","searchreplace.search_desc","mceSearch")},getInfo:function(){return{longname:"Search/Replace",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("searchreplace",tinymce.plugins.SearchReplacePlugin)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js
index 1433a06a4..4c87e8fa7 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js
@@ -12,6 +12,10 @@
 	tinymce.create('tinymce.plugins.SearchReplacePlugin', {

 		init : function(ed, url) {

 			function open(m) {

+				// Keep IE from writing out the f/r character to the editor

+				// instance while initializing a new dialog. See: #3131190

+				window.focus();

+

 				ed.windowManager.open({

 					file : url + '/searchreplace.htm',

 					width : 420 + parseInt(ed.getLang('searchreplace.delta_width', 0)),

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
index c0a624329..80284b9f3 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
@@ -2,14 +2,18 @@ tinyMCEPopup.requireLangPack();
 

 var SearchReplaceDialog = {

 	init : function(ed) {

-		var f = document.forms[0], m = tinyMCEPopup.getWindowArg("mode");

+		var t = this, f = document.forms[0], m = tinyMCEPopup.getWindowArg("mode");

 

-		this.switchMode(m);

+		t.switchMode(m);

 

 		f[m + '_panel_searchstring'].value = tinyMCEPopup.getWindowArg("search_string");

 

 		// Focus input field

 		f[m + '_panel_searchstring'].focus();

+		

+		mcTabs.onChange.add(function(tab_id, panel_id) {

+			t.switchMode(tab_id.substring(0, tab_id.indexOf('_')));

+		});

 	},

 

 	switchMode : function(m) {

@@ -42,21 +46,23 @@ var SearchReplaceDialog = {
 		ca = f[m + '_panel_casesensitivebox'].checked;

 		rs = f['replace_panel_replacestring'].value;

 

+		if (tinymce.isIE) {

+			r = ed.getDoc().selection.createRange();

+		}

+

 		if (s == '')

 			return;

 

 		function fix() {

 			// Correct Firefox graphics glitches

+			// TODO: Verify if this is actually needed any more, maybe it was for very old FF versions? 

 			r = se.getRng().cloneRange();

 			ed.getDoc().execCommand('SelectAll', false, null);

 			se.setRng(r);

 		};

 

 		function replace() {

-			if (tinymce.isIE)

-				ed.selection.getRng().duplicate().pasteHTML(rs); // Needs to be duplicated due to selection bug in IE

-			else

-				ed.getDoc().execCommand('InsertHTML', false, rs);

+			ed.selection.setContent(rs); // Needs to be duplicated due to selection bug in IE

 		};

 

 		// IE flags

@@ -70,6 +76,9 @@ var SearchReplaceDialog = {
 				ed.selection.collapse(true);

 

 				if (tinymce.isIE) {

+					ed.focus();

+					r = ed.getDoc().selection.createRange();

+

 					while (r.findText(s, b ? -1 : 1, fl)) {

 						r.scrollIntoView();

 						r.select();

@@ -111,6 +120,9 @@ var SearchReplaceDialog = {
 			return;

 

 		if (tinymce.isIE) {

+			ed.focus();

+			r = ed.getDoc().selection.createRange();

+

 			if (r.findText(s, b ? -1 : 1, fl)) {

 				r.scrollIntoView();

 				r.select();

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js
index 370959afa..8a6590097 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js
@@ -1,16 +1 @@
-tinyMCE.addI18n('en.searchreplace_dlg',{

-searchnext_desc:"Find again",

-notfound:"The search has been completed. The search string could not be found.",

-search_title:"Find",

-replace_title:"Find/Replace",

-allreplaced:"All occurrences of the search string were replaced.",

-findwhat:"Find what",

-replacewith:"Replace with",

-direction:"Direction",

-up:"Up",

-down:"Down",

-mcase:"Match case",

-findnext:"Find next",

-replace:"Replace",

-replaceall:"Replace all"

-});
\ No newline at end of file
+tinyMCE.addI18n('en.searchreplace_dlg',{findwhat:"Find What",replacewith:"Replace with",direction:"Direction",up:"Up",down:"Down",mcase:"Match Case",findnext:"Find Next",allreplaced:"All occurrences of the search string were replaced.","searchnext_desc":"Find Again",notfound:"The search has been completed. The search string could not be found.","search_title":"Find","replace_title":"Find/Replace",replaceall:"Replace All",replace:"Replace"});
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
index d0424cfc9..5a22d8aa4 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
@@ -8,27 +8,28 @@
 	<script type="text/javascript" src="js/searchreplace.js"></script>

 	<link rel="stylesheet" type="text/css" href="css/searchreplace.css" />

 </head>

-<body style="display:none;">

+<body style="display:none;" role="application" aria-labelledby="app_title">

+<span id="app_title" style="display:none">{#searchreplace_dlg.replace_title}</span>

 <form onsubmit="SearchReplaceDialog.searchNext('none');return false;" action="#">

 	<div class="tabs">

 		<ul>

-			<li id="search_tab"><span><a href="javascript:SearchReplaceDialog.switchMode('search');" onmousedown="return false;">{#searchreplace.search_desc}</a></span></li>

-			<li id="replace_tab"><span><a href="javascript:SearchReplaceDialog.switchMode('replace');" onmousedown="return false;">{#searchreplace_dlg.replace}</a></span></li>

+			<li id="search_tab" aria-controls="search_panel"><span><a href="javascript:SearchReplaceDialog.switchMode('search');" onmousedown="return false;">{#searchreplace.search_desc}</a></span></li>

+			<li id="replace_tab" aria-controls="replace_panel"><span><a href="javascript:SearchReplaceDialog.switchMode('replace');" onmousedown="return false;">{#searchreplace_dlg.replace}</a></span></li>

 		</ul>

 	</div>

 

 	<div class="panel_wrapper">

 		<div id="search_panel" class="panel">

-			<table border="0" cellspacing="0" cellpadding="2">

+			<table role="presentation" border="0" cellspacing="0" cellpadding="2">

 				<tr>

 					<td><label for="search_panel_searchstring">{#searchreplace_dlg.findwhat}</label></td>

-					<td><input type="text" id="search_panel_searchstring" name="search_panel_searchstring" style="width: 200px" /></td>

+					<td><input type="text" id="search_panel_searchstring" name="search_panel_searchstring" style="width: 200px" aria-required="true" /></td>

 				</tr>

 				<tr>

 					<td colspan="2">

-						<table border="0" cellspacing="0" cellpadding="0" class="direction">

-							<tr>

-								<td><label>{#searchreplace_dlg.direction}</label></td>

+						<table role="presentation" border="0" cellspacing="0" cellpadding="0" class="direction">

+							<tr role="group" aria-labelledby="search_panel_backwards_label">

+								<td><label id="search_panel_backwards_label">{#searchreplace_dlg.direction}</label></td>

 								<td><input id="search_panel_backwardsu" name="search_panel_backwards" class="radio" type="radio" /></td>

 								<td><label for="search_panel_backwardsu">{#searchreplace_dlg.up}</label></td>

 								<td><input id="search_panel_backwardsd" name="search_panel_backwards" class="radio" type="radio" checked="checked" /></td>

@@ -39,7 +40,7 @@
 				</tr>

 				<tr>

 					<td colspan="2">

-						<table border="0" cellspacing="0" cellpadding="0">

+						<table role="presentation" border="0" cellspacing="0" cellpadding="0">

 							<tr>

 								<td><input id="search_panel_casesensitivebox" name="search_panel_casesensitivebox" class="checkbox" type="checkbox" /></td>

 								<td><label for="search_panel_casesensitivebox">{#searchreplace_dlg.mcase}</label></td>

@@ -51,20 +52,20 @@
 		</div>

 

 		<div id="replace_panel" class="panel">

-			<table border="0" cellspacing="0" cellpadding="2">

+			<table role="presentation" border="0" cellspacing="0" cellpadding="2">

 				<tr>

 					<td><label for="replace_panel_searchstring">{#searchreplace_dlg.findwhat}</label></td>

-					<td><input type="text" id="replace_panel_searchstring" name="replace_panel_searchstring" style="width: 200px" /></td>

+					<td><input type="text" id="replace_panel_searchstring" name="replace_panel_searchstring" style="width: 200px" aria-required="true" /></td>

 				</tr>

 				<tr>

 					<td><label for="replace_panel_replacestring">{#searchreplace_dlg.replacewith}</label></td>

-					<td><input type="text" id="replace_panel_replacestring" name="replace_panel_replacestring" style="width: 200px" /></td>

+					<td><input type="text" id="replace_panel_replacestring" name="replace_panel_replacestring" style="width: 200px" aria-required="true" /></td>

 				</tr>

 				<tr>

 					<td colspan="2">

-						<table border="0" cellspacing="0" cellpadding="0" class="direction">

-							<tr>

-								<td><label>{#searchreplace_dlg.direction}</label></td>

+						<table role="presentation" border="0" cellspacing="0" cellpadding="0" class="direction">

+							<tr role="group" aria-labelledby="replace_panel_dir_label">

+								<td><label id="replace_panel_dir_label">{#searchreplace_dlg.direction}</label></td>

 								<td><input id="replace_panel_backwardsu" name="replace_panel_backwards" class="radio" type="radio" /></td>

 								<td><label for="replace_panel_backwardsu">{#searchreplace_dlg.up}</label></td>

 								<td><input id="replace_panel_backwardsd" name="replace_panel_backwards" class="radio" type="radio" checked="checked" /></td>

@@ -75,7 +76,7 @@
 				</tr>

 				<tr>

 					<td colspan="2">

-						<table border="0" cellspacing="0" cellpadding="0">

+						<table role="presentation" border="0" cellspacing="0" cellpadding="0">

 							<tr>

 								<td><input id="replace_panel_casesensitivebox" name="replace_panel_casesensitivebox" class="checkbox" type="checkbox" /></td>

 								<td><label for="replace_panel_casesensitivebox">{#searchreplace_dlg.mcase}</label></td>

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/content.css b/library/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/content.css
index 24efa0217..24efa0217 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/content.css
+++ b/library/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/content.css
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
index a9ec3b9cf..48549c923 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.util.JSONRequest,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.SpellcheckerPlugin",{getInfo:function(){return{longname:"Spellchecker",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker",version:tinymce.majorVersion+"."+tinymce.minorVersion}},init:function(e,f){var g=this,d;g.url=f;g.editor=e;g.rpcUrl=e.getParam("spellchecker_rpc_url","{backend}");if(g.rpcUrl=="{backend}"){if(tinymce.isIE){return}g.hasSupport=true;e.onContextMenu.addToTop(function(h,i){if(g.active){return false}})}e.addCommand("mceSpellCheck",function(){if(g.rpcUrl=="{backend}"){g.editor.getBody().spellcheck=g.active=!g.active;return}if(!g.active){e.setProgressState(1);g._sendRPC("checkWords",[g.selectedLang,g._getWords()],function(h){if(h.length>0){g.active=1;g._markWords(h);e.setProgressState(0);e.nodeChanged()}else{e.setProgressState(0);if(e.getParam("spellchecker_report_no_misspellings",true)){e.windowManager.alert("spellchecker.no_mpell")}}})}else{g._done()}});e.onInit.add(function(){if(e.settings.content_css!==false){e.dom.loadCSS(f+"/css/content.css")}});e.onClick.add(g._showMenu,g);e.onContextMenu.add(g._showMenu,g);e.onBeforeGetContent.add(function(){if(g.active){g._removeWords()}});e.onNodeChange.add(function(i,h){h.setActive("spellchecker",g.active)});e.onSetContent.add(function(){g._done()});e.onBeforeGetContent.add(function(){g._done()});e.onBeforeExecCommand.add(function(h,i){if(i=="mceFullScreen"){g._done()}});g.languages={};c(e.getParam("spellchecker_languages","+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv","hash"),function(i,h){if(h.indexOf("+")===0){h=h.substring(1);g.selectedLang=i}g.languages[h]=i})},createControl:function(h,d){var f=this,g,e=f.editor;if(h=="spellchecker"){if(f.rpcUrl=="{backend}"){if(f.hasSupport){g=d.createButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f})}return g}g=d.createSplitButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f});g.onRenderMenu.add(function(j,i){i.add({title:"spellchecker.langs","class":"mceMenuItemTitle"}).setDisabled(1);c(f.languages,function(n,m){var p={icon:1},l;p.onclick=function(){l.setSelected(1);f.selectedItem.setSelected(0);f.selectedItem=l;f.selectedLang=n};p.title=m;l=i.add(p);l.setSelected(n==f.selectedLang);if(n==f.selectedLang){f.selectedItem=l}})});return g}},_walk:function(i,g){var h=this.editor.getDoc(),e;if(h.createTreeWalker){e=h.createTreeWalker(i,NodeFilter.SHOW_TEXT,null,false);while((i=e.nextNode())!=null){g.call(this,i)}}else{tinymce.walk(i,g,"childNodes")}},_getSeparators:function(){var e="",d,f=this.editor.getParam("spellchecker_word_separator_chars",'\\s!"#$%&()*+,-./:;<=>?@[]^_{|}§©«®±¶·¸»¼½¾¿×÷¤\u201d\u201c');for(d=0;d<f.length;d++){e+="\\"+f.charAt(d)}return e},_getWords:function(){var e=this.editor,g=[],d="",f={},h=[];this._walk(e.getBody(),function(i){if(i.nodeType==3){d+=i.nodeValue+" "}});if(e.getParam("spellchecker_word_pattern")){h=d.match("("+e.getParam("spellchecker_word_pattern")+")","gi")}else{d=d.replace(new RegExp("([0-9]|["+this._getSeparators()+"])","g")," ");d=tinymce.trim(d.replace(/(\s+)/g," "));h=d.split(" ")}c(h,function(i){if(!f[i]){g.push(i);f[i]=1}});return g},_removeWords:function(e){var f=this.editor,h=f.dom,g=f.selection,d=g.getBookmark();c(h.select("span").reverse(),function(i){if(i&&(h.hasClass(i,"mceItemHiddenSpellWord")||h.hasClass(i,"mceItemHidden"))){if(!e||h.decode(i.innerHTML)==e){h.remove(i,1)}}});g.moveToBookmark(d)},_markWords:function(o){var i,h,g,f,e,n="",k=this.editor,p=this._getSeparators(),j=k.dom,d=[];var l=k.selection,m=l.getBookmark();c(o,function(q){n+=(n?"|":"")+q});i=new RegExp("(["+p+"])("+n+")(["+p+"])","g");h=new RegExp("^("+n+")","g");g=new RegExp("("+n+")(["+p+"]?)$","g");f=new RegExp("^("+n+")(["+p+"]?)$","g");e=new RegExp("("+n+")(["+p+"])","g");this._walk(this.editor.getBody(),function(q){if(q.nodeType==3){d.push(q)}});c(d,function(r){var q;if(r.nodeType==3){q=r.nodeValue;if(i.test(q)||h.test(q)||g.test(q)||f.test(q)){q=j.encode(q);q=q.replace(e,'<span class="mceItemHiddenSpellWord">$1</span>$2');q=q.replace(g,'<span class="mceItemHiddenSpellWord">$1</span>$2');j.replace(j.create("span",{"class":"mceItemHidden"},q),r)}}});l.moveToBookmark(m)},_showMenu:function(h,j){var i=this,h=i.editor,d=i._menu,l,k=h.dom,g=k.getViewPort(h.getWin()),f=j.target;j=0;if(!d){l=b.getPos(h.getContentAreaContainer());d=h.controlManager.createDropMenu("spellcheckermenu",{offset_x:l.x,offset_y:l.y,"class":"mceNoIcons"});i._menu=d}if(k.hasClass(f,"mceItemHiddenSpellWord")){d.removeAll();d.add({title:"spellchecker.wait","class":"mceMenuItemTitle"}).setDisabled(1);i._sendRPC("getSuggestions",[i.selectedLang,k.decode(f.innerHTML)],function(m){var e;d.removeAll();if(m.length>0){d.add({title:"spellchecker.sug","class":"mceMenuItemTitle"}).setDisabled(1);c(m,function(n){d.add({title:n,onclick:function(){k.replace(h.getDoc().createTextNode(n),f);i._checkDone()}})});d.addSeparator()}else{d.add({title:"spellchecker.no_sug","class":"mceMenuItemTitle"}).setDisabled(1)}e=i.editor.getParam("spellchecker_enable_ignore_rpc","");d.add({title:"spellchecker.ignore_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}}});d.add({title:"spellchecker.ignore_words",onclick:function(){var n=f.innerHTML;i._removeWords(k.decode(n));i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWords",[i.selectedLang,n],function(o){h.setProgressState(0)})}}});if(i.editor.getParam("spellchecker_enable_learn_rpc")){d.add({title:"spellchecker.learn_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();h.setProgressState(1);i._sendRPC("learnWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}})}d.update()});h.selection.select(f);l=k.getPos(f);d.showMenu(l.x,l.y+f.offsetHeight-g.y);return tinymce.dom.Event.cancel(j)}else{d.hideMenu()}},_checkDone:function(){var e=this,d=e.editor,g=d.dom,f;c(g.select("span"),function(h){if(h&&g.hasClass(h,"mceItemHiddenSpellWord")){f=true;return false}});if(!f){e._done()}},_done:function(){var d=this,e=d.active;if(d.active){d.active=0;d._removeWords();if(d._menu){d._menu.hideMenu()}if(e){d.editor.nodeChanged()}}},_sendRPC:function(e,g,d){var f=this;a.sendRPC({url:f.rpcUrl,method:e,params:g,success:d,error:function(i,h){f.editor.setProgressState(0);f.editor.windowManager.alert(i.errstr||("Error response: "+h.responseText))}})}});tinymce.PluginManager.add("spellchecker",tinymce.plugins.SpellcheckerPlugin)})();
\ No newline at end of file
+(function(){var a=tinymce.util.JSONRequest,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.SpellcheckerPlugin",{getInfo:function(){return{longname:"Spellchecker",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker",version:tinymce.majorVersion+"."+tinymce.minorVersion}},init:function(e,f){var g=this,d;g.url=f;g.editor=e;g.rpcUrl=e.getParam("spellchecker_rpc_url","{backend}");if(g.rpcUrl=="{backend}"){if(tinymce.isIE){return}g.hasSupport=true;e.onContextMenu.addToTop(function(h,i){if(g.active){return false}})}e.addCommand("mceSpellCheck",function(){if(g.rpcUrl=="{backend}"){g.editor.getBody().spellcheck=g.active=!g.active;return}if(!g.active){e.setProgressState(1);g._sendRPC("checkWords",[g.selectedLang,g._getWords()],function(h){if(h.length>0){g.active=1;g._markWords(h);e.setProgressState(0);e.nodeChanged()}else{e.setProgressState(0);if(e.getParam("spellchecker_report_no_misspellings",true)){e.windowManager.alert("spellchecker.no_mpell")}}})}else{g._done()}});if(e.settings.content_css!==false){e.contentCSS.push(f+"/css/content.css")}e.onClick.add(g._showMenu,g);e.onContextMenu.add(g._showMenu,g);e.onBeforeGetContent.add(function(){if(g.active){g._removeWords()}});e.onNodeChange.add(function(i,h){h.setActive("spellchecker",g.active)});e.onSetContent.add(function(){g._done()});e.onBeforeGetContent.add(function(){g._done()});e.onBeforeExecCommand.add(function(h,i){if(i=="mceFullScreen"){g._done()}});g.languages={};c(e.getParam("spellchecker_languages","+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv","hash"),function(i,h){if(h.indexOf("+")===0){h=h.substring(1);g.selectedLang=i}g.languages[h]=i})},createControl:function(h,d){var f=this,g,e=f.editor;if(h=="spellchecker"){if(f.rpcUrl=="{backend}"){if(f.hasSupport){g=d.createButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f})}return g}g=d.createSplitButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f});g.onRenderMenu.add(function(j,i){i.add({title:"spellchecker.langs","class":"mceMenuItemTitle"}).setDisabled(1);c(f.languages,function(n,m){var p={icon:1},l;p.onclick=function(){if(n==f.selectedLang){return}l.setSelected(1);f.selectedItem.setSelected(0);f.selectedItem=l;f.selectedLang=n};p.title=m;l=i.add(p);l.setSelected(n==f.selectedLang);if(n==f.selectedLang){f.selectedItem=l}})});return g}},_walk:function(i,g){var h=this.editor.getDoc(),e;if(h.createTreeWalker){e=h.createTreeWalker(i,NodeFilter.SHOW_TEXT,null,false);while((i=e.nextNode())!=null){g.call(this,i)}}else{tinymce.walk(i,g,"childNodes")}},_getSeparators:function(){var e="",d,f=this.editor.getParam("spellchecker_word_separator_chars",'\\s!"#$%&()*+,-./:;<=>?@[]^_{|}§©«®±¶·¸»¼½¾¿×÷¤\u201d\u201c');for(d=0;d<f.length;d++){e+="\\"+f.charAt(d)}return e},_getWords:function(){var e=this.editor,g=[],d="",f={},h=[];this._walk(e.getBody(),function(i){if(i.nodeType==3){d+=i.nodeValue+" "}});if(e.getParam("spellchecker_word_pattern")){h=d.match("("+e.getParam("spellchecker_word_pattern")+")","gi")}else{d=d.replace(new RegExp("([0-9]|["+this._getSeparators()+"])","g")," ");d=tinymce.trim(d.replace(/(\s+)/g," "));h=d.split(" ")}c(h,function(i){if(!f[i]){g.push(i);f[i]=1}});return g},_removeWords:function(d){var e=this.editor,h=e.dom,g=e.selection,f=g.getRng(true);c(h.select("span").reverse(),function(i){if(i&&(h.hasClass(i,"mceItemHiddenSpellWord")||h.hasClass(i,"mceItemHidden"))){if(!d||h.decode(i.innerHTML)==d){h.remove(i,1)}}});g.setRng(f)},_markWords:function(l){var h=this.editor,g=h.dom,j=h.getDoc(),i=h.selection,d=i.getRng(true),e=[],k=l.join("|"),m=this._getSeparators(),f=new RegExp("(^|["+m+"])("+k+")(?=["+m+"]|$)","g");this._walk(h.getBody(),function(o){if(o.nodeType==3){e.push(o)}});c(e,function(t){var r,q,o,s,p=t.nodeValue;if(f.test(p)){p=g.encode(p);q=g.create("span",{"class":"mceItemHidden"});if(tinymce.isIE){p=p.replace(f,"$1<mcespell>$2</mcespell>");while((s=p.indexOf("<mcespell>"))!=-1){o=p.substring(0,s);if(o.length){r=j.createTextNode(g.decode(o));q.appendChild(r)}p=p.substring(s+10);s=p.indexOf("</mcespell>");o=p.substring(0,s);p=p.substring(s+11);q.appendChild(g.create("span",{"class":"mceItemHiddenSpellWord"},o))}if(p.length){r=j.createTextNode(g.decode(p));q.appendChild(r)}}else{q.innerHTML=p.replace(f,'$1<span class="mceItemHiddenSpellWord">$2</span>')}g.replace(q,t)}});i.setRng(d)},_showMenu:function(h,j){var i=this,h=i.editor,d=i._menu,l,k=h.dom,g=k.getViewPort(h.getWin()),f=j.target;j=0;if(!d){d=h.controlManager.createDropMenu("spellcheckermenu",{"class":"mceNoIcons"});i._menu=d}if(k.hasClass(f,"mceItemHiddenSpellWord")){d.removeAll();d.add({title:"spellchecker.wait","class":"mceMenuItemTitle"}).setDisabled(1);i._sendRPC("getSuggestions",[i.selectedLang,k.decode(f.innerHTML)],function(m){var e;d.removeAll();if(m.length>0){d.add({title:"spellchecker.sug","class":"mceMenuItemTitle"}).setDisabled(1);c(m,function(n){d.add({title:n,onclick:function(){k.replace(h.getDoc().createTextNode(n),f);i._checkDone()}})});d.addSeparator()}else{d.add({title:"spellchecker.no_sug","class":"mceMenuItemTitle"}).setDisabled(1)}if(h.getParam("show_ignore_words",true)){e=i.editor.getParam("spellchecker_enable_ignore_rpc","");d.add({title:"spellchecker.ignore_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}}});d.add({title:"spellchecker.ignore_words",onclick:function(){var n=f.innerHTML;i._removeWords(k.decode(n));i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWords",[i.selectedLang,n],function(o){h.setProgressState(0)})}}})}if(i.editor.getParam("spellchecker_enable_learn_rpc")){d.add({title:"spellchecker.learn_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();h.setProgressState(1);i._sendRPC("learnWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}})}d.update()});l=b.getPos(h.getContentAreaContainer());d.settings.offset_x=l.x;d.settings.offset_y=l.y;h.selection.select(f);l=k.getPos(f);d.showMenu(l.x,l.y+f.offsetHeight-g.y);return tinymce.dom.Event.cancel(j)}else{d.hideMenu()}},_checkDone:function(){var e=this,d=e.editor,g=d.dom,f;c(g.select("span"),function(h){if(h&&g.hasClass(h,"mceItemHiddenSpellWord")){f=true;return false}});if(!f){e._done()}},_done:function(){var d=this,e=d.active;if(d.active){d.active=0;d._removeWords();if(d._menu){d._menu.hideMenu()}if(e){d.editor.nodeChanged()}}},_sendRPC:function(e,g,d){var f=this;a.sendRPC({url:f.rpcUrl,method:e,params:g,success:d,error:function(i,h){f.editor.setProgressState(0);f.editor.windowManager.alert(i.errstr||("Error response: "+h.responseText))}})}});tinymce.PluginManager.add("spellchecker",tinymce.plugins.SpellcheckerPlugin)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
index d8680baf2..86fdfceb4 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
@@ -70,10 +70,8 @@
 					t._done();

 			});

 

-			ed.onInit.add(function() {

-				if (ed.settings.content_css !== false)

-					ed.dom.loadCSS(url + '/css/content.css');

-			});

+			if (ed.settings.content_css !== false)

+				ed.contentCSS.push(url + '/css/content.css');

 

 			ed.onClick.add(t._showMenu, t);

 			ed.onContextMenu.add(t._showMenu, t);

@@ -132,6 +130,9 @@
 						var o = {icon : 1}, mi;

 

 						o.onclick = function() {

+							if (v == t.selectedLang) {

+								return;

+							}

 							mi.setSelected(1);

 							t.selectedItem.setSelected(0);

 							t.selectedItem = mi;

@@ -207,7 +208,7 @@
 		},

 

 		_removeWords : function(w) {

-			var ed = this.editor, dom = ed.dom, se = ed.selection, b = se.getBookmark();

+			var ed = this.editor, dom = ed.dom, se = ed.selection, r = se.getRng(true);

 

 			each(dom.select('span').reverse(), function(n) {

 				if (n && (dom.hasClass(n, 'mceItemHiddenSpellWord') || dom.hasClass(n, 'mceItemHidden'))) {

@@ -216,25 +217,15 @@
 				}

 			});

 

-			se.moveToBookmark(b);

+			se.setRng(r);

 		},

 

 		_markWords : function(wl) {

-			var r1, r2, r3, r4, r5, w = '', ed = this.editor, re = this._getSeparators(), dom = ed.dom, nl = [];

-			var se = ed.selection, b = se.getBookmark();

-

-			each(wl, function(v) {

-				w += (w ? '|' : '') + v;

-			});

-

-			r1 = new RegExp('([' + re + '])(' + w + ')([' + re + '])', 'g');

-			r2 = new RegExp('^(' + w + ')', 'g');

-			r3 = new RegExp('(' + w + ')([' + re + ']?)$', 'g');

-			r4 = new RegExp('^(' + w + ')([' + re + ']?)$', 'g');

-			r5 = new RegExp('(' + w + ')([' + re + '])', 'g');

+			var ed = this.editor, dom = ed.dom, doc = ed.getDoc(), se = ed.selection, r = se.getRng(true), nl = [],

+				w = wl.join('|'), re = this._getSeparators(), rx = new RegExp('(^|[' + re + '])(' + w + ')(?=[' + re + ']|$)', 'g');

 

 			// Collect all text nodes

-			this._walk(this.editor.getBody(), function(n) {

+			this._walk(ed.getBody(), function(n) {

 				if (n.nodeType == 3) {

 					nl.push(n);

 				}

@@ -242,22 +233,53 @@
 

 			// Wrap incorrect words in spans

 			each(nl, function(n) {

-				var v;

-

-				if (n.nodeType == 3) {

-					v = n.nodeValue;

-

-					if (r1.test(v) || r2.test(v) || r3.test(v) || r4.test(v)) {

-						v = dom.encode(v);

-						v = v.replace(r5, '<span class="mceItemHiddenSpellWord">$1</span>$2');

-						v = v.replace(r3, '<span class="mceItemHiddenSpellWord">$1</span>$2');

-

-						dom.replace(dom.create('span', {'class' : 'mceItemHidden'}, v), n);

+				var node, elem, txt, pos, v = n.nodeValue;

+

+				if (rx.test(v)) {

+					// Encode the content

+					v = dom.encode(v);

+					// Create container element

+					elem = dom.create('span', {'class' : 'mceItemHidden'});

+

+					// Following code fixes IE issues by creating text nodes

+					// using DOM methods instead of innerHTML.

+					// Bug #3124: <PRE> elements content is broken after spellchecking.

+					// Bug #1408: Preceding whitespace characters are removed

+					// @TODO: I'm not sure that both are still issues on IE9.

+					if (tinymce.isIE) {

+						// Enclose mispelled words with temporal tag

+						v = v.replace(rx, '$1<mcespell>$2</mcespell>');

+						// Loop over the content finding mispelled words

+						while ((pos = v.indexOf('<mcespell>')) != -1) {

+							// Add text node for the content before the word

+							txt = v.substring(0, pos);

+							if (txt.length) {

+								node = doc.createTextNode(dom.decode(txt));

+								elem.appendChild(node);

+							}

+							v = v.substring(pos+10);

+							pos = v.indexOf('</mcespell>');

+							txt = v.substring(0, pos);

+							v = v.substring(pos+11);

+							// Add span element for the word

+							elem.appendChild(dom.create('span', {'class' : 'mceItemHiddenSpellWord'}, txt));

+						}

+						// Add text node for the rest of the content

+						if (v.length) {

+							node = doc.createTextNode(dom.decode(v));

+							elem.appendChild(node);

+						}

+					} else {

+						// Other browsers preserve whitespace characters on innerHTML usage

+						elem.innerHTML = v.replace(rx, '$1<span class="mceItemHiddenSpellWord">$2</span>');

 					}

+

+					// Finally, replace the node with the container

+					dom.replace(elem, n);

 				}

 			});

 

-			se.moveToBookmark(b);

+			se.setRng(r);

 		},

 

 		_showMenu : function(ed, e) {

@@ -266,15 +288,7 @@
 			e = 0; // Fixes IE memory leak

 

 			if (!m) {

-				p1 = DOM.getPos(ed.getContentAreaContainer());

-				//p2 = DOM.getPos(ed.getContainer());

-

-				m = ed.controlManager.createDropMenu('spellcheckermenu', {

-					offset_x : p1.x,

-					offset_y : p1.y,

-					'class' : 'mceNoIcons'

-				});

-

+				m = ed.controlManager.createDropMenu('spellcheckermenu', {'class' : 'mceNoIcons'});

 				t._menu = m;

 			}

 

@@ -300,43 +314,44 @@
 					} else

 						m.add({title : 'spellchecker.no_sug', 'class' : 'mceMenuItemTitle'}).setDisabled(1);

 

-					ignoreRpc = t.editor.getParam("spellchecker_enable_ignore_rpc", '');

-					m.add({

-						title : 'spellchecker.ignore_word',

-						onclick : function() {

-							var word = wordSpan.innerHTML;

+					if (ed.getParam('show_ignore_words', true)) {

+						ignoreRpc = t.editor.getParam("spellchecker_enable_ignore_rpc", '');

+						m.add({

+							title : 'spellchecker.ignore_word',

+							onclick : function() {

+								var word = wordSpan.innerHTML;

 

-							dom.remove(wordSpan, 1);

-							t._checkDone();

+								dom.remove(wordSpan, 1);

+								t._checkDone();

 

-							// tell the server if we need to

-							if (ignoreRpc) {

-								ed.setProgressState(1);

-								t._sendRPC('ignoreWord', [t.selectedLang, word], function(r) {

-									ed.setProgressState(0);

-								});

+								// tell the server if we need to

+								if (ignoreRpc) {

+									ed.setProgressState(1);

+									t._sendRPC('ignoreWord', [t.selectedLang, word], function(r) {

+										ed.setProgressState(0);

+									});

+								}

 							}

-						}

-					});

+						});

 

-					m.add({

-						title : 'spellchecker.ignore_words',

-						onclick : function() {

-							var word = wordSpan.innerHTML;

+						m.add({

+							title : 'spellchecker.ignore_words',

+							onclick : function() {

+								var word = wordSpan.innerHTML;

 

-							t._removeWords(dom.decode(word));

-							t._checkDone();

+								t._removeWords(dom.decode(word));

+								t._checkDone();

 

-							// tell the server if we need to

-							if (ignoreRpc) {

-								ed.setProgressState(1);

-								t._sendRPC('ignoreWords', [t.selectedLang, word], function(r) {

-									ed.setProgressState(0);

-								});

+								// tell the server if we need to

+								if (ignoreRpc) {

+									ed.setProgressState(1);

+									t._sendRPC('ignoreWords', [t.selectedLang, word], function(r) {

+										ed.setProgressState(0);

+									});

+								}

 							}

-						}

-					});

-

+						});

+					}

 

 					if (t.editor.getParam("spellchecker_enable_learn_rpc")) {

 						m.add({

@@ -358,6 +373,10 @@
 					m.update();

 				});

 

+				p1 = DOM.getPos(ed.getContentAreaContainer());

+				m.settings.offset_x = p1.x;

+				m.settings.offset_y = p1.y;

+

 				ed.selection.select(wordSpan);

 				p1 = dom.getPos(wordSpan);

 				m.showMenu(p1.x, p1.y + wordSpan.offsetHeight - vp.y);

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/spellchecker/img/wline.gif b/library/tinymce/jscripts/tiny_mce/plugins/spellchecker/img/wline.gif
index 7d0a4dbca..7d0a4dbca 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/spellchecker/img/wline.gif
+++ b/library/tinymce/jscripts/tiny_mce/plugins/spellchecker/img/wline.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/style/css/props.css b/library/tinymce/jscripts/tiny_mce/plugins/style/css/props.css
index eb1f26496..3b8f0ee77 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/style/css/props.css
+++ b/library/tinymce/jscripts/tiny_mce/plugins/style/css/props.css
@@ -5,6 +5,7 @@ select, #block_text_indent, #box_width, #box_height, #box_padding_top, #box_padd
 #box_margin_top, #box_margin_right, #box_margin_bottom, #box_margin_left, #positioning_width, #positioning_height, #positioning_zindex {width:70px;}

 #positioning_placement_top, #positioning_placement_right, #positioning_placement_bottom, #positioning_placement_left {width:70px;}

 #positioning_clip_top, #positioning_clip_right, #positioning_clip_bottom, #positioning_clip_left {width:70px;}

+.panel_toggle_insert_span {padding-top:10px;}

 .panel_wrapper div.current {padding-top:10px;height:230px;}

 .delim {border-left:1px solid gray;}

 .tdelim {border-bottom:1px solid gray;}

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js
index cab2153c4..dda9f928b 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.StylePlugin",{init:function(a,b){a.addCommand("mceStyleProps",function(){a.windowManager.open({file:b+"/props.htm",width:480+parseInt(a.getLang("style.delta_width",0)),height:320+parseInt(a.getLang("style.delta_height",0)),inline:1},{plugin_url:b,style_text:a.selection.getNode().style.cssText})});a.addCommand("mceSetElementStyle",function(d,c){if(e=a.selection.getNode()){a.dom.setAttrib(e,"style",c);a.execCommand("mceRepaint")}});a.onNodeChange.add(function(d,c,f){c.setDisabled("styleprops",f.nodeName==="BODY")});a.addButton("styleprops",{title:"style.desc",cmd:"mceStyleProps"})},getInfo:function(){return{longname:"Style",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("style",tinymce.plugins.StylePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.StylePlugin",{init:function(a,b){a.addCommand("mceStyleProps",function(){var c=false;var f=a.selection.getSelectedBlocks();var d=[];if(f.length===1){d.push(a.selection.getNode().style.cssText)}else{tinymce.each(f,function(g){d.push(a.dom.getAttrib(g,"style"))});c=true}a.windowManager.open({file:b+"/props.htm",width:480+parseInt(a.getLang("style.delta_width",0)),height:340+parseInt(a.getLang("style.delta_height",0)),inline:1},{applyStyleToBlocks:c,plugin_url:b,styles:d})});a.addCommand("mceSetElementStyle",function(d,c){if(e=a.selection.getNode()){a.dom.setAttrib(e,"style",c);a.execCommand("mceRepaint")}});a.onNodeChange.add(function(d,c,f){c.setDisabled("styleprops",f.nodeName==="BODY")});a.addButton("styleprops",{title:"style.desc",cmd:"mceStyleProps"})},getInfo:function(){return{longname:"Style",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("style",tinymce.plugins.StylePlugin)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
index 5f7755f18..eaa7c7713 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
@@ -13,14 +13,30 @@
 		init : function(ed, url) {

 			// Register commands

 			ed.addCommand('mceStyleProps', function() {

+

+				var applyStyleToBlocks = false;

+				var blocks = ed.selection.getSelectedBlocks();

+				var styles = [];

+

+				if (blocks.length === 1) {

+					styles.push(ed.selection.getNode().style.cssText);

+				}

+				else {

+					tinymce.each(blocks, function(block) {

+						styles.push(ed.dom.getAttrib(block, 'style'));

+					});

+					applyStyleToBlocks = true;

+				}

+

 				ed.windowManager.open({

 					file : url + '/props.htm',

 					width : 480 + parseInt(ed.getLang('style.delta_width', 0)),

-					height : 320 + parseInt(ed.getLang('style.delta_height', 0)),

+					height : 340 + parseInt(ed.getLang('style.delta_height', 0)),

 					inline : 1

 				}, {

+					applyStyleToBlocks : applyStyleToBlocks,

 					plugin_url : url,

-					style_text : ed.selection.getNode().style.cssText

+					styles : styles

 				});

 			});

 

@@ -52,4 +68,4 @@
 

 	// Register plugin

 	tinymce.PluginManager.add('style', tinymce.plugins.StylePlugin);

-})();
\ No newline at end of file
+})();

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/style/js/props.js b/library/tinymce/jscripts/tiny_mce/plugins/style/js/props.js
index a8dd93dec..0a8a8ec3e 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/style/js/props.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/style/js/props.js
@@ -27,10 +27,41 @@ var defaultBorderStyle = "none;solid;dashed;dotted;double;groove;ridge;inset;out
 var defaultBorderWidth = "thin;medium;thick";

 var defaultListType = "disc;circle;square;decimal;lower-roman;upper-roman;lower-alpha;upper-alpha;none";

 

-function init() {

+function aggregateStyles(allStyles) {

+	var mergedStyles = {};

+

+	tinymce.each(allStyles, function(style) {

+		if (style !== '') {

+			var parsedStyles = tinyMCEPopup.editor.dom.parseStyle(style);

+			for (var name in parsedStyles) {

+				if (parsedStyles.hasOwnProperty(name)) {

+					if (mergedStyles[name] === undefined) {

+						mergedStyles[name] = parsedStyles[name];

+					}

+					else if (name === 'text-decoration') {

+						if (mergedStyles[name].indexOf(parsedStyles[name]) === -1) {

+							mergedStyles[name] = mergedStyles[name] +' '+ parsedStyles[name];

+						}

+					}

+				}

+			}

+		}

+	});

+

+  return mergedStyles;

+}

+

+var applyActionIsInsert;

+var existingStyles;

+

+function init(ed) {

 	var ce = document.getElementById('container'), h;

 

-	ce.style.cssText = tinyMCEPopup.getWindowArg('style_text');

+	existingStyles = aggregateStyles(tinyMCEPopup.getWindowArg('styles'));

+	ce.style.cssText = tinyMCEPopup.editor.dom.serializeStyle(existingStyles);

+

+	applyActionIsInsert = ed.getParam("edit_css_style_insert_span", false);

+	document.getElementById('toggle_insert_span').checked = applyActionIsInsert;

 

 	h = getBrowserHTML('background_image_browser','background_image','image','advimage');

 	document.getElementById("background_image_browser").innerHTML = h;

@@ -144,6 +175,8 @@ function setupFormData() {
 	f.text_overline.checked = inStr(ce.style.textDecoration, 'overline');

 	f.text_linethrough.checked = inStr(ce.style.textDecoration, 'line-through');

 	f.text_blink.checked = inStr(ce.style.textDecoration, 'blink');

+	f.text_none.checked = inStr(ce.style.textDecoration, 'none');

+	updateTextDecorations();

 

 	// Setup background fields

 

@@ -177,11 +210,7 @@ function setupFormData() {
 

 	f.box_height.value = getNum(ce.style.height);

 	selectByValue(f, 'box_height_measurement', getMeasurement(ce.style.height));

-

-	if (tinymce.isGecko)

-		selectByValue(f, 'box_float', ce.style.cssFloat, true, true);

-	else

-		selectByValue(f, 'box_float', ce.style.styleFloat, true, true);

+	selectByValue(f, 'box_float', ce.style.cssFloat || ce.style.styleFloat, true, true);

 

 	selectByValue(f, 'box_clear', ce.style.clear, true, true);

 

@@ -370,13 +399,41 @@ function hasEqualValues(a) {
 	return true;

 }

 

+function toggleApplyAction() {

+	applyActionIsInsert = ! applyActionIsInsert;

+}

+

 function applyAction() {

 	var ce = document.getElementById('container'), ed = tinyMCEPopup.editor;

 

 	generateCSS();

 

 	tinyMCEPopup.restoreSelection();

-	ed.dom.setAttrib(ed.selection.getNode(), 'style', tinyMCEPopup.editor.dom.serializeStyle(tinyMCEPopup.editor.dom.parseStyle(ce.style.cssText)));

+

+	var newStyles = tinyMCEPopup.editor.dom.parseStyle(ce.style.cssText);

+

+	if (applyActionIsInsert) {

+		ed.formatter.register('plugin_style', {

+			inline: 'span', styles: existingStyles

+		});

+		ed.formatter.remove('plugin_style');

+

+		ed.formatter.register('plugin_style', {

+			inline: 'span', styles: newStyles

+		});

+		ed.formatter.apply('plugin_style');

+	} else {

+		var nodes;

+

+		if (tinyMCEPopup.getWindowArg('applyStyleToBlocks')) {

+			nodes = ed.selection.getSelectedBlocks();

+		}

+		else {

+			nodes = ed.selection.getNode();

+		}

+

+		ed.dom.setAttrib(nodes, 'style', tinyMCEPopup.editor.dom.serializeStyle(newStyles));

+	}

 }

 

 function updateAction() {

@@ -440,9 +497,7 @@ function generateCSS() {
 	ce.style.width = f.box_width.value + (isNum(f.box_width.value) ? f.box_width_measurement.value : "");

 	ce.style.height = f.box_height.value + (isNum(f.box_height.value) ? f.box_height_measurement.value : "");

 	ce.style.styleFloat = f.box_float.value;

-

-	if (tinymce.isGecko)

-		ce.style.cssFloat = f.box_float.value;

+	ce.style.cssFloat = f.box_float.value;

 

 	ce.style.clear = f.box_clear.value;

 

@@ -638,4 +693,17 @@ function synch(fr, to) {
 		selectByValue(f, to + "_measurement", f.elements[fr + "_measurement"].value);

 }

 

+function updateTextDecorations(){

+	var el = document.forms[0].elements;

+

+	var textDecorations = ["text_underline", "text_overline", "text_linethrough", "text_blink"];

+	var noneChecked = el["text_none"].checked;

+	tinymce.each(textDecorations, function(id) {

+		el[id].disabled = noneChecked;

+		if (noneChecked) {

+			el[id].checked = false;

+		}

+	});

+}

+

 tinyMCEPopup.onInit.add(init);

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js
index 5026313e2..35881b3ac 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js
@@ -1,63 +1 @@
-tinyMCE.addI18n('en.style_dlg',{

-title:"Edit CSS Style",

-apply:"Apply",

-text_tab:"Text",

-background_tab:"Background",

-block_tab:"Block",

-box_tab:"Box",

-border_tab:"Border",

-list_tab:"List",

-positioning_tab:"Positioning",

-text_props:"Text",

-text_font:"Font",

-text_size:"Size",

-text_weight:"Weight",

-text_style:"Style",

-text_variant:"Variant",

-text_lineheight:"Line height",

-text_case:"Case",

-text_color:"Color",

-text_decoration:"Decoration",

-text_overline:"overline",

-text_underline:"underline",

-text_striketrough:"strikethrough",

-text_blink:"blink",

-text_none:"none",

-background_color:"Background color",

-background_image:"Background image",

-background_repeat:"Repeat",

-background_attachment:"Attachment",

-background_hpos:"Horizontal position",

-background_vpos:"Vertical position",

-block_wordspacing:"Word spacing",

-block_letterspacing:"Letter spacing",

-block_vertical_alignment:"Vertical alignment",

-block_text_align:"Text align",

-block_text_indent:"Text indent",

-block_whitespace:"Whitespace",

-block_display:"Display",

-box_width:"Width",

-box_height:"Height",

-box_float:"Float",

-box_clear:"Clear",

-padding:"Padding",

-same:"Same for all",

-top:"Top",

-right:"Right",

-bottom:"Bottom",

-left:"Left",

-margin:"Margin",

-style:"Style",

-width:"Width",

-height:"Height",

-color:"Color",

-list_type:"Type",

-bullet_image:"Bullet image",

-position:"Position",

-positioning_type:"Type",

-visibility:"Visibility",

-zindex:"Z-index",

-overflow:"Overflow",

-placement:"Placement",

-clip:"Clip"

-});
\ No newline at end of file
+tinyMCE.addI18n('en.style_dlg',{"text_lineheight":"Line Height","text_variant":"Variant","text_style":"Style","text_weight":"Weight","text_size":"Size","text_font":"Font","text_props":"Text","positioning_tab":"Positioning","list_tab":"List","border_tab":"Border","box_tab":"Box","block_tab":"Block","background_tab":"Background","text_tab":"Text",apply:"Apply",toggle_insert_span:"Insert span at selection",title:"Edit CSS Style",clip:"Clip",placement:"Placement",overflow:"Overflow",zindex:"Z-index",visibility:"Visibility","positioning_type":"Type",position:"Position","bullet_image":"Bullet Image","list_type":"Type",color:"Color",height:"Height",width:"Width",style:"Style",margin:"Margin",left:"Left",bottom:"Bottom",right:"Right",top:"Top",same:"Same for All",padding:"Padding","box_clear":"Clear","box_float":"Float","box_height":"Height","box_width":"Width","block_display":"Display","block_whitespace":"Whitespace","block_text_indent":"Text Indent","block_text_align":"Text Align","block_vertical_alignment":"Vertical Alignment","block_letterspacing":"Letter Spacing","block_wordspacing":"Word Spacing","background_vpos":"Vertical Position","background_hpos":"Horizontal Position","background_attachment":"Attachment","background_repeat":"Repeat","background_image":"Background Image","background_color":"Background Color","text_none":"None","text_blink":"Blink","text_case":"Case","text_striketrough":"Strikethrough","text_underline":"Underline","text_overline":"Overline","text_decoration":"Decoration","text_color":"Color",text:"Text",background:"Background",block:"Block",box:"Box",border:"Border",list:"List"});
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/style/props.htm b/library/tinymce/jscripts/tiny_mce/plugins/style/props.htm
index 549ed0408..7dc087a30 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/style/props.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/style/props.htm
@@ -10,277 +10,319 @@
 	<link href="css/props.css" rel="stylesheet" type="text/css" />
 </head>
 
-<body id="styleprops" style="display: none">
+<body id="styleprops" style="display: none" role="application" aria-labelledby="app_title">
+<span id="app_title" style="display:none">{#style_dlg.title}</span>
 <form onsubmit="updateAction();return false;" action="#">
 <div class="tabs">
 	<ul>
-		<li id="text_tab" class="current"><span><a href="javascript:mcTabs.displayTab('text_tab','text_panel');" onMouseDown="return false;">{#style_dlg.text_tab}</a></span></li>
-		<li id="background_tab"><span><a href="javascript:mcTabs.displayTab('background_tab','background_panel');" onMouseDown="return false;">{#style_dlg.background_tab}</a></span></li>
-		<li id="block_tab"><span><a href="javascript:mcTabs.displayTab('block_tab','block_panel');" onMouseDown="return false;">{#style_dlg.block_tab}</a></span></li>
-		<li id="box_tab"><span><a href="javascript:mcTabs.displayTab('box_tab','box_panel');" onMouseDown="return false;">{#style_dlg.box_tab}</a></span></li>
-		<li id="border_tab"><span><a href="javascript:mcTabs.displayTab('border_tab','border_panel');" onMouseDown="return false;">{#style_dlg.border_tab}</a></span></li>
-		<li id="list_tab"><span><a href="javascript:mcTabs.displayTab('list_tab','list_panel');" onMouseDown="return false;">{#style_dlg.list_tab}</a></span></li>
-		<li id="positioning_tab"><span><a href="javascript:mcTabs.displayTab('positioning_tab','positioning_panel');" onMouseDown="return false;">{#style_dlg.positioning_tab}</a></span></li>
+		<li id="text_tab" class="current" aria-controls="text_panel"><span><a href="javascript:mcTabs.displayTab('text_tab','text_panel');" onMouseDown="return false;">{#style_dlg.text_tab}</a></span></li>
+		<li id="background_tab" aria-controls="background_panel"><span><a href="javascript:mcTabs.displayTab('background_tab','background_panel');" onMouseDown="return false;">{#style_dlg.background_tab}</a></span></li>
+		<li id="block_tab" aria-controls="block_panel"><span><a href="javascript:mcTabs.displayTab('block_tab','block_panel');" onMouseDown="return false;">{#style_dlg.block_tab}</a></span></li>
+		<li id="box_tab" aria-controls="box_panel"><span><a href="javascript:mcTabs.displayTab('box_tab','box_panel');" onMouseDown="return false;">{#style_dlg.box_tab}</a></span></li>
+		<li id="border_tab" aria-controls="border_panel"><span><a href="javascript:mcTabs.displayTab('border_tab','border_panel');" onMouseDown="return false;">{#style_dlg.border_tab}</a></span></li>
+		<li id="list_tab" aria-controls="list_panel"><span><a href="javascript:mcTabs.displayTab('list_tab','list_panel');" onMouseDown="return false;">{#style_dlg.list_tab}</a></span></li>
+		<li id="positioning_tab" aria-controls="positioning_panel"><span><a href="javascript:mcTabs.displayTab('positioning_tab','positioning_panel');" onMouseDown="return false;">{#style_dlg.positioning_tab}</a></span></li>
 	</ul>
 </div>
 
 <div class="panel_wrapper">
 <div id="text_panel" class="panel current">
-	<table border="0" width="100%">
-		<tr>
-			<td><label for="text_font">{#style_dlg.text_font}</label></td>
-			<td colspan="3">
-				<select id="text_font" name="text_font" class="mceEditableSelect mceFocus"></select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="text_size">{#style_dlg.text_size}</label></td>
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td><select id="text_size" name="text_size" class="mceEditableSelect"></select></td>
-						<td>&nbsp;</td>
-						<td><select id="text_size_measurement" name="text_size_measurement"></select></td>
-					</tr>
-				</table>
-			</td>
-			<td><label for="text_weight">{#style_dlg.text_weight}</label></td>
-			<td>
-				<select id="text_weight" name="text_weight"></select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="text_style">{#style_dlg.text_style}</label></td>
-			<td>
-				<select id="text_style" name="text_style" class="mceEditableSelect"></select>
-			</td>
-			<td><label for="text_variant">{#style_dlg.text_variant}</label></td>
-			<td>
-				<select id="text_variant" name="text_variant"></select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="text_lineheight">{#style_dlg.text_lineheight}</label></td>
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td>
-							<select id="text_lineheight" name="text_lineheight" class="mceEditableSelect"></select>
-						</td>
-						<td>&nbsp;</td>
-						<td><select id="text_lineheight_measurement" name="text_lineheight_measurement"></select></td>
-					</tr>
-				</table>
-			</td>
-			<td><label for="text_case">{#style_dlg.text_case}</label></td>
-			<td>
-				<select id="text_case" name="text_case"></select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="text_color">{#style_dlg.text_color}</label></td>
-			<td colspan="2">
-				<table border="0" cellpadding="0" cellspacing="0">
-					<tr>
-						<td><input id="text_color" name="text_color" type="text" value="" size="9" onChange="updateColor('text_color_pick','text_color');" /></td>
-						<td id="text_color_pickcontainer">&nbsp;</td>
-					</tr>
-				</table>
-			</td>
-		</tr>
-		<tr>
-			<td valign="top" style="vertical-align: top; padding-top: 3px;">{#style_dlg.text_decoration}</td>
-			<td colspan="2">
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td><input id="text_underline" name="text_underline" class="checkbox" type="checkbox" /></td>
-						<td><label for="text_underline">{#style_dlg.text_underline}</label></td>
-					</tr>
-					<tr>
-						<td><input id="text_overline" name="text_overline" class="checkbox" type="checkbox" /></td>
-						<td><label for="text_overline">{#style_dlg.text_overline}</label></td>
-					</tr>
-					<tr>
-						<td><input id="text_linethrough" name="text_linethrough" class="checkbox" type="checkbox" /></td>
-						<td><label for="text_linethrough">{#style_dlg.text_striketrough}</label></td>
-					</tr>
-					<tr>
-						<td><input id="text_blink" name="text_blink" class="checkbox" type="checkbox" /></td>
-						<td><label for="text_blink">{#style_dlg.text_blink}</label></td>
-					</tr>
-					<tr>
-						<td><input id="text_none" name="text_none" class="checkbox" type="checkbox" /></td>
-						<td><label for="text_none">{#style_dlg.text_none}</label></td>
-					</tr>
-				</table>
-			</td>
-		</tr>
-	</table>
+	<fieldset>
+		<legend>{#style_dlg.text}</legend>
+		<table role="presentation" border="0" width="100%">
+			<tr>
+				<td><label for="text_font">{#style_dlg.text_font}</label></td>
+				<td colspan="3">
+					<select id="text_font" name="text_font" class="mceEditableSelect mceFocus"></select>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="text_size">{#style_dlg.text_size}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="text_size" name="text_size" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="text_size_measurement_label" for="text_size_measurement" style="display: none; visibility: hidden;">Text Size Measurement Unit</label>
+								<select id="text_size_measurement" name="text_size_measurement" aria-labelledby="text_size_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td><label for="text_weight">{#style_dlg.text_weight}</label></td>
+				<td>
+					<select id="text_weight" name="text_weight"></select>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="text_style">{#style_dlg.text_style}</label></td>
+				<td>
+					<select id="text_style" name="text_style" class="mceEditableSelect"></select>
+				</td>
+				<td><label for="text_variant">{#style_dlg.text_variant}</label></td>
+				<td>
+					<select id="text_variant" name="text_variant"></select>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="text_lineheight">{#style_dlg.text_lineheight}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td>
+								<select id="text_lineheight" name="text_lineheight" class="mceEditableSelect"></select>
+							</td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="text_lineheight_measurement_label" for="text_lineheight_measurement" style="display: none; visibility: hidden;">Line Height Measurement Unit</label>
+								<select id="text_lineheight_measurement" name="text_lineheight_measurement" aria-labelledby="text_lineheight_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td><label for="text_case">{#style_dlg.text_case}</label></td>
+				<td>
+					<select id="text_case" name="text_case"></select>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="text_color">{#style_dlg.text_color}</label></td>
+				<td colspan="2">
+					<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+						<tr>
+							<td><input id="text_color" name="text_color" type="text" value="" size="9" onChange="updateColor('text_color_pick','text_color');" /></td>
+							<td id="text_color_pickcontainer">&nbsp;</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td valign="top" style="vertical-align: top; padding-top: 3px;">{#style_dlg.text_decoration}</td>
+				<td colspan="2">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input id="text_underline" name="text_underline" class="checkbox" type="checkbox" /></td>
+							<td><label for="text_underline">{#style_dlg.text_underline}</label></td>
+						</tr>
+						<tr>
+							<td><input id="text_overline" name="text_overline" class="checkbox" type="checkbox" /></td>
+							<td><label for="text_overline">{#style_dlg.text_overline}</label></td>
+						</tr>
+						<tr>
+							<td><input id="text_linethrough" name="text_linethrough" class="checkbox" type="checkbox" /></td>
+							<td><label for="text_linethrough">{#style_dlg.text_striketrough}</label></td>
+						</tr>
+						<tr>
+							<td><input id="text_blink" name="text_blink" class="checkbox" type="checkbox" /></td>
+							<td><label for="text_blink">{#style_dlg.text_blink}</label></td>
+						</tr>
+						<tr>
+							<td><input id="text_none" name="text_none" class="checkbox" type="checkbox" onclick="updateTextDecorations();"/></td>
+							<td><label for="text_none">{#style_dlg.text_none}</label></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
 </div>
 
 <div id="background_panel" class="panel">
-	<table border="0">
-		<tr>
-			<td><label for="background_color">{#style_dlg.background_color}</label></td>
-			<td>
-				<table border="0" cellpadding="0" cellspacing="0">
-					<tr>
-						<td><input id="background_color" name="background_color" type="text" value="" size="9" onChange="updateColor('background_color_pick','background_color');" /></td>
-						<td id="background_color_pickcontainer">&nbsp;</td>
+	<fieldset>
+		<legend>{#style_dlg.background}</legend>
+		<table role="presentation" border="0">
+			<tr>
+				<td><label for="background_color">{#style_dlg.background_color}</label></td>
+				<td>
+					<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+						<tr>
+							<td><input id="background_color" name="background_color" type="text" value="" size="9" onChange="updateColor('background_color_pick','background_color');" /></td>
+							<td id="background_color_pickcontainer">&nbsp;</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+
+			<tr>
+				<td><label for="background_image">{#style_dlg.background_image}</label></td>
+				<td><table role="presentation" border="0" cellspacing="0" cellpadding="0">
+					<tr> 
+						<td><input id="background_image" name="background_image" type="text" /></td> 
+						<td id="background_image_browser">&nbsp;</td>
 					</tr>
-				</table>
-			</td>
-		</tr>
+					</table>
+				</td>
+			</tr>
 
-		<tr>
-			<td><label for="background_image">{#style_dlg.background_image}</label></td>
-			<td><table border="0" cellspacing="0" cellpadding="0">
-				<tr> 
-				  <td><input id="background_image" name="background_image" type="text" /></td> 
-				  <td id="background_image_browser">&nbsp;</td>
-				</tr>
-				</table>
-			</td>
-		</tr>
+			<tr>
+				<td><label for="background_repeat">{#style_dlg.background_repeat}</label></td>
+				<td><select id="background_repeat" name="background_repeat" class="mceEditableSelect"></select></td>
+			</tr>
 
-		<tr>
-			<td><label for="background_repeat">{#style_dlg.background_repeat}</label></td>
-			<td><select id="background_repeat" name="background_repeat" class="mceEditableSelect"></select></td>
-		</tr>
+			<tr>
+				<td><label for="background_attachment">{#style_dlg.background_attachment}</label></td>
+				<td><select id="background_attachment" name="background_attachment" class="mceEditableSelect"></select></td>
+			</tr>
 
-		<tr>
-			<td><label for="background_attachment">{#style_dlg.background_attachment}</label></td>
-			<td><select id="background_attachment" name="background_attachment" class="mceEditableSelect"></select></td>
-		</tr>
+			<tr>
+				<td><label for="background_hpos">{#style_dlg.background_hpos}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="background_hpos" name="background_hpos" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="background_hpos_measurement_label" for="background_hpos_measurement" style="display: none; visibility: hidden;">Horizontal position measurement unit</label>
+								<select id="background_hpos_measurement" name="background_hpos_measurement" aria-labelledby="background_hpos_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
 
-		<tr>
-			<td><label for="background_hpos">{#style_dlg.background_hpos}</label></td>
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td><select id="background_hpos" name="background_hpos" class="mceEditableSelect"></select></td>
-						<td>&nbsp;</td>
-						<td><select id="background_hpos_measurement" name="background_hpos_measurement"></select></td>
-					</tr>
-				</table>
-			</td>
-		</tr>
+			<tr>
+				<td><label for="background_vpos">{#style_dlg.background_vpos}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="background_vpos" name="background_vpos" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
 
-		<tr>
-			<td><label for="background_vpos">{#style_dlg.background_vpos}</label></td>
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td><select id="background_vpos" name="background_vpos" class="mceEditableSelect"></select></td>
-						<td>&nbsp;</td>
-						<td><select id="background_vpos_measurement" name="background_vpos_measurement"></select></td>
-					</tr>
-				</table>
-			</td>
-		</tr>
-	</table>
+								<label id="background_vpos_measurement_label" for="background_vpos_measurement" style="display: none; visibility: hidden;">Vertical position measurement unit</label>
+								<select id="background_vpos_measurement" name="background_vpos_measurement" aria-labelledby="background_vpos_measurement_label">></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
 </div>
 
 <div id="block_panel" class="panel">
-	<table border="0">
-		<tr>
-			<td><label for="block_wordspacing">{#style_dlg.block_wordspacing}</label></td>
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td><select id="block_wordspacing" name="block_wordspacing" class="mceEditableSelect"></select></td>
-						<td>&nbsp;</td>
-						<td><select id="block_wordspacing_measurement" name="block_wordspacing_measurement"></select></td>
-					</tr>
-				</table>
-			</td>
-		</tr>
+	<fieldset>
+		<legend>{#style_dlg.block}</legend>
+		<table role="presentation" border="0">
+			<tr>
+				<td><label for="block_wordspacing">{#style_dlg.block_wordspacing}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="block_wordspacing" name="block_wordspacing" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="block_wordspacing_measurement_label" for="block_wordspacing_measurement" style="display: none; visibility: hidden;">Word spacing measurement unit</label>
+								<select id="block_wordspacing_measurement" name="block_wordspacing_measurement" aria-labelledby="block_wordspacing_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
 
-		<tr>
-			<td><label for="block_letterspacing">{#style_dlg.block_letterspacing}</label></td>
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td><select id="block_letterspacing" name="block_letterspacing" class="mceEditableSelect"></select></td>
-						<td>&nbsp;</td>
-						<td><select id="block_letterspacing_measurement" name="block_letterspacing_measurement"></select></td>
-					</tr>
-				</table>
-			</td>
-		</tr>
+			<tr>
+				<td><label for="block_letterspacing">{#style_dlg.block_letterspacing}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="block_letterspacing" name="block_letterspacing" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="block_letterspacing_measurement_label" for="block_letterspacing_measurement" style="display: none; visibility: hidden;">Letter spacing measurement unit</label>
+								<select id="block_letterspacing_measurement" name="block_letterspacing_measurement" aria-labelledby="block_letterspacing_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
 
-		<tr>
-			<td><label for="block_vertical_alignment">{#style_dlg.block_vertical_alignment}</label></td>
-			<td><select id="block_vertical_alignment" name="block_vertical_alignment" class="mceEditableSelect"></select></td>
-		</tr>
+			<tr>
+				<td><label for="block_vertical_alignment">{#style_dlg.block_vertical_alignment}</label></td>
+				<td><select id="block_vertical_alignment" name="block_vertical_alignment" class="mceEditableSelect"></select></td>
+			</tr>
 
-		<tr>
-			<td><label for="block_text_align">{#style_dlg.block_text_align}</label></td>
-			<td><select id="block_text_align" name="block_text_align" class="mceEditableSelect"></select></td>
-		</tr>
+			<tr>
+				<td><label for="block_text_align">{#style_dlg.block_text_align}</label></td>
+				<td><select id="block_text_align" name="block_text_align" class="mceEditableSelect"></select></td>
+			</tr>
 
-		<tr>
-			<td><label for="block_text_indent">{#style_dlg.block_text_indent}</label></td>
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td><input type="text" id="block_text_indent" name="block_text_indent" /></td>
-						<td>&nbsp;</td>
-						<td><select id="block_text_indent_measurement" name="block_text_indent_measurement"></select></td>
-					</tr>
-				</table>
-			</td>
-		</tr>
+			<tr>
+				<td><label for="block_text_indent">{#style_dlg.block_text_indent}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="block_text_indent" name="block_text_indent" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="block_text_indent_measurement_label" for="block_text_indent_measurement" style="display: none; visibility: hidden;">Text Indent Measurement Unit</label>
 
-		<tr>
-			<td><label for="block_whitespace">{#style_dlg.block_whitespace}</label></td>
-			<td><select id="block_whitespace" name="block_whitespace" class="mceEditableSelect"></select></td>
-		</tr>
+								<select id="block_text_indent_measurement" name="block_text_indent_measurement" aria-labelledby="block_text_indent_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
 
-		<tr>
-			<td><label for="block_display">{#style_dlg.block_display}</label></td>
-			<td><select id="block_display" name="block_display" class="mceEditableSelect"></select></td>
-		</tr>
-	</table>
+			<tr>
+				<td><label for="block_whitespace">{#style_dlg.block_whitespace}</label></td>
+				<td><select id="block_whitespace" name="block_whitespace" class="mceEditableSelect"></select></td>
+			</tr>
+
+			<tr>
+				<td><label for="block_display">{#style_dlg.block_display}</label></td>
+				<td><select id="block_display" name="block_display" class="mceEditableSelect"></select></td>
+			</tr>
+		</table>
+	</fieldset>
 </div>
 
 <div id="box_panel" class="panel">
-<table border="0">
-	<tr>
-		<td><label for="box_width">{#style_dlg.box_width}</label></td>
-		<td>
-			<table border="0" cellspacing="0" cellpadding="0">
-				<tr>
-					<td><input type="text" id="box_width" name="box_width" class="mceEditableSelect" onChange="synch('box_width','positioning_width');" /></td>
-					<td>&nbsp;</td>
-					<td><select id="box_width_measurement" name="box_width_measurement"></select></td>
-				</tr>
-			</table>
-		</td>
-		<td>&nbsp;&nbsp;&nbsp;<label for="box_float">{#style_dlg.box_float}</label></td>
-		<td><select id="box_float" name="box_float" class="mceEditableSelect"></select></td>
-	</tr>
+	<fieldset>
+		<legend>{#style_dlg.box}</legend>
+		<table role="presentation" border="0">
+			<tr>
+				<td><label for="box_width">{#style_dlg.box_width}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_width" name="box_width" class="mceEditableSelect" onChange="synch('box_width','positioning_width');" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_width_measurement_label" for="box_width_measurement" style="display: none; visibility: hidden;">Box Width Measurement Unit</label>
+								<select id="box_width_measurement" name="box_width_measurement" aria-labelledby="box_width_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td>&nbsp;&nbsp;&nbsp;<label for="box_float">{#style_dlg.box_float}</label></td>
+				<td><select id="box_float" name="box_float" class="mceEditableSelect"></select></td>
+			</tr>
+
+			<tr>
+				<td><label for="box_height">{#style_dlg.box_height}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_height" name="box_height" class="mceEditableSelect" onChange="synch('box_height','positioning_height');" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_height_measurement_label" for="box_height_measurement" style="display: none; visibility: hidden;">Box Height Measurement Unit</label>
+								<select id="box_height_measurement" name="box_height_measurement" aria-labelledby="box_height_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td>&nbsp;&nbsp;&nbsp;<label for="box_clear">{#style_dlg.box_clear}</label></td>
+				<td><select id="box_clear" name="box_clear" class="mceEditableSelect"></select></td>
+			</tr>
+		</table>
+	</fieldset>
 
-	<tr>
-		<td><label for="box_height">{#style_dlg.box_height}</label></td>
-		<td>
-			<table border="0" cellspacing="0" cellpadding="0">
-				<tr>
-					<td><input type="text" id="box_height" name="box_height" class="mceEditableSelect" onChange="synch('box_height','positioning_height');" /></td>
-					<td>&nbsp;</td>
-					<td><select id="box_height_measurement" name="box_height_measurement"></select></td>
-				</tr>
-			</table>
-		</td>
-		<td>&nbsp;&nbsp;&nbsp;<label for="box_clear">{#style_dlg.box_clear}</label></td>
-		<td><select id="box_clear" name="box_clear" class="mceEditableSelect"></select></td>
-	</tr>
-</table>
 <div style="float: left; width: 49%">
 	<fieldset>
 		<legend>{#style_dlg.padding}</legend>
 
-		<table border="0">
+		<table role="presentation" border="0">
 			<tr>
 				<td>&nbsp;</td>
 				<td><input type="checkbox" id="box_padding_same" name="box_padding_same" class="checkbox" checked="checked" onClick="toggleSame(this,'box_padding');" /> <label for="box_padding_same">{#style_dlg.same}</label></td>
@@ -288,11 +330,14 @@
 			<tr>
 				<td><label for="box_padding_top">{#style_dlg.top}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="box_padding_top" name="box_padding_top" class="mceEditableSelect" /></td>
 							<td>&nbsp;</td>
-							<td><select id="box_padding_top_measurement" name="box_padding_top_measurement"></select></td>
+							<td>
+								<label id="box_padding_top_measurement_label" for="box_padding_top_measurement" style="display: none; visibility: hidden;">Padding Top Measurement Unit</label>
+								<select id="box_padding_top_measurement" name="box_padding_top_measurement" aria-labelledby="box_padding_top_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -300,11 +345,14 @@
 			<tr>
 				<td><label for="box_padding_right">{#style_dlg.right}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="box_padding_right" name="box_padding_right" class="mceEditableSelect" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="box_padding_right_measurement" name="box_padding_right_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="box_padding_right_measurement_label" for="box_padding_right_measurement" style="display: none; visibility: hidden;">Padding Right Measurement Unit</label>
+								<select id="box_padding_right_measurement" name="box_padding_right_measurement" disabled="disabled" aria-labelledby="box_padding_right_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -312,11 +360,14 @@
 			<tr>
 				<td><label for="box_padding_bottom">{#style_dlg.bottom}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="box_padding_bottom" name="box_padding_bottom" class="mceEditableSelect" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="box_padding_bottom_measurement" name="box_padding_bottom_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="box_padding_bottom_measurement_label" for="box_padding_bottom_measurement" style="display: none; visibility: hidden;">Padding Bottom Measurement Unit</label>
+								<select id="box_padding_bottom_measurement" name="box_padding_bottom_measurement" disabled="disabled" aria-labelledby="box_padding_bottom_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -324,11 +375,14 @@
 			<tr>
 				<td><label for="box_padding_left">{#style_dlg.left}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="box_padding_left" name="box_padding_left" class="mceEditableSelect" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="box_padding_left_measurement" name="box_padding_left_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="box_padding_left_measurement_label" for="box_padding_left_measurement" style="display: none; visibility: hidden;">Padding Left Measurement Unit</label>
+								<select id="box_padding_left_measurement" name="box_padding_left_measurement" disabled="disabled" aria-labelledby="box_padding_left_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -341,7 +395,7 @@
 	<fieldset>
 		<legend>{#style_dlg.margin}</legend>
 
-		<table border="0">
+		<table role="presentation" border="0">
 			<tr>
 				<td>&nbsp;</td>
 				<td><input type="checkbox" id="box_margin_same" name="box_margin_same" class="checkbox" checked="checked" onClick="toggleSame(this,'box_margin');" /> <label for="box_margin_same">{#style_dlg.same}</label></td>
@@ -349,11 +403,14 @@
 			<tr>
 				<td><label for="box_margin_top">{#style_dlg.top}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="box_margin_top" name="box_margin_top" class="mceEditableSelect" /></td>
 							<td>&nbsp;</td>
-							<td><select id="box_margin_top_measurement" name="box_margin_top_measurement"></select></td>
+							<td>
+								<label id="box_margin_top_measurement_label" for="box_margin_top_measurement" style="display: none; visibility: hidden;">Margin Top Measurement Unit</label>
+								<select id="box_margin_top_measurement" name="box_margin_top_measurement" aria-labelledby="box_margin_top_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -361,11 +418,14 @@
 			<tr>
 				<td><label for="box_margin_right">{#style_dlg.right}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="box_margin_right" name="box_margin_right" class="mceEditableSelect" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="box_margin_right_measurement" name="box_margin_right_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="box_margin_right_measurement_label" for="box_margin_right_measurement" style="display: none; visibility: hidden;">Margin Right Measurement Unit</label>
+								<select id="box_margin_right_measurement" name="box_margin_right_measurement" disabled="disabled" aria-labelledby="box_margin_right_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -373,11 +433,14 @@
 			<tr>
 				<td><label for="box_margin_bottom">{#style_dlg.bottom}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="box_margin_bottom" name="box_margin_bottom" class="mceEditableSelect" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="box_margin_bottom_measurement" name="box_margin_bottom_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="box_margin_bottom_measurement_label" for="box_margin_bottom_measurement" style="display: none; visibility: hidden;">Margin Bottom Measurement Unit</label>
+								<select id="box_margin_bottom_measurement" name="box_margin_bottom_measurement" disabled="disabled" aria-labelledby="box_margin_bottom_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -385,11 +448,14 @@
 			<tr>
 				<td><label for="box_margin_left">{#style_dlg.left}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="box_margin_left" name="box_margin_left" class="mceEditableSelect" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="box_margin_left_measurement" name="box_margin_left_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="box_margin_left_measurement_label" for="box_margin_left_measurement" style="display: none; visibility: hidden;">Margin Left Measurement Unit</label>
+								<select id="box_margin_left_measurement" name="box_margin_left_measurement" disabled="disabled" aria-labelledby="box_margin_left_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -401,131 +467,148 @@
 </div>
 
 <div id="border_panel" class="panel">
-<table border="0" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-	<td class="tdelim">&nbsp;</td>
-	<td class="tdelim delim">&nbsp;</td>
-	<td class="tdelim">{#style_dlg.style}</td>
-	<td class="tdelim delim">&nbsp;</td>
-	<td class="tdelim">{#style_dlg.width}</td>
-	<td class="tdelim delim">&nbsp;</td>
-	<td class="tdelim">{#style_dlg.color}</td>
-</tr>
-
-<tr>
-	<td>&nbsp;</td>
-	<td class="delim">&nbsp;</td>
-	<td><input type="checkbox" id="border_style_same" name="border_style_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_style');" /> <label for="border_style_same">{#style_dlg.same}</label></td>
-	<td class="delim">&nbsp;</td>
-	<td><input type="checkbox" id="border_width_same" name="border_width_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_width');" /> <label for="border_width_same">{#style_dlg.same}</label></td>
-	<td class="delim">&nbsp;</td>
-	<td><input type="checkbox" id="border_color_same" name="border_color_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_color');" /> <label for="border_color_same">{#style_dlg.same}</label></td>
-</tr>
-
-<tr>
-	<td>{#style_dlg.top}</td>
-	<td class="delim">&nbsp;</td>
-	<td><select id="border_style_top" name="border_style_top" class="mceEditableSelect"></select></td>
-	<td class="delim">&nbsp;</td>
-	<td>
-		<table border="0" cellspacing="0" cellpadding="0">
-			<tr>
-				<td><select id="border_width_top" name="border_width_top" class="mceEditableSelect"></select></td>
-				<td>&nbsp;</td>
-				<td><select id="border_width_top_measurement" name="border_width_top_measurement"></select></td>
-			</tr>
-		</table>
-	</td>
-	<td class="delim">&nbsp;</td>
-	<td>
-		<table border="0" cellpadding="0" cellspacing="0">
-			<tr>
-				<td><input id="border_color_top" name="border_color_top" type="text" value="" size="9" onChange="updateColor('border_color_top_pick','border_color_top');" /></td>
-				<td id="border_color_top_pickcontainer">&nbsp;</td>
-			</tr>
-		</table>
-	</td>
-</tr>
-
-<tr>
-	<td>{#style_dlg.right}</td>
-	<td class="delim">&nbsp;</td>
-	<td><select id="border_style_right" name="border_style_right" class="mceEditableSelect" disabled="disabled"></select></td>
-	<td class="delim">&nbsp;</td>
-	<td>
-		<table border="0" cellspacing="0" cellpadding="0">
-			<tr>
-				<td><select id="border_width_right" name="border_width_right" class="mceEditableSelect" disabled="disabled"></select></td>
-				<td>&nbsp;</td>
-				<td><select id="border_width_right_measurement" name="border_width_right_measurement" disabled="disabled"></select></td>
-			</tr>
-		</table>
-	</td>
-	<td class="delim">&nbsp;</td>
-	<td>
-		<table border="0" cellpadding="0" cellspacing="0">
-			<tr>
-				<td><input id="border_color_right" name="border_color_right" type="text" value="" size="9" onChange="updateColor('border_color_right_pick','border_color_right');" disabled="disabled" /></td>
-				<td id="border_color_right_pickcontainer">&nbsp;</td>
-			</tr>
-		</table>
-	</td>
-</tr>
-
-<tr>
-	<td>{#style_dlg.bottom}</td>
-	<td class="delim">&nbsp;</td>
-	<td><select id="border_style_bottom" name="border_style_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
-	<td class="delim">&nbsp;</td>
-	<td>
-		<table border="0" cellspacing="0" cellpadding="0">
-			<tr>
-				<td><select id="border_width_bottom" name="border_width_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
-				<td>&nbsp;</td>
-				<td><select id="border_width_bottom_measurement" name="border_width_bottom_measurement" disabled="disabled"></select></td>
-			</tr>
-		</table>
-	</td>
-	<td class="delim">&nbsp;</td>
-	<td>
-		<table border="0" cellpadding="0" cellspacing="0">
-			<tr>
-				<td><input id="border_color_bottom" name="border_color_bottom" type="text" value="" size="9" onChange="updateColor('border_color_bottom_pick','border_color_bottom');" disabled="disabled" /></td>
-				<td id="border_color_bottom_pickcontainer">&nbsp;</td>
-			</tr>
-		</table>
-	</td>
-</tr>
-
-<tr>
-	<td>{#style_dlg.left}</td>
-	<td class="delim">&nbsp;</td>
-	<td><select id="border_style_left" name="border_style_left" class="mceEditableSelect" disabled="disabled"></select></td>
-	<td class="delim">&nbsp;</td>
-	<td>
-		<table border="0" cellspacing="0" cellpadding="0">
-			<tr>
-				<td><select id="border_width_left" name="border_width_left" class="mceEditableSelect" disabled="disabled"></select></td>
-				<td>&nbsp;</td>
-				<td><select id="border_width_left_measurement" name="border_width_left_measurement" disabled="disabled"></select></td>
-			</tr>
-		</table>
-	</td>
-	<td class="delim">&nbsp;</td>
-	<td>
-		<table border="0" cellpadding="0" cellspacing="0">
-			<tr>
-				<td><input id="border_color_left" name="border_color_left" type="text" value="" size="9" onChange="updateColor('border_color_left_pick','border_color_left');" disabled="disabled" /></td>
-				<td id="border_color_left_pickcontainer">&nbsp;</td>
-			</tr>
+	<fieldset>
+		<legend>{#style_dlg.border}</legend>	
+		<table role="presentation" border="0" cellspacing="0" cellpadding="0" width="100%">
+		<tr>
+			<td class="tdelim">&nbsp;</td>
+			<td class="tdelim delim">&nbsp;</td>
+			<td class="tdelim">{#style_dlg.style}</td>
+			<td class="tdelim delim">&nbsp;</td>
+			<td class="tdelim">{#style_dlg.width}</td>
+			<td class="tdelim delim">&nbsp;</td>
+			<td class="tdelim">{#style_dlg.color}</td>
+		</tr>
+
+		<tr>
+			<td>&nbsp;</td>
+			<td class="delim">&nbsp;</td>
+			<td><input type="checkbox" id="border_style_same" name="border_style_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_style');" /> <label for="border_style_same">{#style_dlg.same}</label></td>
+			<td class="delim">&nbsp;</td>
+			<td><input type="checkbox" id="border_width_same" name="border_width_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_width');" /> <label for="border_width_same">{#style_dlg.same}</label></td>
+			<td class="delim">&nbsp;</td>
+			<td><input type="checkbox" id="border_color_same" name="border_color_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_color');" /> <label for="border_color_same">{#style_dlg.same}</label></td>
+		</tr>
+
+		<tr>
+			<td>{#style_dlg.top}</td>
+			<td class="delim">&nbsp;</td>
+			<td><select id="border_style_top" name="border_style_top" class="mceEditableSelect"></select></td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="border_width_top" name="border_width_top" class="mceEditableSelect"></select></td>
+						<td>&nbsp;</td>
+						<td>
+							<label id="border_width_top_measurement_label" for="border_width_top_measurement" style="display: none; visibility: hidden;">Width top Measurement Unit</label>
+							<select id="border_width_top_measurement" name="border_width_top_measurement" aria-labelledby="border_width_top_measurement_label"></select>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td><input id="border_color_top" name="border_color_top" type="text" value="" size="9" onChange="updateColor('border_color_top_pick','border_color_top');" /></td>
+						<td id="border_color_top_pickcontainer">&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td>{#style_dlg.right}</td>
+			<td class="delim">&nbsp;</td>
+			<td><select id="border_style_right" name="border_style_right" class="mceEditableSelect" disabled="disabled"></select></td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="border_width_right" name="border_width_right" class="mceEditableSelect" disabled="disabled"></select></td>
+						<td>&nbsp;</td>
+						<td>
+							<label id="border_width_right_measurement_label" for="border_width_right_measurement" style="display: none; visibility: hidden;">Width Right Measurement Unit</label>
+							<select id="border_width_right_measurement" name="border_width_right_measurement" disabled="disabled" aria-labelledby="border_width_right_measurement_label"></select>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td><input id="border_color_right" name="border_color_right" type="text" value="" size="9" onChange="updateColor('border_color_right_pick','border_color_right');" disabled="disabled" /></td>
+						<td id="border_color_right_pickcontainer">&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td>{#style_dlg.bottom}</td>
+			<td class="delim">&nbsp;</td>
+			<td><select id="border_style_bottom" name="border_style_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="border_width_bottom" name="border_width_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
+						<td>&nbsp;</td>
+						<td>
+							<label id="border_width_bottom_measurement_label" for="border_width_bottom_measurement" style="display: none; visibility: hidden;">Width Bottom Measurement Unit</label>
+							<select id="border_width_bottom_measurement" name="border_width_bottom_measurement" disabled="disabled" aria-labelledby="border_width_bottom_measurement_label"></select>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td><input id="border_color_bottom" name="border_color_bottom" type="text" value="" size="9" onChange="updateColor('border_color_bottom_pick','border_color_bottom');" disabled="disabled" /></td>
+						<td id="border_color_bottom_pickcontainer">&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td>{#style_dlg.left}</td>
+			<td class="delim">&nbsp;</td>
+			<td><select id="border_style_left" name="border_style_left" class="mceEditableSelect" disabled="disabled"></select></td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="border_width_left" name="border_width_left" class="mceEditableSelect" disabled="disabled"></select></td>
+						<td>&nbsp;</td>
+						<td>
+							<label id="border_width_left_measurement_label" for="border_width_left_measurement" style="display: none; visibility: hidden;">Width Left Measurement Unit</label>
+							<select id="border_width_left_measurement" name="border_width_left_measurement" disabled="disabled" aria-labelledby="border_width_left_measurement_label"></select>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td><input id="border_color_left" name="border_color_left" type="text" value="" size="9" onChange="updateColor('border_color_left_pick','border_color_left');" disabled="disabled" /></td>
+						<td id="border_color_left_pickcontainer">&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
 		</table>
-	</td>
-</tr>
-</table>
+	</fieldset>
 </div>
 
 <div id="list_panel" class="panel">
-	<table border="0">
+<fieldset>
+	<legend>{#style_dlg.list}</legend>
+	<table role="presentation" border="0">
 		<tr>
 			<td><label for="list_type">{#style_dlg.list_type}</label></td>
 			<td><select id="list_type" name="list_type" class="mceEditableSelect"></select></td>
@@ -541,10 +624,13 @@
 			<td><select id="list_position" name="list_position" class="mceEditableSelect"></select></td>
 		</tr>
 	</table>
+</fieldset>
 </div>
 
 <div id="positioning_panel" class="panel">
-<table border="0">
+<fieldset>
+	<legend>{#style_dlg.position}</legend>
+<table role="presentation" border="0">
 	<tr>
 		<td><label for="positioning_type">{#style_dlg.positioning_type}</label></td>
 		<td><select id="positioning_type" name="positioning_type" class="mceEditableSelect"></select></td>
@@ -555,11 +641,14 @@
 	<tr>
 		<td><label for="positioning_width">{#style_dlg.width}</label></td>
 		<td>
-			<table border="0" cellspacing="0" cellpadding="0">
+			<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 				<tr>
 					<td><input type="text" id="positioning_width" name="positioning_width" onChange="synch('positioning_width','box_width');" /></td>
 					<td>&nbsp;</td>
-					<td><select id="positioning_width_measurement" name="positioning_width_measurement"></select></td>
+					<td>
+						<label id="positioning_width_measurement_label" for="positioning_width_measurement" style="display: none; visibility: hidden;">Positioning width Measurement Unit</label>
+						<select id="positioning_width_measurement" name="positioning_width_measurement" aria-labelledby="positioning_width_measurement_label"></select>
+					</td>
 				</tr>
 			</table>
 		</td>
@@ -570,11 +659,14 @@
 	<tr>
 		<td><label for="positioning_height">{#style_dlg.height}</label></td>
 		<td>
-			<table border="0" cellspacing="0" cellpadding="0">
+			<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 				<tr>
 					<td><input type="text" id="positioning_height" name="positioning_height" onChange="synch('positioning_height','box_height');" /></td>
 					<td>&nbsp;</td>
-					<td><select id="positioning_height_measurement" name="positioning_height_measurement"></select></td>
+					<td>
+						<label id="positioning_height_measurement_label" for="positioning_height_measurement" style="display: none; visibility: hidden;">Positioning Height Measurement Unit</label>
+						<select id="positioning_height_measurement" name="positioning_height_measurement" aria-labelledby="positioning_height_measurement_label"></select>
+					</td>
 				</tr>
 			</table>
 		</td>
@@ -582,12 +674,13 @@
 		<td><select id="positioning_overflow" name="positioning_overflow" class="mceEditableSelect"></select></td>
 	</tr>
 </table>
+</fieldset>
 
 <div style="float: left; width: 49%">
 	<fieldset>
 		<legend>{#style_dlg.placement}</legend>
 
-		<table border="0">
+		<table role="presentation" border="0">
 			<tr>
 				<td>&nbsp;</td>
 				<td><input type="checkbox" id="positioning_placement_same" name="positioning_placement_same" class="checkbox" checked="checked" onClick="toggleSame(this,'positioning_placement');" /> <label for="positioning_placement_same">{#style_dlg.same}</label></td>
@@ -595,11 +688,14 @@
 			<tr>
 				<td>{#style_dlg.top}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="positioning_placement_top" name="positioning_placement_top" /></td>
 							<td>&nbsp;</td>
-							<td><select id="positioning_placement_top_measurement" name="positioning_placement_top_measurement"></select></td>
+							<td>
+								<label id="positioning_placement_top_measurement_label" for="positioning_placement_top_measurement" style="display: none; visibility: hidden;">Placement Top Measurement Unit</label>
+								<select id="positioning_placement_top_measurement" name="positioning_placement_top_measurement" aria-labelledby="positioning_placement_top_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -607,11 +703,14 @@
 			<tr>
 				<td>{#style_dlg.right}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="positioning_placement_right" name="positioning_placement_right" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="positioning_placement_right_measurement" name="positioning_placement_right_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="positioning_placement_right_measurement_label" for="positioning_placement_right_measurement" style="display: none; visibility: hidden;">Placement Right Measurement Unit</label>
+								<select id="positioning_placement_right_measurement" name="positioning_placement_right_measurement" disabled="disabled" aria-labelledby="positioning_placement_right_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -619,11 +718,14 @@
 			<tr>
 				<td>{#style_dlg.bottom}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="positioning_placement_bottom" name="positioning_placement_bottom" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="positioning_placement_bottom_measurement" name="positioning_placement_bottom_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="positioning_placement_bottom_measurement_label" for="positioning_placement_bottom_measurement" style="display: none; visibility: hidden;">Placement Bottom Measurement Unit</label>
+								<select id="positioning_placement_bottom_measurement" name="positioning_placement_bottom_measurement" disabled="disabled" aria-labelledby="positioning_placement_bottom_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -631,11 +733,14 @@
 			<tr>
 				<td>{#style_dlg.left}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="positioning_placement_left" name="positioning_placement_left" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="positioning_placement_left_measurement" name="positioning_placement_left_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="positioning_placement_left_measurement_label" for="positioning_placement_left_measurement" style="display: none; visibility: hidden;">Placement Left Measurement Unit</label>
+								<select id="positioning_placement_left_measurement" name="positioning_placement_left_measurement" disabled="disabled" aria-labelledby="positioning_placement_left_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -648,7 +753,7 @@
 	<fieldset>
 		<legend>{#style_dlg.clip}</legend>
 
-		<table border="0">
+		<table role="presentation" border="0">
 			<tr>
 				<td>&nbsp;</td>
 				<td><input type="checkbox" id="positioning_clip_same" name="positioning_clip_same" class="checkbox" checked="checked" onClick="toggleSame(this,'positioning_clip');" /> <label for="positioning_clip_same">{#style_dlg.same}</label></td>
@@ -656,11 +761,14 @@
 			<tr>
 				<td>{#style_dlg.top}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="positioning_clip_top" name="positioning_clip_top" /></td>
 							<td>&nbsp;</td>
-							<td><select id="positioning_clip_top_measurement" name="positioning_clip_top_measurement"></select></td>
+							<td>
+								<label id="positioning_clip_top_measurement_label" for="positioning_clip_top_measurement" style="display: none; visibility: hidden;">Clip Top Measurement Unit</label>
+								<select id="positioning_clip_top_measurement" name="positioning_clip_top_measurement" aria-labelledby="positioning_clip_top_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -668,11 +776,14 @@
 			<tr>
 				<td>{#style_dlg.right}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="positioning_clip_right" name="positioning_clip_right" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="positioning_clip_right_measurement" name="positioning_clip_right_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="positioning_clip_right_measurement_label" for="positioning_clip_right_measurement" style="display: none; visibility: hidden;">Clip Right Measurement Unit</label>
+								<select id="positioning_clip_right_measurement" name="positioning_clip_right_measurement" disabled="disabled" aria-labelledby="positioning_clip_right_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -680,11 +791,14 @@
 			<tr>
 				<td>{#style_dlg.bottom}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="positioning_clip_bottom" name="positioning_clip_bottom" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="positioning_clip_bottom_measurement" name="positioning_clip_bottom_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="positioning_clip_bottom_measurement_label" for="positioning_clip_bottom_measurement" style="display: none; visibility: hidden;">Clip Bottom Measurement Unit</label>
+								<select id="positioning_clip_bottom_measurement" name="positioning_clip_bottom_measurement" disabled="disabled" aria-labelledby="positioning_clip_bottom_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -692,11 +806,14 @@
 			<tr>
 				<td>{#style_dlg.left}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="positioning_clip_left" name="positioning_clip_left" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="positioning_clip_left_measurement" name="positioning_clip_left_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="positioning_clip_left_measurement_label" for="positioning_clip_left_measurement" style="display: none; visibility: hidden;">Clip Left Measurement Unit</label>
+								<select id="positioning_clip_left_measurement" name="positioning_clip_left_measurement" disabled="disabled" aria-labelledby="positioning_clip_left_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -708,6 +825,11 @@
 </div>
 </div>
 
+<div class="panel_toggle_insert_span">
+	<input type="checkbox" class="checkbox" id="toggle_insert_span" name="toggle_insert_span" onClick="toggleApplyAction();" />
+	<label for="toggle_insert_span">{#style_dlg.toggle_insert_span}</label>
+</div>
+
 <div class="mceActionPanel">
 	<input type="submit" id="insert" name="insert" value="{#update}" />
 	<input type="button" class="button" id="apply" name="apply" value="{#style_dlg.apply}" onClick="applyAction();" />
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/style/readme.txt b/library/tinymce/jscripts/tiny_mce/plugins/style/readme.txt
new file mode 100644
index 000000000..5bac30202
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/plugins/style/readme.txt
@@ -0,0 +1,19 @@
+Edit CSS Style plug-in notes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Unlike WYSIWYG editor functionality that operates only on the selected text,
+typically by inserting new HTML elements with the specified styles.
+This plug-in operates on the HTML blocks surrounding the selected text.
+No new HTML elements are created.
+
+This plug-in only operates on the surrounding blocks and not the nearest
+parent node.  This means that if a block encapsulates a node,
+e.g <p><span>text</span></p>, then only the styles in the block are
+recognized, not those in the span.
+
+When selecting text that includes multiple blocks at the same level (peers),
+this plug-in accumulates the specified styles in all of the surrounding blocks
+and populates the dialogue checkboxes accordingly.  There is no differentiation
+between styles set in all the blocks versus styles set in some of the blocks.
+
+When the [Update] or [Apply] buttons are pressed, the styles selected in the
+checkboxes are applied to all blocks that surround the selected text.
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js
index 27d244022..42a82d112 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js
@@ -1 +1 @@
-(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(i){o=c.getParent(l.id,"form");n=o.elements;if(o){d(n,function(s,r){if(s.id==l.id){j=r;return false}});if(i>0){for(m=j+1;m<n.length;m++){if(n[m].type!="hidden"){return n[m]}}}else{for(m=j-1;m>=0;m--){if(n[m].type!="hidden"){return n[m]}}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(l=tinymce.get(n.id||n.name)){l.focus()}else{window.setTimeout(function(){window.focus();n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}f.onInit.add(function(){d(c.select("a:first,a:last",f.getContainer()),function(i){a.add(i,"focus",function(){f.focus()})})})},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})();
\ No newline at end of file
+(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(t){n=c.select(":input:enabled,*[tabindex]");function s(v){return v.nodeName==="BODY"||(v.type!="hidden"&&!(v.style.display=="none")&&!(v.style.visibility=="hidden")&&s(v.parentNode))}function i(v){return v.attributes.tabIndex.specified||v.nodeName=="INPUT"||v.nodeName=="TEXTAREA"}function u(){return tinymce.isIE6||tinymce.isIE7}function r(v){return((!u()||i(v)))&&v.getAttribute("tabindex")!="-1"&&s(v)}d(n,function(w,v){if(w.id==l.id){j=v;return false}});if(t>0){for(m=j+1;m<n.length;m++){if(r(n[m])){return n[m]}}}else{for(m=j-1;m>=0;m--){if(r(n[m])){return n[m]}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(n.id&&(l=tinymce.get(n.id||n.name))){l.focus()}else{window.setTimeout(function(){if(!tinymce.isWebKit){window.focus()}n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js
index c2be2f40a..a1579c85f 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js
@@ -1,112 +1,122 @@
-/**

- * editor_plugin_src.js

- *

- * Copyright 2009, Moxiecode Systems AB

- * Released under LGPL License.

- *

- * License: http://tinymce.moxiecode.com/license

- * Contributing: http://tinymce.moxiecode.com/contributing

- */

-

-(function() {

-	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, explode = tinymce.explode;

-

-	tinymce.create('tinymce.plugins.TabFocusPlugin', {

-		init : function(ed, url) {

-			function tabCancel(ed, e) {

-				if (e.keyCode === 9)

-					return Event.cancel(e);

-			};

-

-			function tabHandler(ed, e) {

-				var x, i, f, el, v;

-

-				function find(d) {

-					f = DOM.getParent(ed.id, 'form');

-					el = f.elements;

-

-					if (f) {

-						each(el, function(e, i) {

-							if (e.id == ed.id) {

-								x = i;

-								return false;

-							}

-						});

-

-						if (d > 0) {

-							for (i = x + 1; i < el.length; i++) {

-								if (el[i].type != 'hidden')

-									return el[i];

-							}

-						} else {

-							for (i = x - 1; i >= 0; i--) {

-								if (el[i].type != 'hidden')

-									return el[i];

-							}

-						}

-					}

-

-					return null;

-				};

-

-				if (e.keyCode === 9) {

-					v = explode(ed.getParam('tab_focus', ed.getParam('tabfocus_elements', ':prev,:next')));

-

-					if (v.length == 1) {

-						v[1] = v[0];

-						v[0] = ':prev';

-					}

-

-					// Find element to focus

-					if (e.shiftKey) {

-						if (v[0] == ':prev')

-							el = find(-1);

-						else

-							el = DOM.get(v[0]);

-					} else {

-						if (v[1] == ':next')

-							el = find(1);

-						else

-							el = DOM.get(v[1]);

-					}

-

-					if (el) {

-						if (ed = tinymce.get(el.id || el.name))

-							ed.focus();

-						else

-							window.setTimeout(function() {window.focus();el.focus();}, 10);

-

-						return Event.cancel(e);

-					}

-				}

-			};

-

-			ed.onKeyUp.add(tabCancel);

-

-			if (tinymce.isGecko) {

-				ed.onKeyPress.add(tabHandler);

-				ed.onKeyDown.add(tabCancel);

-			} else

-				ed.onKeyDown.add(tabHandler);

-

-			ed.onInit.add(function() {

-				each(DOM.select('a:first,a:last', ed.getContainer()), function(n) {

-					Event.add(n, 'focus', function() {ed.focus();});

-				});

-			});

-		},

-

-		getInfo : function() {

-			return {

-				longname : 'Tabfocus',

-				author : 'Moxiecode Systems AB',

-				authorurl : 'http://tinymce.moxiecode.com',

-				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus',

-				version : tinymce.majorVersion + "." + tinymce.minorVersion

-			};

-		}

-	});

-

-	// Register plugin

-	tinymce.PluginManager.add('tabfocus', tinymce.plugins.TabFocusPlugin);

-})();
\ No newline at end of file
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, explode = tinymce.explode;
+
+	tinymce.create('tinymce.plugins.TabFocusPlugin', {
+		init : function(ed, url) {
+			function tabCancel(ed, e) {
+				if (e.keyCode === 9)
+					return Event.cancel(e);
+			}
+
+			function tabHandler(ed, e) {
+				var x, i, f, el, v;
+
+				function find(d) {
+					el = DOM.select(':input:enabled,*[tabindex]');
+
+					function canSelectRecursive(e) {
+						return e.nodeName==="BODY" || (e.type != 'hidden' &&
+							!(e.style.display == "none") &&
+							!(e.style.visibility == "hidden") && canSelectRecursive(e.parentNode));
+					}
+					function canSelectInOldIe(el) {
+						return el.attributes["tabIndex"].specified || el.nodeName == "INPUT" || el.nodeName == "TEXTAREA";
+					}
+					function isOldIe() {
+						return tinymce.isIE6 || tinymce.isIE7;
+					}
+					function canSelect(el) {
+						return ((!isOldIe() || canSelectInOldIe(el))) && el.getAttribute("tabindex") != '-1' && canSelectRecursive(el);
+					}
+
+					each(el, function(e, i) {
+						if (e.id == ed.id) {
+							x = i;
+							return false;
+						}
+					});
+					if (d > 0) {
+						for (i = x + 1; i < el.length; i++) {
+							if (canSelect(el[i]))
+								return el[i];
+						}
+					} else {
+						for (i = x - 1; i >= 0; i--) {
+							if (canSelect(el[i]))
+								return el[i];
+						}
+					}
+
+					return null;
+				}
+
+				if (e.keyCode === 9) {
+					v = explode(ed.getParam('tab_focus', ed.getParam('tabfocus_elements', ':prev,:next')));
+
+					if (v.length == 1) {
+						v[1] = v[0];
+						v[0] = ':prev';
+					}
+
+					// Find element to focus
+					if (e.shiftKey) {
+						if (v[0] == ':prev')
+							el = find(-1);
+						else
+							el = DOM.get(v[0]);
+					} else {
+						if (v[1] == ':next')
+							el = find(1);
+						else
+							el = DOM.get(v[1]);
+					}
+
+					if (el) {
+						if (el.id && (ed = tinymce.get(el.id || el.name)))
+							ed.focus();
+						else
+							window.setTimeout(function() {
+								if (!tinymce.isWebKit)
+									window.focus();
+								el.focus();
+							}, 10);
+
+						return Event.cancel(e);
+					}
+				}
+			}
+
+			ed.onKeyUp.add(tabCancel);
+
+			if (tinymce.isGecko) {
+				ed.onKeyPress.add(tabHandler);
+				ed.onKeyDown.add(tabCancel);
+			} else
+				ed.onKeyDown.add(tabHandler);
+
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Tabfocus',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('tabfocus', tinymce.plugins.TabFocusPlugin);
+})();
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/cell.htm b/library/tinymce/jscripts/tiny_mce/plugins/table/cell.htm
index d243e1d83..a72a8d697 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/table/cell.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/table/cell.htm
@@ -5,16 +5,17 @@
 	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

 	<script type="text/javascript" src="../../utils/mctabs.js"></script>

 	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/validate.js"></script>

 	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

 	<script type="text/javascript" src="js/cell.js"></script>

 	<link href="css/cell.css" rel="stylesheet" type="text/css" />

 </head>

-<body id="tablecell" style="display: none">

+<body id="tablecell" style="display: none" role="application">

 	<form onsubmit="updateAction();return false;" action="#">

 		<div class="tabs">

 			<ul>

-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>

-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>

+				<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>

+				<li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>

 			</ul>

 		</div>

 

@@ -23,7 +24,7 @@
 				<fieldset>

 					<legend>{#table_dlg.general_props}</legend>

 

-					<table border="0" cellpadding="4" cellspacing="0">

+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">

 						<tr>

 							<td><label for="align">{#table_dlg.align}</label></td>

 							<td>

@@ -70,10 +71,10 @@
 

 						<tr>

 							<td><label for="width">{#table_dlg.width}</label></td>

-							<td><input id="width" name="width" type="text" value="" size="4" maxlength="4" onchange="changedSize();" /></td>

+							<td><input id="width" name="width" type="text" value="" size="7" maxlength="7" onchange="changedSize();" class="size" /></td>

 

 							<td><label for="height">{#table_dlg.height}</label></td>

-							<td><input id="height" name="height" type="text" value="" size="4" maxlength="4" onchange="changedSize();" /></td>

+							<td><input id="height" name="height" type="text" value="" size="7" maxlength="7" onchange="changedSize();" class="size" /></td>

 						</tr>

 

 						<tr id="styleSelectRow">

@@ -92,7 +93,7 @@
 				<fieldset>

 					<legend>{#table_dlg.advanced_props}</legend>

 

-					<table border="0" cellpadding="0" cellspacing="4">

+					<table role="presentation" border="0" cellpadding="0" cellspacing="4">

 						<tr>

 							<td class="column1"><label for="id">{#table_dlg.id}</label></td> 

 							<td><input id="id" name="id" type="text" value="" style="width: 200px" /></td> 

@@ -124,7 +125,7 @@
 						<tr>

 							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 

 							<td>

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

 										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" style="width: 200px" onchange="changedBackgroundImage();" /></td>

 										<td id="backgroundimagebrowsercontainer">&nbsp;</td>

@@ -133,10 +134,10 @@
 							</td> 

 						</tr>

 

-						<tr>

-							<td class="column1"><label for="bordercolor">{#table_dlg.bordercolor}</label></td> 

+						<tr role="group" aria-labelledby="bordercolor_label">

+							<td class="column1"><label id="bordercolor_label" for="bordercolor">{#table_dlg.bordercolor}</label></td> 

 							<td>

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

 										<td><input id="bordercolor" name="bordercolor" type="text" value="" size="9" onchange="updateColor('bordercolor_pick','bordercolor');changedColor();" /></td>

 										<td id="bordercolor_pickcontainer">&nbsp;</td>

@@ -145,10 +146,10 @@
 							</td> 

 						</tr>

 

-						<tr>

-							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 

+						<tr role="group" aria-labelledby="bgcolor_label">

+							<td class="column1"><label id="bgcolor_label" for="bgcolor">{#table_dlg.bgcolor}</label></td> 

 							<td>

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

 										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>

 										<td id="bgcolor_pickcontainer">&nbsp;</td>

@@ -166,6 +167,7 @@
 				<select id="action" name="action">

 					<option value="cell">{#table_dlg.cell_cell}</option>

 					<option value="row">{#table_dlg.cell_row}</option>

+					<option value="col">{#table_dlg.cell_col}</option>

 					<option value="all">{#table_dlg.cell_all}</option>

 				</select>

 			</div>

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/css/cell.css b/library/tinymce/jscripts/tiny_mce/plugins/table/css/cell.css
index a067ecdfe..a067ecdfe 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/table/css/cell.css
+++ b/library/tinymce/jscripts/tiny_mce/plugins/table/css/cell.css
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/css/row.css b/library/tinymce/jscripts/tiny_mce/plugins/table/css/row.css
index 1f7755daf..1f7755daf 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/table/css/row.css
+++ b/library/tinymce/jscripts/tiny_mce/plugins/table/css/row.css
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/css/table.css b/library/tinymce/jscripts/tiny_mce/plugins/table/css/table.css
index d11c3f69c..d11c3f69c 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/table/css/table.css
+++ b/library/tinymce/jscripts/tiny_mce/plugins/table/css/table.css
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js
index 266d7d537..ad462f0e0 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js
@@ -1 +1 @@
-(function(b){var c=b.each;function a(F,E,I){var e,J,B,n;r();n=E.getParent(I.getStart(),"th,td");if(n){J=D(n);B=G();n=v(J.x,J.y)}function w(L,K){L=L.cloneNode(K);L.removeAttribute("id");return L}function r(){var K=0;e=[];c(["thead","tbody","tfoot"],function(L){var M=E.select(L+" tr",F);c(M,function(N,O){O+=K;c(E.select("td,th",N),function(U,P){var Q,R,S,T;if(e[O]){while(e[O][P]){P++}}S=g(U,"rowspan");T=g(U,"colspan");for(R=O;R<O+S;R++){if(!e[R]){e[R]=[]}for(Q=P;Q<P+T;Q++){e[R][Q]={part:L,real:R==O&&Q==P,elm:U,rowspan:S,colspan:T}}}})});K+=M.length})}function v(K,M){var L;L=e[M];if(L){return L[K]}}function g(L,K){return parseInt(L.getAttribute(K)||1)}function h(K){return E.hasClass(K.elm,"mceSelected")||K==n}function j(){var K=[];c(F.rows,function(L){c(L.cells,function(M){if(E.hasClass(M,"mceSelected")||M==n.elm){K.push(L);return false}})});return K}function q(){var K=E.createRng();K.setStartAfter(F);K.setEndAfter(F);I.setRng(K);E.remove(F)}function d(K){var L;b.walk(K,function(N){var M;if(N.nodeType==3){c(E.getParents(N.parentNode,null,K).reverse(),function(O){O=w(O,false);if(!L){L=M=O}else{if(M){M.appendChild(O)}}M=O});if(M){M.innerHTML=b.isIE?"&nbsp;":'<br _mce_bogus="1" />'}return false}},"childNodes");K=w(K,false);K.rowSpan=K.colSpan=1;if(L){K.appendChild(L)}else{if(!b.isIE){K.innerHTML='<br _mce_bogus="1" />'}}return K}function p(){var K=E.createRng();c(E.select("tr",F),function(L){if(L.cells.length==0){E.remove(L)}});if(E.select("tr",F).length==0){K.setStartAfter(F);K.setEndAfter(F);I.setRng(K);E.remove(F);return}c(E.select("thead,tbody,tfoot",F),function(L){if(L.rows.length==0){E.remove(L)}});r();row=e[Math.min(e.length-1,J.y)];if(row){I.select(row[Math.min(row.length-1,J.x)].elm,true);I.collapse(true)}}function s(Q,O,S,P){var N,L,K,M,R;N=e[O][Q].elm.parentNode;for(K=1;K<=S;K++){N=E.getNext(N,"tr");if(N){for(L=Q;L>=0;L--){R=e[O+K][L].elm;if(R.parentNode==N){for(M=1;M<=P;M++){E.insertAfter(d(R),R)}break}}if(L==-1){for(M=1;M<=P;M++){N.insertBefore(d(N.cells[0]),N.cells[0])}}}}}function A(){c(e,function(K,L){c(K,function(N,M){var Q,P,R,O;if(h(N)){N=N.elm;Q=g(N,"colspan");P=g(N,"rowspan");if(Q>1||P>1){N.colSpan=N.rowSpan=1;for(O=0;O<Q-1;O++){E.insertAfter(d(N),N)}s(M,L,P-1,Q)}}})})}function o(S,P,V){var N,M,U,T,R,O,Q,K,S,L;if(S){pos=D(S);N=pos.x;M=pos.y;U=N+(P-1);T=M+(V-1)}else{N=J.x;M=J.y;U=B.x;T=B.y}Q=v(N,M);K=v(U,T);if(Q&&K&&Q.part==K.part){A();r();Q=v(N,M).elm;Q.colSpan=(U-N)+1;Q.rowSpan=(T-M)+1;for(O=M;O<=T;O++){for(R=N;R<=U;R++){S=e[O][R].elm;if(S!=Q){L=b.grep(S.childNodes);c(L,function(X,W){if(X.nodeName!="BR"||W!=L.length-1){Q.appendChild(X)}});E.remove(S)}}}p()}}function k(N){var K,P,M,O,Q,R,L,S;c(e,function(T,U){c(T,function(W,V){if(h(W)){W=W.elm;Q=W.parentNode;R=w(Q,false);K=U;if(N){return false}}});if(N){return !K}});for(O=0;O<e[0].length;O++){P=e[K][O].elm;if(P!=M){if(!N){rowSpan=g(P,"rowspan");if(rowSpan>1){P.rowSpan=rowSpan+1;continue}}else{if(K>0&&e[K-1][O]){S=e[K-1][O].elm;rowSpan=g(S,"rowspan");if(rowSpan>1){S.rowSpan=rowSpan+1;continue}}}L=d(P);L.colSpan=P.colSpan;R.appendChild(L);M=P}}if(R.hasChildNodes()){if(!N){E.insertAfter(R,Q)}else{Q.parentNode.insertBefore(R,Q)}}}function f(L){var M,K;c(e,function(N,O){c(N,function(Q,P){if(h(Q)){M=P;if(L){return false}}});if(L){return !M}});c(e,function(Q,R){var N=Q[M].elm,O,P;if(N!=K){P=g(N,"colspan");O=g(N,"rowspan");if(P==1){if(!L){E.insertAfter(d(N),N);s(M,R,O-1,P)}else{N.parentNode.insertBefore(d(N),N);s(M,R,O-1,P)}}else{N.colSpan++}K=N}})}function m(){var K=[];c(e,function(L,M){c(L,function(O,N){if(h(O)&&b.inArray(K,N)===-1){c(e,function(R){var P=R[N].elm,Q;Q=g(P,"colspan");if(Q>1){P.colSpan=Q-1}else{E.remove(P)}});K.push(N)}})});p()}function l(){var L;function K(O){var N,P,M;N=E.getNext(O,"tr");c(O.cells,function(Q){var R=g(Q,"rowspan");if(R>1){Q.rowSpan=R-1;P=D(Q);s(P.x,P.y,1,1)}});P=D(O.cells[0]);c(e[P.y],function(Q){var R;Q=Q.elm;if(Q!=M){R=g(Q,"rowspan");if(R<=1){E.remove(Q)}else{Q.rowSpan=R-1}M=Q}})}L=j();c(L.reverse(),function(M){K(M)});p()}function C(){var K=j();E.remove(K);p();return K}function H(){var K=j();c(K,function(M,L){K[L]=w(M,true)});return K}function z(M,L){var N=j(),K=N[L?0:N.length-1],O=K.cells.length;c(e,function(Q){var P;O=0;c(Q,function(S,R){if(S.real){O+=S.colspan}if(S.elm.parentNode==K){P=1}});if(P){return false}});if(!L){M.reverse()}c(M,function(R){var Q=R.cells.length,P;for(i=0;i<Q;i++){P=R.cells[i];P.colSpan=P.rowSpan=1}for(i=Q;i<O;i++){R.appendChild(d(R.cells[Q-1]))}for(i=O;i<Q;i++){E.remove(R.cells[i])}if(L){K.parentNode.insertBefore(R,K)}else{E.insertAfter(R,K)}})}function D(K){var L;c(e,function(M,N){c(M,function(P,O){if(P.elm==K){L={x:O,y:N};return false}});return !L});return L}function u(K){J=D(K)}function G(){var M,L,K;L=K=0;c(e,function(N,O){c(N,function(Q,P){var S,R;if(h(Q)){Q=e[O][P];if(P>L){L=P}if(O>K){K=O}if(Q.real){S=Q.colspan-1;R=Q.rowspan-1;if(S){if(P+S>L){L=P+S}}if(R){if(O+R>K){K=O+R}}}}})});return{x:L,y:K}}function t(Q){var N,M,S,R,L,K,O,P;B=D(Q);if(J&&B){N=Math.min(J.x,B.x);M=Math.min(J.y,B.y);S=Math.max(J.x,B.x);R=Math.max(J.y,B.y);L=S;K=R;for(y=M;y<=K;y++){Q=e[y][N];if(!Q.real){if(N-(Q.colspan-1)<N){N-=Q.colspan-1}}}for(x=N;x<=L;x++){Q=e[M][x];if(!Q.real){if(M-(Q.rowspan-1)<M){M-=Q.rowspan-1}}}for(y=M;y<=R;y++){for(x=N;x<=S;x++){Q=e[y][x];if(Q.real){O=Q.colspan-1;P=Q.rowspan-1;if(O){if(x+O>L){L=x+O}}if(P){if(y+P>K){K=y+P}}}}}E.removeClass(E.select("td.mceSelected,th.mceSelected"),"mceSelected");for(y=M;y<=K;y++){for(x=N;x<=L;x++){E.addClass(e[y][x].elm,"mceSelected")}}}}b.extend(this,{deleteTable:q,split:A,merge:o,insertRow:k,insertCol:f,deleteCols:m,deleteRows:l,cutRows:C,copyRows:H,pasteRows:z,getPos:D,setStartCell:u,setEndCell:t})}b.create("tinymce.plugins.TablePlugin",{init:function(e,f){var d,j;function h(m){var l=e.selection,k=e.dom.getParent(m||l.getNode(),"table");if(k){return new a(k,e.dom,l)}}function g(){e.getBody().style.webkitUserSelect="";e.dom.removeClass(e.dom.select("td.mceSelected,th.mceSelected"),"mceSelected")}c([["table","table.desc","mceInsertTable",true],["delete_table","table.del","mceTableDelete"],["delete_col","table.delete_col_desc","mceTableDeleteCol"],["delete_row","table.delete_row_desc","mceTableDeleteRow"],["col_after","table.col_after_desc","mceTableInsertColAfter"],["col_before","table.col_before_desc","mceTableInsertColBefore"],["row_after","table.row_after_desc","mceTableInsertRowAfter"],["row_before","table.row_before_desc","mceTableInsertRowBefore"],["row_props","table.row_desc","mceTableRowProps",true],["cell_props","table.cell_desc","mceTableCellProps",true],["split_cells","table.split_cells_desc","mceTableSplitCells",true],["merge_cells","table.merge_cells_desc","mceTableMergeCells",true]],function(k){e.addButton(k[0],{title:k[1],cmd:k[2],ui:k[3]})});if(!b.isIE){e.onClick.add(function(k,l){l=l.target;if(l.nodeName==="TABLE"){k.selection.select(l)}})}e.onNodeChange.add(function(l,k,o){var m;o=l.selection.getStart();m=l.dom.getParent(o,"td,th,caption");k.setActive("table",o.nodeName==="TABLE"||!!m);if(m&&m.nodeName==="CAPTION"){m=0}k.setDisabled("delete_table",!m);k.setDisabled("delete_col",!m);k.setDisabled("delete_table",!m);k.setDisabled("delete_row",!m);k.setDisabled("col_after",!m);k.setDisabled("col_before",!m);k.setDisabled("row_after",!m);k.setDisabled("row_before",!m);k.setDisabled("row_props",!m);k.setDisabled("cell_props",!m);k.setDisabled("split_cells",!m);k.setDisabled("merge_cells",!m)});e.onInit.add(function(l){var k,o,p=l.dom,m;d=l.windowManager;l.onMouseDown.add(function(q,r){if(r.button!=2){g();o=p.getParent(r.target,"td,th");k=p.getParent(o,"table")}});p.bind(l.getDoc(),"mouseover",function(t){var r,q,s=t.target;if(o&&(m||s!=o)&&(s.nodeName=="TD"||s.nodeName=="TH")){q=p.getParent(s,"table");if(q==k){if(!m){m=h(q);m.setStartCell(o);l.getBody().style.webkitUserSelect="none"}m.setEndCell(s)}r=l.selection.getSel();if(r.removeAllRanges){r.removeAllRanges()}else{r.empty()}t.preventDefault()}});l.onMouseUp.add(function(z,A){var r,t=z.selection,B,C=t.getSel(),q,u,s,w;if(o){if(m){z.getBody().style.webkitUserSelect=""}function v(D,F){var E=new b.dom.TreeWalker(D,D);do{if(D.nodeType==3&&b.trim(D.nodeValue).length!=0){if(F){r.setStart(D,0)}else{r.setEnd(D,D.nodeValue.length)}return}if(D.nodeName=="BR"){if(F){r.setStartBefore(D)}else{r.setEndBefore(D)}return}}while(D=(F?E.next():E.prev()))}B=p.select("td.mceSelected,th.mceSelected");if(B.length>0){r=p.createRng();u=B[0];w=B[B.length-1];v(u,1);q=new b.dom.TreeWalker(u,p.getParent(B[0],"table"));do{if(u.nodeName=="TD"||u.nodeName=="TH"){if(!p.hasClass(u,"mceSelected")){break}s=u}}while(u=q.next());v(s);t.setRng(r)}z.nodeChanged();o=m=k=null}});l.onKeyUp.add(function(q,r){g()});if(l&&l.plugins.contextmenu){l.plugins.contextmenu.onContextMenu.add(function(s,q,u){var v,t=l.selection,r=t.getNode()||l.getBody();if(l.dom.getParent(u,"td")||l.dom.getParent(u,"th")||l.dom.select("td.mceSelected,th.mceSelected").length){q.removeAll();if(r.nodeName=="A"&&!l.dom.getAttrib(r,"name")){q.add({title:"advanced.link_desc",icon:"link",cmd:l.plugins.advlink?"mceAdvLink":"mceLink",ui:true});q.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});q.addSeparator()}if(r.nodeName=="IMG"&&r.className.indexOf("mceItem")==-1){q.add({title:"advanced.image_desc",icon:"image",cmd:l.plugins.advimage?"mceAdvImage":"mceImage",ui:true});q.addSeparator()}q.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",value:{action:"insert"}});q.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable"});q.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete"});q.addSeparator();v=q.addMenu({title:"table.cell"});v.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps"});v.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells"});v.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells"});v=q.addMenu({title:"table.row"});v.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps"});v.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});v.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});v.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});v.addSeparator();v.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});v.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});v.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"}).setDisabled(!j);v.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"}).setDisabled(!j);v=q.addMenu({title:"table.col"});v.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});v.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});v.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{q.add({title:"table.desc",icon:"table",cmd:"mceInsertTable"})}})}if(!b.isIE){function n(){var q;for(q=l.getBody().lastChild;q&&q.nodeType==3&&!q.nodeValue.length;q=q.previousSibling){}if(q&&q.nodeName=="TABLE"){l.dom.add(l.getBody(),"p",null,'<br mce_bogus="1" />')}}if(b.isGecko){l.onKeyDown.add(function(r,t){var q,s,u=r.dom;if(t.keyCode==37||t.keyCode==38){q=r.selection.getRng();s=u.getParent(q.startContainer,"table");if(s&&r.getBody().firstChild==s){if(isAtStart(q,s)){q=u.createRng();q.setStartBefore(s);q.setEndBefore(s);r.selection.setRng(q);t.preventDefault()}}}})}l.onKeyUp.add(n);l.onSetContent.add(n);l.onVisualAid.add(n);l.onPreProcess.add(function(q,s){var r=s.node.lastChild;if(r&&r.childNodes.length==1&&r.firstChild.nodeName=="BR"){q.dom.remove(r)}});n()}});c({mceTableSplitCells:function(k){k.split()},mceTableMergeCells:function(l){var m,n,k;k=e.dom.getParent(e.selection.getNode(),"th,td");if(k){m=k.rowSpan;n=k.colSpan}if(!e.dom.select("td.mceSelected,th.mceSelected").length){d.open({url:f+"/merge_cells.htm",width:240+parseInt(e.getLang("table.merge_cells_delta_width",0)),height:110+parseInt(e.getLang("table.merge_cells_delta_height",0)),inline:1},{rows:m,cols:n,onaction:function(o){l.merge(k,o.cols,o.rows)},plugin_url:f})}else{l.merge()}},mceTableInsertRowBefore:function(k){k.insertRow(true)},mceTableInsertRowAfter:function(k){k.insertRow()},mceTableInsertColBefore:function(k){k.insertCol(true)},mceTableInsertColAfter:function(k){k.insertCol()},mceTableDeleteCol:function(k){k.deleteCols()},mceTableDeleteRow:function(k){k.deleteRows()},mceTableCutRow:function(k){j=k.cutRows()},mceTableCopyRow:function(k){j=k.copyRows()},mceTablePasteRowBefore:function(k){k.pasteRows(j,true)},mceTablePasteRowAfter:function(k){k.pasteRows(j)},mceTableDelete:function(k){k.deleteTable()}},function(l,k){e.addCommand(k,function(){var m=h();if(m){l(m);e.execCommand("mceRepaint");g()}})});c({mceInsertTable:function(k){d.open({url:f+"/table.htm",width:400+parseInt(e.getLang("table.table_delta_width",0)),height:320+parseInt(e.getLang("table.table_delta_height",0)),inline:1},{plugin_url:f,action:k?k.action:0})},mceTableRowProps:function(){d.open({url:f+"/row.htm",width:400+parseInt(e.getLang("table.rowprops_delta_width",0)),height:295+parseInt(e.getLang("table.rowprops_delta_height",0)),inline:1},{plugin_url:f})},mceTableCellProps:function(){d.open({url:f+"/cell.htm",width:400+parseInt(e.getLang("table.cellprops_delta_width",0)),height:295+parseInt(e.getLang("table.cellprops_delta_height",0)),inline:1},{plugin_url:f})}},function(l,k){e.addCommand(k,function(m,n){l(n)})})}});b.PluginManager.add("table",b.plugins.TablePlugin)})(tinymce);
\ No newline at end of file
+(function(d){var e=d.each;function c(g,h){var j=h.ownerDocument,f=j.createRange(),k;f.setStartBefore(h);f.setEnd(g.endContainer,g.endOffset);k=j.createElement("body");k.appendChild(f.cloneContents());return k.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi,"-").replace(/<[^>]+>/g,"").length==0}function a(g,f){return parseInt(g.getAttribute(f)||1)}function b(H,G,K){var g,L,D,o;t();o=G.getParent(K.getStart(),"th,td");if(o){L=F(o);D=I();o=z(L.x,L.y)}function A(N,M){N=N.cloneNode(M);N.removeAttribute("id");return N}function t(){var M=0;g=[];e(["thead","tbody","tfoot"],function(N){var O=G.select("> "+N+" tr",H);e(O,function(P,Q){Q+=M;e(G.select("> td, > th",P),function(W,R){var S,T,U,V;if(g[Q]){while(g[Q][R]){R++}}U=a(W,"rowspan");V=a(W,"colspan");for(T=Q;T<Q+U;T++){if(!g[T]){g[T]=[]}for(S=R;S<R+V;S++){g[T][S]={part:N,real:T==Q&&S==R,elm:W,rowspan:U,colspan:V}}}})});M+=O.length})}function z(M,O){var N;N=g[O];if(N){return N[M]}}function s(O,M,N){if(O){N=parseInt(N);if(N===1){O.removeAttribute(M,1)}else{O.setAttribute(M,N,1)}}}function j(M){return M&&(G.hasClass(M.elm,"mceSelected")||M==o)}function k(){var M=[];e(H.rows,function(N){e(N.cells,function(O){if(G.hasClass(O,"mceSelected")||O==o.elm){M.push(N);return false}})});return M}function r(){var M=G.createRng();M.setStartAfter(H);M.setEndAfter(H);K.setRng(M);G.remove(H)}function f(M){var N;d.walk(M,function(P){var O;if(P.nodeType==3){e(G.getParents(P.parentNode,null,M).reverse(),function(Q){Q=A(Q,false);if(!N){N=O=Q}else{if(O){O.appendChild(Q)}}O=Q});if(O){O.innerHTML=d.isIE?"&nbsp;":'<br data-mce-bogus="1" />'}return false}},"childNodes");M=A(M,false);s(M,"rowSpan",1);s(M,"colSpan",1);if(N){M.appendChild(N)}else{if(!d.isIE){M.innerHTML='<br data-mce-bogus="1" />'}}return M}function q(){var M=G.createRng();e(G.select("tr",H),function(N){if(N.cells.length==0){G.remove(N)}});if(G.select("tr",H).length==0){M.setStartAfter(H);M.setEndAfter(H);K.setRng(M);G.remove(H);return}e(G.select("thead,tbody,tfoot",H),function(N){if(N.rows.length==0){G.remove(N)}});t();row=g[Math.min(g.length-1,L.y)];if(row){K.select(row[Math.min(row.length-1,L.x)].elm,true);K.collapse(true)}}function u(S,Q,U,R){var P,N,M,O,T;P=g[Q][S].elm.parentNode;for(M=1;M<=U;M++){P=G.getNext(P,"tr");if(P){for(N=S;N>=0;N--){T=g[Q+M][N].elm;if(T.parentNode==P){for(O=1;O<=R;O++){G.insertAfter(f(T),T)}break}}if(N==-1){for(O=1;O<=R;O++){P.insertBefore(f(P.cells[0]),P.cells[0])}}}}}function C(){e(g,function(M,N){e(M,function(P,O){var S,R,T,Q;if(j(P)){P=P.elm;S=a(P,"colspan");R=a(P,"rowspan");if(S>1||R>1){s(P,"rowSpan",1);s(P,"colSpan",1);for(Q=0;Q<S-1;Q++){G.insertAfter(f(P),P)}u(O,N,R-1,S)}}})})}function p(V,S,Y){var P,O,X,W,U,R,T,M,V,N,Q;if(V){pos=F(V);P=pos.x;O=pos.y;X=P+(S-1);W=O+(Y-1)}else{P=L.x;O=L.y;X=D.x;W=D.y}T=z(P,O);M=z(X,W);if(T&&M&&T.part==M.part){C();t();T=z(P,O).elm;s(T,"colSpan",(X-P)+1);s(T,"rowSpan",(W-O)+1);for(R=O;R<=W;R++){for(U=P;U<=X;U++){if(!g[R]||!g[R][U]){continue}V=g[R][U].elm;if(V!=T){N=d.grep(V.childNodes);e(N,function(Z){T.appendChild(Z)});if(N.length){N=d.grep(T.childNodes);Q=0;e(N,function(Z){if(Z.nodeName=="BR"&&G.getAttrib(Z,"data-mce-bogus")&&Q++<N.length-1){T.removeChild(Z)}})}G.remove(V)}}}q()}}function l(Q){var M,S,P,R,T,U,N,V,O;e(g,function(W,X){e(W,function(Z,Y){if(j(Z)){Z=Z.elm;T=Z.parentNode;U=A(T,false);M=X;if(Q){return false}}});if(Q){return !M}});for(R=0;R<g[0].length;R++){if(!g[M][R]){continue}S=g[M][R].elm;if(S!=P){if(!Q){O=a(S,"rowspan");if(O>1){s(S,"rowSpan",O+1);continue}}else{if(M>0&&g[M-1][R]){V=g[M-1][R].elm;O=a(V,"rowSpan");if(O>1){s(V,"rowSpan",O+1);continue}}}N=f(S);s(N,"colSpan",S.colSpan);U.appendChild(N);P=S}}if(U.hasChildNodes()){if(!Q){G.insertAfter(U,T)}else{T.parentNode.insertBefore(U,T)}}}function h(N){var O,M;e(g,function(P,Q){e(P,function(S,R){if(j(S)){O=R;if(N){return false}}});if(N){return !O}});e(g,function(S,T){var P,Q,R;if(!S[O]){return}P=S[O].elm;if(P!=M){R=a(P,"colspan");Q=a(P,"rowspan");if(R==1){if(!N){G.insertAfter(f(P),P);u(O,T,Q-1,R)}else{P.parentNode.insertBefore(f(P),P);u(O,T,Q-1,R)}}else{s(P,"colSpan",P.colSpan+1)}M=P}})}function n(){var M=[];e(g,function(N,O){e(N,function(Q,P){if(j(Q)&&d.inArray(M,P)===-1){e(g,function(T){var R=T[P].elm,S;S=a(R,"colSpan");if(S>1){s(R,"colSpan",S-1)}else{G.remove(R)}});M.push(P)}})});q()}function m(){var N;function M(Q){var P,R,O;P=G.getNext(Q,"tr");e(Q.cells,function(S){var T=a(S,"rowSpan");if(T>1){s(S,"rowSpan",T-1);R=F(S);u(R.x,R.y,1,1)}});R=F(Q.cells[0]);e(g[R.y],function(S){var T;S=S.elm;if(S!=O){T=a(S,"rowSpan");if(T<=1){G.remove(S)}else{s(S,"rowSpan",T-1)}O=S}})}N=k();e(N.reverse(),function(O){M(O)});q()}function E(){var M=k();G.remove(M);q();return M}function J(){var M=k();e(M,function(O,N){M[N]=A(O,true)});return M}function B(O,N){var P=k(),M=P[N?0:P.length-1],Q=M.cells.length;e(g,function(S){var R;Q=0;e(S,function(U,T){if(U.real){Q+=U.colspan}if(U.elm.parentNode==M){R=1}});if(R){return false}});if(!N){O.reverse()}e(O,function(T){var S=T.cells.length,R;for(i=0;i<S;i++){R=T.cells[i];s(R,"colSpan",1);s(R,"rowSpan",1)}for(i=S;i<Q;i++){T.appendChild(f(T.cells[S-1]))}for(i=Q;i<S;i++){G.remove(T.cells[i])}if(N){M.parentNode.insertBefore(T,M)}else{G.insertAfter(T,M)}})}function F(M){var N;e(g,function(O,P){e(O,function(R,Q){if(R.elm==M){N={x:Q,y:P};return false}});return !N});return N}function w(M){L=F(M)}function I(){var O,N,M;N=M=0;e(g,function(P,Q){e(P,function(S,R){var U,T;if(j(S)){S=g[Q][R];if(R>N){N=R}if(Q>M){M=Q}if(S.real){U=S.colspan-1;T=S.rowspan-1;if(U){if(R+U>N){N=R+U}}if(T){if(Q+T>M){M=Q+T}}}}})});return{x:N,y:M}}function v(S){var P,O,U,T,N,M,Q,R;D=F(S);if(L&&D){P=Math.min(L.x,D.x);O=Math.min(L.y,D.y);U=Math.max(L.x,D.x);T=Math.max(L.y,D.y);N=U;M=T;for(y=O;y<=M;y++){S=g[y][P];if(!S.real){if(P-(S.colspan-1)<P){P-=S.colspan-1}}}for(x=P;x<=N;x++){S=g[O][x];if(!S.real){if(O-(S.rowspan-1)<O){O-=S.rowspan-1}}}for(y=O;y<=T;y++){for(x=P;x<=U;x++){S=g[y][x];if(S.real){Q=S.colspan-1;R=S.rowspan-1;if(Q){if(x+Q>N){N=x+Q}}if(R){if(y+R>M){M=y+R}}}}}G.removeClass(G.select("td.mceSelected,th.mceSelected"),"mceSelected");for(y=O;y<=M;y++){for(x=P;x<=N;x++){if(g[y][x]){G.addClass(g[y][x].elm,"mceSelected")}}}}}d.extend(this,{deleteTable:r,split:C,merge:p,insertRow:l,insertCol:h,deleteCols:n,deleteRows:m,cutRows:E,copyRows:J,pasteRows:B,getPos:F,setStartCell:w,setEndCell:v})}d.create("tinymce.plugins.TablePlugin",{init:function(g,h){var f,m,j=true;function l(p){var o=g.selection,n=g.dom.getParent(p||o.getNode(),"table");if(n){return new b(n,g.dom,o)}}function k(){g.getBody().style.webkitUserSelect="";if(j){g.dom.removeClass(g.dom.select("td.mceSelected,th.mceSelected"),"mceSelected");j=false}}e([["table","table.desc","mceInsertTable",true],["delete_table","table.del","mceTableDelete"],["delete_col","table.delete_col_desc","mceTableDeleteCol"],["delete_row","table.delete_row_desc","mceTableDeleteRow"],["col_after","table.col_after_desc","mceTableInsertColAfter"],["col_before","table.col_before_desc","mceTableInsertColBefore"],["row_after","table.row_after_desc","mceTableInsertRowAfter"],["row_before","table.row_before_desc","mceTableInsertRowBefore"],["row_props","table.row_desc","mceTableRowProps",true],["cell_props","table.cell_desc","mceTableCellProps",true],["split_cells","table.split_cells_desc","mceTableSplitCells",true],["merge_cells","table.merge_cells_desc","mceTableMergeCells",true]],function(n){g.addButton(n[0],{title:n[1],cmd:n[2],ui:n[3]})});if(!d.isIE){g.onClick.add(function(n,o){o=o.target;if(o.nodeName==="TABLE"){n.selection.select(o);n.nodeChanged()}})}g.onPreProcess.add(function(o,p){var n,q,r,t=o.dom,s;n=t.select("table",p.node);q=n.length;while(q--){r=n[q];t.setAttrib(r,"data-mce-style","");if((s=t.getAttrib(r,"width"))){t.setStyle(r,"width",s);t.setAttrib(r,"width","")}if((s=t.getAttrib(r,"height"))){t.setStyle(r,"height",s);t.setAttrib(r,"height","")}}});g.onNodeChange.add(function(q,o,s){var r;s=q.selection.getStart();r=q.dom.getParent(s,"td,th,caption");o.setActive("table",s.nodeName==="TABLE"||!!r);if(r&&r.nodeName==="CAPTION"){r=0}o.setDisabled("delete_table",!r);o.setDisabled("delete_col",!r);o.setDisabled("delete_table",!r);o.setDisabled("delete_row",!r);o.setDisabled("col_after",!r);o.setDisabled("col_before",!r);o.setDisabled("row_after",!r);o.setDisabled("row_before",!r);o.setDisabled("row_props",!r);o.setDisabled("cell_props",!r);o.setDisabled("split_cells",!r);o.setDisabled("merge_cells",!r)});g.onInit.add(function(r){var p,t,q=r.dom,u;f=r.windowManager;r.onMouseDown.add(function(w,z){if(z.button!=2){k();t=q.getParent(z.target,"td,th");p=q.getParent(t,"table")}});q.bind(r.getDoc(),"mouseover",function(C){var A,z,B=C.target;if(t&&(u||B!=t)&&(B.nodeName=="TD"||B.nodeName=="TH")){z=q.getParent(B,"table");if(z==p){if(!u){u=l(z);u.setStartCell(t);r.getBody().style.webkitUserSelect="none"}u.setEndCell(B);j=true}A=r.selection.getSel();try{if(A.removeAllRanges){A.removeAllRanges()}else{A.empty()}}catch(w){}C.preventDefault()}});r.onMouseUp.add(function(F,G){var z,B=F.selection,H,I=B.getSel(),w,C,A,E;if(t){if(u){F.getBody().style.webkitUserSelect=""}function D(J,L){var K=new d.dom.TreeWalker(J,J);do{if(J.nodeType==3&&d.trim(J.nodeValue).length!=0){if(L){z.setStart(J,0)}else{z.setEnd(J,J.nodeValue.length)}return}if(J.nodeName=="BR"){if(L){z.setStartBefore(J)}else{z.setEndBefore(J)}return}}while(J=(L?K.next():K.prev()))}H=q.select("td.mceSelected,th.mceSelected");if(H.length>0){z=q.createRng();C=H[0];E=H[H.length-1];z.setStartBefore(C);z.setEndAfter(C);D(C,1);w=new d.dom.TreeWalker(C,q.getParent(H[0],"table"));do{if(C.nodeName=="TD"||C.nodeName=="TH"){if(!q.hasClass(C,"mceSelected")){break}A=C}}while(C=w.next());D(A);B.setRng(z)}F.nodeChanged();t=u=p=null}});r.onKeyUp.add(function(w,z){k()});r.onKeyDown.add(function(w,z){n(w)});r.onMouseDown.add(function(w,z){if(z.button!=2){n(w)}});function o(D,z,A,F){var B=3,G=D.dom.getParent(z.startContainer,"TABLE"),C,w,E;if(G){C=G.parentNode}w=z.startContainer.nodeType==B&&z.startOffset==0&&z.endOffset==0&&F&&(A.nodeName=="TR"||A==C);E=(A.nodeName=="TD"||A.nodeName=="TH")&&!F;return w||E}function n(A){if(!d.isWebKit){return}var z=A.selection.getRng();var C=A.selection.getNode();var B=A.dom.getParent(z.startContainer,"TD,TH");if(!o(A,z,C,B)){return}if(!B){B=C}var w=B.lastChild;while(w.lastChild){w=w.lastChild}z.setEnd(w,w.nodeValue.length);A.selection.setRng(z)}r.plugins.table.fixTableCellSelection=n;if(r&&r.plugins.contextmenu){r.plugins.contextmenu.onContextMenu.add(function(A,w,C){var D,B=r.selection,z=B.getNode()||r.getBody();if(r.dom.getParent(C,"td")||r.dom.getParent(C,"th")||r.dom.select("td.mceSelected,th.mceSelected").length){w.removeAll();if(z.nodeName=="A"&&!r.dom.getAttrib(z,"name")){w.add({title:"advanced.link_desc",icon:"link",cmd:r.plugins.advlink?"mceAdvLink":"mceLink",ui:true});w.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});w.addSeparator()}if(z.nodeName=="IMG"&&z.className.indexOf("mceItem")==-1){w.add({title:"advanced.image_desc",icon:"image",cmd:r.plugins.advimage?"mceAdvImage":"mceImage",ui:true});w.addSeparator()}w.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",value:{action:"insert"}});w.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable"});w.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete"});w.addSeparator();D=w.addMenu({title:"table.cell"});D.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps"});D.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells"});D.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells"});D=w.addMenu({title:"table.row"});D.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps"});D.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});D.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});D.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});D.addSeparator();D.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});D.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});D.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"}).setDisabled(!m);D.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"}).setDisabled(!m);D=w.addMenu({title:"table.col"});D.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});D.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});D.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{w.add({title:"table.desc",icon:"table",cmd:"mceInsertTable"})}})}if(d.isWebKit){function v(C,N){var L=d.VK;var Q=N.keyCode;function O(Y,U,S){var T=Y?"previousSibling":"nextSibling";var Z=C.dom.getParent(U,"tr");var X=Z[T];if(X){z(C,U,X,Y);d.dom.Event.cancel(S);return true}else{var aa=C.dom.getParent(Z,"table");var W=Z.parentNode;var R=W.nodeName.toLowerCase();if(R==="tbody"||R===(Y?"tfoot":"thead")){var V=w(Y,aa,W,"tbody");if(V!==null){return K(Y,V,U,S)}}return M(Y,Z,T,aa,S)}}function w(V,T,U,X){var S=C.dom.select(">"+X,T);var R=S.indexOf(U);if(V&&R===0||!V&&R===S.length-1){return B(V,T)}else{if(R===-1){var W=U.tagName.toLowerCase()==="thead"?0:S.length-1;return S[W]}else{return S[R+(V?-1:1)]}}}function B(U,T){var S=U?"thead":"tfoot";var R=C.dom.select(">"+S,T);return R.length!==0?R[0]:null}function K(V,T,S,U){var R=J(T,V);R&&z(C,S,R,V);d.dom.Event.cancel(U);return true}function M(Y,U,R,X,W){var S=X[R];if(S){F(S);return true}else{var V=C.dom.getParent(X,"td,th");if(V){return O(Y,V,W)}else{var T=J(U,!Y);F(T);return d.dom.Event.cancel(W)}}}function J(S,R){var T=S&&S[R?"lastChild":"firstChild"];return T&&T.nodeName==="BR"?C.dom.getParent(T,"td,th"):T}function F(R){C.selection.setCursorLocation(R,0)}function A(){return Q==L.UP||Q==L.DOWN}function D(R){var T=R.selection.getNode();var S=R.dom.getParent(T,"tr");return S!==null}function P(S){var R=0;var T=S;while(T.previousSibling){T=T.previousSibling;R=R+a(T,"colspan")}return R}function E(T,R){var U=0;var S=0;e(T.children,function(V,W){U=U+a(V,"colspan");S=W;if(U>R){return false}});return S}function z(T,W,Y,V){var X=P(T.dom.getParent(W,"td,th"));var S=E(Y,X);var R=Y.childNodes[S];var U=J(R,V);F(U||R)}function H(R){var T=C.selection.getNode();var U=C.dom.getParent(T,"td,th");var S=C.dom.getParent(R,"td,th");return U&&U!==S&&I(U,S)}function I(S,R){return C.dom.getParent(S,"TABLE")===C.dom.getParent(R,"TABLE")}if(A()&&D(C)){var G=C.selection.getNode();setTimeout(function(){if(H(G)){O(!N.shiftKey&&Q===L.UP,G,N)}},0)}}r.onKeyDown.add(v)}if(!d.isIE){function s(){var w;for(w=r.getBody().lastChild;w&&w.nodeType==3&&!w.nodeValue.length;w=w.previousSibling){}if(w&&w.nodeName=="TABLE"){r.dom.add(r.getBody(),"p",null,'<br mce_bogus="1" />')}}if(d.isGecko){r.onKeyDown.add(function(z,B){var w,A,C=z.dom;if(B.keyCode==37||B.keyCode==38){w=z.selection.getRng();A=C.getParent(w.startContainer,"table");if(A&&z.getBody().firstChild==A){if(c(w,A)){w=C.createRng();w.setStartBefore(A);w.setEndBefore(A);z.selection.setRng(w);B.preventDefault()}}}})}r.onKeyUp.add(s);r.onSetContent.add(s);r.onVisualAid.add(s);r.onPreProcess.add(function(w,A){var z=A.node.lastChild;if(z&&z.childNodes.length==1&&z.firstChild.nodeName=="BR"){w.dom.remove(z)}});if(d.isGecko){r.onKeyDown.add(function(z,B){if(B.keyCode===d.VK.ENTER&&B.shiftKey){var A=z.selection.getRng().startContainer;var C=q.getParent(A,"td,th");if(C){var w=z.getDoc().createTextNode("\uFEFF");q.insertAfter(w,A)}}})}s();r.startContent=r.getContent({format:"raw"})}});e({mceTableSplitCells:function(n){n.split()},mceTableMergeCells:function(o){var p,q,n;n=g.dom.getParent(g.selection.getNode(),"th,td");if(n){p=n.rowSpan;q=n.colSpan}if(!g.dom.select("td.mceSelected,th.mceSelected").length){f.open({url:h+"/merge_cells.htm",width:240+parseInt(g.getLang("table.merge_cells_delta_width",0)),height:110+parseInt(g.getLang("table.merge_cells_delta_height",0)),inline:1},{rows:p,cols:q,onaction:function(r){o.merge(n,r.cols,r.rows)},plugin_url:h})}else{o.merge()}},mceTableInsertRowBefore:function(n){n.insertRow(true)},mceTableInsertRowAfter:function(n){n.insertRow()},mceTableInsertColBefore:function(n){n.insertCol(true)},mceTableInsertColAfter:function(n){n.insertCol()},mceTableDeleteCol:function(n){n.deleteCols()},mceTableDeleteRow:function(n){n.deleteRows()},mceTableCutRow:function(n){m=n.cutRows()},mceTableCopyRow:function(n){m=n.copyRows()},mceTablePasteRowBefore:function(n){n.pasteRows(m,true)},mceTablePasteRowAfter:function(n){n.pasteRows(m)},mceTableDelete:function(n){n.deleteTable()}},function(o,n){g.addCommand(n,function(){var p=l();if(p){o(p);g.execCommand("mceRepaint");k()}})});e({mceInsertTable:function(n){f.open({url:h+"/table.htm",width:400+parseInt(g.getLang("table.table_delta_width",0)),height:320+parseInt(g.getLang("table.table_delta_height",0)),inline:1},{plugin_url:h,action:n?n.action:0})},mceTableRowProps:function(){f.open({url:h+"/row.htm",width:400+parseInt(g.getLang("table.rowprops_delta_width",0)),height:295+parseInt(g.getLang("table.rowprops_delta_height",0)),inline:1},{plugin_url:h})},mceTableCellProps:function(){f.open({url:h+"/cell.htm",width:400+parseInt(g.getLang("table.cellprops_delta_width",0)),height:295+parseInt(g.getLang("table.cellprops_delta_height",0)),inline:1},{plugin_url:h})}},function(o,n){g.addCommand(n,function(p,q){o(q)})})}});d.PluginManager.add("table",d.plugins.TablePlugin)})(tinymce);
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
index c2f307f04..832b5e943 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
@@ -1,1125 +1,1428 @@
-/**

- * editor_plugin_src.js

- *

- * Copyright 2009, Moxiecode Systems AB

- * Released under LGPL License.

- *

- * License: http://tinymce.moxiecode.com/license

- * Contributing: http://tinymce.moxiecode.com/contributing

- */

-

-(function(tinymce) {

-	var each = tinymce.each;

-

-	/**

-	 * Table Grid class.

-	 */

-	function TableGrid(table, dom, selection) {

-		var grid, startPos, endPos, selectedCell;

-

-		buildGrid();

-		selectedCell = dom.getParent(selection.getStart(), 'th,td');

-		if (selectedCell) {

-			startPos = getPos(selectedCell);

-			endPos = findEndPos();

-			selectedCell = getCell(startPos.x, startPos.y);

-		}

-

-		function cloneNode(node, children) {

-			node = node.cloneNode(children);

-			node.removeAttribute('id');

-

-			return node;

-		}

-

-		function buildGrid() {

-			var startY = 0;

-

-			grid = [];

-

-			each(['thead', 'tbody', 'tfoot'], function(part) {

-				var rows = dom.select(part + ' tr', table);

-

-				each(rows, function(tr, y) {

-					y += startY;

-

-					each(dom.select('td,th', tr), function(td, x) {

-						var x2, y2, rowspan, colspan;

-

-						// Skip over existing cells produced by rowspan

-						if (grid[y]) {

-							while (grid[y][x])

-								x++;

-						}

-

-						// Get col/rowspan from cell

-						rowspan = getSpanVal(td, 'rowspan');

-						colspan = getSpanVal(td, 'colspan');

-

-						// Fill out rowspan/colspan right and down

-						for (y2 = y; y2 < y + rowspan; y2++) {

-							if (!grid[y2])

-								grid[y2] = [];

-

-							for (x2 = x; x2 < x + colspan; x2++) {

-								grid[y2][x2] = {

-									part : part,

-									real : y2 == y && x2 == x,

-									elm : td,

-									rowspan : rowspan,

-									colspan : colspan

-								};

-							}

-						}

-					});

-				});

-

-				startY += rows.length;

-			});

-		};

-

-		function getCell(x, y) {

-			var row;

-

-			row = grid[y];

-			if (row)

-				return row[x];

-		};

-

-		function getSpanVal(td, name) {

-			return parseInt(td.getAttribute(name) || 1);

-		};

-

-		function isCellSelected(cell) {

-			return dom.hasClass(cell.elm, 'mceSelected') || cell == selectedCell;

-		};

-

-		function getSelectedRows() {

-			var rows = [];

-

-			each(table.rows, function(row) {

-				each(row.cells, function(cell) {

-					if (dom.hasClass(cell, 'mceSelected') || cell == selectedCell.elm) {

-						rows.push(row);

-						return false;

-					}

-				});

-			});

-

-			return rows;

-		};

-

-		function deleteTable() {

-			var rng = dom.createRng();

-

-			rng.setStartAfter(table);

-			rng.setEndAfter(table);

-

-			selection.setRng(rng);

-

-			dom.remove(table);

-		};

-

-		function cloneCell(cell) {

-			var formatNode;

-

-			// Clone formats

-			tinymce.walk(cell, function(node) {

-				var curNode;

-

-				if (node.nodeType == 3) {

-					each(dom.getParents(node.parentNode, null, cell).reverse(), function(node) {

-						node = cloneNode(node, false);

-

-						if (!formatNode)

-							formatNode = curNode = node;

-						else if (curNode)

-							curNode.appendChild(node);

-

-						curNode = node;

-					});

-

-					// Add something to the inner node

-					if (curNode)

-						curNode.innerHTML = tinymce.isIE ? '&nbsp;' : '<br _mce_bogus="1" />';

-

-					return false;

-				}

-			}, 'childNodes');

-

-			cell = cloneNode(cell, false);

-			cell.rowSpan = cell.colSpan = 1;

-

-			if (formatNode) {

-				cell.appendChild(formatNode);

-			} else {

-				if (!tinymce.isIE)

-					cell.innerHTML = '<br _mce_bogus="1" />';

-			}

-

-			return cell;

-		};

-

-		function cleanup() {

-			var rng = dom.createRng();

-

-			// Empty rows

-			each(dom.select('tr', table), function(tr) {

-				if (tr.cells.length == 0)

-					dom.remove(tr);

-			});

-

-			// Empty table

-			if (dom.select('tr', table).length == 0) {

-				rng.setStartAfter(table);

-				rng.setEndAfter(table);

-				selection.setRng(rng);

-				dom.remove(table);

-				return;

-			}

-

-			// Empty header/body/footer

-			each(dom.select('thead,tbody,tfoot', table), function(part) {

-				if (part.rows.length == 0)

-					dom.remove(part);

-			});

-

-			// Restore selection to start position if it still exists

-			buildGrid();

-

-			// Restore the selection to the closest table position

-			row = grid[Math.min(grid.length - 1, startPos.y)];

-			if (row) {

-				selection.select(row[Math.min(row.length - 1, startPos.x)].elm, true);

-				selection.collapse(true);

-			}

-		};

-

-		function fillLeftDown(x, y, rows, cols) {

-			var tr, x2, r, c, cell;

-

-			tr = grid[y][x].elm.parentNode;

-			for (r = 1; r <= rows; r++) {

-				tr = dom.getNext(tr, 'tr');

-

-				if (tr) {

-					// Loop left to find real cell

-					for (x2 = x; x2 >= 0; x2--) {

-						cell = grid[y + r][x2].elm;

-

-						if (cell.parentNode == tr) {

-							// Append clones after

-							for (c = 1; c <= cols; c++)

-								dom.insertAfter(cloneCell(cell), cell);

-

-							break;

-						}

-					}

-

-					if (x2 == -1) {

-						// Insert nodes before first cell

-						for (c = 1; c <= cols; c++)

-							tr.insertBefore(cloneCell(tr.cells[0]), tr.cells[0]);

-					}

-				}

-			}

-		};

-

-		function split() {

-			each(grid, function(row, y) {

-				each(row, function(cell, x) {

-					var colSpan, rowSpan, newCell, i;

-

-					if (isCellSelected(cell)) {

-						cell = cell.elm;

-						colSpan = getSpanVal(cell, 'colspan');

-						rowSpan = getSpanVal(cell, 'rowspan');

-

-						if (colSpan > 1 || rowSpan > 1) {

-							cell.colSpan = cell.rowSpan = 1;

-

-							// Insert cells right

-							for (i = 0; i < colSpan - 1; i++)

-								dom.insertAfter(cloneCell(cell), cell);

-

-							fillLeftDown(x, y, rowSpan - 1, colSpan);

-						}

-					}

-				});

-			});

-		};

-

-		function merge(cell, cols, rows) {

-			var startX, startY, endX, endY, x, y, startCell, endCell, cell, children;

-

-			// Use specified cell and cols/rows

-			if (cell) {

-				pos = getPos(cell);

-				startX = pos.x;

-				startY = pos.y;

-				endX = startX + (cols - 1);

-				endY = startY + (rows - 1);

-			} else {

-				// Use selection

-				startX = startPos.x;

-				startY = startPos.y;

-				endX = endPos.x;

-				endY = endPos.y;

-			}

-

-			// Find start/end cells

-			startCell = getCell(startX, startY);

-			endCell = getCell(endX, endY);

-

-			// Check if the cells exists and if they are of the same part for example tbody = tbody

-			if (startCell && endCell && startCell.part == endCell.part) {

-				// Split and rebuild grid

-				split();

-				buildGrid();

-

-				// Set row/col span to start cell

-				startCell = getCell(startX, startY).elm;

-				startCell.colSpan = (endX - startX) + 1;

-				startCell.rowSpan = (endY - startY) + 1;

-

-				// Remove other cells and add it's contents to the start cell

-				for (y = startY; y <= endY; y++) {

-					for (x = startX; x <= endX; x++) {

-						cell = grid[y][x].elm;

-

-						if (cell != startCell) {

-							// Move children to startCell

-							children = tinymce.grep(cell.childNodes);

-							each(children, function(node, i) {

-								// Jump over last BR element

-								if (node.nodeName != 'BR' || i != children.length - 1)

-									startCell.appendChild(node);

-							});

-

-							// Remove cell

-							dom.remove(cell);

-						}

-					}

-				}

-

-				// Remove empty rows etc and restore caret location

-				cleanup();

-			}

-		};

-

-		function insertRow(before) {

-			var posY, cell, lastCell, x, rowElm, newRow, newCell, otherCell;

-

-			// Find first/last row

-			each(grid, function(row, y) {

-				each(row, function(cell, x) {

-					if (isCellSelected(cell)) {

-						cell = cell.elm;

-						rowElm = cell.parentNode;

-						newRow = cloneNode(rowElm, false);

-						posY = y;

-

-						if (before)

-							return false;

-					}

-				});

-

-				if (before)

-					return !posY;

-			});

-

-			for (x = 0; x < grid[0].length; x++) {

-				cell = grid[posY][x].elm;

-

-				if (cell != lastCell) {

-					if (!before) {

-						rowSpan = getSpanVal(cell, 'rowspan');

-						if (rowSpan > 1) {

-							cell.rowSpan = rowSpan + 1;

-							continue;

-						}

-					} else {

-						// Check if cell above can be expanded

-						if (posY > 0 && grid[posY - 1][x]) {

-							otherCell = grid[posY - 1][x].elm;

-							rowSpan = getSpanVal(otherCell, 'rowspan');

-							if (rowSpan > 1) {

-								otherCell.rowSpan = rowSpan + 1;

-								continue;

-							}

-						}

-					}

-

-					// Insert new cell into new row

-					newCell = cloneCell(cell)

-					newCell.colSpan = cell.colSpan;

-					newRow.appendChild(newCell);

-

-					lastCell = cell;

-				}

-			}

-

-			if (newRow.hasChildNodes()) {

-				if (!before)

-					dom.insertAfter(newRow, rowElm);

-				else

-					rowElm.parentNode.insertBefore(newRow, rowElm);

-			}

-		};

-

-		function insertCol(before) {

-			var posX, lastCell;

-

-			// Find first/last column

-			each(grid, function(row, y) {

-				each(row, function(cell, x) {

-					if (isCellSelected(cell)) {

-						posX = x;

-

-						if (before)

-							return false;

-					}

-				});

-

-				if (before)

-					return !posX;

-			});

-

-			each(grid, function(row, y) {

-				var cell = row[posX].elm, rowSpan, colSpan;

-

-				if (cell != lastCell) {

-					colSpan = getSpanVal(cell, 'colspan');

-					rowSpan = getSpanVal(cell, 'rowspan');

-

-					if (colSpan == 1) {

-						if (!before) {

-							dom.insertAfter(cloneCell(cell), cell);

-							fillLeftDown(posX, y, rowSpan - 1, colSpan);

-						} else {

-							cell.parentNode.insertBefore(cloneCell(cell), cell);

-							fillLeftDown(posX, y, rowSpan - 1, colSpan);

-						}

-					} else

-						cell.colSpan++;

-

-					lastCell = cell;

-				}

-			});

-		};

-

-		function deleteCols() {

-			var cols = [];

-

-			// Get selected column indexes

-			each(grid, function(row, y) {

-				each(row, function(cell, x) {

-					if (isCellSelected(cell) && tinymce.inArray(cols, x) === -1) {

-						each(grid, function(row) {

-							var cell = row[x].elm, colSpan;

-

-							colSpan = getSpanVal(cell, 'colspan');

-

-							if (colSpan > 1)

-								cell.colSpan = colSpan - 1;

-							else

-								dom.remove(cell);

-						});

-

-						cols.push(x);

-					}

-				});

-			});

-

-			cleanup();

-		};

-

-		function deleteRows() {

-			var rows;

-

-			function deleteRow(tr) {

-				var nextTr, pos, lastCell;

-

-				nextTr = dom.getNext(tr, 'tr');

-

-				// Move down row spanned cells

-				each(tr.cells, function(cell) {

-					var rowSpan = getSpanVal(cell, 'rowspan');

-

-					if (rowSpan > 1) {

-						cell.rowSpan = rowSpan - 1;

-						pos = getPos(cell);

-						fillLeftDown(pos.x, pos.y, 1, 1);

-					}

-				});

-

-				// Delete cells

-				pos = getPos(tr.cells[0]);

-				each(grid[pos.y], function(cell) {

-					var rowSpan;

-

-					cell = cell.elm;

-

-					if (cell != lastCell) {

-						rowSpan = getSpanVal(cell, 'rowspan');

-

-						if (rowSpan <= 1)

-							dom.remove(cell);

-						else

-							cell.rowSpan = rowSpan - 1;

-

-						lastCell = cell;

-					}

-				});

-			};

-

-			// Get selected rows and move selection out of scope

-			rows = getSelectedRows();

-

-			// Delete all selected rows

-			each(rows.reverse(), function(tr) {

-				deleteRow(tr);

-			});

-

-			cleanup();

-		};

-

-		function cutRows() {

-			var rows = getSelectedRows();

-

-			dom.remove(rows);

-			cleanup();

-

-			return rows;

-		};

-

-		function copyRows() {

-			var rows = getSelectedRows();

-

-			each(rows, function(row, i) {

-				rows[i] = cloneNode(row, true);

-			});

-

-			return rows;

-		};

-

-		function pasteRows(rows, before) {

-			var selectedRows = getSelectedRows(),

-				targetRow = selectedRows[before ? 0 : selectedRows.length - 1],

-				targetCellCount = targetRow.cells.length;

-

-			// Calc target cell count

-			each(grid, function(row) {

-				var match;

-

-				targetCellCount = 0;

-				each(row, function(cell, x) {

-					if (cell.real)

-						targetCellCount += cell.colspan;

-

-					if (cell.elm.parentNode == targetRow)

-						match = 1;

-				});

-

-				if (match)

-					return false;

-			});

-

-			if (!before)

-				rows.reverse();

-

-			each(rows, function(row) {

-				var cellCount = row.cells.length, cell;

-

-				// Remove col/rowspans

-				for (i = 0; i < cellCount; i++) {

-					cell = row.cells[i];

-					cell.colSpan = cell.rowSpan = 1;

-				}

-

-				// Needs more cells

-				for (i = cellCount; i < targetCellCount; i++)

-					row.appendChild(cloneCell(row.cells[cellCount - 1]));

-

-				// Needs less cells

-				for (i = targetCellCount; i < cellCount; i++)

-					dom.remove(row.cells[i]);

-

-				// Add before/after

-				if (before)

-					targetRow.parentNode.insertBefore(row, targetRow);

-				else

-					dom.insertAfter(row, targetRow);

-			});

-		};

-

-		function getPos(target) {

-			var pos;

-

-			each(grid, function(row, y) {

-				each(row, function(cell, x) {

-					if (cell.elm == target) {

-						pos = {x : x, y : y};

-						return false;

-					}

-				});

-

-				return !pos;

-			});

-

-			return pos;

-		};

-

-		function setStartCell(cell) {

-			startPos = getPos(cell);

-		};

-

-		function findEndPos() {

-			var pos, maxX, maxY;

-

-			maxX = maxY = 0;

-

-			each(grid, function(row, y) {

-				each(row, function(cell, x) {

-					var colSpan, rowSpan;

-

-					if (isCellSelected(cell)) {

-						cell = grid[y][x];

-

-						if (x > maxX)

-							maxX = x;

-

-						if (y > maxY)

-							maxY = y;

-

-						if (cell.real) {

-							colSpan = cell.colspan - 1;

-							rowSpan = cell.rowspan - 1;

-

-							if (colSpan) {

-								if (x + colSpan > maxX)

-									maxX = x + colSpan;

-							}

-

-							if (rowSpan) {

-								if (y + rowSpan > maxY)

-									maxY = y + rowSpan;

-							}

-						}

-					}

-				});

-			});

-

-			return {x : maxX, y : maxY};

-		};

-

-		function setEndCell(cell) {

-			var startX, startY, endX, endY, maxX, maxY, colSpan, rowSpan;

-

-			endPos = getPos(cell);

-

-			if (startPos && endPos) {

-				// Get start/end positions

-				startX = Math.min(startPos.x, endPos.x);

-				startY = Math.min(startPos.y, endPos.y);

-				endX = Math.max(startPos.x, endPos.x);

-				endY = Math.max(startPos.y, endPos.y);

-

-				// Expand end positon to include spans

-				maxX = endX;

-				maxY = endY;

-

-				// Expand startX

-				for (y = startY; y <= maxY; y++) {

-					cell = grid[y][startX];

-

-					if (!cell.real) {

-						if (startX - (cell.colspan - 1) < startX)

-							startX -= cell.colspan - 1;

-					}

-				}

-

-				// Expand startY

-				for (x = startX; x <= maxX; x++) {

-					cell = grid[startY][x];

-

-					if (!cell.real) {

-						if (startY - (cell.rowspan - 1) < startY)

-							startY -= cell.rowspan - 1;

-					}

-				}

-

-				// Find max X, Y

-				for (y = startY; y <= endY; y++) {

-					for (x = startX; x <= endX; x++) {

-						cell = grid[y][x];

-

-						if (cell.real) {

-							colSpan = cell.colspan - 1;

-							rowSpan = cell.rowspan - 1;

-

-							if (colSpan) {

-								if (x + colSpan > maxX)

-									maxX = x + colSpan;

-							}

-

-							if (rowSpan) {

-								if (y + rowSpan > maxY)

-									maxY = y + rowSpan;

-							}

-						}

-					}

-				}

-

-				// Remove current selection

-				dom.removeClass(dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');

-

-				// Add new selection

-				for (y = startY; y <= maxY; y++) {

-					for (x = startX; x <= maxX; x++)

-						dom.addClass(grid[y][x].elm, 'mceSelected');

-				}

-			}

-		};

-

-		// Expose to public

-		tinymce.extend(this, {

-			deleteTable : deleteTable,

-			split : split,

-			merge : merge,

-			insertRow : insertRow,

-			insertCol : insertCol,

-			deleteCols : deleteCols,

-			deleteRows : deleteRows,

-			cutRows : cutRows,

-			copyRows : copyRows,

-			pasteRows : pasteRows,

-			getPos : getPos,

-			setStartCell : setStartCell,

-			setEndCell : setEndCell

-		});

-	};

-

-	tinymce.create('tinymce.plugins.TablePlugin', {

-		init : function(ed, url) {

-			var winMan, clipboardRows;

-

-			function createTableGrid(node) {

-				var selection = ed.selection, tblElm = ed.dom.getParent(node || selection.getNode(), 'table');

-

-				if (tblElm)

-					return new TableGrid(tblElm, ed.dom, selection);

-			};

-

-			function cleanup() {

-				// Restore selection possibilities

-				ed.getBody().style.webkitUserSelect = '';

-				ed.dom.removeClass(ed.dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');

-			};

-

-			// Register buttons

-			each([

-				['table', 'table.desc', 'mceInsertTable', true],

-				['delete_table', 'table.del', 'mceTableDelete'],

-				['delete_col', 'table.delete_col_desc', 'mceTableDeleteCol'],

-				['delete_row', 'table.delete_row_desc', 'mceTableDeleteRow'],

-				['col_after', 'table.col_after_desc', 'mceTableInsertColAfter'],

-				['col_before', 'table.col_before_desc', 'mceTableInsertColBefore'],

-				['row_after', 'table.row_after_desc', 'mceTableInsertRowAfter'],

-				['row_before', 'table.row_before_desc', 'mceTableInsertRowBefore'],

-				['row_props', 'table.row_desc', 'mceTableRowProps', true],

-				['cell_props', 'table.cell_desc', 'mceTableCellProps', true],

-				['split_cells', 'table.split_cells_desc', 'mceTableSplitCells', true],

-				['merge_cells', 'table.merge_cells_desc', 'mceTableMergeCells', true]

-			], function(c) {

-				ed.addButton(c[0], {title : c[1], cmd : c[2], ui : c[3]});

-			});

-

-			// Select whole table is a table border is clicked

-			if (!tinymce.isIE) {

-				ed.onClick.add(function(ed, e) {

-					e = e.target;

-

-					if (e.nodeName === 'TABLE')

-						ed.selection.select(e);

-				});

-			}

-

-			// Handle node change updates

-			ed.onNodeChange.add(function(ed, cm, n) {

-				var p;

-

-				n = ed.selection.getStart();

-				p = ed.dom.getParent(n, 'td,th,caption');

-				cm.setActive('table', n.nodeName === 'TABLE' || !!p);

-

-				// Disable table tools if we are in caption

-				if (p && p.nodeName === 'CAPTION')

-					p = 0;

-

-				cm.setDisabled('delete_table', !p);

-				cm.setDisabled('delete_col', !p);

-				cm.setDisabled('delete_table', !p);

-				cm.setDisabled('delete_row', !p);

-				cm.setDisabled('col_after', !p);

-				cm.setDisabled('col_before', !p);

-				cm.setDisabled('row_after', !p);

-				cm.setDisabled('row_before', !p);

-				cm.setDisabled('row_props', !p);

-				cm.setDisabled('cell_props', !p);

-				cm.setDisabled('split_cells', !p);

-				cm.setDisabled('merge_cells', !p);

-			});

-

-			ed.onInit.add(function(ed) {

-				var startTable, startCell, dom = ed.dom, tableGrid;

-

-				winMan = ed.windowManager;

-

-				// Add cell selection logic

-				ed.onMouseDown.add(function(ed, e) {

-					if (e.button != 2) {

-						cleanup();

-

-						startCell = dom.getParent(e.target, 'td,th');

-						startTable = dom.getParent(startCell, 'table');

-					}

-				});

-

-				dom.bind(ed.getDoc(), 'mouseover', function(e) {

-					var sel, table, target = e.target;

-

-					if (startCell && (tableGrid || target != startCell) && (target.nodeName == 'TD' || target.nodeName == 'TH')) {

-						table = dom.getParent(target, 'table');

-						if (table == startTable) {

-							if (!tableGrid) {

-								tableGrid = createTableGrid(table);

-								tableGrid.setStartCell(startCell);

-

-								ed.getBody().style.webkitUserSelect = 'none';

-							}

-

-							tableGrid.setEndCell(target);

-						}

-

-						// Remove current selection

-						sel = ed.selection.getSel();

-

-						if (sel.removeAllRanges)

-							sel.removeAllRanges();

-						else

-							sel.empty();

-

-						e.preventDefault();

-					}

-				});

-

-				ed.onMouseUp.add(function(ed, e) {

-					var rng, sel = ed.selection, selectedCells, nativeSel = sel.getSel(), walker, node, lastNode, endNode;

-

-					// Move selection to startCell

-					if (startCell) {

-						if (tableGrid)

-							ed.getBody().style.webkitUserSelect = '';

-

-						function setPoint(node, start) {

-							var walker = new tinymce.dom.TreeWalker(node, node);

-

-							do {

-								// Text node

-								if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {

-									if (start)

-										rng.setStart(node, 0);

-									else

-										rng.setEnd(node, node.nodeValue.length);

-

-									return;

-								}

-

-								// BR element

-								if (node.nodeName == 'BR') {

-									if (start)

-										rng.setStartBefore(node);

-									else

-										rng.setEndBefore(node);

-

-									return;

-								}

-							} while (node = (start ? walker.next() : walker.prev()));

-						};

-

-						// Try to expand text selection as much as we can only Gecko supports cell selection

-						selectedCells = dom.select('td.mceSelected,th.mceSelected');

-						if (selectedCells.length > 0) {

-							rng = dom.createRng();

-							node = selectedCells[0];

-							endNode = selectedCells[selectedCells.length - 1];

-

-							setPoint(node, 1);

-							walker = new tinymce.dom.TreeWalker(node, dom.getParent(selectedCells[0], 'table'));

-

-							do {

-								if (node.nodeName == 'TD' || node.nodeName == 'TH') {

-									if (!dom.hasClass(node, 'mceSelected'))

-										break;

-

-									lastNode = node;

-								}

-							} while (node = walker.next());

-

-							setPoint(lastNode);

-

-							sel.setRng(rng);

-						}

-

-						ed.nodeChanged();

-						startCell = tableGrid = startTable = null;

-					}

-				});

-

-				ed.onKeyUp.add(function(ed, e) {

-					cleanup();

-				});

-

-				// Add context menu

-				if (ed && ed.plugins.contextmenu) {

-					ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {

-						var sm, se = ed.selection, el = se.getNode() || ed.getBody();

-

-						if (ed.dom.getParent(e, 'td') || ed.dom.getParent(e, 'th') || ed.dom.select('td.mceSelected,th.mceSelected').length) {

-							m.removeAll();

-

-							if (el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) {

-								m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true});

-								m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'});

-								m.addSeparator();

-							}

-

-							if (el.nodeName == 'IMG' && el.className.indexOf('mceItem') == -1) {

-								m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true});

-								m.addSeparator();

-							}

-

-							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', value : {action : 'insert'}});

-							m.add({title : 'table.props_desc', icon : 'table_props', cmd : 'mceInsertTable'});

-							m.add({title : 'table.del', icon : 'delete_table', cmd : 'mceTableDelete'});

-							m.addSeparator();

-

-							// Cell menu

-							sm = m.addMenu({title : 'table.cell'});

-							sm.add({title : 'table.cell_desc', icon : 'cell_props', cmd : 'mceTableCellProps'});

-							sm.add({title : 'table.split_cells_desc', icon : 'split_cells', cmd : 'mceTableSplitCells'});

-							sm.add({title : 'table.merge_cells_desc', icon : 'merge_cells', cmd : 'mceTableMergeCells'});

-

-							// Row menu

-							sm = m.addMenu({title : 'table.row'});

-							sm.add({title : 'table.row_desc', icon : 'row_props', cmd : 'mceTableRowProps'});

-							sm.add({title : 'table.row_before_desc', icon : 'row_before', cmd : 'mceTableInsertRowBefore'});

-							sm.add({title : 'table.row_after_desc', icon : 'row_after', cmd : 'mceTableInsertRowAfter'});

-							sm.add({title : 'table.delete_row_desc', icon : 'delete_row', cmd : 'mceTableDeleteRow'});

-							sm.addSeparator();

-							sm.add({title : 'table.cut_row_desc', icon : 'cut', cmd : 'mceTableCutRow'});

-							sm.add({title : 'table.copy_row_desc', icon : 'copy', cmd : 'mceTableCopyRow'});

-							sm.add({title : 'table.paste_row_before_desc', icon : 'paste', cmd : 'mceTablePasteRowBefore'}).setDisabled(!clipboardRows);

-							sm.add({title : 'table.paste_row_after_desc', icon : 'paste', cmd : 'mceTablePasteRowAfter'}).setDisabled(!clipboardRows);

-

-							// Column menu

-							sm = m.addMenu({title : 'table.col'});

-							sm.add({title : 'table.col_before_desc', icon : 'col_before', cmd : 'mceTableInsertColBefore'});

-							sm.add({title : 'table.col_after_desc', icon : 'col_after', cmd : 'mceTableInsertColAfter'});

-							sm.add({title : 'table.delete_col_desc', icon : 'delete_col', cmd : 'mceTableDeleteCol'});

-						} else

-							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable'});

-					});

-				}

-

-				// Fixes an issue on Gecko where it's impossible to place the caret behind a table

-				// This fix will force a paragraph element after the table but only when the forced_root_block setting is enabled

-				if (!tinymce.isIE) {

-					function fixTableCaretPos() {

-						var last;

-

-						// Skip empty text nodes form the end

-						for (last = ed.getBody().lastChild; last && last.nodeType == 3 && !last.nodeValue.length; last = last.previousSibling) ;

-

-						if (last && last.nodeName == 'TABLE')

-							ed.dom.add(ed.getBody(), 'p', null, '<br mce_bogus="1" />');

-					};

-

-					// Fixes an bug where it's impossible to place the caret before a table in Gecko

-					// this fix solves it by detecting when the caret is at the beginning of such a table

-					// and then manually moves the caret infront of the table

-					if (tinymce.isGecko) {

-						ed.onKeyDown.add(function(ed, e) {

-							var rng, table, dom = ed.dom;

-

-							// On gecko it's not possible to place the caret before a table

-							if (e.keyCode == 37 || e.keyCode == 38) {

-								rng = ed.selection.getRng();

-								table = dom.getParent(rng.startContainer, 'table');

-

-								if (table && ed.getBody().firstChild == table) {

-									if (isAtStart(rng, table)) {

-										rng = dom.createRng();

-

-										rng.setStartBefore(table);

-										rng.setEndBefore(table);

-

-										ed.selection.setRng(rng);

-

-										e.preventDefault();

-									}

-								}

-							}

-						});

-					}

-

-					ed.onKeyUp.add(fixTableCaretPos);

-					ed.onSetContent.add(fixTableCaretPos);

-					ed.onVisualAid.add(fixTableCaretPos);

-

-					ed.onPreProcess.add(function(ed, o) {

-						var last = o.node.lastChild;

-

-						if (last && last.childNodes.length == 1 && last.firstChild.nodeName == 'BR')

-							ed.dom.remove(last);

-					});

-

-					fixTableCaretPos();

-				}

-			});

-

-			// Register action commands

-			each({

-				mceTableSplitCells : function(grid) {

-					grid.split();

-				},

-

-				mceTableMergeCells : function(grid) {

-					var rowSpan, colSpan, cell;

-

-					cell = ed.dom.getParent(ed.selection.getNode(), 'th,td');

-					if (cell) {

-						rowSpan = cell.rowSpan;

-						colSpan = cell.colSpan;

-					}

-

-					if (!ed.dom.select('td.mceSelected,th.mceSelected').length) {

-						winMan.open({

-							url : url + '/merge_cells.htm',

-							width : 240 + parseInt(ed.getLang('table.merge_cells_delta_width', 0)),

-							height : 110 + parseInt(ed.getLang('table.merge_cells_delta_height', 0)),

-							inline : 1

-						}, {

-							rows : rowSpan,

-							cols : colSpan,

-							onaction : function(data) {

-								grid.merge(cell, data.cols, data.rows);

-							},

-							plugin_url : url

-						});

-					} else

-						grid.merge();

-				},

-

-				mceTableInsertRowBefore : function(grid) {

-					grid.insertRow(true);

-				},

-

-				mceTableInsertRowAfter : function(grid) {

-					grid.insertRow();

-				},

-

-				mceTableInsertColBefore : function(grid) {

-					grid.insertCol(true);

-				},

-

-				mceTableInsertColAfter : function(grid) {

-					grid.insertCol();

-				},

-

-				mceTableDeleteCol : function(grid) {

-					grid.deleteCols();

-				},

-

-				mceTableDeleteRow : function(grid) {

-					grid.deleteRows();

-				},

-

-				mceTableCutRow : function(grid) {

-					clipboardRows = grid.cutRows();

-				},

-

-				mceTableCopyRow : function(grid) {

-					clipboardRows = grid.copyRows();

-				},

-

-				mceTablePasteRowBefore : function(grid) {

-					grid.pasteRows(clipboardRows, true);

-				},

-

-				mceTablePasteRowAfter : function(grid) {

-					grid.pasteRows(clipboardRows);

-				},

-

-				mceTableDelete : function(grid) {

-					grid.deleteTable();

-				}

-			}, function(func, name) {

-				ed.addCommand(name, function() {

-					var grid = createTableGrid();

-

-					if (grid) {

-						func(grid);

-						ed.execCommand('mceRepaint');

-						cleanup();

-					}

-				});

-			});

-

-			// Register dialog commands

-			each({

-				mceInsertTable : function(val) {

-					winMan.open({

-						url : url + '/table.htm',

-						width : 400 + parseInt(ed.getLang('table.table_delta_width', 0)),

-						height : 320 + parseInt(ed.getLang('table.table_delta_height', 0)),

-						inline : 1

-					}, {

-						plugin_url : url,

-						action : val ? val.action : 0

-					});

-				},

-

-				mceTableRowProps : function() {

-					winMan.open({

-						url : url + '/row.htm',

-						width : 400 + parseInt(ed.getLang('table.rowprops_delta_width', 0)),

-						height : 295 + parseInt(ed.getLang('table.rowprops_delta_height', 0)),

-						inline : 1

-					}, {

-						plugin_url : url

-					});

-				},

-

-				mceTableCellProps : function() {

-					winMan.open({

-						url : url + '/cell.htm',

-						width : 400 + parseInt(ed.getLang('table.cellprops_delta_width', 0)),

-						height : 295 + parseInt(ed.getLang('table.cellprops_delta_height', 0)),

-						inline : 1

-					}, {

-						plugin_url : url

-					});

-				}

-			}, function(func, name) {

-				ed.addCommand(name, function(ui, val) {

-					func(val);

-				});

-			});

-		}

-	});

-

-	// Register plugin

-	tinymce.PluginManager.add('table', tinymce.plugins.TablePlugin);

-})(tinymce);
\ No newline at end of file
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function(tinymce) {
+	var each = tinymce.each;
+
+	// Checks if the selection/caret is at the start of the specified block element
+	function isAtStart(rng, par) {
+		var doc = par.ownerDocument, rng2 = doc.createRange(), elm;
+
+		rng2.setStartBefore(par);
+		rng2.setEnd(rng.endContainer, rng.endOffset);
+
+		elm = doc.createElement('body');
+		elm.appendChild(rng2.cloneContents());
+
+		// Check for text characters of other elements that should be treated as content
+		return elm.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi, '-').replace(/<[^>]+>/g, '').length == 0;
+	};
+
+	function getSpanVal(td, name) {
+		return parseInt(td.getAttribute(name) || 1);
+	}
+
+	/**
+	 * Table Grid class.
+	 */
+	function TableGrid(table, dom, selection) {
+		var grid, startPos, endPos, selectedCell;
+
+		buildGrid();
+		selectedCell = dom.getParent(selection.getStart(), 'th,td');
+		if (selectedCell) {
+			startPos = getPos(selectedCell);
+			endPos = findEndPos();
+			selectedCell = getCell(startPos.x, startPos.y);
+		}
+
+		function cloneNode(node, children) {
+			node = node.cloneNode(children);
+			node.removeAttribute('id');
+
+			return node;
+		}
+
+		function buildGrid() {
+			var startY = 0;
+
+			grid = [];
+
+			each(['thead', 'tbody', 'tfoot'], function(part) {
+				var rows = dom.select('> ' + part + ' tr', table);
+
+				each(rows, function(tr, y) {
+					y += startY;
+
+					each(dom.select('> td, > th', tr), function(td, x) {
+						var x2, y2, rowspan, colspan;
+
+						// Skip over existing cells produced by rowspan
+						if (grid[y]) {
+							while (grid[y][x])
+								x++;
+						}
+
+						// Get col/rowspan from cell
+						rowspan = getSpanVal(td, 'rowspan');
+						colspan = getSpanVal(td, 'colspan');
+
+						// Fill out rowspan/colspan right and down
+						for (y2 = y; y2 < y + rowspan; y2++) {
+							if (!grid[y2])
+								grid[y2] = [];
+
+							for (x2 = x; x2 < x + colspan; x2++) {
+								grid[y2][x2] = {
+									part : part,
+									real : y2 == y && x2 == x,
+									elm : td,
+									rowspan : rowspan,
+									colspan : colspan
+								};
+							}
+						}
+					});
+				});
+
+				startY += rows.length;
+			});
+		};
+
+		function getCell(x, y) {
+			var row;
+
+			row = grid[y];
+			if (row)
+				return row[x];
+		};
+
+		function setSpanVal(td, name, val) {
+			if (td) {
+				val = parseInt(val);
+
+				if (val === 1)
+					td.removeAttribute(name, 1);
+				else
+					td.setAttribute(name, val, 1);
+			}
+		}
+
+		function isCellSelected(cell) {
+			return cell && (dom.hasClass(cell.elm, 'mceSelected') || cell == selectedCell);
+		};
+
+		function getSelectedRows() {
+			var rows = [];
+
+			each(table.rows, function(row) {
+				each(row.cells, function(cell) {
+					if (dom.hasClass(cell, 'mceSelected') || cell == selectedCell.elm) {
+						rows.push(row);
+						return false;
+					}
+				});
+			});
+
+			return rows;
+		};
+
+		function deleteTable() {
+			var rng = dom.createRng();
+
+			rng.setStartAfter(table);
+			rng.setEndAfter(table);
+
+			selection.setRng(rng);
+
+			dom.remove(table);
+		};
+
+		function cloneCell(cell) {
+			var formatNode;
+
+			// Clone formats
+			tinymce.walk(cell, function(node) {
+				var curNode;
+
+				if (node.nodeType == 3) {
+					each(dom.getParents(node.parentNode, null, cell).reverse(), function(node) {
+						node = cloneNode(node, false);
+
+						if (!formatNode)
+							formatNode = curNode = node;
+						else if (curNode)
+							curNode.appendChild(node);
+
+						curNode = node;
+					});
+
+					// Add something to the inner node
+					if (curNode)
+						curNode.innerHTML = tinymce.isIE ? '&nbsp;' : '<br data-mce-bogus="1" />';
+
+					return false;
+				}
+			}, 'childNodes');
+
+			cell = cloneNode(cell, false);
+			setSpanVal(cell, 'rowSpan', 1);
+			setSpanVal(cell, 'colSpan', 1);
+
+			if (formatNode) {
+				cell.appendChild(formatNode);
+			} else {
+				if (!tinymce.isIE)
+					cell.innerHTML = '<br data-mce-bogus="1" />';
+			}
+
+			return cell;
+		};
+
+		function cleanup() {
+			var rng = dom.createRng();
+
+			// Empty rows
+			each(dom.select('tr', table), function(tr) {
+				if (tr.cells.length == 0)
+					dom.remove(tr);
+			});
+
+			// Empty table
+			if (dom.select('tr', table).length == 0) {
+				rng.setStartAfter(table);
+				rng.setEndAfter(table);
+				selection.setRng(rng);
+				dom.remove(table);
+				return;
+			}
+
+			// Empty header/body/footer
+			each(dom.select('thead,tbody,tfoot', table), function(part) {
+				if (part.rows.length == 0)
+					dom.remove(part);
+			});
+
+			// Restore selection to start position if it still exists
+			buildGrid();
+
+			// Restore the selection to the closest table position
+			row = grid[Math.min(grid.length - 1, startPos.y)];
+			if (row) {
+				selection.select(row[Math.min(row.length - 1, startPos.x)].elm, true);
+				selection.collapse(true);
+			}
+		};
+
+		function fillLeftDown(x, y, rows, cols) {
+			var tr, x2, r, c, cell;
+
+			tr = grid[y][x].elm.parentNode;
+			for (r = 1; r <= rows; r++) {
+				tr = dom.getNext(tr, 'tr');
+
+				if (tr) {
+					// Loop left to find real cell
+					for (x2 = x; x2 >= 0; x2--) {
+						cell = grid[y + r][x2].elm;
+
+						if (cell.parentNode == tr) {
+							// Append clones after
+							for (c = 1; c <= cols; c++)
+								dom.insertAfter(cloneCell(cell), cell);
+
+							break;
+						}
+					}
+
+					if (x2 == -1) {
+						// Insert nodes before first cell
+						for (c = 1; c <= cols; c++)
+							tr.insertBefore(cloneCell(tr.cells[0]), tr.cells[0]);
+					}
+				}
+			}
+		};
+
+		function split() {
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					var colSpan, rowSpan, newCell, i;
+
+					if (isCellSelected(cell)) {
+						cell = cell.elm;
+						colSpan = getSpanVal(cell, 'colspan');
+						rowSpan = getSpanVal(cell, 'rowspan');
+
+						if (colSpan > 1 || rowSpan > 1) {
+							setSpanVal(cell, 'rowSpan', 1);
+							setSpanVal(cell, 'colSpan', 1);
+
+							// Insert cells right
+							for (i = 0; i < colSpan - 1; i++)
+								dom.insertAfter(cloneCell(cell), cell);
+
+							fillLeftDown(x, y, rowSpan - 1, colSpan);
+						}
+					}
+				});
+			});
+		};
+
+		function merge(cell, cols, rows) {
+			var startX, startY, endX, endY, x, y, startCell, endCell, cell, children, count;
+
+			// Use specified cell and cols/rows
+			if (cell) {
+				pos = getPos(cell);
+				startX = pos.x;
+				startY = pos.y;
+				endX = startX + (cols - 1);
+				endY = startY + (rows - 1);
+			} else {
+				// Use selection
+				startX = startPos.x;
+				startY = startPos.y;
+				endX = endPos.x;
+				endY = endPos.y;
+			}
+
+			// Find start/end cells
+			startCell = getCell(startX, startY);
+			endCell = getCell(endX, endY);
+
+			// Check if the cells exists and if they are of the same part for example tbody = tbody
+			if (startCell && endCell && startCell.part == endCell.part) {
+				// Split and rebuild grid
+				split();
+				buildGrid();
+
+				// Set row/col span to start cell
+				startCell = getCell(startX, startY).elm;
+				setSpanVal(startCell, 'colSpan', (endX - startX) + 1);
+				setSpanVal(startCell, 'rowSpan', (endY - startY) + 1);
+
+				// Remove other cells and add it's contents to the start cell
+				for (y = startY; y <= endY; y++) {
+					for (x = startX; x <= endX; x++) {
+						if (!grid[y] || !grid[y][x])
+							continue;
+
+						cell = grid[y][x].elm;
+
+						if (cell != startCell) {
+							// Move children to startCell
+							children = tinymce.grep(cell.childNodes);
+							each(children, function(node) {
+								startCell.appendChild(node);
+							});
+
+							// Remove bogus nodes if there is children in the target cell
+							if (children.length) {
+								children = tinymce.grep(startCell.childNodes);
+								count = 0;
+								each(children, function(node) {
+									if (node.nodeName == 'BR' && dom.getAttrib(node, 'data-mce-bogus') && count++ < children.length - 1)
+										startCell.removeChild(node);
+								});
+							}
+							
+							// Remove cell
+							dom.remove(cell);
+						}
+					}
+				}
+
+				// Remove empty rows etc and restore caret location
+				cleanup();
+			}
+		};
+
+		function insertRow(before) {
+			var posY, cell, lastCell, x, rowElm, newRow, newCell, otherCell, rowSpan;
+
+			// Find first/last row
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (isCellSelected(cell)) {
+						cell = cell.elm;
+						rowElm = cell.parentNode;
+						newRow = cloneNode(rowElm, false);
+						posY = y;
+
+						if (before)
+							return false;
+					}
+				});
+
+				if (before)
+					return !posY;
+			});
+
+			for (x = 0; x < grid[0].length; x++) {
+				// Cell not found could be because of an invalid table structure
+				if (!grid[posY][x])
+					continue;
+
+				cell = grid[posY][x].elm;
+
+				if (cell != lastCell) {
+					if (!before) {
+						rowSpan = getSpanVal(cell, 'rowspan');
+						if (rowSpan > 1) {
+							setSpanVal(cell, 'rowSpan', rowSpan + 1);
+							continue;
+						}
+					} else {
+						// Check if cell above can be expanded
+						if (posY > 0 && grid[posY - 1][x]) {
+							otherCell = grid[posY - 1][x].elm;
+							rowSpan = getSpanVal(otherCell, 'rowSpan');
+							if (rowSpan > 1) {
+								setSpanVal(otherCell, 'rowSpan', rowSpan + 1);
+								continue;
+							}
+						}
+					}
+
+					// Insert new cell into new row
+					newCell = cloneCell(cell);
+					setSpanVal(newCell, 'colSpan', cell.colSpan);
+
+					newRow.appendChild(newCell);
+
+					lastCell = cell;
+				}
+			}
+
+			if (newRow.hasChildNodes()) {
+				if (!before)
+					dom.insertAfter(newRow, rowElm);
+				else
+					rowElm.parentNode.insertBefore(newRow, rowElm);
+			}
+		};
+
+		function insertCol(before) {
+			var posX, lastCell;
+
+			// Find first/last column
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (isCellSelected(cell)) {
+						posX = x;
+
+						if (before)
+							return false;
+					}
+				});
+
+				if (before)
+					return !posX;
+			});
+
+			each(grid, function(row, y) {
+				var cell, rowSpan, colSpan;
+
+				if (!row[posX])
+					return;
+
+				cell = row[posX].elm;
+				if (cell != lastCell) {
+					colSpan = getSpanVal(cell, 'colspan');
+					rowSpan = getSpanVal(cell, 'rowspan');
+
+					if (colSpan == 1) {
+						if (!before) {
+							dom.insertAfter(cloneCell(cell), cell);
+							fillLeftDown(posX, y, rowSpan - 1, colSpan);
+						} else {
+							cell.parentNode.insertBefore(cloneCell(cell), cell);
+							fillLeftDown(posX, y, rowSpan - 1, colSpan);
+						}
+					} else
+						setSpanVal(cell, 'colSpan', cell.colSpan + 1);
+
+					lastCell = cell;
+				}
+			});
+		};
+
+		function deleteCols() {
+			var cols = [];
+
+			// Get selected column indexes
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (isCellSelected(cell) && tinymce.inArray(cols, x) === -1) {
+						each(grid, function(row) {
+							var cell = row[x].elm, colSpan;
+
+							colSpan = getSpanVal(cell, 'colSpan');
+
+							if (colSpan > 1)
+								setSpanVal(cell, 'colSpan', colSpan - 1);
+							else
+								dom.remove(cell);
+						});
+
+						cols.push(x);
+					}
+				});
+			});
+
+			cleanup();
+		};
+
+		function deleteRows() {
+			var rows;
+
+			function deleteRow(tr) {
+				var nextTr, pos, lastCell;
+
+				nextTr = dom.getNext(tr, 'tr');
+
+				// Move down row spanned cells
+				each(tr.cells, function(cell) {
+					var rowSpan = getSpanVal(cell, 'rowSpan');
+
+					if (rowSpan > 1) {
+						setSpanVal(cell, 'rowSpan', rowSpan - 1);
+						pos = getPos(cell);
+						fillLeftDown(pos.x, pos.y, 1, 1);
+					}
+				});
+
+				// Delete cells
+				pos = getPos(tr.cells[0]);
+				each(grid[pos.y], function(cell) {
+					var rowSpan;
+
+					cell = cell.elm;
+
+					if (cell != lastCell) {
+						rowSpan = getSpanVal(cell, 'rowSpan');
+
+						if (rowSpan <= 1)
+							dom.remove(cell);
+						else
+							setSpanVal(cell, 'rowSpan', rowSpan - 1);
+
+						lastCell = cell;
+					}
+				});
+			};
+
+			// Get selected rows and move selection out of scope
+			rows = getSelectedRows();
+
+			// Delete all selected rows
+			each(rows.reverse(), function(tr) {
+				deleteRow(tr);
+			});
+
+			cleanup();
+		};
+
+		function cutRows() {
+			var rows = getSelectedRows();
+
+			dom.remove(rows);
+			cleanup();
+
+			return rows;
+		};
+
+		function copyRows() {
+			var rows = getSelectedRows();
+
+			each(rows, function(row, i) {
+				rows[i] = cloneNode(row, true);
+			});
+
+			return rows;
+		};
+
+		function pasteRows(rows, before) {
+			var selectedRows = getSelectedRows(),
+				targetRow = selectedRows[before ? 0 : selectedRows.length - 1],
+				targetCellCount = targetRow.cells.length;
+
+			// Calc target cell count
+			each(grid, function(row) {
+				var match;
+
+				targetCellCount = 0;
+				each(row, function(cell, x) {
+					if (cell.real)
+						targetCellCount += cell.colspan;
+
+					if (cell.elm.parentNode == targetRow)
+						match = 1;
+				});
+
+				if (match)
+					return false;
+			});
+
+			if (!before)
+				rows.reverse();
+
+			each(rows, function(row) {
+				var cellCount = row.cells.length, cell;
+
+				// Remove col/rowspans
+				for (i = 0; i < cellCount; i++) {
+					cell = row.cells[i];
+					setSpanVal(cell, 'colSpan', 1);
+					setSpanVal(cell, 'rowSpan', 1);
+				}
+
+				// Needs more cells
+				for (i = cellCount; i < targetCellCount; i++)
+					row.appendChild(cloneCell(row.cells[cellCount - 1]));
+
+				// Needs less cells
+				for (i = targetCellCount; i < cellCount; i++)
+					dom.remove(row.cells[i]);
+
+				// Add before/after
+				if (before)
+					targetRow.parentNode.insertBefore(row, targetRow);
+				else
+					dom.insertAfter(row, targetRow);
+			});
+		};
+
+		function getPos(target) {
+			var pos;
+
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (cell.elm == target) {
+						pos = {x : x, y : y};
+						return false;
+					}
+				});
+
+				return !pos;
+			});
+
+			return pos;
+		};
+
+		function setStartCell(cell) {
+			startPos = getPos(cell);
+		};
+
+		function findEndPos() {
+			var pos, maxX, maxY;
+
+			maxX = maxY = 0;
+
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					var colSpan, rowSpan;
+
+					if (isCellSelected(cell)) {
+						cell = grid[y][x];
+
+						if (x > maxX)
+							maxX = x;
+
+						if (y > maxY)
+							maxY = y;
+
+						if (cell.real) {
+							colSpan = cell.colspan - 1;
+							rowSpan = cell.rowspan - 1;
+
+							if (colSpan) {
+								if (x + colSpan > maxX)
+									maxX = x + colSpan;
+							}
+
+							if (rowSpan) {
+								if (y + rowSpan > maxY)
+									maxY = y + rowSpan;
+							}
+						}
+					}
+				});
+			});
+
+			return {x : maxX, y : maxY};
+		};
+
+		function setEndCell(cell) {
+			var startX, startY, endX, endY, maxX, maxY, colSpan, rowSpan;
+
+			endPos = getPos(cell);
+
+			if (startPos && endPos) {
+				// Get start/end positions
+				startX = Math.min(startPos.x, endPos.x);
+				startY = Math.min(startPos.y, endPos.y);
+				endX = Math.max(startPos.x, endPos.x);
+				endY = Math.max(startPos.y, endPos.y);
+
+				// Expand end positon to include spans
+				maxX = endX;
+				maxY = endY;
+
+				// Expand startX
+				for (y = startY; y <= maxY; y++) {
+					cell = grid[y][startX];
+
+					if (!cell.real) {
+						if (startX - (cell.colspan - 1) < startX)
+							startX -= cell.colspan - 1;
+					}
+				}
+
+				// Expand startY
+				for (x = startX; x <= maxX; x++) {
+					cell = grid[startY][x];
+
+					if (!cell.real) {
+						if (startY - (cell.rowspan - 1) < startY)
+							startY -= cell.rowspan - 1;
+					}
+				}
+
+				// Find max X, Y
+				for (y = startY; y <= endY; y++) {
+					for (x = startX; x <= endX; x++) {
+						cell = grid[y][x];
+
+						if (cell.real) {
+							colSpan = cell.colspan - 1;
+							rowSpan = cell.rowspan - 1;
+
+							if (colSpan) {
+								if (x + colSpan > maxX)
+									maxX = x + colSpan;
+							}
+
+							if (rowSpan) {
+								if (y + rowSpan > maxY)
+									maxY = y + rowSpan;
+							}
+						}
+					}
+				}
+
+				// Remove current selection
+				dom.removeClass(dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');
+
+				// Add new selection
+				for (y = startY; y <= maxY; y++) {
+					for (x = startX; x <= maxX; x++) {
+						if (grid[y][x])
+							dom.addClass(grid[y][x].elm, 'mceSelected');
+					}
+				}
+			}
+		};
+
+		// Expose to public
+		tinymce.extend(this, {
+			deleteTable : deleteTable,
+			split : split,
+			merge : merge,
+			insertRow : insertRow,
+			insertCol : insertCol,
+			deleteCols : deleteCols,
+			deleteRows : deleteRows,
+			cutRows : cutRows,
+			copyRows : copyRows,
+			pasteRows : pasteRows,
+			getPos : getPos,
+			setStartCell : setStartCell,
+			setEndCell : setEndCell
+		});
+	};
+
+	tinymce.create('tinymce.plugins.TablePlugin', {
+		init : function(ed, url) {
+			var winMan, clipboardRows, hasCellSelection = true; // Might be selected cells on reload
+
+			function createTableGrid(node) {
+				var selection = ed.selection, tblElm = ed.dom.getParent(node || selection.getNode(), 'table');
+
+				if (tblElm)
+					return new TableGrid(tblElm, ed.dom, selection);
+			};
+
+			function cleanup() {
+				// Restore selection possibilities
+				ed.getBody().style.webkitUserSelect = '';
+
+				if (hasCellSelection) {
+					ed.dom.removeClass(ed.dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');
+					hasCellSelection = false;
+				}
+			};
+
+			// Register buttons
+			each([
+				['table', 'table.desc', 'mceInsertTable', true],
+				['delete_table', 'table.del', 'mceTableDelete'],
+				['delete_col', 'table.delete_col_desc', 'mceTableDeleteCol'],
+				['delete_row', 'table.delete_row_desc', 'mceTableDeleteRow'],
+				['col_after', 'table.col_after_desc', 'mceTableInsertColAfter'],
+				['col_before', 'table.col_before_desc', 'mceTableInsertColBefore'],
+				['row_after', 'table.row_after_desc', 'mceTableInsertRowAfter'],
+				['row_before', 'table.row_before_desc', 'mceTableInsertRowBefore'],
+				['row_props', 'table.row_desc', 'mceTableRowProps', true],
+				['cell_props', 'table.cell_desc', 'mceTableCellProps', true],
+				['split_cells', 'table.split_cells_desc', 'mceTableSplitCells', true],
+				['merge_cells', 'table.merge_cells_desc', 'mceTableMergeCells', true]
+			], function(c) {
+				ed.addButton(c[0], {title : c[1], cmd : c[2], ui : c[3]});
+			});
+
+			// Select whole table is a table border is clicked
+			if (!tinymce.isIE) {
+				ed.onClick.add(function(ed, e) {
+					e = e.target;
+
+					if (e.nodeName === 'TABLE') {
+						ed.selection.select(e);
+						ed.nodeChanged();
+					}
+				});
+			}
+
+			ed.onPreProcess.add(function(ed, args) {
+				var nodes, i, node, dom = ed.dom, value;
+
+				nodes = dom.select('table', args.node);
+				i = nodes.length;
+				while (i--) {
+					node = nodes[i];
+					dom.setAttrib(node, 'data-mce-style', '');
+
+					if ((value = dom.getAttrib(node, 'width'))) {
+						dom.setStyle(node, 'width', value);
+						dom.setAttrib(node, 'width', '');
+					}
+
+					if ((value = dom.getAttrib(node, 'height'))) {
+						dom.setStyle(node, 'height', value);
+						dom.setAttrib(node, 'height', '');
+					}
+				}
+			});
+
+			// Handle node change updates
+			ed.onNodeChange.add(function(ed, cm, n) {
+				var p;
+
+				n = ed.selection.getStart();
+				p = ed.dom.getParent(n, 'td,th,caption');
+				cm.setActive('table', n.nodeName === 'TABLE' || !!p);
+
+				// Disable table tools if we are in caption
+				if (p && p.nodeName === 'CAPTION')
+					p = 0;
+
+				cm.setDisabled('delete_table', !p);
+				cm.setDisabled('delete_col', !p);
+				cm.setDisabled('delete_table', !p);
+				cm.setDisabled('delete_row', !p);
+				cm.setDisabled('col_after', !p);
+				cm.setDisabled('col_before', !p);
+				cm.setDisabled('row_after', !p);
+				cm.setDisabled('row_before', !p);
+				cm.setDisabled('row_props', !p);
+				cm.setDisabled('cell_props', !p);
+				cm.setDisabled('split_cells', !p);
+				cm.setDisabled('merge_cells', !p);
+			});
+
+			ed.onInit.add(function(ed) {
+				var startTable, startCell, dom = ed.dom, tableGrid;
+
+				winMan = ed.windowManager;
+
+				// Add cell selection logic
+				ed.onMouseDown.add(function(ed, e) {
+					if (e.button != 2) {
+						cleanup();
+
+						startCell = dom.getParent(e.target, 'td,th');
+						startTable = dom.getParent(startCell, 'table');
+					}
+				});
+
+				dom.bind(ed.getDoc(), 'mouseover', function(e) {
+					var sel, table, target = e.target;
+
+					if (startCell && (tableGrid || target != startCell) && (target.nodeName == 'TD' || target.nodeName == 'TH')) {
+						table = dom.getParent(target, 'table');
+						if (table == startTable) {
+							if (!tableGrid) {
+								tableGrid = createTableGrid(table);
+								tableGrid.setStartCell(startCell);
+
+								ed.getBody().style.webkitUserSelect = 'none';
+							}
+
+							tableGrid.setEndCell(target);
+							hasCellSelection = true;
+						}
+
+						// Remove current selection
+						sel = ed.selection.getSel();
+
+						try {
+							if (sel.removeAllRanges)
+								sel.removeAllRanges();
+							else
+								sel.empty();
+						} catch (ex) {
+							// IE9 might throw errors here
+						}
+
+						e.preventDefault();
+					}
+				});
+
+				ed.onMouseUp.add(function(ed, e) {
+					var rng, sel = ed.selection, selectedCells, nativeSel = sel.getSel(), walker, node, lastNode, endNode;
+
+					// Move selection to startCell
+					if (startCell) {
+						if (tableGrid)
+							ed.getBody().style.webkitUserSelect = '';
+
+						function setPoint(node, start) {
+							var walker = new tinymce.dom.TreeWalker(node, node);
+
+							do {
+								// Text node
+								if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {
+									if (start)
+										rng.setStart(node, 0);
+									else
+										rng.setEnd(node, node.nodeValue.length);
+
+									return;
+								}
+
+								// BR element
+								if (node.nodeName == 'BR') {
+									if (start)
+										rng.setStartBefore(node);
+									else
+										rng.setEndBefore(node);
+
+									return;
+								}
+							} while (node = (start ? walker.next() : walker.prev()));
+						}
+
+						// Try to expand text selection as much as we can only Gecko supports cell selection
+						selectedCells = dom.select('td.mceSelected,th.mceSelected');
+						if (selectedCells.length > 0) {
+							rng = dom.createRng();
+							node = selectedCells[0];
+							endNode = selectedCells[selectedCells.length - 1];
+							rng.setStartBefore(node);
+							rng.setEndAfter(node);
+
+							setPoint(node, 1);
+							walker = new tinymce.dom.TreeWalker(node, dom.getParent(selectedCells[0], 'table'));
+
+							do {
+								if (node.nodeName == 'TD' || node.nodeName == 'TH') {
+									if (!dom.hasClass(node, 'mceSelected'))
+										break;
+
+									lastNode = node;
+								}
+							} while (node = walker.next());
+
+							setPoint(lastNode);
+
+							sel.setRng(rng);
+						}
+
+						ed.nodeChanged();
+						startCell = tableGrid = startTable = null;
+					}
+				});
+
+				ed.onKeyUp.add(function(ed, e) {
+					cleanup();
+				});
+
+				ed.onKeyDown.add(function (ed, e) {
+					fixTableCellSelection(ed);
+				});
+
+				ed.onMouseDown.add(function (ed, e) {
+					if (e.button != 2) {
+						fixTableCellSelection(ed);
+					}
+				});
+				function tableCellSelected(ed, rng, n, currentCell) {
+					// The decision of when a table cell is selected is somewhat involved.  The fact that this code is
+					// required is actually a pointer to the root cause of this bug. A cell is selected when the start 
+					// and end offsets are 0, the start container is a text, and the selection node is either a TR (most cases)
+					// or the parent of the table (in the case of the selection containing the last cell of a table).
+					var TEXT_NODE = 3, table = ed.dom.getParent(rng.startContainer, 'TABLE'), 
+					tableParent, allOfCellSelected, tableCellSelection;
+					if (table) 
+					tableParent = table.parentNode;
+					allOfCellSelected =rng.startContainer.nodeType == TEXT_NODE && 
+						rng.startOffset == 0 && 
+						rng.endOffset == 0 && 
+						currentCell && 
+						(n.nodeName=="TR" || n==tableParent);
+					tableCellSelection = (n.nodeName=="TD"||n.nodeName=="TH")&& !currentCell;	   
+					return  allOfCellSelected || tableCellSelection;
+					// return false;
+				}
+				
+				// this nasty hack is here to work around some WebKit selection bugs.
+				function fixTableCellSelection(ed) {
+					if (!tinymce.isWebKit)
+						return;
+
+					var rng = ed.selection.getRng();
+					var n = ed.selection.getNode();
+					var currentCell = ed.dom.getParent(rng.startContainer, 'TD,TH');
+				
+					if (!tableCellSelected(ed, rng, n, currentCell))
+						return;
+						if (!currentCell) {
+							currentCell=n;
+						}
+					
+					// Get the very last node inside the table cell
+					var end = currentCell.lastChild;
+					while (end.lastChild)
+						end = end.lastChild;
+					
+					// Select the entire table cell. Nothing outside of the table cell should be selected.
+					rng.setEnd(end, end.nodeValue.length);
+					ed.selection.setRng(rng);
+				}
+				ed.plugins.table.fixTableCellSelection=fixTableCellSelection;
+
+				// Add context menu
+				if (ed && ed.plugins.contextmenu) {
+					ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {
+						var sm, se = ed.selection, el = se.getNode() || ed.getBody();
+
+						if (ed.dom.getParent(e, 'td') || ed.dom.getParent(e, 'th') || ed.dom.select('td.mceSelected,th.mceSelected').length) {
+							m.removeAll();
+
+							if (el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) {
+								m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true});
+								m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'});
+								m.addSeparator();
+							}
+
+							if (el.nodeName == 'IMG' && el.className.indexOf('mceItem') == -1) {
+								m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true});
+								m.addSeparator();
+							}
+
+							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', value : {action : 'insert'}});
+							m.add({title : 'table.props_desc', icon : 'table_props', cmd : 'mceInsertTable'});
+							m.add({title : 'table.del', icon : 'delete_table', cmd : 'mceTableDelete'});
+							m.addSeparator();
+
+							// Cell menu
+							sm = m.addMenu({title : 'table.cell'});
+							sm.add({title : 'table.cell_desc', icon : 'cell_props', cmd : 'mceTableCellProps'});
+							sm.add({title : 'table.split_cells_desc', icon : 'split_cells', cmd : 'mceTableSplitCells'});
+							sm.add({title : 'table.merge_cells_desc', icon : 'merge_cells', cmd : 'mceTableMergeCells'});
+
+							// Row menu
+							sm = m.addMenu({title : 'table.row'});
+							sm.add({title : 'table.row_desc', icon : 'row_props', cmd : 'mceTableRowProps'});
+							sm.add({title : 'table.row_before_desc', icon : 'row_before', cmd : 'mceTableInsertRowBefore'});
+							sm.add({title : 'table.row_after_desc', icon : 'row_after', cmd : 'mceTableInsertRowAfter'});
+							sm.add({title : 'table.delete_row_desc', icon : 'delete_row', cmd : 'mceTableDeleteRow'});
+							sm.addSeparator();
+							sm.add({title : 'table.cut_row_desc', icon : 'cut', cmd : 'mceTableCutRow'});
+							sm.add({title : 'table.copy_row_desc', icon : 'copy', cmd : 'mceTableCopyRow'});
+							sm.add({title : 'table.paste_row_before_desc', icon : 'paste', cmd : 'mceTablePasteRowBefore'}).setDisabled(!clipboardRows);
+							sm.add({title : 'table.paste_row_after_desc', icon : 'paste', cmd : 'mceTablePasteRowAfter'}).setDisabled(!clipboardRows);
+
+							// Column menu
+							sm = m.addMenu({title : 'table.col'});
+							sm.add({title : 'table.col_before_desc', icon : 'col_before', cmd : 'mceTableInsertColBefore'});
+							sm.add({title : 'table.col_after_desc', icon : 'col_after', cmd : 'mceTableInsertColAfter'});
+							sm.add({title : 'table.delete_col_desc', icon : 'delete_col', cmd : 'mceTableDeleteCol'});
+						} else
+							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable'});
+					});
+				}
+
+				// Fix to allow navigating up and down in a table in WebKit browsers.
+				if (tinymce.isWebKit) {
+					function moveSelection(ed, e) {
+						var VK = tinymce.VK;
+						var key = e.keyCode;
+
+						function handle(upBool, sourceNode, event) {
+							var siblingDirection = upBool ? 'previousSibling' : 'nextSibling';
+							var currentRow = ed.dom.getParent(sourceNode, 'tr');
+							var siblingRow = currentRow[siblingDirection];
+
+							if (siblingRow) {
+								moveCursorToRow(ed, sourceNode, siblingRow, upBool);
+								tinymce.dom.Event.cancel(event);
+								return true;
+							} else {
+								var tableNode = ed.dom.getParent(currentRow, 'table');
+								var middleNode = currentRow.parentNode;
+								var parentNodeName = middleNode.nodeName.toLowerCase();
+								if (parentNodeName === 'tbody' || parentNodeName === (upBool ? 'tfoot' : 'thead')) {
+									var targetParent = getTargetParent(upBool, tableNode, middleNode, 'tbody');
+									if (targetParent !== null) {
+										return moveToRowInTarget(upBool, targetParent, sourceNode, event);
+									}
+								}
+								return escapeTable(upBool, currentRow, siblingDirection, tableNode, event);
+							}
+						}
+
+						function getTargetParent(upBool, topNode, secondNode, nodeName) {
+							var tbodies = ed.dom.select('>' + nodeName, topNode);
+							var position = tbodies.indexOf(secondNode);
+							if (upBool && position === 0 || !upBool && position === tbodies.length - 1) {
+								return getFirstHeadOrFoot(upBool, topNode);
+							} else if (position === -1) {
+								var topOrBottom = secondNode.tagName.toLowerCase() === 'thead' ? 0 : tbodies.length - 1;
+								return tbodies[topOrBottom];
+							} else {
+								return tbodies[position + (upBool ? -1 : 1)];
+							}
+						}
+
+						function getFirstHeadOrFoot(upBool, parent) {
+							var tagName = upBool ? 'thead' : 'tfoot';
+							var headOrFoot = ed.dom.select('>' + tagName, parent);
+							return headOrFoot.length !== 0 ? headOrFoot[0] : null;
+						}
+
+						function moveToRowInTarget(upBool, targetParent, sourceNode, event) {
+							var targetRow = getChildForDirection(targetParent, upBool);
+							targetRow && moveCursorToRow(ed, sourceNode, targetRow, upBool);
+							tinymce.dom.Event.cancel(event);
+							return true;
+						}
+
+						function escapeTable(upBool, currentRow, siblingDirection, table, event) {
+							var tableSibling = table[siblingDirection];
+							if (tableSibling) {
+								moveCursorToStartOfElement(tableSibling);
+								return true;
+							} else {
+								var parentCell = ed.dom.getParent(table, 'td,th');
+								if (parentCell) {
+									return handle(upBool, parentCell, event);
+								} else {
+									var backUpSibling = getChildForDirection(currentRow, !upBool);
+									moveCursorToStartOfElement(backUpSibling);
+									return tinymce.dom.Event.cancel(event);
+								}
+							}
+						}
+
+						function getChildForDirection(parent, up) {
+							var child =  parent && parent[up ? 'lastChild' : 'firstChild'];
+							// BR is not a valid table child to return in this case we return the table cell
+							return child && child.nodeName === 'BR' ? ed.dom.getParent(child, 'td,th') : child;
+						}
+
+						function moveCursorToStartOfElement(n) {
+							ed.selection.setCursorLocation(n, 0);
+						}
+
+						function isVerticalMovement() {
+							return key == VK.UP || key == VK.DOWN;
+						}
+
+						function isInTable(ed) {
+							var node = ed.selection.getNode();
+							var currentRow = ed.dom.getParent(node, 'tr');
+							return currentRow !== null;
+						}
+
+						function columnIndex(column) {
+							var colIndex = 0;
+							var c = column;
+							while (c.previousSibling) {
+								c = c.previousSibling;
+								colIndex = colIndex + getSpanVal(c, "colspan");
+							}
+							return colIndex;
+						}
+
+						function findColumn(rowElement, columnIndex) {
+							var c = 0;
+							var r = 0;
+							each(rowElement.children, function(cell, i) {
+								c = c + getSpanVal(cell, "colspan");
+								r = i;
+								if (c > columnIndex)
+									return false;
+							});
+							return r;
+						}
+
+						function moveCursorToRow(ed, node, row, upBool) {
+							var srcColumnIndex = columnIndex(ed.dom.getParent(node, 'td,th'));
+							var tgtColumnIndex = findColumn(row, srcColumnIndex);
+							var tgtNode = row.childNodes[tgtColumnIndex];
+							var rowCellTarget = getChildForDirection(tgtNode, upBool);
+							moveCursorToStartOfElement(rowCellTarget || tgtNode);
+						}
+
+						function shouldFixCaret(preBrowserNode) {
+							var newNode = ed.selection.getNode();
+							var newParent = ed.dom.getParent(newNode, 'td,th');
+							var oldParent = ed.dom.getParent(preBrowserNode, 'td,th');
+							return newParent && newParent !== oldParent && checkSameParentTable(newParent, oldParent)
+						}
+
+						function checkSameParentTable(nodeOne, NodeTwo) {
+							return ed.dom.getParent(nodeOne, 'TABLE') === ed.dom.getParent(NodeTwo, 'TABLE');
+						}
+
+						if (isVerticalMovement() && isInTable(ed)) {
+							var preBrowserNode = ed.selection.getNode();
+							setTimeout(function() {
+								if (shouldFixCaret(preBrowserNode)) {
+									handle(!e.shiftKey && key === VK.UP, preBrowserNode, e);
+								}
+							}, 0);
+						}
+					}
+
+					ed.onKeyDown.add(moveSelection);
+				}
+								
+				// Fixes an issue on Gecko where it's impossible to place the caret behind a table
+				// This fix will force a paragraph element after the table but only when the forced_root_block setting is enabled
+				if (!tinymce.isIE) {
+					function fixTableCaretPos() {
+						var last;
+
+						// Skip empty text nodes form the end
+						for (last = ed.getBody().lastChild; last && last.nodeType == 3 && !last.nodeValue.length; last = last.previousSibling) ;
+
+						if (last && last.nodeName == 'TABLE')
+							ed.dom.add(ed.getBody(), 'p', null, '<br mce_bogus="1" />');
+					};
+
+					// Fixes an bug where it's impossible to place the caret before a table in Gecko
+					// this fix solves it by detecting when the caret is at the beginning of such a table
+					// and then manually moves the caret infront of the table
+					if (tinymce.isGecko) {
+						ed.onKeyDown.add(function(ed, e) {
+							var rng, table, dom = ed.dom;
+
+							// On gecko it's not possible to place the caret before a table
+							if (e.keyCode == 37 || e.keyCode == 38) {
+								rng = ed.selection.getRng();
+								table = dom.getParent(rng.startContainer, 'table');
+
+								if (table && ed.getBody().firstChild == table) {
+									if (isAtStart(rng, table)) {
+										rng = dom.createRng();
+
+										rng.setStartBefore(table);
+										rng.setEndBefore(table);
+
+										ed.selection.setRng(rng);
+
+										e.preventDefault();
+									}
+								}
+							}
+						});
+					}
+
+					ed.onKeyUp.add(fixTableCaretPos);
+					ed.onSetContent.add(fixTableCaretPos);
+					ed.onVisualAid.add(fixTableCaretPos);
+
+					ed.onPreProcess.add(function(ed, o) {
+						var last = o.node.lastChild;
+
+						if (last && last.childNodes.length == 1 && last.firstChild.nodeName == 'BR')
+							ed.dom.remove(last);
+					});
+
+
+					/**
+					 * Fixes bug in Gecko where shift-enter in table cell does not place caret on new line
+					 */
+					if (tinymce.isGecko) {
+						ed.onKeyDown.add(function(ed, e) {
+							if (e.keyCode === tinymce.VK.ENTER && e.shiftKey) {
+								var node = ed.selection.getRng().startContainer;
+								var tableCell = dom.getParent(node, 'td,th');
+								if (tableCell) {
+									var zeroSizedNbsp = ed.getDoc().createTextNode("\uFEFF");
+									dom.insertAfter(zeroSizedNbsp, node);
+								}
+							}
+						});
+					}
+
+
+					fixTableCaretPos();
+					ed.startContent = ed.getContent({format : 'raw'});
+				}
+			});
+
+			// Register action commands
+			each({
+				mceTableSplitCells : function(grid) {
+					grid.split();
+				},
+
+				mceTableMergeCells : function(grid) {
+					var rowSpan, colSpan, cell;
+
+					cell = ed.dom.getParent(ed.selection.getNode(), 'th,td');
+					if (cell) {
+						rowSpan = cell.rowSpan;
+						colSpan = cell.colSpan;
+					}
+
+					if (!ed.dom.select('td.mceSelected,th.mceSelected').length) {
+						winMan.open({
+							url : url + '/merge_cells.htm',
+							width : 240 + parseInt(ed.getLang('table.merge_cells_delta_width', 0)),
+							height : 110 + parseInt(ed.getLang('table.merge_cells_delta_height', 0)),
+							inline : 1
+						}, {
+							rows : rowSpan,
+							cols : colSpan,
+							onaction : function(data) {
+								grid.merge(cell, data.cols, data.rows);
+							},
+							plugin_url : url
+						});
+					} else
+						grid.merge();
+				},
+
+				mceTableInsertRowBefore : function(grid) {
+					grid.insertRow(true);
+				},
+
+				mceTableInsertRowAfter : function(grid) {
+					grid.insertRow();
+				},
+
+				mceTableInsertColBefore : function(grid) {
+					grid.insertCol(true);
+				},
+
+				mceTableInsertColAfter : function(grid) {
+					grid.insertCol();
+				},
+
+				mceTableDeleteCol : function(grid) {
+					grid.deleteCols();
+				},
+
+				mceTableDeleteRow : function(grid) {
+					grid.deleteRows();
+				},
+
+				mceTableCutRow : function(grid) {
+					clipboardRows = grid.cutRows();
+				},
+
+				mceTableCopyRow : function(grid) {
+					clipboardRows = grid.copyRows();
+				},
+
+				mceTablePasteRowBefore : function(grid) {
+					grid.pasteRows(clipboardRows, true);
+				},
+
+				mceTablePasteRowAfter : function(grid) {
+					grid.pasteRows(clipboardRows);
+				},
+
+				mceTableDelete : function(grid) {
+					grid.deleteTable();
+				}
+			}, function(func, name) {
+				ed.addCommand(name, function() {
+					var grid = createTableGrid();
+
+					if (grid) {
+						func(grid);
+						ed.execCommand('mceRepaint');
+						cleanup();
+					}
+				});
+			});
+
+			// Register dialog commands
+			each({
+				mceInsertTable : function(val) {
+					winMan.open({
+						url : url + '/table.htm',
+						width : 400 + parseInt(ed.getLang('table.table_delta_width', 0)),
+						height : 320 + parseInt(ed.getLang('table.table_delta_height', 0)),
+						inline : 1
+					}, {
+						plugin_url : url,
+						action : val ? val.action : 0
+					});
+				},
+
+				mceTableRowProps : function() {
+					winMan.open({
+						url : url + '/row.htm',
+						width : 400 + parseInt(ed.getLang('table.rowprops_delta_width', 0)),
+						height : 295 + parseInt(ed.getLang('table.rowprops_delta_height', 0)),
+						inline : 1
+					}, {
+						plugin_url : url
+					});
+				},
+
+				mceTableCellProps : function() {
+					winMan.open({
+						url : url + '/cell.htm',
+						width : 400 + parseInt(ed.getLang('table.cellprops_delta_width', 0)),
+						height : 295 + parseInt(ed.getLang('table.cellprops_delta_height', 0)),
+						inline : 1
+					}, {
+						plugin_url : url
+					});
+				}
+			}, function(func, name) {
+				ed.addCommand(name, function(ui, val) {
+					func(val);
+				});
+			});
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('table', tinymce.plugins.TablePlugin);
+})(tinymce);
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js b/library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
index b5fc1fda3..d6f329059 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
@@ -63,6 +63,11 @@ function init() {
 function updateAction() {

 	var el, inst = ed, tdElm, trElm, tableElm, formObj = document.forms[0];

 

+	if (!AutoValidator.validate(formObj)) {

+		tinyMCEPopup.alert(AutoValidator.getErrorMessages(formObj).join('. ') + '.');

+		return false;

+	}

+

 	tinyMCEPopup.restoreSelection();

 	el = ed.selection.getStart();

 	tdElm = ed.dom.getParent(el, "td,th");

@@ -83,8 +88,6 @@ function updateAction() {
 		return;

 	}

 

-	ed.execCommand('mceBeginUndoLevel');

-

 	switch (getSelectValue(formObj, 'action')) {

 		case "cell":

 			var celltype = getSelectValue(formObj, 'celltype');

@@ -125,6 +128,36 @@ function updateAction() {
 

 			break;

 

+		case "col":

+			var curr, col = 0, cell = trElm.firstChild, rows = tableElm.getElementsByTagName("tr");

+

+			if (cell.nodeName != "TD" && cell.nodeName != "TH")

+				cell = nextCell(cell);

+

+			do {

+				if (cell == tdElm)

+					break;

+				col += cell.getAttribute("colspan");

+			} while ((cell = nextCell(cell)) != null);

+

+			for (var i=0; i<rows.length; i++) {

+				cell = rows[i].firstChild;

+

+				if (cell.nodeName != "TD" && cell.nodeName != "TH")

+					cell = nextCell(cell);

+

+				curr = 0;

+				do {

+					if (curr == col) {

+						cell = updateCell(cell, true);

+						break;

+					}

+					curr += cell.getAttribute("colspan");

+				} while ((cell = nextCell(cell)) != null);

+			}

+

+			break;

+

 		case "all":

 			var rows = tableElm.getElementsByTagName("tr");

 

@@ -166,15 +199,15 @@ function updateCell(td, skip_id) {
 	var dom = ed.dom;

 

 	if (!skip_id)

-		td.setAttribute('id', formObj.id.value);

-

-	td.setAttribute('align', formObj.align.value);

-	td.setAttribute('vAlign', formObj.valign.value);

-	td.setAttribute('lang', formObj.lang.value);

-	td.setAttribute('dir', getSelectValue(formObj, 'dir'));

-	td.setAttribute('style', ed.dom.serializeStyle(ed.dom.parseStyle(formObj.style.value)));

-	td.setAttribute('scope', formObj.scope.value);

-	ed.dom.setAttrib(td, 'class', getSelectValue(formObj, 'class'));

+		dom.setAttrib(td, 'id', formObj.id.value);

+

+	dom.setAttrib(td, 'align', formObj.align.value);

+	dom.setAttrib(td, 'vAlign', formObj.valign.value);

+	dom.setAttrib(td, 'lang', formObj.lang.value);

+	dom.setAttrib(td, 'dir', getSelectValue(formObj, 'dir'));

+	dom.setAttrib(td, 'style', ed.dom.serializeStyle(ed.dom.parseStyle(formObj.style.value)));

+	dom.setAttrib(td, 'scope', formObj.scope.value);

+	dom.setAttrib(td, 'class', getSelectValue(formObj, 'class'));

 

 	// Clear deprecated attributes

 	ed.dom.setAttrib(td, 'width', '');

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/js/merge_cells.js b/library/tinymce/jscripts/tiny_mce/plugins/table/js/merge_cells.js
index 7ee4bf040..7ee4bf040 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/table/js/merge_cells.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/table/js/merge_cells.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/js/row.js b/library/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
index 70d95b672..a13d69592 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
@@ -56,6 +56,11 @@ function updateAction() {
 	var inst = tinyMCEPopup.editor, dom = inst.dom, trElm, tableElm, formObj = document.forms[0];

 	var action = getSelectValue(formObj, 'action');

 

+	if (!AutoValidator.validate(formObj)) {

+		tinyMCEPopup.alert(AutoValidator.getErrorMessages(formObj).join('. ') + '.');

+		return false;

+	}

+

 	tinyMCEPopup.restoreSelection();

 	trElm = dom.getParent(inst.selection.getStart(), "tr");

 	tableElm = dom.getParent(inst.selection.getStart(), "table");

@@ -80,8 +85,6 @@ function updateAction() {
 		return;

 	}

 

-	inst.execCommand('mceBeginUndoLevel');

-

 	switch (action) {

 		case "row":

 			updateRow(trElm);

@@ -123,19 +126,19 @@ function updateRow(tr_elm, skip_id, skip_parent) {
 

 	// Update row element

 	if (!skip_id)

-		tr_elm.setAttribute('id', formObj.id.value);

+		dom.setAttrib(tr_elm, 'id', formObj.id.value);

 

-	tr_elm.setAttribute('align', getSelectValue(formObj, 'align'));

-	tr_elm.setAttribute('vAlign', getSelectValue(formObj, 'valign'));

-	tr_elm.setAttribute('lang', formObj.lang.value);

-	tr_elm.setAttribute('dir', getSelectValue(formObj, 'dir'));

-	tr_elm.setAttribute('style', dom.serializeStyle(dom.parseStyle(formObj.style.value)));

+	dom.setAttrib(tr_elm, 'align', getSelectValue(formObj, 'align'));

+	dom.setAttrib(tr_elm, 'vAlign', getSelectValue(formObj, 'valign'));

+	dom.setAttrib(tr_elm, 'lang', formObj.lang.value);

+	dom.setAttrib(tr_elm, 'dir', getSelectValue(formObj, 'dir'));

+	dom.setAttrib(tr_elm, 'style', dom.serializeStyle(dom.parseStyle(formObj.style.value)));

 	dom.setAttrib(tr_elm, 'class', getSelectValue(formObj, 'class'));

 

 	// Clear deprecated attributes

-	tr_elm.setAttribute('background', '');

-	tr_elm.setAttribute('bgColor', '');

-	tr_elm.setAttribute('height', '');

+	dom.setAttrib(tr_elm, 'background', '');

+	dom.setAttrib(tr_elm, 'bgColor', '');

+	dom.setAttrib(tr_elm, 'height', '');

 

 	// Set styles

 	tr_elm.style.height = getCSSSize(formObj.height.value);

@@ -163,13 +166,10 @@ function updateRow(tr_elm, skip_id, skip_parent) {
 		if (newParent == null) {

 			newParent = doc.createElement(dest);

 

-			if (dest == "thead") {

-				if (theTable.firstChild.nodeName == 'CAPTION')

-					inst.dom.insertAfter(newParent, theTable.firstChild);

-				else

-					theTable.insertBefore(newParent, theTable.firstChild);

-			} else

-				theTable.appendChild(newParent);

+			if (theTable.firstChild.nodeName == 'CAPTION')

+				inst.dom.insertAfter(newParent, theTable.firstChild);

+			else

+				theTable.insertBefore(newParent, theTable.firstChild);

 		}

 

 		// append the row to the new parent

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/js/table.js b/library/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
index d1b42c2af..0aafb5fda 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
@@ -12,7 +12,7 @@ function insertTable() {
 	tinyMCEPopup.restoreSelection();

 

 	if (!AutoValidator.validate(formObj)) {

-		tinyMCEPopup.alert(inst.getLang('invalid_data'));

+		tinyMCEPopup.alert(AutoValidator.getErrorMessages(formObj).join('. ') + '.');

 		return false;

 	}

 

@@ -21,7 +21,7 @@ function insertTable() {
 	// Get form data

 	cols = formObj.elements['cols'].value;

 	rows = formObj.elements['rows'].value;

-	border = formObj.elements['border'].value != "" ? formObj.elements['border'].value  : 0;

+	border = formObj.elements['border'].value != "" ? formObj.elements['border'].value : 0;

 	cellpadding = formObj.elements['cellpadding'].value != "" ? formObj.elements['cellpadding'].value : "";

 	cellspacing = formObj.elements['cellspacing'].value != "" ? formObj.elements['cellspacing'].value : "";

 	align = getSelectValue(formObj, "align");

@@ -58,11 +58,21 @@ function insertTable() {
 

 	// Update table

 	if (action == "update") {

-		inst.execCommand('mceBeginUndoLevel');

-

 		dom.setAttrib(elm, 'cellPadding', cellpadding, true);

 		dom.setAttrib(elm, 'cellSpacing', cellspacing, true);

-		dom.setAttrib(elm, 'border', border);

+

+		if (!isCssSize(border)) {

+			dom.setAttrib(elm, 'border', border);

+		} else {

+			dom.setAttrib(elm, 'border', '');

+		}

+

+		if (border == '') {

+			dom.setStyle(elm, 'border-width', '');

+			dom.setStyle(elm, 'border', '');

+			dom.setAttrib(elm, 'border', '');

+		}

+

 		dom.setAttrib(elm, 'align', align);

 		dom.setAttrib(elm, 'frame', frame);

 		dom.setAttrib(elm, 'rules', rules);

@@ -82,7 +92,7 @@ function insertTable() {
 			capEl = elm.ownerDocument.createElement('caption');

 

 			if (!tinymce.isIE)

-				capEl.innerHTML = '<br _mce_bogus="1"/>';

+				capEl.innerHTML = '<br data-mce-bogus="1"/>';

 

 			elm.insertBefore(capEl, elm.firstChild);

 		}

@@ -121,7 +131,7 @@ function insertTable() {
 		if (bordercolor != "") {

 			elm.style.borderColor = bordercolor;

 			elm.style.borderStyle = elm.style.borderStyle == "" ? "solid" : elm.style.borderStyle;

-			elm.style.borderWidth = border == "" ? "1px" : border;

+			elm.style.borderWidth = cssSize(border);

 		} else

 			elm.style.borderColor = '';

 

@@ -134,7 +144,7 @@ function insertTable() {
 		//elm.outerHTML = elm.outerHTML;

 

 		inst.nodeChanged();

-		inst.execCommand('mceEndUndoLevel');

+		inst.execCommand('mceEndUndoLevel', false, {}, {skip_undo: true});

 

 		// Repaint if dimensions changed

 		if (formObj.width.value != orgTableWidth || formObj.height.value != orgTableHeight)

@@ -148,10 +158,13 @@ function insertTable() {
 	html += '<table';

 

 	html += makeAttrib('id', id);

-	html += makeAttrib('border', border);

+	if (!isCssSize(border)) {

+		html += makeAttrib('border', border);

+	}

+

 	html += makeAttrib('cellpadding', cellpadding);

 	html += makeAttrib('cellspacing', cellspacing);

-	html += makeAttrib('_mce_new', '1');

+	html += makeAttrib('data-mce-new', '1');

 

 	if (width && inst.settings.inline_styles) {

 		if (style)

@@ -187,7 +200,7 @@ function insertTable() {
 

 	if (caption) {

 		if (!tinymce.isIE)

-			html += '<caption><br _mce_bogus="1"/></caption>';

+			html += '<caption><br data-mce-bogus="1"/></caption>';

 		else

 			html += '<caption></caption>';

 	}

@@ -197,7 +210,7 @@ function insertTable() {
 

 		for (var x=0; x<cols; x++) {

 			if (!tinymce.isIE)

-				html += '<td><br _mce_bogus="1"/></td>';

+				html += '<td><br data-mce-bogus="1"/></td>';

 			else

 				html += '<td></td>';

 		}

@@ -207,8 +220,6 @@ function insertTable() {
 

 	html += "</table>";

 

-	inst.execCommand('mceBeginUndoLevel');

-

 	// Move table

 	if (inst.settings.fix_table_elements) {

 		var patt = '';

@@ -231,17 +242,26 @@ function insertTable() {
 	} else

 		inst.execCommand('mceInsertContent', false, html);

 

-	tinymce.each(dom.select('table[_mce_new]'), function(node) {

-		var td = dom.select('td', node);

-

-		inst.selection.select(td[0], true);

-		inst.selection.collapse();

+	tinymce.each(dom.select('table[data-mce-new]'), function(node) {
+		var tdorth = dom.select('td,th', node);

+
+		// Fixes a bug in IE where the caret cannot be placed after the table if the table is at the end of the document

+		if (tinymce.isIE && node.nextSibling == null) {

+			dom.insertAfter(dom.create('p'), node);

+		}
+

+		try {

+			// IE9 might fail to do this selection 

+			inst.selection.setCursorLocation(tdorth[0], 0);

+		} catch (ex) {

+			// Ignore

+		}

 

-		dom.setAttrib(node, '_mce_new', '');

+		dom.setAttrib(node, 'data-mce-new', '');

 	});

 

 	inst.addVisual();

-	inst.execCommand('mceEndUndoLevel');

+	inst.execCommand('mceEndUndoLevel', false, {}, {skip_undo: true});

 

 	tinyMCEPopup.close();

 }

@@ -279,7 +299,7 @@ function init() {
 

 	var cols = 2, rows = 2, border = tinyMCEPopup.getParam('table_default_border', '0'), cellpadding = tinyMCEPopup.getParam('table_default_cellpadding', ''), cellspacing = tinyMCEPopup.getParam('table_default_cellspacing', '');

 	var align = "", width = "", height = "", bordercolor = "", bgcolor = "", className = "";

-	var id = "", summary = "", style = "", dir = "", lang = "", background = "", bgcolor = "", bordercolor = "", rules, frame;

+	var id = "", summary = "", style = "", dir = "", lang = "", background = "", bgcolor = "", bordercolor = "", rules = "", frame = "";

 	var inst = tinyMCEPopup.editor, dom = inst.dom;

 	var formObj = document.forms[0];

 	var elm = dom.getParent(inst.selection.getNode(), "table");

@@ -383,6 +403,20 @@ function changedSize() {
 	formObj.style.value = dom.serializeStyle(st);

 }

 

+function isCssSize(value) {

+	return /^[0-9.]+(%|in|cm|mm|em|ex|pt|pc|px)$/.test(value);

+}

+

+function cssSize(value, def) {

+	value = tinymce.trim(value || def);

+

+	if (!isCssSize(value)) {

+		return parseInt(value, 10) + 'px';

+	}

+

+	return value;

+}

+

 function changedBackgroundImage() {

 	var formObj = document.forms[0];

 	var st = dom.parseStyle(formObj.style.value);

@@ -397,8 +431,14 @@ function changedBorder() {
 	var st = dom.parseStyle(formObj.style.value);

 

 	// Update border width if the element has a color

-	if (formObj.border.value != "" && formObj.bordercolor.value != "")

-		st['border-width'] = formObj.border.value + "px";

+	if (formObj.border.value != "" && (isCssSize(formObj.border.value) || formObj.bordercolor.value != ""))

+		st['border-width'] = cssSize(formObj.border.value);

+	else {

+		if (!formObj.border.value) {

+			st['border'] = '';

+			st['border-width'] = '';

+		}

+	}

 

 	formObj.style.value = dom.serializeStyle(st);

 }

@@ -414,7 +454,7 @@ function changedColor() {
 

 		// Add border-width if it's missing

 		if (!st['border-width'])

-			st['border-width'] = formObj.border.value == "" ? "1px" : formObj.border.value + "px";

+			st['border-width'] = cssSize(formObj.border.value, 1);

 	}

 

 	formObj.style.value = dom.serializeStyle(st);

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js
index 000332a35..463e09ee1 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js
@@ -1,74 +1 @@
-tinyMCE.addI18n('en.table_dlg',{

-general_tab:"General",

-advanced_tab:"Advanced",

-general_props:"General properties",

-advanced_props:"Advanced properties",

-rowtype:"Row in table part",

-title:"Insert/Modify table",

-width:"Width",

-height:"Height",

-cols:"Cols",

-rows:"Rows",

-cellspacing:"Cellspacing",

-cellpadding:"Cellpadding",

-border:"Border",

-align:"Alignment",

-align_default:"Default",

-align_left:"Left",

-align_right:"Right",

-align_middle:"Center",

-row_title:"Table row properties",

-cell_title:"Table cell properties",

-cell_type:"Cell type",

-valign:"Vertical alignment",

-align_top:"Top",

-align_bottom:"Bottom",

-bordercolor:"Border color",

-bgcolor:"Background color",

-merge_cells_title:"Merge table cells",

-id:"Id",

-style:"Style",

-langdir:"Language direction",

-langcode:"Language code",

-mime:"Target MIME type",

-ltr:"Left to right",

-rtl:"Right to left",

-bgimage:"Background image",

-summary:"Summary",

-td:"Data",

-th:"Header",

-cell_cell:"Update current cell",

-cell_row:"Update all cells in row",

-cell_all:"Update all cells in table",

-row_row:"Update current row",

-row_odd:"Update odd rows in table",

-row_even:"Update even rows in table",

-row_all:"Update all rows in table",

-thead:"Table Head",

-tbody:"Table Body",

-tfoot:"Table Foot",

-scope:"Scope",

-rowgroup:"Row Group",

-colgroup:"Col Group",

-col_limit:"You've exceeded the maximum number of columns of {$cols}.",

-row_limit:"You've exceeded the maximum number of rows of {$rows}.",

-cell_limit:"You've exceeded the maximum number of cells of {$cells}.",

-missing_scope:"Are you sure you want to continue without specifying a scope for this table header cell. Without it, it may be difficult for some users with disabilities to understand the content or data displayed of the table.",

-caption:"Table caption",

-frame:"Frame",

-frame_none:"none",

-frame_groups:"groups",

-frame_rows:"rows",

-frame_cols:"cols",

-frame_all:"all",

-rules:"Rules",

-rules_void:"void",

-rules_above:"above",

-rules_below:"below",

-rules_hsides:"hsides",

-rules_lhs:"lhs",

-rules_rhs:"rhs",

-rules_vsides:"vsides",

-rules_box:"box",

-rules_border:"border"

-});
\ No newline at end of file
+tinyMCE.addI18n('en.table_dlg',{"rules_border":"border","rules_box":"box","rules_vsides":"vsides","rules_rhs":"rhs","rules_lhs":"lhs","rules_hsides":"hsides","rules_below":"below","rules_above":"above","rules_void":"void",rules:"Rules","frame_all":"all","frame_cols":"cols","frame_rows":"rows","frame_groups":"groups","frame_none":"none",frame:"Frame",caption:"Table Caption","missing_scope":"Are you sure you want to continue without specifying a scope for this table header cell. Without it, it may be difficult for some users with disabilities to understand the content or data displayed of the table.","cell_limit":"You\'ve exceeded the maximum number of cells of {$cells}.","row_limit":"You\'ve exceeded the maximum number of rows of {$rows}.","col_limit":"You\'ve exceeded the maximum number of columns of {$cols}.",colgroup:"Col Group",rowgroup:"Row Group",scope:"Scope",tfoot:"Footer",tbody:"Body",thead:"Header","row_all":"Update All Rows in Table","row_even":"Update Even Rows in Table","row_odd":"Update Odd Rows in Table","row_row":"Update Current Row","cell_all":"Update All Cells in Table","cell_row":"Update All Cells in Row","cell_cell":"Update Current Cell",th:"Header",td:"Data",summary:"Summary",bgimage:"Background Image",rtl:"Right to Left",ltr:"Left to Right",mime:"Target MIME Type",langcode:"Language Code",langdir:"Language Direction",style:"Style",id:"ID","merge_cells_title":"Merge Table Cells",bgcolor:"Background Color",bordercolor:"Border Color","align_bottom":"Bottom","align_top":"Top",valign:"Vertical Alignment","cell_type":"Cell Type","cell_title":"Table Cell Properties","row_title":"Table Row Properties","align_middle":"Center","align_right":"Right","align_left":"Left","align_default":"Default",align:"Alignment",border:"Border",cellpadding:"Cell Padding",cellspacing:"Cell Spacing",rows:"Rows",cols:"Columns",height:"Height",width:"Width",title:"Insert/Edit Table",rowtype:"Row Type","advanced_props":"Advanced Properties","general_props":"General Properties","advanced_tab":"Advanced","general_tab":"General","cell_col":"Update all cells in column"});
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm b/library/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm
index 9736ed8c0..d231090e7 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm
@@ -7,20 +7,20 @@
 	<script type="text/javascript" src="../../utils/validate.js"></script>

 	<script type="text/javascript" src="js/merge_cells.js"></script>

 </head>

-<body style="margin: 8px">

+<body style="margin: 8px" role="application">

 <form onsubmit="MergeCellsDialog.merge();return false;" action="#">

 	<fieldset>

 		<legend>{#table_dlg.merge_cells_title}</legend>

-		  <table border="0" cellpadding="0" cellspacing="3" width="100%">

-			  <tr>

-				<td>{#table_dlg.cols}:</td>

-				<td align="right"><input type="text" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" /></td>

-			  </tr>

-			  <tr>

-				<td>{#table_dlg.rows}:</td>

-				<td align="right"><input type="text" name="numrows" value="" class="number min1" style="width: 30px" /></td>

-			  </tr>

-		  </table>

+		<table role="presentation" border="0" cellpadding="0" cellspacing="3" width="100%">

+			<tr>

+				<td><label for="numcols">{#table_dlg.cols}</label>:</td>

+				<td align="right"><input type="text" id="numcols" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" aria-required="true" /></td>

+			</tr>

+			<tr>

+				<td><label for="numrows">{#table_dlg.rows}</label>:</td>

+				<td align="right"><input type="text" id="numrows" name="numrows" value="" class="number min1" style="width: 30px" aria-required="true" /></td>

+			</tr>

+		</table>

 	</fieldset>

 

 	<div class="mceActionPanel">

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/row.htm b/library/tinymce/jscripts/tiny_mce/plugins/table/row.htm
index 092e6c827..1885401f6 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/table/row.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/table/row.htm
@@ -5,16 +5,17 @@
 	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

 	<script type="text/javascript" src="../../utils/mctabs.js"></script>

 	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/validate.js"></script>

 	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

 	<script type="text/javascript" src="js/row.js"></script>

 	<link href="css/row.css" rel="stylesheet" type="text/css" />

 </head>

-<body id="tablerow" style="display: none">

+<body id="tablerow" style="display: none" role="application">

 	<form onsubmit="updateAction();return false;" action="#">

 		<div class="tabs">

 			<ul>

-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>

-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>

+				<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>

+				<li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>

 			</ul>

 		</div>

 

@@ -23,7 +24,7 @@
 				<fieldset>

 					<legend>{#table_dlg.general_props}</legend>

 

-					<table border="0" cellpadding="4" cellspacing="0">

+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">

 						<tr>

 							<td><label for="rowtype">{#table_dlg.rowtype}</label></td>

 							<td class="col2">

@@ -70,7 +71,7 @@
 

 						<tr>

 							<td><label for="height">{#table_dlg.height}</label></td>

-							<td class="col2"><input name="height" type="text" id="height" value="" size="4" maxlength="4" onchange="changedSize();" /></td>

+							<td class="col2"><input name="height" type="text" id="height" value="" size="7" maxlength="7" onchange="changedSize();" class="size" /></td>

 						</tr>

 					</table>

 				</fieldset>

@@ -80,7 +81,7 @@
 				<fieldset>

 					<legend>{#table_dlg.advanced_props}</legend>

 

-					<table border="0" cellpadding="0" cellspacing="4">

+					<table role="presentation" border="0" cellpadding="0" cellspacing="4">

 						<tr>

 							<td class="column1"><label for="id">{#table_dlg.id}</label></td> 

 							<td><input id="id" name="id" type="text" value="" style="width: 200px" /></td> 

@@ -112,7 +113,7 @@
 						<tr>

 							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 

 							<td>

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

 										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" style="width: 200px" onchange="changedBackgroundImage();" /></td>

 										<td id="backgroundimagebrowsercontainer">&nbsp;</td>

@@ -122,14 +123,16 @@
 						</tr>

 

 						<tr>

-							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 

+							<td class="column1"><label for="bgcolor" id="bgcolor_label">{#table_dlg.bgcolor}</label></td> 

 							<td>

-								<table border="0" cellpadding="0" cellspacing="0">

+								<span role="group" aria-labelledby="bgcolor_label">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

 										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>

 										<td id="bgcolor_pickcontainer">&nbsp;</td>

 									</tr>

 								</table>

+								</span>

 							</td> 

 						</tr>

 					</table>

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/table.htm b/library/tinymce/jscripts/tiny_mce/plugins/table/table.htm
index f26903922..b92fa741e 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/table/table.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/table/table.htm
@@ -10,12 +10,13 @@
 	<script type="text/javascript" src="js/table.js"></script>

 	<link href="css/table.css" rel="stylesheet" type="text/css" />

 </head>

-<body id="table" style="display: none">

+<body id="table" style="display: none" role="application" aria-labelledby="app_title">

+	<span style="display:none;" id="app_title">{#table_dlg.title}</span>

 	<form onsubmit="insertTable();return false;" action="#">

 		<div class="tabs">

 			<ul>

-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>

-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>

+				<li id="general_tab" aria-controls="general_panel" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>

+				<li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>

 			</ul>

 		</div>

 

@@ -23,48 +24,48 @@
 			<div id="general_panel" class="panel current">

 				<fieldset>

 					<legend>{#table_dlg.general_props}</legend>

-					  <table border="0" cellpadding="4" cellspacing="0" width="100%">

-							  <tr>

-								<td><label id="colslabel" for="cols">{#table_dlg.cols}</label></td>

-								<td><input id="cols" name="cols" type="text" value="" size="3" maxlength="3" class="required number min1 mceFocus" /></td>

-								<td><label id="rowslabel" for="rows">{#table_dlg.rows}</label></td>

-								<td><input id="rows" name="rows" type="text" value="" size="3" maxlength="3" class="required number min1" /></td>

-							  </tr>

-							  <tr>

-								<td><label id="cellpaddinglabel" for="cellpadding">{#table_dlg.cellpadding}</label></td>

-								<td><input id="cellpadding" name="cellpadding" type="text" value="" size="3" maxlength="3" class="number" /></td>

-								<td><label id="cellspacinglabel" for="cellspacing">{#table_dlg.cellspacing}</label></td>

-								<td><input id="cellspacing" name="cellspacing" type="text" value="" size="3" maxlength="3" class="number" /></td>

-							  </tr>

-							  <tr>

-								<td><label id="alignlabel" for="align">{#table_dlg.align}</label></td>

-								<td><select id="align" name="align">

-									<option value="">{#not_set}</option>

-									<option value="center">{#table_dlg.align_middle}</option>

-									<option value="left">{#table_dlg.align_left}</option>

-									<option value="right">{#table_dlg.align_right}</option>

-								  </select></td>

-								<td><label id="borderlabel" for="border">{#table_dlg.border}</label></td>

-								<td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="changedBorder();" class="number" /></td>

-							  </tr>

-							  <tr id="width_row">

-								<td><label id="widthlabel" for="width">{#table_dlg.width}</label></td>

-								<td><input name="width" type="text" id="width" value="" size="4" maxlength="4" onchange="changedSize();" class="size" /></td>

-								<td><label id="heightlabel" for="height">{#table_dlg.height}</label></td>

-								<td><input name="height" type="text" id="height" value="" size="4" maxlength="4" onchange="changedSize();" class="size" /></td>

-							  </tr>

-							  <tr id="styleSelectRow">

-								<td><label id="classlabel" for="class">{#class_name}</label></td>

-								<td colspan="3">

-								 <select id="class" name="class" class="mceEditableSelect">

-									<option value="" selected="selected">{#not_set}</option>

-								 </select></td>

-							  </tr>

-							  <tr>

-								<td class="column1"><label for="caption">{#table_dlg.caption}</label></td> 

-								<td><input id="caption" name="caption" type="checkbox" class="checkbox" value="true" /></td> 

-							  </tr>

-							</table>

+					<table role="presentation" border="0" cellpadding="4" cellspacing="0" width="100%">

+						<tr>

+							<td><label id="colslabel" for="cols">{#table_dlg.cols}</label></td>

+							<td><input id="cols" name="cols" type="text" value="" size="3" maxlength="3" class="required number min1 mceFocus" aria-required="true" /></td>

+							<td><label id="rowslabel" for="rows">{#table_dlg.rows}</label></td>

+							<td><input id="rows" name="rows" type="text" value="" size="3" maxlength="3" class="required number min1" aria-required="true" /></td>

+						</tr>

+						<tr>

+							<td><label id="cellpaddinglabel" for="cellpadding">{#table_dlg.cellpadding}</label></td>

+							<td><input id="cellpadding" name="cellpadding" type="text" value="" size="3" maxlength="3" class="number" /></td>

+							<td><label id="cellspacinglabel" for="cellspacing">{#table_dlg.cellspacing}</label></td>

+							<td><input id="cellspacing" name="cellspacing" type="text" value="" size="3" maxlength="3" class="number" /></td>

+						</tr>

+						<tr>

+							<td><label id="alignlabel" for="align">{#table_dlg.align}</label></td>

+							<td><select id="align" name="align">

+								<option value="">{#not_set}</option>

+								<option value="center">{#table_dlg.align_middle}</option>

+								<option value="left">{#table_dlg.align_left}</option>

+								<option value="right">{#table_dlg.align_right}</option>

+							</select></td>

+							<td><label id="borderlabel" for="border">{#table_dlg.border}</label></td>

+							<td><input id="border" name="border" type="text" value="" size="3" maxlength="5" onchange="changedBorder();" class="size" /></td>

+						</tr>

+						<tr id="width_row">

+							<td><label id="widthlabel" for="width">{#table_dlg.width}</label></td>

+							<td><input name="width" type="text" id="width" value="" size="7" maxlength="7" onchange="changedSize();" class="size" /></td>

+							<td><label id="heightlabel" for="height">{#table_dlg.height}</label></td>

+							<td><input name="height" type="text" id="height" value="" size="7" maxlength="7" onchange="changedSize();" class="size" /></td>

+						</tr>

+						<tr id="styleSelectRow" >

+							<td><label id="classlabel" for="class">{#class_name}</label></td>

+							<td colspan="3" >

+							 <select id="class" name="class" class="mceEditableSelect">

+								<option value="" selected="selected">{#not_set}</option>

+							 </select></td>

+						</tr>

+						<tr>

+							<td class="column1" ><label for="caption">{#table_dlg.caption}</label></td> 

+							<td><input id="caption" name="caption" type="checkbox" class="checkbox" value="true" /></td> 

+						</tr>

+					</table>

 				</fieldset>

 			</div>

 

@@ -72,7 +73,7 @@
 				<fieldset>

 					<legend>{#table_dlg.advanced_props}</legend>

 

-					<table border="0" cellpadding="0" cellspacing="4">

+					<table role="presentation" border="0" cellpadding="0" cellspacing="4">

 						<tr>

 							<td class="column1"><label for="id">{#table_dlg.id}</label></td> 

 							<td><input id="id" name="id" type="text" value="" class="advfield" /></td> 

@@ -98,7 +99,7 @@
 						<tr>

 							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 

 							<td>

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" aria-labelledby="backgroundimage_label" border="0" cellpadding="0" cellspacing="0">

 									<tr>

 										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" class="advfield" onchange="changedBackgroundImage();" /></td>

 										<td id="backgroundimagebrowsercontainer">&nbsp;</td>

@@ -150,10 +151,10 @@
 							</td> 

 						</tr>

 

-						<tr>

-							<td class="column1"><label for="bordercolor">{#table_dlg.bordercolor}</label></td> 

+						<tr role="group" aria-labelledby="bordercolor_label">

+							<td class="column1"><label id="bordercolor_label" for="bordercolor">{#table_dlg.bordercolor}</label></td> 

 							<td>

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

 										<td><input id="bordercolor" name="bordercolor" type="text" value="" size="9" onchange="updateColor('bordercolor_pick','bordercolor');changedColor();" /></td>

 										<td id="bordercolor_pickcontainer">&nbsp;</td>

@@ -162,10 +163,10 @@
 							</td> 

 						</tr>

 

-						<tr>

-							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 

+						<tr role="group" aria-labelledby="bgcolor_label">

+							<td class="column1"><label id="bgcolor_label" for="bgcolor">{#table_dlg.bgcolor}</label></td> 

 							<td>

-								<table border="0" cellpadding="0" cellspacing="0">

+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">

 									<tr>

 										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>

 										<td id="bgcolor_pickcontainer">&nbsp;</td>

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/template/blank.htm b/library/tinymce/jscripts/tiny_mce/plugins/template/blank.htm
index ecde53fae..ecde53fae 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/template/blank.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/template/blank.htm
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/template/css/template.css b/library/tinymce/jscripts/tiny_mce/plugins/template/css/template.css
index 2d23a4938..2d23a4938 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/template/css/template.css
+++ b/library/tinymce/jscripts/tiny_mce/plugins/template/css/template.css
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin.js
index ebe3c27d7..ebe3c27d7 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js
index 9cac26991..9cac26991 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/template/js/template.js b/library/tinymce/jscripts/tiny_mce/plugins/template/js/template.js
index 24045d731..bc3045d24 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/template/js/template.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/template/js/template.js
@@ -42,7 +42,7 @@ var TemplateDialog = {
 

 		if (e) {

 			e.style.height = Math.abs(h) + 'px';

-			e.style.width  = Math.abs(w - 5) + 'px';

+			e.style.width = Math.abs(w - 5) + 'px';

 		}

 	},

 

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js
index 2471c3fa0..83e599d68 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js
@@ -1,15 +1 @@
-tinyMCE.addI18n('en.template_dlg',{

-title:"Templates",

-label:"Template",

-desc_label:"Description",

-desc:"Insert predefined template content",

-select:"Select a template",

-preview:"Preview",

-warning:"Warning: Updating a template with a different one may cause data loss.",

-mdate_format:"%Y-%m-%d %H:%M:%S",

-cdate_format:"%Y-%m-%d %H:%M:%S",

-months_long:"January,February,March,April,May,June,July,August,September,October,November,December",

-months_short:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec",

-day_long:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday",

-day_short:"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun"

-});
\ No newline at end of file
+tinyMCE.addI18n('en.template_dlg',{title:"Templates",label:"Template","desc_label":"Description",desc:"Insert Predefined Template Content",select:"Select a Template",preview:"Preview",warning:"Warning: Updating a template with a different one may cause data loss.","mdate_format":"%Y-%m-%d %H:%M:%S","cdate_format":"%Y-%m-%d %H:%M:%S","months_long":"January,February,March,April,May,June,July,August,September,October,November,December","months_short":"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec","day_long":"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday","day_short":"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun"});
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/template/template.htm b/library/tinymce/jscripts/tiny_mce/plugins/template/template.htm
index b2182e632..b2182e632 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/template/template.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/template/template.htm
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/visualblocks/css/visualblocks.css b/library/tinymce/jscripts/tiny_mce/plugins/visualblocks/css/visualblocks.css
new file mode 100644
index 000000000..17b9aeff1
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/plugins/visualblocks/css/visualblocks.css
@@ -0,0 +1,19 @@
+p, h1, h2, h3, h4, h5, h6, hgroup, aside, div, section, article, blockquote, address, pre {display: block; padding-top: 10px; border: 1px dashed #BBB; background: transparent no-repeat}

+p, h1, h2, h3, h4, h5, h6, hgroup, aside, div, section, article, address, pre {margin-left: 3px}

+section, article, address, hgroup, aside {margin: 1em 0 0 3px}

+

+p {background-image: url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7)}

+h1 {background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==)}

+h2 {background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==)}

+h3 {background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7)}

+h4 {background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==)}

+h5 {background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==)}

+h6 {background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==)}

+div {background-image: url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7)}

+section {background-image: url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=)}

+article {background-image: url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7)}

+blockquote {background-image: url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7)}

+address {background-image: url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=)}

+pre {background-image: url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==)}

+hgroup {background-image: url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7)}

+aside {background-image: url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=)}

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/visualblocks/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/visualblocks/editor_plugin.js
new file mode 100644
index 000000000..62cc2e4ce
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/plugins/visualblocks/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.VisualBlocks",{init:function(a,b){var c;if(!window.NodeList){return}a.addCommand("mceVisualBlocks",function(){var e=a.dom,d;if(!c){c=e.uniqueId();d=e.create("link",{id:c,rel:"stylesheet",href:b+"/css/visualblocks.css"});a.getDoc().getElementsByTagName("head")[0].appendChild(d)}else{d=e.get(c);d.disabled=!d.disabled}a.controlManager.setActive("visualblocks",!d.disabled)});a.addButton("visualblocks",{title:"visualblocks.desc",cmd:"mceVisualBlocks"});a.onInit.add(function(){if(a.settings.visualblocks_default_state){a.execCommand("mceVisualBlocks")}})},getInfo:function(){return{longname:"Visual blocks",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualblocks",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("visualblocks",tinymce.plugins.VisualBlocks)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/visualblocks/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/visualblocks/editor_plugin_src.js
new file mode 100644
index 000000000..e74c0bdc0
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/plugins/visualblocks/editor_plugin_src.js
@@ -0,0 +1,63 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2012, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	tinymce.create('tinymce.plugins.VisualBlocks', {

+		init : function(ed, url) {

+			var cssId;

+

+			// We don't support older browsers like IE6/7 and they don't provide prototypes for DOM objects

+			if (!window.NodeList) {

+				return;

+			}

+

+			ed.addCommand('mceVisualBlocks', function() {

+				var dom = ed.dom, linkElm;

+

+				if (!cssId) {

+					cssId = dom.uniqueId();

+					linkElm = dom.create('link', {

+						id: cssId,

+						rel : 'stylesheet',

+						href : url + '/css/visualblocks.css'

+					});

+

+					ed.getDoc().getElementsByTagName('head')[0].appendChild(linkElm);

+				} else {

+					linkElm = dom.get(cssId);

+					linkElm.disabled = !linkElm.disabled;

+				}

+

+				ed.controlManager.setActive('visualblocks', !linkElm.disabled);

+			});

+

+			ed.addButton('visualblocks', {title : 'visualblocks.desc', cmd : 'mceVisualBlocks'});

+

+			ed.onInit.add(function() {

+				if (ed.settings.visualblocks_default_state) {

+					ed.execCommand('mceVisualBlocks');

+				}

+			});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Visual blocks',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualblocks',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('visualblocks', tinymce.plugins.VisualBlocks);

+})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js
index 53d31c44f..1a148e8b4 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.VisualChars",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceVisualChars",c._toggleVisualChars,c);a.addButton("visualchars",{title:"visualchars.desc",cmd:"mceVisualChars"});a.onBeforeGetContent.add(function(d,e){if(c.state){c.state=true;c._toggleVisualChars()}})},getInfo:function(){return{longname:"Visual characters",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_toggleVisualChars:function(){var m=this,g=m.editor,a,e,f,k=g.getDoc(),l=g.getBody(),j,n=g.selection,c;m.state=!m.state;g.controlManager.setActive("visualchars",m.state);if(m.state){a=[];tinymce.walk(l,function(b){if(b.nodeType==3&&b.nodeValue&&b.nodeValue.indexOf("\u00a0")!=-1){a.push(b)}},"childNodes");for(e=0;e<a.length;e++){j=a[e].nodeValue;j=j.replace(/(\u00a0+)/g,'<span class="mceItemHidden mceVisualNbsp">$1</span>');j=j.replace(/\u00a0/g,"\u00b7");g.dom.setOuterHTML(a[e],j,k)}}else{a=tinymce.grep(g.dom.select("span",l),function(b){return g.dom.hasClass(b,"mceVisualNbsp")});for(e=0;e<a.length;e++){g.dom.setOuterHTML(a[e],a[e].innerHTML.replace(/(&middot;|\u00b7)/g,"&nbsp;"),k)}}}});tinymce.PluginManager.add("visualchars",tinymce.plugins.VisualChars)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.VisualChars",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceVisualChars",c._toggleVisualChars,c);a.addButton("visualchars",{title:"visualchars.desc",cmd:"mceVisualChars"});a.onBeforeGetContent.add(function(d,e){if(c.state&&e.format!="raw"&&!e.draft){c.state=true;c._toggleVisualChars(false)}})},getInfo:function(){return{longname:"Visual characters",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_toggleVisualChars:function(m){var p=this,k=p.editor,a,g,j,n=k.getDoc(),o=k.getBody(),l,q=k.selection,e,c,f;p.state=!p.state;k.controlManager.setActive("visualchars",p.state);if(m){f=q.getBookmark()}if(p.state){a=[];tinymce.walk(o,function(b){if(b.nodeType==3&&b.nodeValue&&b.nodeValue.indexOf("\u00a0")!=-1){a.push(b)}},"childNodes");for(g=0;g<a.length;g++){l=a[g].nodeValue;l=l.replace(/(\u00a0)/g,'<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">$1</span>');c=k.dom.create("div",null,l);while(node=c.lastChild){k.dom.insertAfter(node,a[g])}k.dom.remove(a[g])}}else{a=k.dom.select("span.mceItemNbsp",o);for(g=a.length-1;g>=0;g--){k.dom.remove(a[g],1)}}q.moveToBookmark(f)}});tinymce.PluginManager.add("visualchars",tinymce.plugins.VisualChars)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js
index 0a5275fe2..df985905b 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js
@@ -22,9 +22,9 @@
 			ed.addButton('visualchars', {title : 'visualchars.desc', cmd : 'mceVisualChars'});

 

 			ed.onBeforeGetContent.add(function(ed, o) {

-				if (t.state) {

+				if (t.state && o.format != 'raw' && !o.draft) {

 					t.state = true;

-					t._toggleVisualChars();

+					t._toggleVisualChars(false);

 				}

 			});

 		},

@@ -41,12 +41,15 @@
 

 		// Private methods

 

-		_toggleVisualChars : function() {

-			var t = this, ed = t.editor, nl, i, h, d = ed.getDoc(), b = ed.getBody(), nv, s = ed.selection, bo;

+		_toggleVisualChars : function(bookmark) {

+			var t = this, ed = t.editor, nl, i, h, d = ed.getDoc(), b = ed.getBody(), nv, s = ed.selection, bo, div, bm;

 

 			t.state = !t.state;

 			ed.controlManager.setActive('visualchars', t.state);

 

+			if (bookmark)

+				bm = s.getBookmark();

+

 			if (t.state) {

 				nl = [];

 				tinymce.walk(b, function(n) {

@@ -54,20 +57,24 @@
 						nl.push(n);

 				}, 'childNodes');

 

-				for (i=0; i<nl.length; i++) {

+				for (i = 0; i < nl.length; i++) {

 					nv = nl[i].nodeValue;

-					nv = nv.replace(/(\u00a0+)/g, '<span class="mceItemHidden mceVisualNbsp">$1</span>');

-					nv = nv.replace(/\u00a0/g, '\u00b7');

-					ed.dom.setOuterHTML(nl[i], nv, d);

+					nv = nv.replace(/(\u00a0)/g, '<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">$1</span>');

+

+					div = ed.dom.create('div', null, nv);

+					while (node = div.lastChild)

+						ed.dom.insertAfter(node, nl[i]);

+

+					ed.dom.remove(nl[i]);

 				}

 			} else {

-				nl = tinymce.grep(ed.dom.select('span', b), function(n) {

-					return ed.dom.hasClass(n, 'mceVisualNbsp');

-				});

+				nl = ed.dom.select('span.mceItemNbsp', b);

 

-				for (i=0; i<nl.length; i++)

-					ed.dom.setOuterHTML(nl[i], nl[i].innerHTML.replace(/(&middot;|\u00b7)/g, '&nbsp;'), d);

+				for (i = nl.length - 1; i >= 0; i--)

+					ed.dom.remove(nl[i], 1);

 			}

+

+			s.moveToBookmark(bm);

 		}

 	});

 

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js
index a099e6a8c..42ece2092 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.WordCount",{block:0,id:null,countre:null,cleanre:null,init:function(a,b){var c=this,d=0;c.countre=a.getParam("wordcount_countregex",/\S\s+/g);c.cleanre=a.getParam("wordcount_cleanregex",/[0-9.(),;:!?%#$¿'"_+=\\\/-]*/g);c.id=a.id+"-word-count";a.onPostRender.add(function(f,e){var g,h;h=f.getParam("wordcount_target_id");if(!h){g=tinymce.DOM.get(f.id+"_path_row");if(g){tinymce.DOM.add(g.parentNode,"div",{style:"float: right"},f.getLang("wordcount.words","Words: ")+'<span id="'+c.id+'">0</span>')}}else{tinymce.DOM.add(h,"span",{},'<span id="'+c.id+'">0</span>')}});a.onInit.add(function(e){e.selection.onSetContent.add(function(){c._count(e)});c._count(e)});a.onSetContent.add(function(e){c._count(e)});a.onKeyUp.add(function(f,g){if(g.keyCode==d){return}if(13==g.keyCode||8==d||46==d){c._count(f)}d=g.keyCode})},_count:function(b){var c=this,a=0;if(c.block){return}c.block=1;setTimeout(function(){var d=b.getContent({format:"raw"});if(d){d=d.replace(/<.[^<>]*?>/g," ").replace(/&nbsp;|&#160;/gi," ");d=d.replace(c.cleanre,"");d.replace(c.countre,function(){a++})}tinymce.DOM.setHTML(c.id,a.toString());setTimeout(function(){c.block=0},2000)},1)},getInfo:function(){return{longname:"Word Count plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("wordcount",tinymce.plugins.WordCount)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.WordCount",{block:0,id:null,countre:null,cleanre:null,init:function(c,d){var e=this,f=0,g=tinymce.VK;e.countre=c.getParam("wordcount_countregex",/[\w\u2019\'-]+/g);e.cleanre=c.getParam("wordcount_cleanregex",/[0-9.(),;:!?%#$?\'\"_+=\\\/-]*/g);e.update_rate=c.getParam("wordcount_update_rate",2000);e.update_on_delete=c.getParam("wordcount_update_on_delete",false);e.id=c.id+"-word-count";c.onPostRender.add(function(i,h){var j,k;k=i.getParam("wordcount_target_id");if(!k){j=tinymce.DOM.get(i.id+"_path_row");if(j){tinymce.DOM.add(j.parentNode,"div",{style:"float: right"},i.getLang("wordcount.words","Words: ")+'<span id="'+e.id+'">0</span>')}}else{tinymce.DOM.add(k,"span",{},'<span id="'+e.id+'">0</span>')}});c.onInit.add(function(h){h.selection.onSetContent.add(function(){e._count(h)});e._count(h)});c.onSetContent.add(function(h){e._count(h)});function b(h){return h!==f&&(h===g.ENTER||f===g.SPACEBAR||a(f))}function a(h){return h===g.DELETE||h===g.BACKSPACE}c.onKeyUp.add(function(h,i){if(b(i.keyCode)||e.update_on_delete&&a(i.keyCode)){e._count(h)}f=i.keyCode})},_getCount:function(c){var a=0;var b=c.getContent({format:"raw"});if(b){b=b.replace(/\.\.\./g," ");b=b.replace(/<.[^<>]*?>/g," ").replace(/&nbsp;|&#160;/gi," ");b=b.replace(/(\w+)(&.+?;)+(\w+)/,"$1$3").replace(/&.+?;/g," ");b=b.replace(this.cleanre,"");var d=b.match(this.countre);if(d){a=d.length}}return a},_count:function(a){var b=this;if(b.block){return}b.block=1;setTimeout(function(){if(!a.destroyed){var c=b._getCount(a);tinymce.DOM.setHTML(b.id,c.toString());setTimeout(function(){b.block=0},b.update_rate)}},1)},getInfo:function(){return{longname:"Word Count plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("wordcount",tinymce.plugins.WordCount)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js
index 5cb92fa0f..34b265553 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js
@@ -9,17 +9,19 @@
  */

 

 (function() {

-    tinymce.create('tinymce.plugins.WordCount', {

+	tinymce.create('tinymce.plugins.WordCount', {

 		block : 0,

 		id : null,

 		countre : null,

 		cleanre : null,

 

 		init : function(ed, url) {

-			var t = this, last = 0;

+			var t = this, last = 0, VK = tinymce.VK;

 

-			t.countre = ed.getParam('wordcount_countregex', /\S\s+/g);

-			t.cleanre = ed.getParam('wordcount_cleanregex', /[0-9.(),;:!?%#$¿'"_+=\\\/-]*/g);

+			t.countre = ed.getParam('wordcount_countregex', /[\w\u2019\'-]+/g); // u2019 == &rsquo;

+			t.cleanre = ed.getParam('wordcount_cleanregex', /[0-9.(),;:!?%#$?\'\"_+=\\\/-]*/g);

+			t.update_rate = ed.getParam('wordcount_update_rate', 2000);

+			t.update_on_delete = ed.getParam('wordcount_update_on_delete', false);

 			t.id = ed.id + '-word-count';

 

 			ed.onPostRender.add(function(ed, cm) {

@@ -32,11 +34,12 @@
 

 					if (row)

 						tinymce.DOM.add(row.parentNode, 'div', {'style': 'float: right'}, ed.getLang('wordcount.words', 'Words: ') + '<span id="' + t.id + '">0</span>');

-				} else

+				} else {

 					tinymce.DOM.add(id, 'span', {}, '<span id="' + t.id + '">0</span>');

+				}

 			});

 

-            ed.onInit.add(function(ed) {

+			ed.onInit.add(function(ed) {

 				ed.selection.onSetContent.add(function() {

 					t._count(ed);

 				});

@@ -48,19 +51,46 @@
 				t._count(ed);

 			});

 

-			ed.onKeyUp.add(function(ed, e) {

-				if (e.keyCode == last)

-					return;

+			function checkKeys(key) {

+				return key !== last && (key === VK.ENTER || last === VK.SPACEBAR || checkDelOrBksp(last));

+			}

 

-				if (13 == e.keyCode || 8 == last || 46 == last)

+			function checkDelOrBksp(key) {

+				return key === VK.DELETE || key === VK.BACKSPACE;

+			}

+

+			ed.onKeyUp.add(function(ed, e) {

+				if (checkKeys(e.keyCode) || t.update_on_delete && checkDelOrBksp(e.keyCode)) {

 					t._count(ed);

+				}

 

 				last = e.keyCode;

 			});

 		},

 

+		_getCount : function(ed) {

+			var tc = 0;

+			var tx = ed.getContent({ format: 'raw' });

+

+			if (tx) {

+					tx = tx.replace(/\.\.\./g, ' '); // convert ellipses to spaces

+					tx = tx.replace(/<.[^<>]*?>/g, ' ').replace(/&nbsp;|&#160;/gi, ' '); // remove html tags and space chars

+

+					// deal with html entities

+					tx = tx.replace(/(\w+)(&.+?;)+(\w+)/, "$1$3").replace(/&.+?;/g, ' ');

+					tx = tx.replace(this.cleanre, ''); // remove numbers and punctuation

+

+					var wordArray = tx.match(this.countre);

+					if (wordArray) {

+							tc = wordArray.length;

+					}

+			}

+

+			return tc;

+		},

+

 		_count : function(ed) {

-			var t = this, tc = 0;

+			var t = this;

 

 			// Keep multiple calls from happening at the same time

 			if (t.block)

@@ -69,21 +99,15 @@
 			t.block = 1;

 

 			setTimeout(function() {

-				var tx = ed.getContent({format : 'raw'});

-

-				if (tx) {

-					tx = tx.replace(/<.[^<>]*?>/g, ' ').replace(/&nbsp;|&#160;/gi, ' '); // remove html tags and space chars

-					tx = tx.replace(t.cleanre, ''); // remove numbers and punctuation

-					tx.replace(t.countre, function() {tc++;}); // count the words

+				if (!ed.destroyed) {

+					var tc = t._getCount(ed);

+					tinymce.DOM.setHTML(t.id, tc.toString());

+					setTimeout(function() {t.block = 0;}, t.update_rate);

 				}

-

-				tinymce.DOM.setHTML(t.id, tc.toString());

-

-				setTimeout(function() {t.block = 0;}, 2000);

 			}, 1);

 		},

 

-        getInfo: function() {

+		getInfo: function() {

 			return {

 				longname : 'Word Count plugin',

 				author : 'Moxiecode Systems AB',

@@ -91,8 +115,8 @@
 				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount',

 				version : tinymce.majorVersion + "." + tinymce.minorVersion

 			};

-        }

-    });

+		}

+	});

 

-    tinymce.PluginManager.add('wordcount', tinymce.plugins.WordCount);

+	tinymce.PluginManager.add('wordcount', tinymce.plugins.WordCount);

 })();

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm
index 3aeac0deb..30a894f7c 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm
@@ -10,11 +10,12 @@
 	<script type="text/javascript" src="js/abbr.js"></script>

 	<link rel="stylesheet" type="text/css" href="css/popup.css" />

 </head>

-<body style="display: none">

+<body style="display: none" role="application" aria-labelledby="app_title">

+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_abbr_element}</span>

 <form onsubmit="insertAbbr();return false;" action="#">

 	<div class="tabs">

 		<ul>

-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>

+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>

 			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->

 		</ul>

 	</div>

@@ -23,7 +24,7 @@
 		<div id="general_panel" class="panel current">

 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>

-				<table border="0" cellpadding="0" cellspacing="4">

+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">

 					<tr>

 						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 

 						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td> 

@@ -41,7 +42,7 @@
 						</td>

 					</tr>

 					<tr>

-						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

 						<td><input id="style" name="style" type="text" value="" class="field" /></td> 

 					</tr>

 					<tr>

@@ -67,7 +68,7 @@
 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>

 

-				<table border="0" cellpadding="0" cellspacing="4">

+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">

 					<tr>

 						<td class="label"><label for="onfocus">onfocus</label>:</td> 

 						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm
index 31ee7b70f..c10934592 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm
@@ -10,11 +10,12 @@
 	<script type="text/javascript" src="js/acronym.js"></script>

 	<link rel="stylesheet" type="text/css" href="css/popup.css" />

 </head>

-<body style="display: none">

+<body style="display: none" role="application" aria-labelledby="app_title">

+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_acronym_element}</span>

 <form onsubmit="insertAcronym();return false;" action="#">

 	<div class="tabs">

 		<ul>

-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>

+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>

 			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->

 		</ul>

 	</div>

@@ -23,7 +24,7 @@
 		<div id="general_panel" class="panel current">

 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>

-				<table border="0" cellpadding="0" cellspacing="4">

+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">

 					<tr>

 						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 

 						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td> 

@@ -41,7 +42,7 @@
 						</td>

 					</tr>

 					<tr>

-						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

 						<td><input id="style" name="style" type="text" value="" class="field" /></td> 

 					</tr>

 					<tr>

@@ -67,7 +68,7 @@
 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>

 

-				<table border="0" cellpadding="0" cellspacing="4">

+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">

 					<tr>

 						<td class="label"><label for="onfocus">onfocus</label>:</td> 

 						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm
index 17054da3e..e8d606a34 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm
@@ -9,12 +9,13 @@
 	<script type="text/javascript" src="js/attributes.js"></script>

 	<link rel="stylesheet" type="text/css" href="css/attributes.css" />

 </head>

-<body style="display: none">

+<body style="display: none" role="application" aria-labelledby="app_title">

+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.attribs_title}</span>

 <form onsubmit="insertAction();return false;" action="#">

 	<div class="tabs">

 		<ul>

-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_attrib_tab}</a></span></li>

-			<li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_events_tab}</a></span></li>

+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_attrib_tab}</a></span></li>

+			<li id="events_tab" aria-controls="events_panel"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_events_tab}</a></span></li>

 		</ul>

 	</div>

 

@@ -22,7 +23,7 @@
 		<div id="general_panel" class="panel current">

 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.attribute_attrib_tab}</legend>

-				<table border="0" cellpadding="0" cellspacing="4">

+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">

 					<tr>

 						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 

 						<td><input id="title" name="title" type="text" value="" class="mceFocus" /></td> 

@@ -75,7 +76,7 @@
 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.attribute_events_tab}</legend>

 

-				<table border="0" cellpadding="0" cellspacing="4">

+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">

 					<tr>

 						<td class="label"><label for="onfocus">onfocus</label>:</td> 

 						<td><input id="onfocus" name="onfocus" type="text" value="" /></td> 

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm
index d0a3e3a8e..0ac6bdb66 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm
@@ -10,11 +10,12 @@
 	<script type="text/javascript" src="js/cite.js"></script>

 	<link rel="stylesheet" type="text/css" href="css/popup.css" />

 </head>

-<body style="display: none">

+<body style="display: none" role="application" aria-labelledby="app_title">

+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_cite_element}</span>

 <form onsubmit="insertCite();return false;" action="#">

 	<div class="tabs">

 		<ul>

-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>

+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>

 			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->

 		</ul>

 	</div>

@@ -23,7 +24,7 @@
 		<div id="general_panel" class="panel current">

 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>

-				<table border="0" cellpadding="0" cellspacing="4">

+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">

 					<tr>

 						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 

 						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td> 

@@ -67,7 +68,7 @@
 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>

 

-				<table border="0" cellpadding="0" cellspacing="4">

+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">

 					<tr>

 						<td class="label"><label for="onfocus">onfocus</label>:</td> 

 						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css
index 9a6a235c3..9a6a235c3 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css
index e67114dba..e67114dba 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm
index 8b07fa842..5f667510f 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm
@@ -10,11 +10,12 @@
 	<script type="text/javascript" src="js/del.js"></script>

 	<link rel="stylesheet" type="text/css" href="css/popup.css" />

 </head>

-<body id="xhtmlxtrasins" style="display: none">

+<body id="xhtmlxtrasins" style="display: none" role="application" aria-labelledby="app_title">

+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_del_element}</span>

 <form onsubmit="insertDel();return false;" action="#">

 	<div class="tabs">

 		<ul>

-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>

+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>

 			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->

 		</ul>

 	</div>

@@ -23,14 +24,14 @@
 		<div id="general_panel" class="panel current">

 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_general_tab}</legend>

-				<table border="0" cellpadding="0" cellspacing="4">

+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">

 					<tr>

 						<td class="label"><label id="datetimelabel" for="datetime">{#xhtmlxtras_dlg.attribute_label_datetime}</label>:</td>

 						<td>

-							<table border="0" cellspacing="0" cellpadding="0">

+							<table role="presentation" border="0" cellspacing="0" cellpadding="0">

 								<tr> 

 									<td><input id="datetime" name="datetime" type="text" value="" maxlength="19" class="field mceFocus" /></td> 

-									<td><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse"><span class="datetime" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>

+									<td><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse" role="button" aria-labelledby="datetimelabel"><span class="datetime" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>

 								</tr>

 							</table>

 						</td>

@@ -43,7 +44,7 @@
 			</fieldset>

 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>

-				<table border="0" cellpadding="0" cellspacing="4">

+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">

 					<tr>

 						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 

 						<td><input id="title" name="title" type="text" value="" class="field" /></td> 

@@ -61,7 +62,7 @@
 						</td>

 					</tr>

 					<tr>

-						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

 						<td><input id="style" name="style" type="text" value="" class="field" /></td> 

 					</tr>

 					<tr>

@@ -87,7 +88,7 @@
 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>

 

-				<table border="0" cellpadding="0" cellspacing="4">

+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">

 					<tr>

 						<td class="label"><label for="onfocus">onfocus</label>:</td> 

 						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
index e5195265e..9b98a5154 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.XHTMLXtrasPlugin",{init:function(b,c){b.addCommand("mceCite",function(){b.windowManager.open({file:c+"/cite.htm",width:350+parseInt(b.getLang("xhtmlxtras.cite_delta_width",0)),height:250+parseInt(b.getLang("xhtmlxtras.cite_delta_height",0)),inline:1},{plugin_url:c})});b.addCommand("mceAcronym",function(){b.windowManager.open({file:c+"/acronym.htm",width:350+parseInt(b.getLang("xhtmlxtras.acronym_delta_width",0)),height:250+parseInt(b.getLang("xhtmlxtras.acronym_delta_width",0)),inline:1},{plugin_url:c})});b.addCommand("mceAbbr",function(){b.windowManager.open({file:c+"/abbr.htm",width:350+parseInt(b.getLang("xhtmlxtras.abbr_delta_width",0)),height:250+parseInt(b.getLang("xhtmlxtras.abbr_delta_width",0)),inline:1},{plugin_url:c})});b.addCommand("mceDel",function(){b.windowManager.open({file:c+"/del.htm",width:340+parseInt(b.getLang("xhtmlxtras.del_delta_width",0)),height:310+parseInt(b.getLang("xhtmlxtras.del_delta_width",0)),inline:1},{plugin_url:c})});b.addCommand("mceIns",function(){b.windowManager.open({file:c+"/ins.htm",width:340+parseInt(b.getLang("xhtmlxtras.ins_delta_width",0)),height:310+parseInt(b.getLang("xhtmlxtras.ins_delta_width",0)),inline:1},{plugin_url:c})});b.addCommand("mceAttributes",function(){b.windowManager.open({file:c+"/attributes.htm",width:380,height:370,inline:1},{plugin_url:c})});b.addButton("cite",{title:"xhtmlxtras.cite_desc",cmd:"mceCite"});b.addButton("acronym",{title:"xhtmlxtras.acronym_desc",cmd:"mceAcronym"});b.addButton("abbr",{title:"xhtmlxtras.abbr_desc",cmd:"mceAbbr"});b.addButton("del",{title:"xhtmlxtras.del_desc",cmd:"mceDel"});b.addButton("ins",{title:"xhtmlxtras.ins_desc",cmd:"mceIns"});b.addButton("attribs",{title:"xhtmlxtras.attribs_desc",cmd:"mceAttributes"});if(tinymce.isIE){function a(d,e){if(e.set){e.content=e.content.replace(/<abbr([^>]+)>/gi,"<html:abbr $1>");e.content=e.content.replace(/<\/abbr>/gi,"</html:abbr>")}}b.onBeforeSetContent.add(a);b.onPostProcess.add(a)}b.onNodeChange.add(function(e,d,g,f){g=e.dom.getParent(g,"CITE,ACRONYM,ABBR,DEL,INS");d.setDisabled("cite",f);d.setDisabled("acronym",f);d.setDisabled("abbr",f);d.setDisabled("del",f);d.setDisabled("ins",f);d.setDisabled("attribs",g&&g.nodeName=="BODY");d.setActive("cite",0);d.setActive("acronym",0);d.setActive("abbr",0);d.setActive("del",0);d.setActive("ins",0);if(g){do{d.setDisabled(g.nodeName.toLowerCase(),0);d.setActive(g.nodeName.toLowerCase(),1)}while(g=g.parentNode)}});b.onPreInit.add(function(){b.dom.create("abbr")})},getInfo:function(){return{longname:"XHTML Xtras Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("xhtmlxtras",tinymce.plugins.XHTMLXtrasPlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.XHTMLXtrasPlugin",{init:function(a,b){a.addCommand("mceCite",function(){a.windowManager.open({file:b+"/cite.htm",width:350+parseInt(a.getLang("xhtmlxtras.cite_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.cite_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAcronym",function(){a.windowManager.open({file:b+"/acronym.htm",width:350+parseInt(a.getLang("xhtmlxtras.acronym_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.acronym_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAbbr",function(){a.windowManager.open({file:b+"/abbr.htm",width:350+parseInt(a.getLang("xhtmlxtras.abbr_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.abbr_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceDel",function(){a.windowManager.open({file:b+"/del.htm",width:340+parseInt(a.getLang("xhtmlxtras.del_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.del_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceIns",function(){a.windowManager.open({file:b+"/ins.htm",width:340+parseInt(a.getLang("xhtmlxtras.ins_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.ins_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAttributes",function(){a.windowManager.open({file:b+"/attributes.htm",width:380+parseInt(a.getLang("xhtmlxtras.attr_delta_width",0)),height:370+parseInt(a.getLang("xhtmlxtras.attr_delta_height",0)),inline:1},{plugin_url:b})});a.addButton("cite",{title:"xhtmlxtras.cite_desc",cmd:"mceCite"});a.addButton("acronym",{title:"xhtmlxtras.acronym_desc",cmd:"mceAcronym"});a.addButton("abbr",{title:"xhtmlxtras.abbr_desc",cmd:"mceAbbr"});a.addButton("del",{title:"xhtmlxtras.del_desc",cmd:"mceDel"});a.addButton("ins",{title:"xhtmlxtras.ins_desc",cmd:"mceIns"});a.addButton("attribs",{title:"xhtmlxtras.attribs_desc",cmd:"mceAttributes"});a.onNodeChange.add(function(d,c,f,e){f=d.dom.getParent(f,"CITE,ACRONYM,ABBR,DEL,INS");c.setDisabled("cite",e);c.setDisabled("acronym",e);c.setDisabled("abbr",e);c.setDisabled("del",e);c.setDisabled("ins",e);c.setDisabled("attribs",f&&f.nodeName=="BODY");c.setActive("cite",0);c.setActive("acronym",0);c.setActive("abbr",0);c.setActive("del",0);c.setActive("ins",0);if(f){do{c.setDisabled(f.nodeName.toLowerCase(),0);c.setActive(f.nodeName.toLowerCase(),1)}while(f=f.parentNode)}});a.onPreInit.add(function(){a.dom.create("abbr")})},getInfo:function(){return{longname:"XHTML Xtras Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("xhtmlxtras",tinymce.plugins.XHTMLXtrasPlugin)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
index 9b51b8368..f24057211 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
@@ -27,7 +27,7 @@
 				ed.windowManager.open({

 					file : url + '/acronym.htm',

 					width : 350 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_width', 0)),

-					height : 250 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_width', 0)),

+					height : 250 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_height', 0)),

 					inline : 1

 				}, {

 					plugin_url : url

@@ -38,7 +38,7 @@
 				ed.windowManager.open({

 					file : url + '/abbr.htm',

 					width : 350 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_width', 0)),

-					height : 250 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_width', 0)),

+					height : 250 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_height', 0)),

 					inline : 1

 				}, {

 					plugin_url : url

@@ -49,7 +49,7 @@
 				ed.windowManager.open({

 					file : url + '/del.htm',

 					width : 340 + parseInt(ed.getLang('xhtmlxtras.del_delta_width', 0)),

-					height : 310 + parseInt(ed.getLang('xhtmlxtras.del_delta_width', 0)),

+					height : 310 + parseInt(ed.getLang('xhtmlxtras.del_delta_height', 0)),

 					inline : 1

 				}, {

 					plugin_url : url

@@ -60,7 +60,7 @@
 				ed.windowManager.open({

 					file : url + '/ins.htm',

 					width : 340 + parseInt(ed.getLang('xhtmlxtras.ins_delta_width', 0)),

-					height : 310 + parseInt(ed.getLang('xhtmlxtras.ins_delta_width', 0)),

+					height : 310 + parseInt(ed.getLang('xhtmlxtras.ins_delta_height', 0)),

 					inline : 1

 				}, {

 					plugin_url : url

@@ -70,8 +70,8 @@
 			ed.addCommand('mceAttributes', function() {

 				ed.windowManager.open({

 					file : url + '/attributes.htm',

-					width : 380,

-					height : 370,

+					width : 380 + parseInt(ed.getLang('xhtmlxtras.attr_delta_width', 0)),

+					height : 370 + parseInt(ed.getLang('xhtmlxtras.attr_delta_height', 0)),

 					inline : 1

 				}, {

 					plugin_url : url

@@ -86,18 +86,6 @@
 			ed.addButton('ins', {title : 'xhtmlxtras.ins_desc', cmd : 'mceIns'});

 			ed.addButton('attribs', {title : 'xhtmlxtras.attribs_desc', cmd : 'mceAttributes'});

 

-			if (tinymce.isIE) {

-				function fix(ed, o) {

-					if (o.set) {

-						o.content = o.content.replace(/<abbr([^>]+)>/gi, '<html:abbr $1>');

-						o.content = o.content.replace(/<\/abbr>/gi, '</html:abbr>');

-					}

-				};

-

-				ed.onBeforeSetContent.add(fix);

-				ed.onPostProcess.add(fix);

-			}

-

 			ed.onNodeChange.add(function(ed, cm, n, co) {

 				n = ed.dom.getParent(n, 'CITE,ACRONYM,ABBR,DEL,INS');

 

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm
index 6c5470cfc..d001ac7c4 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm
@@ -10,11 +10,12 @@
 	<script type="text/javascript" src="js/ins.js"></script>

 	<link rel="stylesheet" type="text/css" href="css/popup.css" />

 </head>

-<body id="xhtmlxtrasins" style="display: none">

+<body id="xhtmlxtrasins" style="display: none" role="application" aria-labelledby="app_title">

+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_ins_element}</span>

 <form onsubmit="insertIns();return false;" action="#">

 	<div class="tabs">

 		<ul>

-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>

+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>

 			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->

 		</ul>

 	</div>

@@ -23,19 +24,19 @@
 		<div id="general_panel" class="panel current">

 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_general_tab}</legend>

-				<table border="0" cellpadding="0" cellspacing="4">

+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">

 					<tr>

 						<td class="label"><label id="datetimelabel" for="datetime">{#xhtmlxtras_dlg.attribute_label_datetime}</label>:</td> 

 						<td>

-							<table border="0" cellspacing="0" cellpadding="0">

+							<table role="presentation" border="0" cellspacing="0" cellpadding="0">

 								<tr> 

 									<td><input id="datetime" name="datetime" type="text" value="" maxlength="19" class="field mceFocus" /></td> 

-									<td><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse"><span class="datetime" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>

+									<td ><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse" role="button" aria-labelledby="datetimelabel"><span class="datetime" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>

 								</tr>

 							</table>

 						</td>

 					</tr>

-					<tr>

+					<tr >

 						<td class="label"><label id="citelabel" for="cite">{#xhtmlxtras_dlg.attribute_label_cite}</label>:</td> 

 						<td><input id="cite" name="cite" type="text" value="" class="field" /></td> 

 					</tr>

@@ -43,9 +44,9 @@
 			</fieldset>

 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>

-				<table border="0" cellpadding="0" cellspacing="4">

+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">

 					<tr>

-						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 

+						<td  class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 

 						<td><input id="title" name="title" type="text" value="" class="field" /></td> 

 					</tr>

 					<tr>

@@ -61,7 +62,7 @@
 						</td>

 					</tr>

 					<tr>

-						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

 						<td><input id="style" name="style" type="text" value="" class="field" /></td> 

 					</tr>

 					<tr>

@@ -87,7 +88,7 @@
 			<fieldset>

 				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>

 

-				<table border="0" cellpadding="0" cellspacing="4">

+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">

 					<tr>

 						<td class="label"><label for="onfocus">onfocus</label>:</td> 

 						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js
index 4b51a2572..4b51a2572 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js
index 6ec2f8871..6ec2f8871 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
index d62a219e6..9c99995ad 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
@@ -53,7 +53,6 @@ function insertAction() {
 	var inst = tinyMCEPopup.editor;

 	var elm = inst.selection.getNode();

 

-	tinyMCEPopup.execCommand("mceBeginUndoLevel");	

 	setAllAttribs(elm);

 	tinyMCEPopup.execCommand("mceEndUndoLevel");

 	tinyMCEPopup.close();

@@ -72,21 +71,7 @@ function setAttrib(elm, attrib, value) {
 			value = valueElm.value;

 	}

 

-	if (value != "") {

-		dom.setAttrib(elm, attrib.toLowerCase(), value);

-

-		if (attrib == "style")

-			attrib = "style.cssText";

-

-		if (attrib.substring(0, 2) == 'on')

-			value = 'return true;' + value;

-

-		if (attrib == "class")

-			attrib = "className";

-

-		elm[attrib]=value;

-	} else

-		elm.removeAttribute(attrib);

+	dom.setAttrib(elm, attrib.toLowerCase(), value);

 }

 

 function setAllAttribs(elm) {

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js
index 009b71546..009b71546 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js
index 9e5d8c571..1f957dc78 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js
@@ -21,17 +21,17 @@ function setElementAttribs(elm) {
 	setAllCommonAttribs(elm);

 	setAttrib(elm, 'datetime');

 	setAttrib(elm, 'cite');

+	elm.removeAttribute('data-mce-new');

 }

 

 function insertDel() {

 	var elm = tinyMCEPopup.editor.dom.getParent(SXE.focusElement, 'DEL');

 

-	tinyMCEPopup.execCommand('mceBeginUndoLevel');

 	if (elm == null) {

 		var s = SXE.inst.selection.getContent();

 		if(s.length > 0) {

 			insertInlineElement('del');

-			var elementArray = tinymce.grep(SXE.inst.dom.select('del'), function(n) {return n.id == '#sxe_temp_del#';});

+			var elementArray = SXE.inst.dom.select('del[data-mce-new]');

 			for (var i=0; i<elementArray.length; i++) {

 				var elm = elementArray[i];

 				setElementAttribs(elm);

@@ -45,16 +45,6 @@ function insertDel() {
 	tinyMCEPopup.close();

 }

 

-function insertInlineElement(en) {

-	var ed = tinyMCEPopup.editor, dom = ed.dom;

-

-	ed.getDoc().execCommand('FontName', false, 'mceinline');

-	tinymce.each(dom.select(tinymce.isWebKit ? 'span' : 'font'), function(n) {

-		if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline')

-			dom.replace(dom.create(en), n, 1);

-	});

-}

-

 function removeDel() {

 	SXE.removeElement('del');

 	tinyMCEPopup.close();

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js
index 5b494a566..4e5d9c3bb 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js
@@ -154,7 +154,6 @@ SXE.initElementDialog = function(element_name) {
 SXE.insertElement = function(element_name) {

 	var elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase()), h, tagName;

 

-	tinyMCEPopup.execCommand('mceBeginUndoLevel');

 	if (elm == null) {

 		var s = SXE.inst.selection.getContent();

 		if(s.length > 0) {

@@ -165,11 +164,11 @@ SXE.insertElement = function(element_name) {
 			for (var i=0; i<elementArray.length; i++) {

 				var elm = elementArray[i];

 

-				if (SXE.inst.dom.getAttrib(elm, '_mce_new')) {

+				if (SXE.inst.dom.getAttrib(elm, 'data-mce-new')) {

 					elm.id = '';

 					elm.setAttribute('id', '');

 					elm.removeAttribute('id');

-					elm.removeAttribute('_mce_new');

+					elm.removeAttribute('data-mce-new');

 

 					setAllCommonAttribs(elm);

 				}

@@ -186,7 +185,6 @@ SXE.removeElement = function(element_name){
 	element_name = element_name.toLowerCase();

 	elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase());

 	if(elm && elm.nodeName.toUpperCase() == element_name.toUpperCase()){

-		tinyMCEPopup.execCommand('mceBeginUndoLevel');

 		tinyMCE.execCommand('mceRemoveNode', false, elm);

 		SXE.inst.nodeChanged();

 		tinyMCEPopup.execCommand('mceEndUndoLevel');

@@ -226,6 +224,6 @@ function insertInlineElement(en) {
 	ed.getDoc().execCommand('FontName', false, 'mceinline');

 	tinymce.each(dom.select('span,font'), function(n) {

 		if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline')

-			dom.replace(dom.create(en, {_mce_new : 1}), n, 1);

+			dom.replace(dom.create(en, {'data-mce-new' : 1}), n, 1);

 	});

 }

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js
index 3774f0a18..c4addfb01 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js
@@ -21,16 +21,17 @@ function setElementAttribs(elm) {
 	setAllCommonAttribs(elm);

 	setAttrib(elm, 'datetime');

 	setAttrib(elm, 'cite');

+	elm.removeAttribute('data-mce-new');

 }

 

 function insertIns() {

 	var elm = tinyMCEPopup.editor.dom.getParent(SXE.focusElement, 'INS');

-	tinyMCEPopup.execCommand('mceBeginUndoLevel');

+

 	if (elm == null) {

 		var s = SXE.inst.selection.getContent();

 		if(s.length > 0) {

-			insertInlineElement('INS');

-			var elementArray = tinymce.grep(SXE.inst.dom.select('ins'), function(n) {return n.id == '#sxe_temp_ins#';});

+			insertInlineElement('ins');

+			var elementArray = SXE.inst.dom.select('ins[data-mce-new]');

 			for (var i=0; i<elementArray.length; i++) {

 				var elm = elementArray[i];

 				setElementAttribs(elm);

@@ -49,14 +50,4 @@ function removeIns() {
 	tinyMCEPopup.close();

 }

 

-function insertInlineElement(en) {

-	var ed = tinyMCEPopup.editor, dom = ed.dom;

-

-	ed.getDoc().execCommand('FontName', false, 'mceinline');

-	tinymce.each(dom.select(tinymce.isWebKit ? 'span' : 'font'), function(n) {

-		if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline')

-			dom.replace(dom.create(en), n, 1);

-	});

-}

-

 tinyMCEPopup.onInit.add(init);

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
index 45b6b267b..c4569f85e 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
@@ -1,32 +1 @@
-tinyMCE.addI18n('en.xhtmlxtras_dlg',{

-attribute_label_title:"Title",

-attribute_label_id:"ID",

-attribute_label_class:"Class",

-attribute_label_style:"Style",

-attribute_label_cite:"Cite",

-attribute_label_datetime:"Date/Time",

-attribute_label_langdir:"Text Direction",

-attribute_option_ltr:"Left to right",

-attribute_option_rtl:"Right to left",

-attribute_label_langcode:"Language",

-attribute_label_tabindex:"TabIndex",

-attribute_label_accesskey:"AccessKey",

-attribute_events_tab:"Events",

-attribute_attrib_tab:"Attributes",

-general_tab:"General",

-attrib_tab:"Attributes",

-events_tab:"Events",

-fieldset_general_tab:"General Settings",

-fieldset_attrib_tab:"Element Attributes",

-fieldset_events_tab:"Element Events",

-title_ins_element:"Insertion Element",

-title_del_element:"Deletion Element",

-title_acronym_element:"Acronym Element",

-title_abbr_element:"Abbreviation Element",

-title_cite_element:"Citation Element",

-remove:"Remove",

-insert_date:"Insert current date/time",

-option_ltr:"Left to right",

-option_rtl:"Right to left",

-attribs_title:"Insert/Edit Attributes"

-});
\ No newline at end of file
+tinyMCE.addI18n('en.xhtmlxtras_dlg',{"attribs_title":"Insert/Edit Attributes","option_rtl":"Right to Left","option_ltr":"Left to Right","insert_date":"Insert Current Date/Time",remove:"Remove","title_cite_element":"Citation Element","title_abbr_element":"Abbreviation Element","title_acronym_element":"Acronym Element","title_del_element":"Deletion Element","title_ins_element":"Insertion Element","fieldset_events_tab":"Element Events","fieldset_attrib_tab":"Element Attributes","fieldset_general_tab":"General Settings","events_tab":"Events","attrib_tab":"Attributes","general_tab":"General","attribute_attrib_tab":"Attributes","attribute_events_tab":"Events","attribute_label_accesskey":"AccessKey","attribute_label_tabindex":"TabIndex","attribute_label_langcode":"Language","attribute_option_rtl":"Right to Left","attribute_option_ltr":"Left to Right","attribute_label_langdir":"Text Direction","attribute_label_datetime":"Date/Time","attribute_label_cite":"Cite","attribute_label_style":"Style","attribute_label_class":"Class","attribute_label_id":"ID","attribute_label_title":"Title"});
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/about.htm b/library/tinymce/jscripts/tiny_mce/themes/advanced/about.htm
index 267f837eb..7a97cb715 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/about.htm
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/about.htm
@@ -9,9 +9,9 @@
 <body id="about" style="display: none">

 		<div class="tabs">

 			<ul>

-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.about_general}</a></span></li>

-				<li id="help_tab" style="display:none"><span><a href="javascript:mcTabs.displayTab('help_tab','help_panel');" onmousedown="return false;">{#advanced_dlg.about_help}</a></span></li>

-				<li id="plugins_tab"><span><a href="javascript:mcTabs.displayTab('plugins_tab','plugins_panel');" onmousedown="return false;">{#advanced_dlg.about_plugins}</a></span></li>

+				<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.about_general}</a></span></li>

+				<li id="help_tab" style="display:none" aria-hidden="true" aria-controls="help_panel"><span><a href="javascript:mcTabs.displayTab('help_tab','help_panel');" onmousedown="return false;">{#advanced_dlg.about_help}</a></span></li>

+				<li id="plugins_tab" aria-controls="plugins_panel"><span><a href="javascript:mcTabs.displayTab('plugins_tab','plugins_panel');" onmousedown="return false;">{#advanced_dlg.about_plugins}</a></span></li>

 			</ul>

 		</div>

 

@@ -26,8 +26,6 @@
 

 				<div id="buttoncontainer">

 					<a href="http://www.moxiecode.com" target="_blank"><img src="http://tinymce.moxiecode.com/images/gotmoxie.png" alt="Got Moxie?" border="0" /></a>

-					<a href="http://sourceforge.net/projects/tinymce/" target="_blank"><img src="http://sourceforge.net/sflogo.php?group_id=103281" alt="Hosted By Sourceforge" border="0" /></a>

-					<a href="http://www.freshmeat.net/projects/tinymce" target="_blank"><img src="http://tinymce.moxiecode.com/images/fm.gif" alt="Also on freshmeat" border="0" /></a>

 				</div>

 			</div>

 

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm b/library/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm
index 2bc63fcfd..75c93b799 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm
@@ -5,15 +5,15 @@
 	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

 	<script type="text/javascript" src="js/anchor.js"></script>

 </head>

-<body style="display: none">

+<body style="display: none" role="application" aria-labelledby="app_title">

 <form onsubmit="AnchorDialog.update();return false;" action="#">

-	<table border="0" cellpadding="4" cellspacing="0">

+	<table border="0" cellpadding="4" cellspacing="0" role="presentation">

 		<tr>

-			<td colspan="2" class="title">{#advanced_dlg.anchor_title}</td>

+			<td colspan="2" class="title" id="app_title">{#advanced_dlg.anchor_title}</td>

 		</tr>

 		<tr>

-			<td class="nowrap">{#advanced_dlg.anchor_name}:</td>

-			<td><input name="anchorName" type="text" class="mceFocus" id="anchorName" value="" style="width: 200px" /></td>

+			<td class="nowrap"><label for="anchorName">{#advanced_dlg.anchor_name}:</label></td>

+			<td><input name="anchorName" type="text" class="mceFocus" id="anchorName" value="" style="width: 200px" aria-required="true" /></td>

 		</tr>

 	</table>

 

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm b/library/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm
index 3991b8141..d4b6bdfb7 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm
@@ -5,48 +5,51 @@
 	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

 	<script type="text/javascript" src="js/charmap.js"></script>

 </head>

-<body id="charmap" style="display:none">

-<table align="center" border="0" cellspacing="0" cellpadding="2">

-    <tr>

-        <td colspan="2" class="title">{#advanced_dlg.charmap_title}</td>

-    </tr>

-    <tr>

-        <td id="charmapView" rowspan="2" align="left" valign="top">

+<body id="charmap" style="display:none" role="application">

+<table align="center" border="0" cellspacing="0" cellpadding="2" role="presentation">

+	<tr>

+		<td colspan="2" class="title" ><label for="charmapView" id="charmap_label">{#advanced_dlg.charmap_title}</label></td>

+	</tr>

+	<tr>

+		<td id="charmapView" rowspan="2" align="left" valign="top">

 			<!-- Chars will be rendered here -->

-        </td>

-        <td width="100" align="center" valign="top">

-            <table border="0" cellpadding="0" cellspacing="0" width="100" style="height:100px">

-                <tr>

-                    <td id="codeV">&nbsp;</td>

-                </tr>

-                <tr>

-                    <td id="codeN">&nbsp;</td>

-                </tr>

-            </table>

-        </td>

-    </tr>

-    <tr>

-        <td valign="bottom" style="padding-bottom: 3px;">

-            <table width="100" align="center" border="0" cellpadding="2" cellspacing="0">

-                <tr>

-                    <td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;">HTML-Code</td>

-                </tr>

-                <tr>

-                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeA" align="center">&nbsp;</td>

-                </tr>

-                <tr>

-                    <td style="font-size: 1px;">&nbsp;</td>

-                </tr>

-                <tr>

-                    <td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;">NUM-Code</td>

-                </tr>

-                <tr>

-                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeB" align="center">&nbsp;</td>

-                </tr>

-            </table>

-        </td>

-    </tr>

+		</td>

+		<td width="100" align="center" valign="top">

+			<table border="0" cellpadding="0" cellspacing="0" width="100" style="height:100px" role="presentation">

+				<tr>

+					<td id="codeV">&nbsp;</td>

+				</tr>

+				<tr>

+					<td id="codeN">&nbsp;</td>

+				</tr>

+			</table>

+		</td>

+	</tr>

+	<tr>

+		<td valign="bottom" style="padding-bottom: 3px;">

+			<table width="100" align="center" border="0" cellpadding="2" cellspacing="0" role="presentation">

+				<tr>

+					<td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;"><label for="codeA">HTML-Code</label></td>

+				</tr>

+				<tr>

+					<td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeA" align="center">&nbsp;</td>

+				</tr>

+				<tr>

+					<td style="font-size: 1px;">&nbsp;</td>

+				</tr>

+				<tr>

+					<td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;"><label for="codeB">NUM-Code</label></td>

+				</tr>

+				<tr>

+					<td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeB" align="center">&nbsp;</td>

+				</tr>

+			</table>

+		</td>

+	</tr>

+	<tr>

+		<td colspan="2" id="charmap_usage">{#advanced_dlg.charmap_usage}</td>

+	</tr>

+	

 </table>

-

 </body>

 </html>

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm b/library/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm
index 096e7550c..ad1bb0f6c 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm
@@ -6,13 +6,14 @@
 	<script type="text/javascript" src="../../utils/mctabs.js"></script>

 	<script type="text/javascript" src="js/color_picker.js"></script>

 </head>

-<body id="colorpicker" style="display: none">

+<body id="colorpicker" style="display: none" role="application" aria-labelledby="app_label">

+	<span class="mceVoiceLabel" id="app_label" style="display:none;">{#advanced_dlg.colorpicker_title}</span>

 <form onsubmit="insertAction();return false" action="#">

 	<div class="tabs">

 		<ul>

-			<li id="picker_tab" class="current"><span><a href="javascript:mcTabs.displayTab('picker_tab','picker_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_picker_tab}</a></span></li>

-			<li id="rgb_tab"><span><a href="javascript:;" onclick="generateWebColors();mcTabs.displayTab('rgb_tab','rgb_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_palette_tab}</a></span></li>

-			<li id="named_tab"><span><a  href="javascript:;" onclick="generateNamedColors();javascript:mcTabs.displayTab('named_tab','named_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_named_tab}</a></span></li>

+			<li id="picker_tab" aria-controls="picker_panel" class="current"><span><a href="javascript:mcTabs.displayTab('picker_tab','picker_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_picker_tab}</a></span></li>

+			<li id="rgb_tab" aria-controls="rgb_panel"><span><a href="javascript:;" onclick="mcTabs.displayTab('rgb_tab','rgb_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_palette_tab}</a></span></li>

+			<li id="named_tab" aria-controls="named_panel"><span><a  href="javascript:;" onclick="javascript:mcTabs.displayTab('named_tab','named_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_named_tab}</a></span></li>

 		</ul>

 	</div>

 

@@ -34,7 +35,7 @@
 

 		<div id="rgb_panel" class="panel">

 			<fieldset>

-				<legend>{#advanced_dlg.colorpicker_palette_title}</legend>

+				<legend id="webcolors_title">{#advanced_dlg.colorpicker_palette_title}</legend>

 				<div id="webcolors">

 					<!-- Gets filled with web safe colors-->

 				</div>

@@ -44,9 +45,9 @@
 		</div>

 

 		<div id="named_panel" class="panel">

-			<fieldset>

-				<legend>{#advanced_dlg.colorpicker_named_title}</legend>

-				<div id="namedcolors">

+			<fieldset id="named_picker_label">

+				<legend id="named_title">{#advanced_dlg.colorpicker_named_title}</legend>

+				<div id="namedcolors" role="listbox" tabindex="0" aria-labelledby="named_picker_label">

 					<!-- Gets filled with named colors-->

 				</div>

 

@@ -65,7 +66,7 @@
 		<div id="preview"></div>

 

 		<div id="previewblock">

-			<label for="color">{#advanced_dlg.colorpicker_color}</label> <input id="color" type="text" size="8" maxlength="8" class="text mceFocus" />

+			<label for="color">{#advanced_dlg.colorpicker_color}</label> <input id="color" type="text" size="8" class="text mceFocus" aria-required="true" />

 		</div>

 	</div>

 </form>

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
index dc6197746..a88701812 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
@@ -1 +1 @@
-(function(e){var d=e.DOM,b=e.dom.Event,h=e.extend,f=e.each,a=e.util.Cookie,g,c=e.explode;e.ThemeManager.requireLangPack("advanced");e.create("tinymce.themes.AdvancedTheme",{sizes:[8,10,12,14,18,24,36],controls:{bold:["bold_desc","Bold"],italic:["italic_desc","Italic"],underline:["underline_desc","Underline"],strikethrough:["striketrough_desc","Strikethrough"],justifyleft:["justifyleft_desc","JustifyLeft"],justifycenter:["justifycenter_desc","JustifyCenter"],justifyright:["justifyright_desc","JustifyRight"],justifyfull:["justifyfull_desc","JustifyFull"],bullist:["bullist_desc","InsertUnorderedList"],numlist:["numlist_desc","InsertOrderedList"],outdent:["outdent_desc","Outdent"],indent:["indent_desc","Indent"],cut:["cut_desc","Cut"],copy:["copy_desc","Copy"],paste:["paste_desc","Paste"],undo:["undo_desc","Undo"],redo:["redo_desc","Redo"],link:["link_desc","mceLink"],unlink:["unlink_desc","unlink"],image:["image_desc","mceImage"],cleanup:["cleanup_desc","mceCleanup"],help:["help_desc","mceHelp"],code:["code_desc","mceCodeEditor"],hr:["hr_desc","InsertHorizontalRule"],removeformat:["removeformat_desc","RemoveFormat"],sub:["sub_desc","subscript"],sup:["sup_desc","superscript"],forecolor:["forecolor_desc","ForeColor"],forecolorpicker:["forecolor_desc","mceForeColor"],backcolor:["backcolor_desc","HiliteColor"],backcolorpicker:["backcolor_desc","mceBackColor"],charmap:["charmap_desc","mceCharMap"],visualaid:["visualaid_desc","mceToggleVisualAid"],anchor:["anchor_desc","mceInsertAnchor"],newdocument:["newdocument_desc","mceNewDocument"],blockquote:["blockquote_desc","mceBlockQuote"]},stateControls:["bold","italic","underline","strikethrough","bullist","numlist","justifyleft","justifycenter","justifyright","justifyfull","sub","sup","blockquote"],init:function(j,k){var l=this,m,i,n;l.editor=j;l.url=k;l.onResolveName=new e.util.Dispatcher(this);l.settings=m=h({theme_advanced_path:true,theme_advanced_toolbar_location:"bottom",theme_advanced_buttons1:"bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",theme_advanced_buttons2:"bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",theme_advanced_buttons3:"hr,removeformat,visualaid,|,sub,sup,|,charmap",theme_advanced_blockformats:"p,address,pre,h1,h2,h3,h4,h5,h6",theme_advanced_toolbar_align:"center",theme_advanced_fonts:"Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",theme_advanced_more_colors:1,theme_advanced_row_height:23,theme_advanced_resize_horizontal:1,theme_advanced_resizing_use_cookie:1,theme_advanced_font_sizes:"1,2,3,4,5,6,7",readonly:j.settings.readonly},j.settings);if(!m.font_size_style_values){m.font_size_style_values="8pt,10pt,12pt,14pt,18pt,24pt,36pt"}if(e.is(m.theme_advanced_font_sizes,"string")){m.font_size_style_values=e.explode(m.font_size_style_values);m.font_size_classes=e.explode(m.font_size_classes||"");n={};j.settings.theme_advanced_font_sizes=m.theme_advanced_font_sizes;f(j.getParam("theme_advanced_font_sizes","","hash"),function(q,p){var o;if(p==q&&q>=1&&q<=7){p=q+" ("+l.sizes[q-1]+"pt)";o=m.font_size_classes[q-1];q=m.font_size_style_values[q-1]||(l.sizes[q-1]+"pt")}if(/^\s*\./.test(q)){o=q.replace(/\./g,"")}n[p]=o?{"class":o}:{fontSize:q}});m.theme_advanced_font_sizes=n}if((i=m.theme_advanced_path_location)&&i!="none"){m.theme_advanced_statusbar_location=m.theme_advanced_path_location}if(m.theme_advanced_statusbar_location=="none"){m.theme_advanced_statusbar_location=0}j.onInit.add(function(){if(!j.settings.readonly){j.onNodeChange.add(l._nodeChanged,l)}if(j.settings.content_css!==false){j.dom.loadCSS(j.baseURI.toAbsolute("themes/advanced/skins/"+j.settings.skin+"/content.css"))}});j.onSetProgressState.add(function(q,o,r){var s,t=q.id,p;if(o){l.progressTimer=setTimeout(function(){s=q.getContainer();s=s.insertBefore(d.create("DIV",{style:"position:relative"}),s.firstChild);p=d.get(q.id+"_tbl");d.add(s,"div",{id:t+"_blocker","class":"mceBlocker",style:{width:p.clientWidth+2,height:p.clientHeight+2}});d.add(s,"div",{id:t+"_progress","class":"mceProgress",style:{left:p.clientWidth/2,top:p.clientHeight/2}})},r||0)}else{d.remove(t+"_blocker");d.remove(t+"_progress");clearTimeout(l.progressTimer)}});d.loadCSS(m.editor_css?j.documentBaseURI.toAbsolute(m.editor_css):k+"/skins/"+j.settings.skin+"/ui.css");if(m.skin_variant){d.loadCSS(k+"/skins/"+j.settings.skin+"/ui_"+m.skin_variant+".css")}},createControl:function(l,i){var j,k;if(k=i.createControl(l)){return k}switch(l){case"styleselect":return this._createStyleSelect();case"formatselect":return this._createBlockFormats();case"fontselect":return this._createFontSelect();case"fontsizeselect":return this._createFontSizeSelect();case"forecolor":return this._createForeColorMenu();case"backcolor":return this._createBackColorMenu()}if((j=this.controls[l])){return i.createButton(l,{title:"advanced."+j[0],cmd:j[1],ui:j[2],value:j[3]})}},execCommand:function(k,j,l){var i=this["_"+k];if(i){i.call(this,j,l);return true}return false},_importClasses:function(k){var i=this.editor,j=i.controlManager.get("styleselect");if(j.getLength()==0){f(i.dom.getClasses(),function(n,l){var m="style_"+l;i.formatter.register(m,{inline:"span",attributes:{"class":n["class"]},selector:"*"});j.add(n["class"],m)})}},_createStyleSelect:function(m){var k=this,i=k.editor,j=i.controlManager,l;l=j.createListBox("styleselect",{title:"advanced.style_select",onselect:function(o){var p,n=[];f(l.items,function(q){n.push(q.value)});i.focus();i.undoManager.add();p=i.formatter.matchAll(n);if(p[0]==o){i.formatter.remove(o)}else{i.formatter.apply(o)}i.undoManager.add();i.nodeChanged();return false}});i.onInit.add(function(){var o=0,n=i.getParam("style_formats");if(n){f(n,function(p){var q,r=0;f(p,function(){r++});if(r>1){q=p.name=p.name||"style_"+(o++);i.formatter.register(q,p);l.add(p.title,q)}else{l.add(p.title)}})}else{f(i.getParam("theme_advanced_styles","","hash"),function(r,q){var p;if(r){p="style_"+(o++);i.formatter.register(p,{inline:"span",classes:r,selector:"*"});l.add(k.editor.translate(q),p)}})}});if(l.getLength()==0){l.onPostRender.add(function(o,p){if(!l.NativeListBox){b.add(p.id+"_text","focus",k._importClasses,k);b.add(p.id+"_text","mousedown",k._importClasses,k);b.add(p.id+"_open","focus",k._importClasses,k);b.add(p.id+"_open","mousedown",k._importClasses,k)}else{b.add(p.id,"focus",k._importClasses,k)}})}return l},_createFontSelect:function(){var k,j=this,i=j.editor;k=i.controlManager.createListBox("fontselect",{title:"advanced.fontdefault",onselect:function(l){i.execCommand("FontName",false,l);k.select(function(m){return l==m});return false}});if(k){f(i.getParam("theme_advanced_fonts",j.settings.theme_advanced_fonts,"hash"),function(m,l){k.add(i.translate(l),m,{style:m.indexOf("dings")==-1?"font-family:"+m:""})})}return k},_createFontSizeSelect:function(){var m=this,k=m.editor,n,l=0,j=[];n=k.controlManager.createListBox("fontsizeselect",{title:"advanced.font_size",onselect:function(i){if(i["class"]){k.focus();k.undoManager.add();k.formatter.toggle("fontsize_class",{value:i["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,i.fontSize)}n.select(function(o){return i==o});return false}});if(n){f(m.settings.theme_advanced_font_sizes,function(o,i){var p=o.fontSize;if(p>=1&&p<=7){p=m.sizes[parseInt(p)-1]+"pt"}n.add(i,o,{style:"font-size:"+p,"class":"mceFontSize"+(l++)+(" "+(o["class"]||""))})})}return n},_createBlockFormats:function(){var k,i={p:"advanced.paragraph",address:"advanced.address",pre:"advanced.pre",h1:"advanced.h1",h2:"advanced.h2",h3:"advanced.h3",h4:"advanced.h4",h5:"advanced.h5",h6:"advanced.h6",div:"advanced.div",blockquote:"advanced.blockquote",code:"advanced.code",dt:"advanced.dt",dd:"advanced.dd",samp:"advanced.samp"},j=this;k=j.editor.controlManager.createListBox("formatselect",{title:"advanced.block",cmd:"FormatBlock"});if(k){f(j.editor.getParam("theme_advanced_blockformats",j.settings.theme_advanced_blockformats,"hash"),function(m,l){k.add(j.editor.translate(l!=m?l:i[m]),m,{"class":"mce_formatPreview mce_"+m})})}return k},_createForeColorMenu:function(){var m,j=this,k=j.settings,l={},i;if(k.theme_advanced_more_colors){l.more_colors_func=function(){j._mceColorPicker(0,{color:m.value,func:function(n){m.setColor(n)}})}}if(i=k.theme_advanced_text_colors){l.colors=i}if(k.theme_advanced_default_foreground_color){l.default_color=k.theme_advanced_default_foreground_color}l.title="advanced.forecolor_desc";l.cmd="ForeColor";l.scope=this;m=j.editor.controlManager.createColorSplitButton("forecolor",l);return m},_createBackColorMenu:function(){var m,j=this,k=j.settings,l={},i;if(k.theme_advanced_more_colors){l.more_colors_func=function(){j._mceColorPicker(0,{color:m.value,func:function(n){m.setColor(n)}})}}if(i=k.theme_advanced_background_colors){l.colors=i}if(k.theme_advanced_default_background_color){l.default_color=k.theme_advanced_default_background_color}l.title="advanced.backcolor_desc";l.cmd="HiliteColor";l.scope=this;m=j.editor.controlManager.createColorSplitButton("backcolor",l);return m},renderUI:function(k){var m,l,q,v=this,r=v.editor,w=v.settings,u,j,i;m=j=d.create("span",{id:r.id+"_parent","class":"mceEditor "+r.settings.skin+"Skin"+(w.skin_variant?" "+r.settings.skin+"Skin"+v._ufirst(w.skin_variant):"")});if(!d.boxModel){m=d.add(m,"div",{"class":"mceOldBoxModel"})}m=u=d.add(m,"table",{id:r.id+"_tbl","class":"mceLayout",cellSpacing:0,cellPadding:0});m=q=d.add(m,"tbody");switch((w.theme_advanced_layout_manager||"").toLowerCase()){case"rowlayout":l=v._rowLayout(w,q,k);break;case"customlayout":l=r.execCallback("theme_advanced_custom_layout",w,q,k,j);break;default:l=v._simpleLayout(w,q,k,j)}m=k.targetNode;i=d.stdMode?u.getElementsByTagName("tr"):u.rows;d.addClass(i[0],"mceFirst");d.addClass(i[i.length-1],"mceLast");f(d.select("tr",q),function(o){d.addClass(o.firstChild,"mceFirst");d.addClass(o.childNodes[o.childNodes.length-1],"mceLast")});if(d.get(w.theme_advanced_toolbar_container)){d.get(w.theme_advanced_toolbar_container).appendChild(j)}else{d.insertAfter(j,m)}b.add(r.id+"_path_row","click",function(n){n=n.target;if(n.nodeName=="A"){v._sel(n.className.replace(/^.*mcePath_([0-9]+).*$/,"$1"));return b.cancel(n)}});if(!r.getParam("accessibility_focus")){b.add(d.add(j,"a",{href:"#"},"<!-- IE -->"),"focus",function(){tinyMCE.get(r.id).focus()})}if(w.theme_advanced_toolbar_location=="external"){k.deltaHeight=0}v.deltaHeight=k.deltaHeight;k.targetNode=null;return{iframeContainer:l,editorContainer:r.id+"_parent",sizeContainer:u,deltaHeight:k.deltaHeight}},getInfo:function(){return{longname:"Advanced theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:e.majorVersion+"."+e.minorVersion}},resizeBy:function(i,j){var k=d.get(this.editor.id+"_tbl");this.resizeTo(k.clientWidth+i,k.clientHeight+j)},resizeTo:function(i,l){var j=this.editor,k=this.settings,m=d.get(j.id+"_tbl"),n=d.get(j.id+"_ifr");i=Math.max(k.theme_advanced_resizing_min_width||100,i);l=Math.max(k.theme_advanced_resizing_min_height||100,l);i=Math.min(k.theme_advanced_resizing_max_width||65535,i);l=Math.min(k.theme_advanced_resizing_max_height||65535,l);d.setStyle(m,"height","");d.setStyle(n,"height",l);if(k.theme_advanced_resize_horizontal){d.setStyle(m,"width","");d.setStyle(n,"width",i);if(i<m.clientWidth){d.setStyle(n,"width",m.clientWidth)}}},destroy:function(){var i=this.editor.id;b.clear(i+"_resize");b.clear(i+"_path_row");b.clear(i+"_external_close")},_simpleLayout:function(y,r,k,i){var x=this,u=x.editor,v=y.theme_advanced_toolbar_location,m=y.theme_advanced_statusbar_location,l,j,q,w;if(y.readonly){l=d.add(r,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"});return j}if(v=="top"){x._addToolbars(r,k)}if(v=="external"){l=w=d.create("div",{style:"position:relative"});l=d.add(l,"div",{id:u.id+"_external","class":"mceExternalToolbar"});d.add(l,"a",{id:u.id+"_external_close",href:"javascript:;","class":"mceExternalClose"});l=d.add(l,"table",{id:u.id+"_tblext",cellSpacing:0,cellPadding:0});q=d.add(l,"tbody");if(i.firstChild.className=="mceOldBoxModel"){i.firstChild.appendChild(w)}else{i.insertBefore(w,i.firstChild)}x._addToolbars(q,k);u.onMouseUp.add(function(){var o=d.get(u.id+"_external");d.show(o);d.hide(g);var n=b.add(u.id+"_external_close","click",function(){d.hide(u.id+"_external");b.remove(u.id+"_external_close","click",n)});d.show(o);d.setStyle(o,"top",0-d.getRect(u.id+"_tblext").h-1);d.hide(o);d.show(o);o.style.filter="";g=u.id+"_external";o=null})}if(m=="top"){x._addStatusBar(r,k)}if(!y.theme_advanced_toolbar_container){l=d.add(r,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"})}if(v=="bottom"){x._addToolbars(r,k)}if(m=="bottom"){x._addStatusBar(r,k)}return j},_rowLayout:function(w,m,k){var v=this,p=v.editor,u,x,i=p.controlManager,l,j,r,q;u=w.theme_advanced_containers_default_class||"";x=w.theme_advanced_containers_default_align||"center";f(c(w.theme_advanced_containers||""),function(s,o){var n=w["theme_advanced_container_"+s]||"";switch(n.toLowerCase()){case"mceeditor":l=d.add(m,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"});break;case"mceelementpath":v._addStatusBar(m,k);break;default:q=(w["theme_advanced_container_"+s+"_align"]||x).toLowerCase();q="mce"+v._ufirst(q);l=d.add(d.add(m,"tr"),"td",{"class":"mceToolbar "+(w["theme_advanced_container_"+s+"_class"]||u)+" "+q||x});r=i.createToolbar("toolbar"+o);v._addControls(n,r);d.setHTML(l,r.renderHTML());k.deltaHeight-=w.theme_advanced_row_height}});return j},_addControls:function(j,i){var k=this,l=k.settings,m,n=k.editor.controlManager;if(l.theme_advanced_disable&&!k._disabled){m={};f(c(l.theme_advanced_disable),function(o){m[o]=1});k._disabled=m}else{m=k._disabled}f(c(j),function(p){var o;if(m&&m[p]){return}if(p=="tablecontrols"){f(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"],function(q){q=k.createControl(q,n);if(q){i.add(q)}});return}o=k.createControl(p,n);if(o){i.add(o)}})},_addToolbars:function(w,k){var z=this,p,m,r=z.editor,A=z.settings,y,j=r.controlManager,u,l,q=[],x;x=A.theme_advanced_toolbar_align.toLowerCase();x="mce"+z._ufirst(x);l=d.add(d.add(w,"tr"),"td",{"class":"mceToolbar "+x});if(!r.getParam("accessibility_focus")){q.push(d.createHTML("a",{href:"#",onfocus:"tinyMCE.get('"+r.id+"').focus();"},"<!-- IE -->"))}q.push(d.createHTML("a",{href:"#",accesskey:"q",title:r.getLang("advanced.toolbar_focus")},"<!-- IE -->"));for(p=1;(y=A["theme_advanced_buttons"+p]);p++){m=j.createToolbar("toolbar"+p,{"class":"mceToolbarRow"+p});if(A["theme_advanced_buttons"+p+"_add"]){y+=","+A["theme_advanced_buttons"+p+"_add"]}if(A["theme_advanced_buttons"+p+"_add_before"]){y=A["theme_advanced_buttons"+p+"_add_before"]+","+y}z._addControls(y,m);q.push(m.renderHTML());k.deltaHeight-=A.theme_advanced_row_height}q.push(d.createHTML("a",{href:"#",accesskey:"z",title:r.getLang("advanced.toolbar_focus"),onfocus:"tinyMCE.getInstanceById('"+r.id+"').focus();"},"<!-- IE -->"));d.setHTML(l,q.join(""))},_addStatusBar:function(m,j){var k,v=this,p=v.editor,w=v.settings,i,q,u,l;k=d.add(m,"tr");k=l=d.add(k,"td",{"class":"mceStatusbar"});k=d.add(k,"div",{id:p.id+"_path_row"},w.theme_advanced_path?p.translate("advanced.path")+": ":"&#160;");d.add(k,"a",{href:"#",accesskey:"x"});if(w.theme_advanced_resizing){d.add(l,"a",{id:p.id+"_resize",href:"javascript:;",onclick:"return false;","class":"mceResize"});if(w.theme_advanced_resizing_use_cookie){p.onPostRender.add(function(){var n=a.getHash("TinyMCE_"+p.id+"_size"),r=d.get(p.id+"_tbl");if(!n){return}v.resizeTo(n.cw,n.ch)})}p.onPostRender.add(function(){b.add(p.id+"_resize","mousedown",function(D){var t,r,s,o,C,z,A,F,n,E,x;function y(G){n=A+(G.screenX-C);E=F+(G.screenY-z);v.resizeTo(n,E)}function B(G){b.remove(d.doc,"mousemove",t);b.remove(p.getDoc(),"mousemove",r);b.remove(d.doc,"mouseup",s);b.remove(p.getDoc(),"mouseup",o);if(w.theme_advanced_resizing_use_cookie){a.setHash("TinyMCE_"+p.id+"_size",{cw:n,ch:E})}}D.preventDefault();C=D.screenX;z=D.screenY;x=d.get(v.editor.id+"_ifr");A=n=x.clientWidth;F=E=x.clientHeight;t=b.add(d.doc,"mousemove",y);r=b.add(p.getDoc(),"mousemove",y);s=b.add(d.doc,"mouseup",B);o=b.add(p.getDoc(),"mouseup",B)})})}j.deltaHeight-=21;k=m=null},_nodeChanged:function(r,z,l,x,j){var C=this,i,y=0,B,u,D=C.settings,A,k,w,m,q;e.each(C.stateControls,function(n){z.setActive(n,r.queryCommandState(C.controls[n][1]))});function o(p){var s,n=j.parents,t=p;if(typeof(p)=="string"){t=function(v){return v.nodeName==p}}for(s=0;s<n.length;s++){if(t(n[s])){return n[s]}}}z.setActive("visualaid",r.hasVisual);z.setDisabled("undo",!r.undoManager.hasUndo()&&!r.typing);z.setDisabled("redo",!r.undoManager.hasRedo());z.setDisabled("outdent",!r.queryCommandState("Outdent"));i=o("A");if(u=z.get("link")){if(!i||!i.name){u.setDisabled(!i&&x);u.setActive(!!i)}}if(u=z.get("unlink")){u.setDisabled(!i&&x);u.setActive(!!i&&!i.name)}if(u=z.get("anchor")){u.setActive(!!i&&i.name)}i=o("IMG");if(u=z.get("image")){u.setActive(!!i&&l.className.indexOf("mceItem")==-1)}if(u=z.get("styleselect")){C._importClasses();m=[];f(u.items,function(n){m.push(n.value)});q=r.formatter.matchAll(m);u.select(q[0])}if(u=z.get("formatselect")){i=o(d.isBlock);if(i){u.select(i.nodeName.toLowerCase())}}o(function(p){if(p.nodeName==="SPAN"){if(!A&&p.className){A=p.className}if(!k&&p.style.fontSize){k=p.style.fontSize}if(!w&&p.style.fontFamily){w=p.style.fontFamily.replace(/[\"\']+/g,"").replace(/^([^,]+).*/,"$1").toLowerCase()}}return false});if(u=z.get("fontselect")){u.select(function(n){return n.replace(/^([^,]+).*/,"$1").toLowerCase()==w})}if(u=z.get("fontsizeselect")){if(D.theme_advanced_runtime_fontsize&&!k&&!A){k=r.dom.getStyle(l,"fontSize",true)}u.select(function(n){if(n.fontSize&&n.fontSize===k){return true}if(n["class"]&&n["class"]===A){return true}})}if(D.theme_advanced_path&&D.theme_advanced_statusbar_location){i=d.get(r.id+"_path")||d.add(r.id+"_path_row","span",{id:r.id+"_path"});d.setHTML(i,"");o(function(E){var p=E.nodeName.toLowerCase(),s,v,t="";if(E.nodeType!=1||E.nodeName==="BR"||(d.hasClass(E,"mceItemHidden")||d.hasClass(E,"mceItemRemoved"))){return}if(B=d.getAttrib(E,"mce_name")){p=B}if(e.isIE&&E.scopeName!=="HTML"){p=E.scopeName+":"+p}p=p.replace(/mce\:/g,"");switch(p){case"b":p="strong";break;case"i":p="em";break;case"img":if(B=d.getAttrib(E,"src")){t+="src: "+B+" "}break;case"a":if(B=d.getAttrib(E,"name")){t+="name: "+B+" ";p+="#"+B}if(B=d.getAttrib(E,"href")){t+="href: "+B+" "}break;case"font":if(B=d.getAttrib(E,"face")){t+="font: "+B+" "}if(B=d.getAttrib(E,"size")){t+="size: "+B+" "}if(B=d.getAttrib(E,"color")){t+="color: "+B+" "}break;case"span":if(B=d.getAttrib(E,"style")){t+="style: "+B+" "}break}if(B=d.getAttrib(E,"id")){t+="id: "+B+" "}if(B=E.className){B=B.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g,"");if(B){t+="class: "+B+" ";if(d.isBlock(E)||p=="img"||p=="span"){p+="."+B}}}p=p.replace(/(html:)/g,"");p={name:p,node:E,title:t};C.onResolveName.dispatch(C,p);t=p.title;p=p.name;v=d.create("a",{href:"javascript:;",onmousedown:"return false;",title:t,"class":"mcePath_"+(y++)},p);if(i.hasChildNodes()){i.insertBefore(d.doc.createTextNode(" \u00bb "),i.firstChild);i.insertBefore(v,i.firstChild)}else{i.appendChild(v)}},r.getBody())}},_sel:function(i){this.editor.execCommand("mceSelectNodeDepth",false,i)},_mceInsertAnchor:function(k,j){var i=this.editor;i.windowManager.open({url:e.baseURL+"/themes/advanced/anchor.htm",width:320+parseInt(i.getLang("advanced.anchor_delta_width",0)),height:90+parseInt(i.getLang("advanced.anchor_delta_height",0)),inline:true},{theme_url:this.url})},_mceCharMap:function(){var i=this.editor;i.windowManager.open({url:e.baseURL+"/themes/advanced/charmap.htm",width:550+parseInt(i.getLang("advanced.charmap_delta_width",0)),height:250+parseInt(i.getLang("advanced.charmap_delta_height",0)),inline:true},{theme_url:this.url})},_mceHelp:function(){var i=this.editor;i.windowManager.open({url:e.baseURL+"/themes/advanced/about.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceColorPicker:function(k,j){var i=this.editor;j=j||{};i.windowManager.open({url:e.baseURL+"/themes/advanced/color_picker.htm",width:375+parseInt(i.getLang("advanced.colorpicker_delta_width",0)),height:250+parseInt(i.getLang("advanced.colorpicker_delta_height",0)),close_previous:false,inline:true},{input_color:j.color,func:j.func,theme_url:this.url})},_mceCodeEditor:function(j,k){var i=this.editor;i.windowManager.open({url:e.baseURL+"/themes/advanced/source_editor.htm",width:parseInt(i.getParam("theme_advanced_source_editor_width",720)),height:parseInt(i.getParam("theme_advanced_source_editor_height",580)),inline:true,resizable:true,maximizable:true},{theme_url:this.url})},_mceImage:function(j,k){var i=this.editor;if(i.dom.getAttrib(i.selection.getNode(),"class").indexOf("mceItem")!=-1){return}i.windowManager.open({url:e.baseURL+"/themes/advanced/image.htm",width:355+parseInt(i.getLang("advanced.image_delta_width",0)),height:275+parseInt(i.getLang("advanced.image_delta_height",0)),inline:true},{theme_url:this.url})},_mceLink:function(j,k){var i=this.editor;i.windowManager.open({url:e.baseURL+"/themes/advanced/link.htm",width:310+parseInt(i.getLang("advanced.link_delta_width",0)),height:200+parseInt(i.getLang("advanced.link_delta_height",0)),inline:true},{theme_url:this.url})},_mceNewDocument:function(){var i=this.editor;i.windowManager.confirm("advanced.newdocument",function(j){if(j){i.execCommand("mceSetContent",false,"")}})},_mceForeColor:function(){var i=this;this._mceColorPicker(0,{color:i.fgColor,func:function(j){i.fgColor=j;i.editor.execCommand("ForeColor",false,j)}})},_mceBackColor:function(){var i=this;this._mceColorPicker(0,{color:i.bgColor,func:function(j){i.bgColor=j;i.editor.execCommand("HiliteColor",false,j)}})},_ufirst:function(i){return i.substring(0,1).toUpperCase()+i.substring(1)}});e.ThemeManager.add("advanced",e.themes.AdvancedTheme)}(tinymce));
\ No newline at end of file
+(function(h){var i=h.DOM,g=h.dom.Event,c=h.extend,f=h.each,a=h.util.Cookie,e,d=h.explode;function b(m,k){var q,p=m.dom,n="",o,l;previewStyles=m.settings.preview_styles;if(previewStyles===false){return""}if(!previewStyles){previewStyles="font-family font-size font-weight text-decoration text-transform color background-color"}function j(r){return r.replace(/%(\w+)/g,"")}name=k.block||k.inline||"span";q=p.create(name);f(k.styles,function(s,r){s=j(s);if(s){p.setStyle(q,r,s)}});f(k.attributes,function(s,r){s=j(s);if(s){p.setAttrib(q,r,s)}});f(k.classes,function(r){r=j(r);if(!p.hasClass(q,r)){p.addClass(q,r)}});p.setStyles(q,{position:"absolute",left:-65535});m.getBody().appendChild(q);o=p.getStyle(m.getBody(),"fontSize",true);o=/px$/.test(o)?parseInt(o,10):0;f(previewStyles.split(" "),function(r){var s=p.getStyle(q,r,true);if(r=="font-size"){if(/em|%$/.test(s)){if(o===0){return}s=parseFloat(s,10)/(/%$/.test(s)?100:1);s=(s*o)+"px"}}n+=r+":"+s+";"});p.remove(q);return n}h.ThemeManager.requireLangPack("advanced");h.create("tinymce.themes.AdvancedTheme",{sizes:[8,10,12,14,18,24,36],controls:{bold:["bold_desc","Bold"],italic:["italic_desc","Italic"],underline:["underline_desc","Underline"],strikethrough:["striketrough_desc","Strikethrough"],justifyleft:["justifyleft_desc","JustifyLeft"],justifycenter:["justifycenter_desc","JustifyCenter"],justifyright:["justifyright_desc","JustifyRight"],justifyfull:["justifyfull_desc","JustifyFull"],bullist:["bullist_desc","InsertUnorderedList"],numlist:["numlist_desc","InsertOrderedList"],outdent:["outdent_desc","Outdent"],indent:["indent_desc","Indent"],cut:["cut_desc","Cut"],copy:["copy_desc","Copy"],paste:["paste_desc","Paste"],undo:["undo_desc","Undo"],redo:["redo_desc","Redo"],link:["link_desc","mceLink"],unlink:["unlink_desc","unlink"],image:["image_desc","mceImage"],cleanup:["cleanup_desc","mceCleanup"],help:["help_desc","mceHelp"],code:["code_desc","mceCodeEditor"],hr:["hr_desc","InsertHorizontalRule"],removeformat:["removeformat_desc","RemoveFormat"],sub:["sub_desc","subscript"],sup:["sup_desc","superscript"],forecolor:["forecolor_desc","ForeColor"],forecolorpicker:["forecolor_desc","mceForeColor"],backcolor:["backcolor_desc","HiliteColor"],backcolorpicker:["backcolor_desc","mceBackColor"],charmap:["charmap_desc","mceCharMap"],visualaid:["visualaid_desc","mceToggleVisualAid"],anchor:["anchor_desc","mceInsertAnchor"],newdocument:["newdocument_desc","mceNewDocument"],blockquote:["blockquote_desc","mceBlockQuote"]},stateControls:["bold","italic","underline","strikethrough","bullist","numlist","justifyleft","justifycenter","justifyright","justifyfull","sub","sup","blockquote"],init:function(k,l){var m=this,n,j,p;m.editor=k;m.url=l;m.onResolveName=new h.util.Dispatcher(this);k.forcedHighContrastMode=k.settings.detect_highcontrast&&m._isHighContrast();k.settings.skin=k.forcedHighContrastMode?"highcontrast":k.settings.skin;m.settings=n=c({theme_advanced_path:true,theme_advanced_toolbar_location:"bottom",theme_advanced_buttons1:"bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",theme_advanced_buttons2:"bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",theme_advanced_buttons3:"hr,removeformat,visualaid,|,sub,sup,|,charmap",theme_advanced_blockformats:"p,address,pre,h1,h2,h3,h4,h5,h6",theme_advanced_toolbar_align:"center",theme_advanced_fonts:"Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",theme_advanced_more_colors:1,theme_advanced_row_height:23,theme_advanced_resize_horizontal:1,theme_advanced_resizing_use_cookie:1,theme_advanced_font_sizes:"1,2,3,4,5,6,7",theme_advanced_font_selector:"span",theme_advanced_show_current_color:0,readonly:k.settings.readonly},k.settings);if(!n.font_size_style_values){n.font_size_style_values="8pt,10pt,12pt,14pt,18pt,24pt,36pt"}if(h.is(n.theme_advanced_font_sizes,"string")){n.font_size_style_values=h.explode(n.font_size_style_values);n.font_size_classes=h.explode(n.font_size_classes||"");p={};k.settings.theme_advanced_font_sizes=n.theme_advanced_font_sizes;f(k.getParam("theme_advanced_font_sizes","","hash"),function(r,q){var o;if(q==r&&r>=1&&r<=7){q=r+" ("+m.sizes[r-1]+"pt)";o=n.font_size_classes[r-1];r=n.font_size_style_values[r-1]||(m.sizes[r-1]+"pt")}if(/^\s*\./.test(r)){o=r.replace(/\./g,"")}p[q]=o?{"class":o}:{fontSize:r}});n.theme_advanced_font_sizes=p}if((j=n.theme_advanced_path_location)&&j!="none"){n.theme_advanced_statusbar_location=n.theme_advanced_path_location}if(n.theme_advanced_statusbar_location=="none"){n.theme_advanced_statusbar_location=0}if(k.settings.content_css!==false){k.contentCSS.push(k.baseURI.toAbsolute(l+"/skins/"+k.settings.skin+"/content.css"))}k.onInit.add(function(){if(!k.settings.readonly){k.onNodeChange.add(m._nodeChanged,m);k.onKeyUp.add(m._updateUndoStatus,m);k.onMouseUp.add(m._updateUndoStatus,m);k.dom.bind(k.dom.getRoot(),"dragend",function(){m._updateUndoStatus(k)})}});k.onSetProgressState.add(function(r,o,s){var t,u=r.id,q;if(o){m.progressTimer=setTimeout(function(){t=r.getContainer();t=t.insertBefore(i.create("DIV",{style:"position:relative"}),t.firstChild);q=i.get(r.id+"_tbl");i.add(t,"div",{id:u+"_blocker","class":"mceBlocker",style:{width:q.clientWidth+2,height:q.clientHeight+2}});i.add(t,"div",{id:u+"_progress","class":"mceProgress",style:{left:q.clientWidth/2,top:q.clientHeight/2}})},s||0)}else{i.remove(u+"_blocker");i.remove(u+"_progress");clearTimeout(m.progressTimer)}});i.loadCSS(n.editor_css?k.documentBaseURI.toAbsolute(n.editor_css):l+"/skins/"+k.settings.skin+"/ui.css");if(n.skin_variant){i.loadCSS(l+"/skins/"+k.settings.skin+"/ui_"+n.skin_variant+".css")}},_isHighContrast:function(){var j,k=i.add(i.getRoot(),"div",{style:"background-color: rgb(171,239,86);"});j=(i.getStyle(k,"background-color",true)+"").toLowerCase().replace(/ /g,"");i.remove(k);return j!="rgb(171,239,86)"&&j!="#abef56"},createControl:function(m,j){var k,l;if(l=j.createControl(m)){return l}switch(m){case"styleselect":return this._createStyleSelect();case"formatselect":return this._createBlockFormats();case"fontselect":return this._createFontSelect();case"fontsizeselect":return this._createFontSizeSelect();case"forecolor":return this._createForeColorMenu();case"backcolor":return this._createBackColorMenu()}if((k=this.controls[m])){return j.createButton(m,{title:"advanced."+k[0],cmd:k[1],ui:k[2],value:k[3]})}},execCommand:function(l,k,m){var j=this["_"+l];if(j){j.call(this,k,m);return true}return false},_importClasses:function(l){var j=this.editor,k=j.controlManager.get("styleselect");if(k.getLength()==0){f(j.dom.getClasses(),function(q,m){var p="style_"+m,n;n={inline:"span",attributes:{"class":q["class"]},selector:"*"};j.formatter.register(p,n);k.add(q["class"],p,{style:function(){return b(j,n)}})})}},_createStyleSelect:function(o){var l=this,j=l.editor,k=j.controlManager,m;m=k.createListBox("styleselect",{title:"advanced.style_select",onselect:function(q){var r,n=[],p;f(m.items,function(s){n.push(s.value)});j.focus();j.undoManager.add();r=j.formatter.matchAll(n);h.each(r,function(s){if(!q||s==q){if(s){j.formatter.remove(s)}p=true}});if(!p){j.formatter.apply(q)}j.undoManager.add();j.nodeChanged();return false}});j.onPreInit.add(function(){var p=0,n=j.getParam("style_formats");if(n){f(n,function(q){var r,s=0;f(q,function(){s++});if(s>1){r=q.name=q.name||"style_"+(p++);j.formatter.register(r,q);m.add(q.title,r,{style:function(){return b(j,q)}})}else{m.add(q.title)}})}else{f(j.getParam("theme_advanced_styles","","hash"),function(t,s){var r,q;if(t){r="style_"+(p++);q={inline:"span",classes:t,selector:"*"};j.formatter.register(r,q);m.add(l.editor.translate(s),r,{style:function(){return b(j,q)}})}})}});if(m.getLength()==0){m.onPostRender.add(function(p,q){if(!m.NativeListBox){g.add(q.id+"_text","focus",l._importClasses,l);g.add(q.id+"_text","mousedown",l._importClasses,l);g.add(q.id+"_open","focus",l._importClasses,l);g.add(q.id+"_open","mousedown",l._importClasses,l)}else{g.add(q.id,"focus",l._importClasses,l)}})}return m},_createFontSelect:function(){var l,k=this,j=k.editor;l=j.controlManager.createListBox("fontselect",{title:"advanced.fontdefault",onselect:function(m){var n=l.items[l.selectedIndex];if(!m&&n){j.execCommand("FontName",false,n.value);return}j.execCommand("FontName",false,m);l.select(function(o){return m==o});if(n&&n.value==m){l.select(null)}return false}});if(l){f(j.getParam("theme_advanced_fonts",k.settings.theme_advanced_fonts,"hash"),function(n,m){l.add(j.translate(m),n,{style:n.indexOf("dings")==-1?"font-family:"+n:""})})}return l},_createFontSizeSelect:function(){var m=this,k=m.editor,n,l=0,j=[];n=k.controlManager.createListBox("fontsizeselect",{title:"advanced.font_size",onselect:function(o){var p=n.items[n.selectedIndex];if(!o&&p){p=p.value;if(p["class"]){k.formatter.toggle("fontsize_class",{value:p["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,p.fontSize)}return}if(o["class"]){k.focus();k.undoManager.add();k.formatter.toggle("fontsize_class",{value:o["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,o.fontSize)}n.select(function(q){return o==q});if(p&&(p.value.fontSize==o.fontSize||p.value["class"]&&p.value["class"]==o["class"])){n.select(null)}return false}});if(n){f(m.settings.theme_advanced_font_sizes,function(p,o){var q=p.fontSize;if(q>=1&&q<=7){q=m.sizes[parseInt(q)-1]+"pt"}n.add(o,p,{style:"font-size:"+q,"class":"mceFontSize"+(l++)+(" "+(p["class"]||""))})})}return n},_createBlockFormats:function(){var l,j={p:"advanced.paragraph",address:"advanced.address",pre:"advanced.pre",h1:"advanced.h1",h2:"advanced.h2",h3:"advanced.h3",h4:"advanced.h4",h5:"advanced.h5",h6:"advanced.h6",div:"advanced.div",blockquote:"advanced.blockquote",code:"advanced.code",dt:"advanced.dt",dd:"advanced.dd",samp:"advanced.samp"},k=this;l=k.editor.controlManager.createListBox("formatselect",{title:"advanced.block",onselect:function(m){k.editor.execCommand("FormatBlock",false,m);return false}});if(l){f(k.editor.getParam("theme_advanced_blockformats",k.settings.theme_advanced_blockformats,"hash"),function(n,m){l.add(k.editor.translate(m!=n?m:j[n]),n,{"class":"mce_formatPreview mce_"+n,style:function(){return b(k.editor,{block:n})}})})}return l},_createForeColorMenu:function(){var n,k=this,l=k.settings,m={},j;if(l.theme_advanced_more_colors){m.more_colors_func=function(){k._mceColorPicker(0,{color:n.value,func:function(o){n.setColor(o)}})}}if(j=l.theme_advanced_text_colors){m.colors=j}if(l.theme_advanced_default_foreground_color){m.default_color=l.theme_advanced_default_foreground_color}m.title="advanced.forecolor_desc";m.cmd="ForeColor";m.scope=this;n=k.editor.controlManager.createColorSplitButton("forecolor",m);return n},_createBackColorMenu:function(){var n,k=this,l=k.settings,m={},j;if(l.theme_advanced_more_colors){m.more_colors_func=function(){k._mceColorPicker(0,{color:n.value,func:function(o){n.setColor(o)}})}}if(j=l.theme_advanced_background_colors){m.colors=j}if(l.theme_advanced_default_background_color){m.default_color=l.theme_advanced_default_background_color}m.title="advanced.backcolor_desc";m.cmd="HiliteColor";m.scope=this;n=k.editor.controlManager.createColorSplitButton("backcolor",m);return n},renderUI:function(l){var q,m,r,w=this,u=w.editor,x=w.settings,v,k,j;if(u.settings){u.settings.aria_label=x.aria_label+u.getLang("advanced.help_shortcut")}q=k=i.create("span",{role:"application","aria-labelledby":u.id+"_voice",id:u.id+"_parent","class":"mceEditor "+u.settings.skin+"Skin"+(x.skin_variant?" "+u.settings.skin+"Skin"+w._ufirst(x.skin_variant):"")});i.add(q,"span",{"class":"mceVoiceLabel",style:"display:none;",id:u.id+"_voice"},x.aria_label);if(!i.boxModel){q=i.add(q,"div",{"class":"mceOldBoxModel"})}q=v=i.add(q,"table",{role:"presentation",id:u.id+"_tbl","class":"mceLayout",cellSpacing:0,cellPadding:0});q=r=i.add(q,"tbody");switch((x.theme_advanced_layout_manager||"").toLowerCase()){case"rowlayout":m=w._rowLayout(x,r,l);break;case"customlayout":m=u.execCallback("theme_advanced_custom_layout",x,r,l,k);break;default:m=w._simpleLayout(x,r,l,k)}q=l.targetNode;j=v.rows;i.addClass(j[0],"mceFirst");i.addClass(j[j.length-1],"mceLast");f(i.select("tr",r),function(o){i.addClass(o.firstChild,"mceFirst");i.addClass(o.childNodes[o.childNodes.length-1],"mceLast")});if(i.get(x.theme_advanced_toolbar_container)){i.get(x.theme_advanced_toolbar_container).appendChild(k)}else{i.insertAfter(k,q)}g.add(u.id+"_path_row","click",function(n){n=n.target;if(n.nodeName=="A"){w._sel(n.className.replace(/^.*mcePath_([0-9]+).*$/,"$1"));return false}});if(!u.getParam("accessibility_focus")){g.add(i.add(k,"a",{href:"#"},"<!-- IE -->"),"focus",function(){tinyMCE.get(u.id).focus()})}if(x.theme_advanced_toolbar_location=="external"){l.deltaHeight=0}w.deltaHeight=l.deltaHeight;l.targetNode=null;u.onKeyDown.add(function(p,n){var s=121,o=122;if(n.altKey){if(n.keyCode===s){if(h.isWebKit){window.focus()}w.toolbarGroup.focus();return g.cancel(n)}else{if(n.keyCode===o){i.get(p.id+"_path_row").focus();return g.cancel(n)}}}});u.addShortcut("alt+0","","mceShortcuts",w);return{iframeContainer:m,editorContainer:u.id+"_parent",sizeContainer:v,deltaHeight:l.deltaHeight}},getInfo:function(){return{longname:"Advanced theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:h.majorVersion+"."+h.minorVersion}},resizeBy:function(j,k){var l=i.get(this.editor.id+"_ifr");this.resizeTo(l.clientWidth+j,l.clientHeight+k)},resizeTo:function(j,n,l){var k=this.editor,m=this.settings,o=i.get(k.id+"_tbl"),p=i.get(k.id+"_ifr");j=Math.max(m.theme_advanced_resizing_min_width||100,j);n=Math.max(m.theme_advanced_resizing_min_height||100,n);j=Math.min(m.theme_advanced_resizing_max_width||65535,j);n=Math.min(m.theme_advanced_resizing_max_height||65535,n);i.setStyle(o,"height","");i.setStyle(p,"height",n);if(m.theme_advanced_resize_horizontal){i.setStyle(o,"width","");i.setStyle(p,"width",j);if(j<o.clientWidth){j=o.clientWidth;i.setStyle(p,"width",o.clientWidth)}}if(l&&m.theme_advanced_resizing_use_cookie){a.setHash("TinyMCE_"+k.id+"_size",{cw:j,ch:n})}},destroy:function(){var j=this.editor.id;g.clear(j+"_resize");g.clear(j+"_path_row");g.clear(j+"_external_close")},_simpleLayout:function(z,u,l,j){var y=this,v=y.editor,w=z.theme_advanced_toolbar_location,q=z.theme_advanced_statusbar_location,m,k,r,x;if(z.readonly){m=i.add(u,"tr");m=k=i.add(m,"td",{"class":"mceIframeContainer"});return k}if(w=="top"){y._addToolbars(u,l)}if(w=="external"){m=x=i.create("div",{style:"position:relative"});m=i.add(m,"div",{id:v.id+"_external","class":"mceExternalToolbar"});i.add(m,"a",{id:v.id+"_external_close",href:"javascript:;","class":"mceExternalClose"});m=i.add(m,"table",{id:v.id+"_tblext",cellSpacing:0,cellPadding:0});r=i.add(m,"tbody");if(j.firstChild.className=="mceOldBoxModel"){j.firstChild.appendChild(x)}else{j.insertBefore(x,j.firstChild)}y._addToolbars(r,l);v.onMouseUp.add(function(){var o=i.get(v.id+"_external");i.show(o);i.hide(e);var n=g.add(v.id+"_external_close","click",function(){i.hide(v.id+"_external");g.remove(v.id+"_external_close","click",n)});i.show(o);i.setStyle(o,"top",0-i.getRect(v.id+"_tblext").h-1);i.hide(o);i.show(o);o.style.filter="";e=v.id+"_external";o=null})}if(q=="top"){y._addStatusBar(u,l)}if(!z.theme_advanced_toolbar_container){m=i.add(u,"tr");m=k=i.add(m,"td",{"class":"mceIframeContainer"})}if(w=="bottom"){y._addToolbars(u,l)}if(q=="bottom"){y._addStatusBar(u,l)}return k},_rowLayout:function(x,p,l){var w=this,q=w.editor,v,y,j=q.controlManager,m,k,u,r;v=x.theme_advanced_containers_default_class||"";y=x.theme_advanced_containers_default_align||"center";f(d(x.theme_advanced_containers||""),function(s,o){var n=x["theme_advanced_container_"+s]||"";switch(s.toLowerCase()){case"mceeditor":m=i.add(p,"tr");m=k=i.add(m,"td",{"class":"mceIframeContainer"});break;case"mceelementpath":w._addStatusBar(p,l);break;default:r=(x["theme_advanced_container_"+s+"_align"]||y).toLowerCase();r="mce"+w._ufirst(r);m=i.add(i.add(p,"tr"),"td",{"class":"mceToolbar "+(x["theme_advanced_container_"+s+"_class"]||v)+" "+r||y});u=j.createToolbar("toolbar"+o);w._addControls(n,u);i.setHTML(m,u.renderHTML());l.deltaHeight-=x.theme_advanced_row_height}});return k},_addControls:function(k,j){var l=this,m=l.settings,n,o=l.editor.controlManager;if(m.theme_advanced_disable&&!l._disabled){n={};f(d(m.theme_advanced_disable),function(p){n[p]=1});l._disabled=n}else{n=l._disabled}f(d(k),function(q){var p;if(n&&n[q]){return}if(q=="tablecontrols"){f(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"],function(r){r=l.createControl(r,o);if(r){j.add(r)}});return}p=l.createControl(q,o);if(p){j.add(p)}})},_addToolbars:function(x,k){var A=this,p,m,r=A.editor,B=A.settings,z,j=r.controlManager,u,l,q=[],y,w;w=j.createToolbarGroup("toolbargroup",{name:r.getLang("advanced.toolbar"),tab_focus_toolbar:r.getParam("theme_advanced_tab_focus_toolbar")});A.toolbarGroup=w;y=B.theme_advanced_toolbar_align.toLowerCase();y="mce"+A._ufirst(y);l=i.add(i.add(x,"tr",{role:"presentation"}),"td",{"class":"mceToolbar "+y,role:"presentation"});for(p=1;(z=B["theme_advanced_buttons"+p]);p++){m=j.createToolbar("toolbar"+p,{"class":"mceToolbarRow"+p});if(B["theme_advanced_buttons"+p+"_add"]){z+=","+B["theme_advanced_buttons"+p+"_add"]}if(B["theme_advanced_buttons"+p+"_add_before"]){z=B["theme_advanced_buttons"+p+"_add_before"]+","+z}A._addControls(z,m);w.add(m);k.deltaHeight-=B.theme_advanced_row_height}q.push(w.renderHTML());q.push(i.createHTML("a",{href:"#",accesskey:"z",title:r.getLang("advanced.toolbar_focus"),onfocus:"tinyMCE.getInstanceById('"+r.id+"').focus();"},"<!-- IE -->"));i.setHTML(l,q.join(""))},_addStatusBar:function(p,k){var l,w=this,q=w.editor,x=w.settings,j,u,v,m;l=i.add(p,"tr");l=m=i.add(l,"td",{"class":"mceStatusbar"});l=i.add(l,"div",{id:q.id+"_path_row",role:"group","aria-labelledby":q.id+"_path_voice"});if(x.theme_advanced_path){i.add(l,"span",{id:q.id+"_path_voice"},q.translate("advanced.path"));i.add(l,"span",{},": ")}else{i.add(l,"span",{},"&#160;")}if(x.theme_advanced_resizing){i.add(m,"a",{id:q.id+"_resize",href:"javascript:;",onclick:"return false;","class":"mceResize",tabIndex:"-1"});if(x.theme_advanced_resizing_use_cookie){q.onPostRender.add(function(){var n=a.getHash("TinyMCE_"+q.id+"_size"),r=i.get(q.id+"_tbl");if(!n){return}w.resizeTo(n.cw,n.ch)})}q.onPostRender.add(function(){g.add(q.id+"_resize","click",function(n){n.preventDefault()});g.add(q.id+"_resize","mousedown",function(E){var t,r,s,o,D,A,B,G,n,F,y;function z(H){H.preventDefault();n=B+(H.screenX-D);F=G+(H.screenY-A);w.resizeTo(n,F)}function C(H){g.remove(i.doc,"mousemove",t);g.remove(q.getDoc(),"mousemove",r);g.remove(i.doc,"mouseup",s);g.remove(q.getDoc(),"mouseup",o);n=B+(H.screenX-D);F=G+(H.screenY-A);w.resizeTo(n,F,true)}E.preventDefault();D=E.screenX;A=E.screenY;y=i.get(w.editor.id+"_ifr");B=n=y.clientWidth;G=F=y.clientHeight;t=g.add(i.doc,"mousemove",z);r=g.add(q.getDoc(),"mousemove",z);s=g.add(i.doc,"mouseup",C);o=g.add(q.getDoc(),"mouseup",C)})})}k.deltaHeight-=21;l=p=null},_updateUndoStatus:function(k){var j=k.controlManager,l=k.undoManager;j.setDisabled("undo",!l.hasUndo()&&!l.typing);j.setDisabled("redo",!l.hasRedo())},_nodeChanged:function(o,u,E,r,F){var z=this,D,G=0,y,H,A=z.settings,x,l,w,C,m,k,j;h.each(z.stateControls,function(n){u.setActive(n,o.queryCommandState(z.controls[n][1]))});function q(p){var s,n=F.parents,t=p;if(typeof(p)=="string"){t=function(v){return v.nodeName==p}}for(s=0;s<n.length;s++){if(t(n[s])){return n[s]}}}u.setActive("visualaid",o.hasVisual);z._updateUndoStatus(o);u.setDisabled("outdent",!o.queryCommandState("Outdent"));D=q("A");if(H=u.get("link")){if(!D||!D.name){H.setDisabled(!D&&r);H.setActive(!!D)}}if(H=u.get("unlink")){H.setDisabled(!D&&r);H.setActive(!!D&&!D.name)}if(H=u.get("anchor")){H.setActive(!r&&!!D&&D.name)}D=q("IMG");if(H=u.get("image")){H.setActive(!r&&!!D&&E.className.indexOf("mceItem")==-1)}if(H=u.get("styleselect")){z._importClasses();k=[];f(H.items,function(n){k.push(n.value)});j=o.formatter.matchAll(k);H.select(j[0]);h.each(j,function(p,n){if(n>0){H.mark(p)}})}if(H=u.get("formatselect")){D=q(i.isBlock);if(D){H.select(D.nodeName.toLowerCase())}}q(function(p){if(p.nodeName==="SPAN"){if(!x&&p.className){x=p.className}}if(o.dom.is(p,A.theme_advanced_font_selector)){if(!l&&p.style.fontSize){l=p.style.fontSize}if(!w&&p.style.fontFamily){w=p.style.fontFamily.replace(/[\"\']+/g,"").replace(/^([^,]+).*/,"$1").toLowerCase()}if(!C&&p.style.color){C=p.style.color}if(!m&&p.style.backgroundColor){m=p.style.backgroundColor}}return false});if(H=u.get("fontselect")){H.select(function(n){return n.replace(/^([^,]+).*/,"$1").toLowerCase()==w})}if(H=u.get("fontsizeselect")){if(A.theme_advanced_runtime_fontsize&&!l&&!x){l=o.dom.getStyle(E,"fontSize",true)}H.select(function(n){if(n.fontSize&&n.fontSize===l){return true}if(n["class"]&&n["class"]===x){return true}})}if(A.theme_advanced_show_current_color){function B(p,n){if(H=u.get(p)){if(!n){n=H.settings.default_color}if(n!==H.value){H.displayColor(n)}}}B("forecolor",C);B("backcolor",m)}if(A.theme_advanced_show_current_color){function B(p,n){if(H=u.get(p)){if(!n){n=H.settings.default_color}if(n!==H.value){H.displayColor(n)}}}B("forecolor",C);B("backcolor",m)}if(A.theme_advanced_path&&A.theme_advanced_statusbar_location){D=i.get(o.id+"_path")||i.add(o.id+"_path_row","span",{id:o.id+"_path"});if(z.statusKeyboardNavigation){z.statusKeyboardNavigation.destroy();z.statusKeyboardNavigation=null}i.setHTML(D,"");q(function(I){var p=I.nodeName.toLowerCase(),s,v,t="";if(I.nodeType!=1||p==="br"||I.getAttribute("data-mce-bogus")||i.hasClass(I,"mceItemHidden")||i.hasClass(I,"mceItemRemoved")){return}if(h.isIE&&I.scopeName!=="HTML"){p=I.scopeName+":"+p}p=p.replace(/mce\:/g,"");switch(p){case"b":p="strong";break;case"i":p="em";break;case"img":if(y=i.getAttrib(I,"src")){t+="src: "+y+" "}break;case"a":if(y=i.getAttrib(I,"name")){t+="name: "+y+" ";p+="#"+y}if(y=i.getAttrib(I,"href")){t+="href: "+y+" "}break;case"font":if(y=i.getAttrib(I,"face")){t+="font: "+y+" "}if(y=i.getAttrib(I,"size")){t+="size: "+y+" "}if(y=i.getAttrib(I,"color")){t+="color: "+y+" "}break;case"span":if(y=i.getAttrib(I,"style")){t+="style: "+y+" "}break}if(y=i.getAttrib(I,"id")){t+="id: "+y+" "}if(y=I.className){y=y.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g,"");if(y){t+="class: "+y+" ";if(i.isBlock(I)||p=="img"||p=="span"){p+="."+y}}}p=p.replace(/(html:)/g,"");p={name:p,node:I,title:t};z.onResolveName.dispatch(z,p);t=p.title;p=p.name;v=i.create("a",{href:"javascript:;",role:"button",onmousedown:"return false;",title:t,"class":"mcePath_"+(G++)},p);if(D.hasChildNodes()){D.insertBefore(i.create("span",{"aria-hidden":"true"},"\u00a0\u00bb "),D.firstChild);D.insertBefore(v,D.firstChild)}else{D.appendChild(v)}},o.getBody());if(i.select("a",D).length>0){z.statusKeyboardNavigation=new h.ui.KeyboardNavigation({root:o.id+"_path_row",items:i.select("a",D),excludeFromTabOrder:true,onCancel:function(){o.focus()}},i)}}},_sel:function(j){this.editor.execCommand("mceSelectNodeDepth",false,j)},_mceInsertAnchor:function(l,k){var j=this.editor;j.windowManager.open({url:this.url+"/anchor.htm",width:320+parseInt(j.getLang("advanced.anchor_delta_width",0)),height:90+parseInt(j.getLang("advanced.anchor_delta_height",0)),inline:true},{theme_url:this.url})},_mceCharMap:function(){var j=this.editor;j.windowManager.open({url:this.url+"/charmap.htm",width:550+parseInt(j.getLang("advanced.charmap_delta_width",0)),height:265+parseInt(j.getLang("advanced.charmap_delta_height",0)),inline:true},{theme_url:this.url})},_mceHelp:function(){var j=this.editor;j.windowManager.open({url:this.url+"/about.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceShortcuts:function(){var j=this.editor;j.windowManager.open({url:this.url+"/shortcuts.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceColorPicker:function(l,k){var j=this.editor;k=k||{};j.windowManager.open({url:this.url+"/color_picker.htm",width:375+parseInt(j.getLang("advanced.colorpicker_delta_width",0)),height:250+parseInt(j.getLang("advanced.colorpicker_delta_height",0)),close_previous:false,inline:true},{input_color:k.color,func:k.func,theme_url:this.url})},_mceCodeEditor:function(k,l){var j=this.editor;j.windowManager.open({url:this.url+"/source_editor.htm",width:parseInt(j.getParam("theme_advanced_source_editor_width",720)),height:parseInt(j.getParam("theme_advanced_source_editor_height",580)),inline:true,resizable:true,maximizable:true},{theme_url:this.url})},_mceImage:function(k,l){var j=this.editor;if(j.dom.getAttrib(j.selection.getNode(),"class","").indexOf("mceItem")!=-1){return}j.windowManager.open({url:this.url+"/image.htm",width:355+parseInt(j.getLang("advanced.image_delta_width",0)),height:275+parseInt(j.getLang("advanced.image_delta_height",0)),inline:true},{theme_url:this.url})},_mceLink:function(k,l){var j=this.editor;j.windowManager.open({url:this.url+"/link.htm",width:310+parseInt(j.getLang("advanced.link_delta_width",0)),height:200+parseInt(j.getLang("advanced.link_delta_height",0)),inline:true},{theme_url:this.url})},_mceNewDocument:function(){var j=this.editor;j.windowManager.confirm("advanced.newdocument",function(k){if(k){j.execCommand("mceSetContent",false,"")}})},_mceForeColor:function(){var j=this;this._mceColorPicker(0,{color:j.fgColor,func:function(k){j.fgColor=k;j.editor.execCommand("ForeColor",false,k)}})},_mceBackColor:function(){var j=this;this._mceColorPicker(0,{color:j.bgColor,func:function(k){j.bgColor=k;j.editor.execCommand("HiliteColor",false,k)}})},_ufirst:function(j){return j.substring(0,1).toUpperCase()+j.substring(1)}});h.ThemeManager.add("advanced",h.themes.AdvancedTheme)}(tinymce));
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
index 279ca359c..d94c8e499 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
@@ -11,6 +11,85 @@
 (function(tinymce) {

 	var DOM = tinymce.DOM, Event = tinymce.dom.Event, extend = tinymce.extend, each = tinymce.each, Cookie = tinymce.util.Cookie, lastExtID, explode = tinymce.explode;

 

+	// Generates a preview for a format

+	function getPreviewCss(ed, fmt) {

+		var previewElm, dom = ed.dom, previewCss = '', parentFontSize, previewStylesName;

+

+		previewStyles = ed.settings.preview_styles;

+

+		// No preview forced

+		if (previewStyles === false)

+			return '';

+

+		// Default preview

+		if (!previewStyles)

+			previewStyles = 'font-family font-size font-weight text-decoration text-transform color background-color';

+

+		// Removes any variables since these can't be previewed

+		function removeVars(val) {

+			return val.replace(/%(\w+)/g, '');

+		};

+

+		// Create block/inline element to use for preview

+		name = fmt.block || fmt.inline || 'span';

+		previewElm = dom.create(name);

+

+		// Add format styles to preview element

+		each(fmt.styles, function(value, name) {

+			value = removeVars(value);

+

+			if (value)

+				dom.setStyle(previewElm, name, value);

+		});

+

+		// Add attributes to preview element

+		each(fmt.attributes, function(value, name) {

+			value = removeVars(value);

+

+			if (value)

+				dom.setAttrib(previewElm, name, value);

+		});

+

+		// Add classes to preview element

+		each(fmt.classes, function(value) {

+			value = removeVars(value);

+

+			if (!dom.hasClass(previewElm, value))

+				dom.addClass(previewElm, value);

+		});

+

+		// Add the previewElm outside the visual area

+		dom.setStyles(previewElm, {position: 'absolute', left: -0xFFFF});

+		ed.getBody().appendChild(previewElm);

+

+		// Get parent container font size so we can compute px values out of em/% for older IE:s

+		parentFontSize = dom.getStyle(ed.getBody(), 'fontSize', true);

+		parentFontSize = /px$/.test(parentFontSize) ? parseInt(parentFontSize, 10) : 0;

+

+		each(previewStyles.split(' '), function(name) {

+			var value = dom.getStyle(previewElm, name, true);

+

+			// Old IE won't calculate the font size so we need to do that manually

+			if (name == 'font-size') {

+				if (/em|%$/.test(value)) {

+					if (parentFontSize === 0) {

+						return;

+					}

+

+					// Convert font size from em/% to px

+					value = parseFloat(value, 10) / (/%$/.test(value) ? 100 : 1);

+					value = (value * parentFontSize) + 'px';

+				}

+			}

+

+			previewCss += name + ':' + value + ';';

+		});

+

+		dom.remove(previewElm);

+

+		return previewCss;

+	};

+

 	// Tell it to load theme specific language pack(s)

 	tinymce.ThemeManager.requireLangPack('advanced');

 

@@ -66,6 +145,9 @@
 			t.url = url;

 			t.onResolveName = new tinymce.util.Dispatcher(this);

 

+			ed.forcedHighContrastMode = ed.settings.detect_highcontrast && t._isHighContrast();

+			ed.settings.skin = ed.forcedHighContrastMode ? 'highcontrast' : ed.settings.skin;

+

 			// Default settings

 			t.settings = s = extend({

 				theme_advanced_path : true,

@@ -81,6 +163,8 @@
 				theme_advanced_resize_horizontal : 1,

 				theme_advanced_resizing_use_cookie : 1,

 				theme_advanced_font_sizes : "1,2,3,4,5,6,7",

+				theme_advanced_font_selector : "span",

+				theme_advanced_show_current_color: 0,

 				readonly : ed.settings.readonly

 			}, ed.settings);

 

@@ -119,13 +203,19 @@
 			if (s.theme_advanced_statusbar_location == 'none')

 				s.theme_advanced_statusbar_location = 0;

 

+			if (ed.settings.content_css !== false)

+				ed.contentCSS.push(ed.baseURI.toAbsolute(url + "/skins/" + ed.settings.skin + "/content.css"));

+

 			// Init editor

 			ed.onInit.add(function() {

-				if (!ed.settings.readonly)

+				if (!ed.settings.readonly) {

 					ed.onNodeChange.add(t._nodeChanged, t);

-

-				if (ed.settings.content_css !== false)

-					ed.dom.loadCSS(ed.baseURI.toAbsolute("themes/advanced/skins/" + ed.settings.skin + "/content.css"));

+					ed.onKeyUp.add(t._updateUndoStatus, t);

+					ed.onMouseUp.add(t._updateUndoStatus, t);

+					ed.dom.bind(ed.dom.getRoot(), 'dragend', function() {

+						t._updateUndoStatus(ed);

+					});

+				}

 			});

 

 			ed.onSetProgressState.add(function(ed, b, ti) {

@@ -153,6 +243,15 @@
 				DOM.loadCSS(url + "/skins/" + ed.settings.skin + "/ui_" + s.skin_variant + ".css");

 		},

 

+		_isHighContrast : function() {

+			var actualColor, div = DOM.add(DOM.getRoot(), 'div', {'style': 'background-color: rgb(171,239,86);'});

+

+			actualColor = (DOM.getStyle(div, 'background-color', true) + '').toLowerCase().replace(/ /g, '');

+			DOM.remove(div);

+

+			return actualColor != 'rgb(171,239,86)' && actualColor != '#abef56';

+		},

+

 		createControl : function(n, cf) {

 			var cd, c;

 

@@ -199,15 +298,21 @@
 

 			if (ctrl.getLength() == 0) {

 				each(ed.dom.getClasses(), function(o, idx) {

-					var name = 'style_' + idx;

+					var name = 'style_' + idx, fmt;

 

-					ed.formatter.register(name, {

+					fmt = {

 						inline : 'span',

 						attributes : {'class' : o['class']},

 						selector : '*'

-					});

+					};

+

+					ed.formatter.register(name, fmt);

 

-					ctrl.add(o['class'], name);

+					ctrl.add(o['class'], name, {

+						style: function() {

+							return getPreviewCss(ed, fmt);

+						}

+					});

 				});

 			}

 		},

@@ -219,7 +324,7 @@
 			ctrl = ctrlMan.createListBox('styleselect', {

 				title : 'advanced.style_select',

 				onselect : function(name) {

-					var matches, formatNames = [];

+					var matches, formatNames = [], removedFormat;

 

 					each(ctrl.items, function(item) {

 						formatNames.push(item.value);

@@ -228,11 +333,18 @@
 					ed.focus();

 					ed.undoManager.add();

 

-					// Toggle off the current format

+					// Toggle off the current format(s)

 					matches = ed.formatter.matchAll(formatNames);

-					if (matches[0] == name)

-						ed.formatter.remove(name);

-					else

+					tinymce.each(matches, function(match) {

+						if (!name || match == name) {

+							if (match)

+								ed.formatter.remove(match);

+

+							removedFormat = true;

+						}

+					});

+

+					if (!removedFormat)

 						ed.formatter.apply(name);

 

 					ed.undoManager.add();

@@ -243,7 +355,7 @@
 			});

 

 			// Handle specified format

-			ed.onInit.add(function() {

+			ed.onPreInit.add(function() {

 				var counter = 0, formats = ed.getParam('style_formats');

 

 				if (formats) {

@@ -255,24 +367,32 @@
 						if (keys > 1) {

 							name = fmt.name = fmt.name || 'style_' + (counter++);

 							ed.formatter.register(name, fmt);

-							ctrl.add(fmt.title, name);

+							ctrl.add(fmt.title, name, {

+								style: function() {

+									return getPreviewCss(ed, fmt);

+								}

+							});

 						} else

 							ctrl.add(fmt.title);

 					});

 				} else {

 					each(ed.getParam('theme_advanced_styles', '', 'hash'), function(val, key) {

-						var name;

+						var name, fmt;

 

 						if (val) {

 							name = 'style_' + (counter++);

-

-							ed.formatter.register(name, {

+							fmt = {

 								inline : 'span',

 								classes : val,

 								selector : '*'

-							});

+							};

 

-							ctrl.add(t.editor.translate(key), name);

+							ed.formatter.register(name, fmt);

+							ctrl.add(t.editor.translate(key), name, {

+								style: function() {

+									return getPreviewCss(ed, fmt);

+								}

+							});

 						}

 					});

 				}

@@ -300,6 +420,13 @@
 			c = ed.controlManager.createListBox('fontselect', {

 				title : 'advanced.fontdefault',

 				onselect : function(v) {

+					var cur = c.items[c.selectedIndex];

+

+					if (!v && cur) {

+						ed.execCommand('FontName', false, cur.value);

+						return;

+					}

+

 					ed.execCommand('FontName', false, v);

 

 					// Fake selection, execCommand will fire a nodeChange and update the selection

@@ -307,6 +434,10 @@
 						return v == sv;

 					});

 

+					if (cur && cur.value == v) {

+						c.select(null);

+					}

+

 					return false; // No auto select

 				}

 			});

@@ -324,6 +455,22 @@
 			var t = this, ed = t.editor, c, i = 0, cl = [];

 

 			c = ed.controlManager.createListBox('fontsizeselect', {title : 'advanced.font_size', onselect : function(v) {

+				var cur = c.items[c.selectedIndex];

+

+				if (!v && cur) {

+					cur = cur.value;

+

+					if (cur['class']) {

+						ed.formatter.toggle('fontsize_class', {value : cur['class']});

+						ed.undoManager.add();

+						ed.nodeChanged();

+					} else {

+						ed.execCommand('FontSize', false, cur.fontSize);

+					}

+

+					return;

+				}

+

 				if (v['class']) {

 					ed.focus();

 					ed.undoManager.add();

@@ -338,6 +485,10 @@
 					return v == sv;

 				});

 

+				if (cur && (cur.value.fontSize == v.fontSize || cur.value['class'] && cur.value['class'] == v['class'])) {

+					c.select(null);

+				}

+

 				return false; // No auto select

 			}});

 

@@ -374,10 +525,16 @@
 				samp : 'advanced.samp'

 			}, t = this;

 

-			c = t.editor.controlManager.createListBox('formatselect', {title : 'advanced.block', cmd : 'FormatBlock'});

+			c = t.editor.controlManager.createListBox('formatselect', {title : 'advanced.block', onselect : function(v) {

+				t.editor.execCommand('FormatBlock', false, v);

+				return false;

+			}});

+

 			if (c) {

 				each(t.editor.getParam('theme_advanced_blockformats', t.settings.theme_advanced_blockformats, 'hash'), function(v, k) {

-					c.add(t.editor.translate(k != v ? k : fmts[v]), v, {'class' : 'mce_formatPreview mce_' + v});

+					c.add(t.editor.translate(k != v ? k : fmts[v]), v, {'class' : 'mce_formatPreview mce_' + v, style: function() {

+						return getPreviewCss(t.editor, {block: v});

+					}});

 				});

 			}

 

@@ -445,12 +602,19 @@
 		renderUI : function(o) {

 			var n, ic, tb, t = this, ed = t.editor, s = t.settings, sc, p, nl;

 

-			n = p = DOM.create('span', {id : ed.id + '_parent', 'class' : 'mceEditor ' + ed.settings.skin + 'Skin' + (s.skin_variant ? ' ' + ed.settings.skin + 'Skin' + t._ufirst(s.skin_variant) : '')});

+			if (ed.settings) {

+				ed.settings.aria_label = s.aria_label + ed.getLang('advanced.help_shortcut');

+			}

+

+			// TODO: ACC Should have an aria-describedby attribute which is user-configurable to describe what this field is actually for.

+			// Maybe actually inherit it from the original textara?

+			n = p = DOM.create('span', {role : 'application', 'aria-labelledby' : ed.id + '_voice', id : ed.id + '_parent', 'class' : 'mceEditor ' + ed.settings.skin + 'Skin' + (s.skin_variant ? ' ' + ed.settings.skin + 'Skin' + t._ufirst(s.skin_variant) : '')});

+			DOM.add(n, 'span', {'class': 'mceVoiceLabel', 'style': 'display:none;', id: ed.id + '_voice'}, s.aria_label);

 

 			if (!DOM.boxModel)

 				n = DOM.add(n, 'div', {'class' : 'mceOldBoxModel'});

 

-			n = sc = DOM.add(n, 'table', {id : ed.id + '_tbl', 'class' : 'mceLayout', cellSpacing : 0, cellPadding : 0});

+			n = sc = DOM.add(n, 'table', {role : "presentation", id : ed.id + '_tbl', 'class' : 'mceLayout', cellSpacing : 0, cellPadding : 0});

 			n = tb = DOM.add(n, 'tbody');

 

 			switch ((s.theme_advanced_layout_manager || '').toLowerCase()) {

@@ -469,7 +633,7 @@
 			n = o.targetNode;

 

 			// Add classes to first and last TRs

-			nl = DOM.stdMode ? sc.getElementsByTagName('tr') : sc.rows; // Quick fix for IE 8

+			nl = sc.rows;

 			DOM.addClass(nl[0], 'mceFirst');

 			DOM.addClass(nl[nl.length - 1], 'mceLast');

 

@@ -489,8 +653,7 @@
 

 				if (e.nodeName == 'A') {

 					t._sel(e.className.replace(/^.*mcePath_([0-9]+).*$/, '$1'));

-

-					return Event.cancel(e);

+					return false;

 				}

 			});

 /*

@@ -525,6 +688,28 @@
 			t.deltaHeight = o.deltaHeight;

 			o.targetNode = null;

 

+			ed.onKeyDown.add(function(ed, evt) {

+				var DOM_VK_F10 = 121, DOM_VK_F11 = 122;

+

+				if (evt.altKey) {

+		 			if (evt.keyCode === DOM_VK_F10) {

+						// Make sure focus is given to toolbar in Safari.

+						// We can't do this in IE as it prevents giving focus to toolbar when editor is in a frame

+						if (tinymce.isWebKit) {

+							window.focus();

+						}

+						t.toolbarGroup.focus();

+						return Event.cancel(evt);

+					} else if (evt.keyCode === DOM_VK_F11) {

+						DOM.get(ed.id + '_path_row').focus();

+						return Event.cancel(evt);

+					}

+				}

+			});

+

+			// alt+0 is the UK recommended shortcut for accessing the list of access controls.

+			ed.addShortcut('alt+0', '', 'mceShortcuts', t);

+

 			return {

 				iframeContainer : ic,

 				editorContainer : ed.id + '_parent',

@@ -543,12 +728,12 @@
 		},

 

 		resizeBy : function(dw, dh) {

-			var e = DOM.get(this.editor.id + '_tbl');

+			var e = DOM.get(this.editor.id + '_ifr');

 

 			this.resizeTo(e.clientWidth + dw, e.clientHeight + dh);

 		},

 

-		resizeTo : function(w, h) {

+		resizeTo : function(w, h, store) {

 			var ed = this.editor, s = this.settings, e = DOM.get(ed.id + '_tbl'), ifr = DOM.get(ed.id + '_ifr');

 

 			// Boundery fix box

@@ -566,8 +751,18 @@
 				DOM.setStyle(ifr, 'width', w);

 

 				// Make sure that the size is never smaller than the over all ui

-				if (w < e.clientWidth)

+				if (w < e.clientWidth) {

+					w = e.clientWidth;

 					DOM.setStyle(ifr, 'width', e.clientWidth);

+				}

+			}

+

+			// Store away the size

+			if (store && s.theme_advanced_resizing_use_cookie) {

+				Cookie.setHash("TinyMCE_" + ed.id + "_size", {

+					cw : w,

+					ch : h

+				});

 			}

 		},

 

@@ -662,7 +857,7 @@
 			each(explode(s.theme_advanced_containers || ''), function(c, i) {

 				var v = s['theme_advanced_container_' + c] || '';

 

-				switch (v.toLowerCase()) {

+				switch (c.toLowerCase()) {

 					case 'mceeditor':

 						n = DOM.add(tb, 'tr');

 						n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});

@@ -730,17 +925,19 @@
 		},

 

 		_addToolbars : function(c, o) {

-			var t = this, i, tb, ed = t.editor, s = t.settings, v, cf = ed.controlManager, di, n, h = [], a;

+			var t = this, i, tb, ed = t.editor, s = t.settings, v, cf = ed.controlManager, di, n, h = [], a, toolbarGroup;

 

-			a = s.theme_advanced_toolbar_align.toLowerCase();

-			a = 'mce' + t._ufirst(a);

+			toolbarGroup = cf.createToolbarGroup('toolbargroup', {

+				'name': ed.getLang('advanced.toolbar'),

+				'tab_focus_toolbar':ed.getParam('theme_advanced_tab_focus_toolbar')

+			});

 

-			n = DOM.add(DOM.add(c, 'tr'), 'td', {'class' : 'mceToolbar ' + a});

+			t.toolbarGroup = toolbarGroup;

 

-			if (!ed.getParam('accessibility_focus'))

-				h.push(DOM.createHTML('a', {href : '#', onfocus : 'tinyMCE.get(\'' + ed.id + '\').focus();'}, '<!-- IE -->'));

+			a = s.theme_advanced_toolbar_align.toLowerCase();

+			a = 'mce' + t._ufirst(a);

 

-			h.push(DOM.createHTML('a', {href : '#', accesskey : 'q', title : ed.getLang("advanced.toolbar_focus")}, '<!-- IE -->'));

+			n = DOM.add(DOM.add(c, 'tr', {role: 'presentation'}), 'td', {'class' : 'mceToolbar ' + a, "role":"presentation"});

 

 			// Create toolbar and add the controls

 			for (i=1; (v = s['theme_advanced_buttons' + i]); i++) {

@@ -753,13 +950,11 @@
 					v = s['theme_advanced_buttons' + i + '_add_before'] + ',' + v;

 

 				t._addControls(v, tb);

-

-				//n.appendChild(n = tb.render());

-				h.push(tb.renderHTML());

+				toolbarGroup.add(tb);

 

 				o.deltaHeight -= s.theme_advanced_row_height;

 			}

-

+			h.push(toolbarGroup.renderHTML());

 			h.push(DOM.createHTML('a', {href : '#', accesskey : 'z', title : ed.getLang("advanced.toolbar_focus"), onfocus : 'tinyMCE.getInstanceById(\'' + ed.id + '\').focus();'}, '<!-- IE -->'));

 			DOM.setHTML(n, h.join(''));

 		},

@@ -768,12 +963,18 @@
 			var n, t = this, ed = t.editor, s = t.settings, r, mf, me, td;

 

 			n = DOM.add(tb, 'tr');

-			n = td = DOM.add(n, 'td', {'class' : 'mceStatusbar'});

-			n = DOM.add(n, 'div', {id : ed.id + '_path_row'}, s.theme_advanced_path ? ed.translate('advanced.path') + ': ' : '&#160;');

-			DOM.add(n, 'a', {href : '#', accesskey : 'x'});

+			n = td = DOM.add(n, 'td', {'class' : 'mceStatusbar'}); 

+			n = DOM.add(n, 'div', {id : ed.id + '_path_row', 'role': 'group', 'aria-labelledby': ed.id + '_path_voice'});

+			if (s.theme_advanced_path) {

+				DOM.add(n, 'span', {id: ed.id + '_path_voice'}, ed.translate('advanced.path'));

+				DOM.add(n, 'span', {}, ': ');

+			} else {

+				DOM.add(n, 'span', {}, '&#160;');

+			}

+			

 

 			if (s.theme_advanced_resizing) {

-				DOM.add(td, 'a', {id : ed.id + '_resize', href : 'javascript:;', onclick : "return false;", 'class' : 'mceResize'});

+				DOM.add(td, 'a', {id : ed.id + '_resize', href : 'javascript:;', onclick : "return false;", 'class' : 'mceResize', tabIndex:"-1"});

 

 				if (s.theme_advanced_resizing_use_cookie) {

 					ed.onPostRender.add(function() {

@@ -787,12 +988,18 @@
 				}

 

 				ed.onPostRender.add(function() {

+					Event.add(ed.id + '_resize', 'click', function(e) {

+						e.preventDefault();

+					});

+

 					Event.add(ed.id + '_resize', 'mousedown', function(e) {

 						var mouseMoveHandler1, mouseMoveHandler2,

 							mouseUpHandler1, mouseUpHandler2,

 							startX, startY, startWidth, startHeight, width, height, ifrElm;

 

 						function resizeOnMove(e) {

+							e.preventDefault();

+

 							width = startWidth + (e.screenX - startX);

 							height = startHeight + (e.screenY - startY);

 

@@ -806,13 +1013,9 @@
 							Event.remove(DOM.doc, 'mouseup', mouseUpHandler1);

 							Event.remove(ed.getDoc(), 'mouseup', mouseUpHandler2);

 

-							// Store away the size

-							if (s.theme_advanced_resizing_use_cookie) {

-								Cookie.setHash("TinyMCE_" + ed.id + "_size", {

-									cw : width,

-									ch : height

-								});

-							}

+							width = startWidth + (e.screenX - startX);

+							height = startHeight + (e.screenY - startY);

+							t.resizeTo(width, height, true);

 						};

 

 						e.preventDefault();

@@ -837,8 +1040,15 @@
 			n = tb = null;

 		},

 

+		_updateUndoStatus : function(ed) {

+			var cm = ed.controlManager, um = ed.undoManager;

+

+			cm.setDisabled('undo', !um.hasUndo() && !um.typing);

+			cm.setDisabled('redo', !um.hasRedo());

+		},

+

 		_nodeChanged : function(ed, cm, n, co, ob) {

-			var t = this, p, de = 0, v, c, s = t.settings, cl, fz, fn, formatNames, matches;

+			var t = this, p, de = 0, v, c, s = t.settings, cl, fz, fn, fc, bc, formatNames, matches;

 

 			tinymce.each(t.stateControls, function(c) {

 				cm.setActive(c, ed.queryCommandState(t.controls[c][1]));

@@ -860,8 +1070,7 @@
 			};

 

 			cm.setActive('visualaid', ed.hasVisual);

-			cm.setDisabled('undo', !ed.undoManager.hasUndo() && !ed.typing);

-			cm.setDisabled('redo', !ed.undoManager.hasRedo());

+			t._updateUndoStatus(ed);

 			cm.setDisabled('outdent', !ed.queryCommandState('Outdent'));

 

 			p = getParent('A');

@@ -878,12 +1087,12 @@
 			}

 

 			if (c = cm.get('anchor')) {

-				c.setActive(!!p && p.name);

+				c.setActive(!co && !!p && p.name);

 			}

 

 			p = getParent('IMG');

 			if (c = cm.get('image'))

-				c.setActive(!!p && n.className.indexOf('mceItem') == -1);

+				c.setActive(!co && !!p && n.className.indexOf('mceItem') == -1);

 

 			if (c = cm.get('styleselect')) {

 				t._importClasses();

@@ -895,6 +1104,11 @@
 

 				matches = ed.formatter.matchAll(formatNames);

 				c.select(matches[0]);

+				tinymce.each(matches, function(match, index) {

+					if (index > 0) {

+						c.mark(match);

+					}

+				});

 			}

 

 			if (c = cm.get('formatselect')) {

@@ -909,12 +1123,20 @@
 				if (n.nodeName === 'SPAN') {

 					if (!cl && n.className)

 						cl = n.className;

+				}

 

+				if (ed.dom.is(n, s.theme_advanced_font_selector)) {

 					if (!fz && n.style.fontSize)

 						fz = n.style.fontSize;

 

 					if (!fn && n.style.fontFamily)

 						fn = n.style.fontFamily.replace(/[\"\']+/g, '').replace(/^([^,]+).*/, '$1').toLowerCase();

+					

+					if (!fc && n.style.color)

+						fc = n.style.color;

+

+					if (!bc && n.style.backgroundColor)

+						bc = n.style.backgroundColor;

 				}

 

 				return false;

@@ -940,25 +1162,53 @@
 						return true;

 				});

 			}

+			

+			if (s.theme_advanced_show_current_color) {

+				function updateColor(controlId, color) {

+					if (c = cm.get(controlId)) {

+						if (!color)

+							color = c.settings.default_color;

+						if (color !== c.value) {

+							c.displayColor(color);

+						}

+					}

+				}

+				updateColor('forecolor', fc);

+				updateColor('backcolor', bc);

+			}

+

+			if (s.theme_advanced_show_current_color) {

+				function updateColor(controlId, color) {

+					if (c = cm.get(controlId)) {

+						if (!color)

+							color = c.settings.default_color;

+						if (color !== c.value) {

+							c.displayColor(color);

+						}

+					}

+				};

+

+				updateColor('forecolor', fc);

+				updateColor('backcolor', bc);

+			}

 

 			if (s.theme_advanced_path && s.theme_advanced_statusbar_location) {

 				p = DOM.get(ed.id + '_path') || DOM.add(ed.id + '_path_row', 'span', {id : ed.id + '_path'});

+

+				if (t.statusKeyboardNavigation) {

+					t.statusKeyboardNavigation.destroy();

+					t.statusKeyboardNavigation = null;

+				}

+

 				DOM.setHTML(p, '');

 

 				getParent(function(n) {

 					var na = n.nodeName.toLowerCase(), u, pi, ti = '';

 

-					/*if (n.getAttribute('_mce_bogus'))

-						return;

-*/

-					// Ignore non element and hidden elements

-					if (n.nodeType != 1 || n.nodeName === 'BR' || (DOM.hasClass(n, 'mceItemHidden') || DOM.hasClass(n, 'mceItemRemoved')))

+					// Ignore non element and bogus/hidden elements

+					if (n.nodeType != 1 || na === 'br' || n.getAttribute('data-mce-bogus') || DOM.hasClass(n, 'mceItemHidden') || DOM.hasClass(n, 'mceItemRemoved'))

 						return;

 

-					// Fake name

-					if (v = DOM.getAttrib(n, 'mce_name'))

-						na = v;

-

 					// Handle prefix

 					if (tinymce.isIE && n.scopeName !== 'HTML')

 						na = n.scopeName + ':' + na;

@@ -1033,14 +1283,25 @@
 					na = na.name;

 

 					//u = "javascript:tinymce.EditorManager.get('" + ed.id + "').theme._sel('" + (de++) + "');";

-					pi = DOM.create('a', {'href' : "javascript:;", onmousedown : "return false;", title : ti, 'class' : 'mcePath_' + (de++)}, na);

+					pi = DOM.create('a', {'href' : "javascript:;", role: 'button', onmousedown : "return false;", title : ti, 'class' : 'mcePath_' + (de++)}, na);

 

 					if (p.hasChildNodes()) {

-						p.insertBefore(DOM.doc.createTextNode(' \u00bb '), p.firstChild);

+						p.insertBefore(DOM.create('span', {'aria-hidden': 'true'}, '\u00a0\u00bb '), p.firstChild);

 						p.insertBefore(pi, p.firstChild);

 					} else

 						p.appendChild(pi);

 				}, ed.getBody());

+

+				if (DOM.select('a', p).length > 0) {

+					t.statusKeyboardNavigation = new tinymce.ui.KeyboardNavigation({

+						root: ed.id + "_path_row",

+						items: DOM.select('a', p),

+						excludeFromTabOrder: true,

+						onCancel: function() {

+							ed.focus();

+						}

+					}, DOM);

+				}

 			}

 		},

 

@@ -1054,7 +1315,7 @@
 			var ed = this.editor;

 

 			ed.windowManager.open({

-				url : tinymce.baseURL + '/themes/advanced/anchor.htm',

+				url : this.url + '/anchor.htm',

 				width : 320 + parseInt(ed.getLang('advanced.anchor_delta_width', 0)),

 				height : 90 + parseInt(ed.getLang('advanced.anchor_delta_height', 0)),

 				inline : true

@@ -1067,9 +1328,9 @@
 			var ed = this.editor;

 

 			ed.windowManager.open({

-				url : tinymce.baseURL + '/themes/advanced/charmap.htm',

+				url : this.url + '/charmap.htm',

 				width : 550 + parseInt(ed.getLang('advanced.charmap_delta_width', 0)),

-				height : 250 + parseInt(ed.getLang('advanced.charmap_delta_height', 0)),

+				height : 265 + parseInt(ed.getLang('advanced.charmap_delta_height', 0)),

 				inline : true

 			}, {

 				theme_url : this.url

@@ -1080,7 +1341,7 @@
 			var ed = this.editor;

 

 			ed.windowManager.open({

-				url : tinymce.baseURL + '/themes/advanced/about.htm',

+				url : this.url + '/about.htm',

 				width : 480,

 				height : 380,

 				inline : true

@@ -1089,13 +1350,25 @@
 			});

 		},

 

+		_mceShortcuts : function() {

+			var ed = this.editor;

+			ed.windowManager.open({

+				url: this.url + '/shortcuts.htm',

+				width: 480,

+				height: 380,

+				inline: true

+			}, {

+				theme_url: this.url

+			});

+		},

+

 		_mceColorPicker : function(u, v) {

 			var ed = this.editor;

 

 			v = v || {};

 

 			ed.windowManager.open({

-				url : tinymce.baseURL + '/themes/advanced/color_picker.htm',

+				url : this.url + '/color_picker.htm',

 				width : 375 + parseInt(ed.getLang('advanced.colorpicker_delta_width', 0)),

 				height : 250 + parseInt(ed.getLang('advanced.colorpicker_delta_height', 0)),

 				close_previous : false,

@@ -1111,7 +1384,7 @@
 			var ed = this.editor;

 

 			ed.windowManager.open({

-				url : tinymce.baseURL + '/themes/advanced/source_editor.htm',

+				url : this.url + '/source_editor.htm',

 				width : parseInt(ed.getParam("theme_advanced_source_editor_width", 720)),

 				height : parseInt(ed.getParam("theme_advanced_source_editor_height", 580)),

 				inline : true,

@@ -1126,11 +1399,11 @@
 			var ed = this.editor;

 

 			// Internal image object like a flash placeholder

-			if (ed.dom.getAttrib(ed.selection.getNode(), 'class').indexOf('mceItem') != -1)

+			if (ed.dom.getAttrib(ed.selection.getNode(), 'class', '').indexOf('mceItem') != -1)

 				return;

 

 			ed.windowManager.open({

-				url : tinymce.baseURL + '/themes/advanced/image.htm',

+				url : this.url + '/image.htm',

 				width : 355 + parseInt(ed.getLang('advanced.image_delta_width', 0)),

 				height : 275 + parseInt(ed.getLang('advanced.image_delta_height', 0)),

 				inline : true

@@ -1143,7 +1416,7 @@
 			var ed = this.editor;

 

 			ed.windowManager.open({

-				url : tinymce.baseURL + '/themes/advanced/link.htm',

+				url : this.url + '/link.htm',

 				width : 310 + parseInt(ed.getLang('advanced.link_delta_width', 0)),

 				height : 200 + parseInt(ed.getLang('advanced.link_delta_height', 0)),

 				inline : true

@@ -1191,4 +1464,4 @@
 	});

 

 	tinymce.ThemeManager.add('advanced', tinymce.themes.AdvancedTheme);

-}(tinymce));
\ No newline at end of file
+}(tinymce));

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/image.htm b/library/tinymce/jscripts/tiny_mce/themes/advanced/image.htm
index f30d67064..b8ba729f6 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/image.htm
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/image.htm
@@ -17,57 +17,57 @@
 

 	<div class="panel_wrapper">

 		<div id="general_panel" class="panel current">

-     <table border="0" cellpadding="4" cellspacing="0">

-          <tr>

-            <td class="nowrap"><label for="src">{#advanced_dlg.image_src}</label></td>

-            <td><table border="0" cellspacing="0" cellpadding="0">

-                <tr>

-                  <td><input id="src" name="src" type="text" class="mceFocus" value="" style="width: 200px" onchange="ImageDialog.getImageData();" /></td>

-                  <td id="srcbrowsercontainer">&nbsp;</td>

-                </tr>

-              </table></td>

-          </tr>

-		  <tr>

-			<td><label for="image_list">{#advanced_dlg.image_list}</label></td>

-			<td><select id="image_list" name="image_list" onchange="document.getElementById('src').value=this.options[this.selectedIndex].value;document.getElementById('alt').value=this.options[this.selectedIndex].text;"></select></td>

-		  </tr>

-          <tr>

-            <td class="nowrap"><label for="alt">{#advanced_dlg.image_alt}</label></td>

-            <td><input id="alt" name="alt" type="text" value="" style="width: 200px" /></td>

-          </tr>

-          <tr>

-            <td class="nowrap"><label for="align">{#advanced_dlg.image_align}</label></td>

-            <td><select id="align" name="align" onchange="ImageDialog.updateStyle();">

-                <option value="">{#not_set}</option>

-                <option value="baseline">{#advanced_dlg.image_align_baseline}</option>

-                <option value="top">{#advanced_dlg.image_align_top}</option>

-                <option value="middle">{#advanced_dlg.image_align_middle}</option>

-                <option value="bottom">{#advanced_dlg.image_align_bottom}</option>

-                <option value="text-top">{#advanced_dlg.image_align_texttop}</option>

-                <option value="text-bottom">{#advanced_dlg.image_align_textbottom}</option>

-                <option value="left">{#advanced_dlg.image_align_left}</option>

-                <option value="right">{#advanced_dlg.image_align_right}</option>

-              </select></td>

-          </tr>

-          <tr>

-            <td class="nowrap"><label for="width">{#advanced_dlg.image_dimensions}</label></td>

-            <td><input id="width" name="width" type="text" value="" size="3" maxlength="5" />

-              x

-              <input id="height" name="height" type="text" value="" size="3" maxlength="5" /></td>

-          </tr>

-          <tr>

-            <td class="nowrap"><label for="border">{#advanced_dlg.image_border}</label></td>

-            <td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>

-          </tr>

-          <tr>

-            <td class="nowrap"><label for="vspace">{#advanced_dlg.image_vspace}</label></td>

-            <td><input id="vspace" name="vspace" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>

-          </tr>

-          <tr>

-            <td class="nowrap"><label for="hspace">{#advanced_dlg.image_hspace}</label></td>

-            <td><input id="hspace" name="hspace" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>

-          </tr>

-        </table>

+			<table border="0" cellpadding="4" cellspacing="0">

+				<tr>

+					<td class="nowrap"><label for="src">{#advanced_dlg.image_src}</label></td>

+					<td><table border="0" cellspacing="0" cellpadding="0">

+						<tr>

+							<td><input id="src" name="src" type="text" class="mceFocus" value="" style="width: 200px" onchange="ImageDialog.getImageData();" /></td>

+							<td id="srcbrowsercontainer">&nbsp;</td>

+						</tr>

+					</table></td>

+				</tr>

+				<tr>

+					<td><label for="image_list">{#advanced_dlg.image_list}</label></td>

+					<td><select id="image_list" name="image_list" onchange="document.getElementById('src').value=this.options[this.selectedIndex].value;document.getElementById('alt').value=this.options[this.selectedIndex].text;"></select></td>

+				</tr>

+				<tr>

+					<td class="nowrap"><label for="alt">{#advanced_dlg.image_alt}</label></td>

+					<td><input id="alt" name="alt" type="text" value="" style="width: 200px" /></td>

+				</tr>

+				<tr>

+					<td class="nowrap"><label for="align">{#advanced_dlg.image_align}</label></td>

+					<td><select id="align" name="align" onchange="ImageDialog.updateStyle();">

+						<option value="">{#not_set}</option>

+						<option value="baseline">{#advanced_dlg.image_align_baseline}</option>

+						<option value="top">{#advanced_dlg.image_align_top}</option>

+						<option value="middle">{#advanced_dlg.image_align_middle}</option>

+						<option value="bottom">{#advanced_dlg.image_align_bottom}</option>

+						<option value="text-top">{#advanced_dlg.image_align_texttop}</option>

+						<option value="text-bottom">{#advanced_dlg.image_align_textbottom}</option>

+						<option value="left">{#advanced_dlg.image_align_left}</option>

+						<option value="right">{#advanced_dlg.image_align_right}</option>

+					</select></td>

+				</tr>

+				<tr>

+					<td class="nowrap"><label for="width">{#advanced_dlg.image_dimensions}</label></td>

+					<td><input id="width" name="width" type="text" value="" size="3" maxlength="5" />

+					 x 

+					<input id="height" name="height" type="text" value="" size="3" maxlength="5" /></td>

+				</tr>

+				<tr>

+				<td class="nowrap"><label for="border">{#advanced_dlg.image_border}</label></td>

+				<td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>

+				</tr>

+				<tr>

+					<td class="nowrap"><label for="vspace">{#advanced_dlg.image_vspace}</label></td>

+					<td><input id="vspace" name="vspace" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>

+				</tr>

+				<tr>

+					<td class="nowrap"><label for="hspace">{#advanced_dlg.image_hspace}</label></td>

+					<td><input id="hspace" name="hspace" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>

+				</tr>

+			</table>

 		</div>

 	</div>

 

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg
index b4c542d10..b1a377aba 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/img/flash.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/flash.gif
new file mode 100644
index 000000000..dec3f7c70
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/flash.gif
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif
index efb356c41..efb356c41 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/img/iframe.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/iframe.gif
new file mode 100644
index 000000000..410c7ad08
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/iframe.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/pagebreak.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/pagebreak.gif
index acdf4085f..acdf4085f 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/pagebreak.gif
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/pagebreak.gif
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/img/quicktime.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/quicktime.gif
new file mode 100644
index 000000000..8f10e7aa6
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/quicktime.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/media/img/realmedia.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/realmedia.gif
index fdfe0b9ac..fdfe0b9ac 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/media/img/realmedia.gif
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/realmedia.gif
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/img/shockwave.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/shockwave.gif
new file mode 100644
index 000000000..9314d0447
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/shockwave.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/media/img/trans.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/trans.gif
index 388486517..388486517 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/media/img/trans.gif
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/trans.gif
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/img/video.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/video.gif
new file mode 100644
index 000000000..357010407
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/video.gif
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/media/img/windowsmedia.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/windowsmedia.gif
index ab50f2d88..ab50f2d88 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/media/img/windowsmedia.gif
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/windowsmedia.gif
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js
index 5cee9ed86..5b3584576 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js
@@ -66,6 +66,7 @@ function insertHelpIFrame() {
 		html = '<iframe width="100%" height="300" src="' + tinyMCEPopup.editor.baseURI.toAbsolute(tinyMCEPopup.getParam('docs_url')) + '"></iframe>';

 		document.getElementById('iframecontainer').innerHTML = html;

 		document.getElementById('help_tab').style.display = 'block';

+		document.getElementById('help_tab').setAttribute("aria-hidden", "false");

 	}

 }

 

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
index 7fe781055..2940db359 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
@@ -19,16 +19,23 @@ var AnchorDialog = {
 	update : function() {

 		var ed = this.editor, elm, name = document.forms[0].anchorName.value;

 

+		if (!name || !/^[a-z][a-z0-9\-\_:\.]*$/i.test(name)) {

+			tinyMCEPopup.alert('advanced_dlg.anchor_invalid');

+			return;

+		}

+

 		tinyMCEPopup.restoreSelection();

 

 		if (this.action != 'update')

 			ed.selection.collapse(1);

 

 		elm = ed.dom.getParent(ed.selection.getNode(), 'A');

-		if (elm)

+		if (elm) {

+			elm.setAttribute('name', name);

 			elm.name = name;

-		else

-			ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('a', {name : name, 'class' : 'mceItemAnchor'}, ''));

+		} else

+			// create with zero-sized nbsp so that in Webkit where anchor is on last line by itself caret cannot be placed after it

+			ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('a', {name : name, 'class' : 'mceItemAnchor'}, '\uFEFF'));

 

 		tinyMCEPopup.close();

 	}

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
index 8c5aea172..bb1869558 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
@@ -173,7 +173,7 @@ var charmap = [
 	['&yacute;',  '&#253;',  true, 'y - acute'],

 	['&thorn;',   '&#254;',  true, 'thorn'],

 	['&yuml;',    '&#255;',  true, 'y - diaeresis'],

-    ['&Alpha;',   '&#913;',  true, 'Alpha'],

+	['&Alpha;',   '&#913;',  true, 'Alpha'],

 	['&Beta;',    '&#914;',  true, 'Beta'],

 	['&Gamma;',   '&#915;',  true, 'Gamma'],

 	['&Delta;',   '&#916;',  true, 'Delta'],

@@ -258,8 +258,8 @@ var charmap = [
 	['&rfloor;',  '&#8971;', false,'right floor'],

 	['&lang;',    '&#9001;', false,'left-pointing angle bracket'],

 	['&rang;',    '&#9002;', false,'right-pointing angle bracket'],

-	['&loz;',     '&#9674;', true,'lozenge'],

-	['&spades;',  '&#9824;', false,'black spade suit'],

+	['&loz;',     '&#9674;', true, 'lozenge'],

+	['&spades;',  '&#9824;', true, 'black spade suit'],

 	['&clubs;',   '&#9827;', true, 'black club suit'],

 	['&hearts;',  '&#9829;', true, 'black heart suit'],

 	['&diams;',   '&#9830;', true, 'black diamond suit'],

@@ -275,19 +275,46 @@ var charmap = [
 

 tinyMCEPopup.onInit.add(function() {

 	tinyMCEPopup.dom.setHTML('charmapView', renderCharMapHTML());

+	addKeyboardNavigation();

 });

 

+function addKeyboardNavigation(){

+	var tableElm, cells, settings;

+

+	cells = tinyMCEPopup.dom.select("a.charmaplink", "charmapgroup");

+

+	settings ={

+		root: "charmapgroup",

+		items: cells

+	};

+	cells[0].tabindex=0;

+	tinyMCEPopup.dom.addClass(cells[0], "mceFocus");

+	if (tinymce.isGecko) {

+		cells[0].focus();		

+	} else {

+		setTimeout(function(){

+			cells[0].focus();

+		}, 100);

+	}

+	tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', settings, tinyMCEPopup.dom);

+}

+

 function renderCharMapHTML() {

 	var charsPerRow = 20, tdWidth=20, tdHeight=20, i;

-	var html = '<table border="0" cellspacing="1" cellpadding="0" width="' + (tdWidth*charsPerRow) + '"><tr height="' + tdHeight + '">';

+	var html = '<div id="charmapgroup" aria-labelledby="charmap_label" tabindex="0" role="listbox">'+

+	'<table role="presentation" border="0" cellspacing="1" cellpadding="0" width="' + (tdWidth*charsPerRow) + 

+	'"><tr height="' + tdHeight + '">';

 	var cols=-1;

 

 	for (i=0; i<charmap.length; i++) {

+		var previewCharFn;

+

 		if (charmap[i][2]==true) {

 			cols++;

+			previewCharFn = 'previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');';

 			html += ''

 				+ '<td class="charmap">'

-				+ '<a onmouseover="previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');" onfocus="previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');" href="javascript:void(0)" onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + '">'

+				+ '<a class="charmaplink" role="button" onmouseover="'+previewCharFn+'" onfocus="'+previewCharFn+'" href="javascript:void(0)" onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + ' '+ tinyMCEPopup.editor.translate("advanced_dlg.charmap_usage")+'">'

 				+ charmap[i][1]

 				+ '</a></td>';

 			if ((cols+1) % charsPerRow == 0)

@@ -301,7 +328,8 @@ function renderCharMapHTML() {
 			html += '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap">&nbsp;</td>';

 	}

 

-	html += '</tr></table>';

+	html += '</tr></table></div>';

+	html = html.replace(/<tr height="20"><\/tr>/g, '');

 

 	return html;

 }

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
index fd9700f22..cc891c171 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
@@ -1,253 +1,345 @@
-tinyMCEPopup.requireLangPack();

-

-var detail = 50, strhex = "0123456789abcdef", i, isMouseDown = false, isMouseOver = false;

-

-var colors = [

-	"#000000","#000033","#000066","#000099","#0000cc","#0000ff","#330000","#330033",

-	"#330066","#330099","#3300cc","#3300ff","#660000","#660033","#660066","#660099",

-	"#6600cc","#6600ff","#990000","#990033","#990066","#990099","#9900cc","#9900ff",

-	"#cc0000","#cc0033","#cc0066","#cc0099","#cc00cc","#cc00ff","#ff0000","#ff0033",

-	"#ff0066","#ff0099","#ff00cc","#ff00ff","#003300","#003333","#003366","#003399",

-	"#0033cc","#0033ff","#333300","#333333","#333366","#333399","#3333cc","#3333ff",

-	"#663300","#663333","#663366","#663399","#6633cc","#6633ff","#993300","#993333",

-	"#993366","#993399","#9933cc","#9933ff","#cc3300","#cc3333","#cc3366","#cc3399",

-	"#cc33cc","#cc33ff","#ff3300","#ff3333","#ff3366","#ff3399","#ff33cc","#ff33ff",

-	"#006600","#006633","#006666","#006699","#0066cc","#0066ff","#336600","#336633",

-	"#336666","#336699","#3366cc","#3366ff","#666600","#666633","#666666","#666699",

-	"#6666cc","#6666ff","#996600","#996633","#996666","#996699","#9966cc","#9966ff",

-	"#cc6600","#cc6633","#cc6666","#cc6699","#cc66cc","#cc66ff","#ff6600","#ff6633",

-	"#ff6666","#ff6699","#ff66cc","#ff66ff","#009900","#009933","#009966","#009999",

-	"#0099cc","#0099ff","#339900","#339933","#339966","#339999","#3399cc","#3399ff",

-	"#669900","#669933","#669966","#669999","#6699cc","#6699ff","#999900","#999933",

-	"#999966","#999999","#9999cc","#9999ff","#cc9900","#cc9933","#cc9966","#cc9999",

-	"#cc99cc","#cc99ff","#ff9900","#ff9933","#ff9966","#ff9999","#ff99cc","#ff99ff",

-	"#00cc00","#00cc33","#00cc66","#00cc99","#00cccc","#00ccff","#33cc00","#33cc33",

-	"#33cc66","#33cc99","#33cccc","#33ccff","#66cc00","#66cc33","#66cc66","#66cc99",

-	"#66cccc","#66ccff","#99cc00","#99cc33","#99cc66","#99cc99","#99cccc","#99ccff",

-	"#cccc00","#cccc33","#cccc66","#cccc99","#cccccc","#ccccff","#ffcc00","#ffcc33",

-	"#ffcc66","#ffcc99","#ffcccc","#ffccff","#00ff00","#00ff33","#00ff66","#00ff99",

-	"#00ffcc","#00ffff","#33ff00","#33ff33","#33ff66","#33ff99","#33ffcc","#33ffff",

-	"#66ff00","#66ff33","#66ff66","#66ff99","#66ffcc","#66ffff","#99ff00","#99ff33",

-	"#99ff66","#99ff99","#99ffcc","#99ffff","#ccff00","#ccff33","#ccff66","#ccff99",

-	"#ccffcc","#ccffff","#ffff00","#ffff33","#ffff66","#ffff99","#ffffcc","#ffffff"

-];

-

-var named = {

-	'#F0F8FF':'AliceBlue','#FAEBD7':'AntiqueWhite','#00FFFF':'Aqua','#7FFFD4':'Aquamarine','#F0FFFF':'Azure','#F5F5DC':'Beige',

-	'#FFE4C4':'Bisque','#000000':'Black','#FFEBCD':'BlanchedAlmond','#0000FF':'Blue','#8A2BE2':'BlueViolet','#A52A2A':'Brown',

-	'#DEB887':'BurlyWood','#5F9EA0':'CadetBlue','#7FFF00':'Chartreuse','#D2691E':'Chocolate','#FF7F50':'Coral','#6495ED':'CornflowerBlue',

-	'#FFF8DC':'Cornsilk','#DC143C':'Crimson','#00FFFF':'Cyan','#00008B':'DarkBlue','#008B8B':'DarkCyan','#B8860B':'DarkGoldenRod',

-	'#A9A9A9':'DarkGray','#A9A9A9':'DarkGrey','#006400':'DarkGreen','#BDB76B':'DarkKhaki','#8B008B':'DarkMagenta','#556B2F':'DarkOliveGreen',

-	'#FF8C00':'Darkorange','#9932CC':'DarkOrchid','#8B0000':'DarkRed','#E9967A':'DarkSalmon','#8FBC8F':'DarkSeaGreen','#483D8B':'DarkSlateBlue',

-	'#2F4F4F':'DarkSlateGray','#2F4F4F':'DarkSlateGrey','#00CED1':'DarkTurquoise','#9400D3':'DarkViolet','#FF1493':'DeepPink','#00BFFF':'DeepSkyBlue',

-	'#696969':'DimGray','#696969':'DimGrey','#1E90FF':'DodgerBlue','#B22222':'FireBrick','#FFFAF0':'FloralWhite','#228B22':'ForestGreen',

-	'#FF00FF':'Fuchsia','#DCDCDC':'Gainsboro','#F8F8FF':'GhostWhite','#FFD700':'Gold','#DAA520':'GoldenRod','#808080':'Gray','#808080':'Grey',

-	'#008000':'Green','#ADFF2F':'GreenYellow','#F0FFF0':'HoneyDew','#FF69B4':'HotPink','#CD5C5C':'IndianRed','#4B0082':'Indigo','#FFFFF0':'Ivory',

-	'#F0E68C':'Khaki','#E6E6FA':'Lavender','#FFF0F5':'LavenderBlush','#7CFC00':'LawnGreen','#FFFACD':'LemonChiffon','#ADD8E6':'LightBlue',

-	'#F08080':'LightCoral','#E0FFFF':'LightCyan','#FAFAD2':'LightGoldenRodYellow','#D3D3D3':'LightGray','#D3D3D3':'LightGrey','#90EE90':'LightGreen',

-	'#FFB6C1':'LightPink','#FFA07A':'LightSalmon','#20B2AA':'LightSeaGreen','#87CEFA':'LightSkyBlue','#778899':'LightSlateGray','#778899':'LightSlateGrey',

-	'#B0C4DE':'LightSteelBlue','#FFFFE0':'LightYellow','#00FF00':'Lime','#32CD32':'LimeGreen','#FAF0E6':'Linen','#FF00FF':'Magenta','#800000':'Maroon',

-	'#66CDAA':'MediumAquaMarine','#0000CD':'MediumBlue','#BA55D3':'MediumOrchid','#9370D8':'MediumPurple','#3CB371':'MediumSeaGreen','#7B68EE':'MediumSlateBlue',

-	'#00FA9A':'MediumSpringGreen','#48D1CC':'MediumTurquoise','#C71585':'MediumVioletRed','#191970':'MidnightBlue','#F5FFFA':'MintCream','#FFE4E1':'MistyRose','#FFE4B5':'Moccasin',

-	'#FFDEAD':'NavajoWhite','#000080':'Navy','#FDF5E6':'OldLace','#808000':'Olive','#6B8E23':'OliveDrab','#FFA500':'Orange','#FF4500':'OrangeRed','#DA70D6':'Orchid',

-	'#EEE8AA':'PaleGoldenRod','#98FB98':'PaleGreen','#AFEEEE':'PaleTurquoise','#D87093':'PaleVioletRed','#FFEFD5':'PapayaWhip','#FFDAB9':'PeachPuff',

-	'#CD853F':'Peru','#FFC0CB':'Pink','#DDA0DD':'Plum','#B0E0E6':'PowderBlue','#800080':'Purple','#FF0000':'Red','#BC8F8F':'RosyBrown','#4169E1':'RoyalBlue',

-	'#8B4513':'SaddleBrown','#FA8072':'Salmon','#F4A460':'SandyBrown','#2E8B57':'SeaGreen','#FFF5EE':'SeaShell','#A0522D':'Sienna','#C0C0C0':'Silver',

-	'#87CEEB':'SkyBlue','#6A5ACD':'SlateBlue','#708090':'SlateGray','#708090':'SlateGrey','#FFFAFA':'Snow','#00FF7F':'SpringGreen',

-	'#4682B4':'SteelBlue','#D2B48C':'Tan','#008080':'Teal','#D8BFD8':'Thistle','#FF6347':'Tomato','#40E0D0':'Turquoise','#EE82EE':'Violet',

-	'#F5DEB3':'Wheat','#FFFFFF':'White','#F5F5F5':'WhiteSmoke','#FFFF00':'Yellow','#9ACD32':'YellowGreen'

-};

-

-function init() {

-	var inputColor = convertRGBToHex(tinyMCEPopup.getWindowArg('input_color'));

-

-	tinyMCEPopup.resizeToInnerSize();

-

-	generatePicker();

-

-	if (inputColor) {

-		changeFinalColor(inputColor);

-

-		col = convertHexToRGB(inputColor);

-

-		if (col)

-			updateLight(col.r, col.g, col.b);

-	}

-}

-

-function insertAction() {

-	var color = document.getElementById("color").value, f = tinyMCEPopup.getWindowArg('func');

-

-	tinyMCEPopup.restoreSelection();

-

-	if (f)

-		f(color);

-

-	tinyMCEPopup.close();

-}

-

-function showColor(color, name) {

-	if (name)

-		document.getElementById("colorname").innerHTML = name;

-

-	document.getElementById("preview").style.backgroundColor = color;

-	document.getElementById("color").value = color.toLowerCase();

-}

-

-function convertRGBToHex(col) {

-	var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");

-

-	if (!col)

-		return col;

-

-	var rgb = col.replace(re, "$1,$2,$3").split(',');

-	if (rgb.length == 3) {

-		r = parseInt(rgb[0]).toString(16);

-		g = parseInt(rgb[1]).toString(16);

-		b = parseInt(rgb[2]).toString(16);

-

-		r = r.length == 1 ? '0' + r : r;

-		g = g.length == 1 ? '0' + g : g;

-		b = b.length == 1 ? '0' + b : b;

-

-		return "#" + r + g + b;

-	}

-

-	return col;

-}

-

-function convertHexToRGB(col) {

-	if (col.indexOf('#') != -1) {

-		col = col.replace(new RegExp('[^0-9A-F]', 'gi'), '');

-

-		r = parseInt(col.substring(0, 2), 16);

-		g = parseInt(col.substring(2, 4), 16);

-		b = parseInt(col.substring(4, 6), 16);

-

-		return {r : r, g : g, b : b};

-	}

-

-	return null;

-}

-

-function generatePicker() {

-	var el = document.getElementById('light'), h = '', i;

-

-	for (i = 0; i < detail; i++){

-		h += '<div id="gs'+i+'" style="background-color:#000000; width:15px; height:3px; border-style:none; border-width:0px;"'

-		+ ' onclick="changeFinalColor(this.style.backgroundColor)"'

-		+ ' onmousedown="isMouseDown = true; return false;"'

-		+ ' onmouseup="isMouseDown = false;"'

-		+ ' onmousemove="if (isMouseDown && isMouseOver) changeFinalColor(this.style.backgroundColor); return false;"'

-		+ ' onmouseover="isMouseOver = true;"'

-		+ ' onmouseout="isMouseOver = false;"'

-		+ '></div>';

-	}

-

-	el.innerHTML = h;

-}

-

-function generateWebColors() {

-	var el = document.getElementById('webcolors'), h = '', i;

-

-	if (el.className == 'generated')

-		return;

-

-	h += '<table border="0" cellspacing="1" cellpadding="0">'

-		+ '<tr>';

-

-	for (i=0; i<colors.length; i++) {

-		h += '<td bgcolor="' + colors[i] + '" width="10" height="10">'

-			+ '<a href="javascript:insertAction();" onfocus="showColor(\'' + colors[i] +  '\');" onmouseover="showColor(\'' + colors[i] +  '\');" style="display:block;width:10px;height:10px;overflow:hidden;">'

-			+ '</a></td>';

-		if ((i+1) % 18 == 0)

-			h += '</tr><tr>';

-	}

-

-	h += '</table>';

-

-	el.innerHTML = h;

-	el.className = 'generated';

-}

-

-function generateNamedColors() {

-	var el = document.getElementById('namedcolors'), h = '', n, v, i = 0;

-

-	if (el.className == 'generated')

-		return;

-

-	for (n in named) {

-		v = named[n];

-		h += '<a href="javascript:insertAction();" onmouseover="showColor(\'' + n +  '\',\'' + v + '\');" style="background-color: ' + n + '"><!-- IE --></a>'

-	}

-

-	el.innerHTML = h;

-	el.className = 'generated';

-}

-

-function dechex(n) {

-	return strhex.charAt(Math.floor(n / 16)) + strhex.charAt(n % 16);

-}

-

-function computeColor(e) {

-	var x, y, partWidth, partDetail, imHeight, r, g, b, coef, i, finalCoef, finalR, finalG, finalB;

-

-	x = e.offsetX ? e.offsetX : (e.target ? e.clientX - e.target.x : 0);

-	y = e.offsetY ? e.offsetY : (e.target ? e.clientY - e.target.y : 0);

-

-	partWidth = document.getElementById('colors').width / 6;

-	partDetail = detail / 2;

-	imHeight = document.getElementById('colors').height;

-

-	r = (x >= 0)*(x < partWidth)*255 + (x >= partWidth)*(x < 2*partWidth)*(2*255 - x * 255 / partWidth) + (x >= 4*partWidth)*(x < 5*partWidth)*(-4*255 + x * 255 / partWidth) + (x >= 5*partWidth)*(x < 6*partWidth)*255;

-	g = (x >= 0)*(x < partWidth)*(x * 255 / partWidth) + (x >= partWidth)*(x < 3*partWidth)*255	+ (x >= 3*partWidth)*(x < 4*partWidth)*(4*255 - x * 255 / partWidth);

-	b = (x >= 2*partWidth)*(x < 3*partWidth)*(-2*255 + x * 255 / partWidth) + (x >= 3*partWidth)*(x < 5*partWidth)*255 + (x >= 5*partWidth)*(x < 6*partWidth)*(6*255 - x * 255 / partWidth);

-

-	coef = (imHeight - y) / imHeight;

-	r = 128 + (r - 128) * coef;

-	g = 128 + (g - 128) * coef;

-	b = 128 + (b - 128) * coef;

-

-	changeFinalColor('#' + dechex(r) + dechex(g) + dechex(b));

-	updateLight(r, g, b);

-}

-

-function updateLight(r, g, b) {

-	var i, partDetail = detail / 2, finalCoef, finalR, finalG, finalB, color;

-

-	for (i=0; i<detail; i++) {

-		if ((i>=0) && (i<partDetail)) {

-			finalCoef = i / partDetail;

-			finalR = dechex(255 - (255 - r) * finalCoef);

-			finalG = dechex(255 - (255 - g) * finalCoef);

-			finalB = dechex(255 - (255 - b) * finalCoef);

-		} else {

-			finalCoef = 2 - i / partDetail;

-			finalR = dechex(r * finalCoef);

-			finalG = dechex(g * finalCoef);

-			finalB = dechex(b * finalCoef);

-		}

-

-		color = finalR + finalG + finalB;

-

-		setCol('gs' + i, '#'+color);

-	}

-}

-

-function changeFinalColor(color) {

-	if (color.indexOf('#') == -1)

-		color = convertRGBToHex(color);

-

-	setCol('preview', color);

-	document.getElementById('color').value = color;

-}

-

-function setCol(e, c) {

-	try {

-		document.getElementById(e).style.backgroundColor = c;

-	} catch (ex) {

-		// Ignore IE warning

-	}

-}

-

-tinyMCEPopup.onInit.add(init);

+tinyMCEPopup.requireLangPack();
+
+var detail = 50, strhex = "0123456789abcdef", i, isMouseDown = false, isMouseOver = false;
+
+var colors = [
+	"#000000","#000033","#000066","#000099","#0000cc","#0000ff","#330000","#330033",
+	"#330066","#330099","#3300cc","#3300ff","#660000","#660033","#660066","#660099",
+	"#6600cc","#6600ff","#990000","#990033","#990066","#990099","#9900cc","#9900ff",
+	"#cc0000","#cc0033","#cc0066","#cc0099","#cc00cc","#cc00ff","#ff0000","#ff0033",
+	"#ff0066","#ff0099","#ff00cc","#ff00ff","#003300","#003333","#003366","#003399",
+	"#0033cc","#0033ff","#333300","#333333","#333366","#333399","#3333cc","#3333ff",
+	"#663300","#663333","#663366","#663399","#6633cc","#6633ff","#993300","#993333",
+	"#993366","#993399","#9933cc","#9933ff","#cc3300","#cc3333","#cc3366","#cc3399",
+	"#cc33cc","#cc33ff","#ff3300","#ff3333","#ff3366","#ff3399","#ff33cc","#ff33ff",
+	"#006600","#006633","#006666","#006699","#0066cc","#0066ff","#336600","#336633",
+	"#336666","#336699","#3366cc","#3366ff","#666600","#666633","#666666","#666699",
+	"#6666cc","#6666ff","#996600","#996633","#996666","#996699","#9966cc","#9966ff",
+	"#cc6600","#cc6633","#cc6666","#cc6699","#cc66cc","#cc66ff","#ff6600","#ff6633",
+	"#ff6666","#ff6699","#ff66cc","#ff66ff","#009900","#009933","#009966","#009999",
+	"#0099cc","#0099ff","#339900","#339933","#339966","#339999","#3399cc","#3399ff",
+	"#669900","#669933","#669966","#669999","#6699cc","#6699ff","#999900","#999933",
+	"#999966","#999999","#9999cc","#9999ff","#cc9900","#cc9933","#cc9966","#cc9999",
+	"#cc99cc","#cc99ff","#ff9900","#ff9933","#ff9966","#ff9999","#ff99cc","#ff99ff",
+	"#00cc00","#00cc33","#00cc66","#00cc99","#00cccc","#00ccff","#33cc00","#33cc33",
+	"#33cc66","#33cc99","#33cccc","#33ccff","#66cc00","#66cc33","#66cc66","#66cc99",
+	"#66cccc","#66ccff","#99cc00","#99cc33","#99cc66","#99cc99","#99cccc","#99ccff",
+	"#cccc00","#cccc33","#cccc66","#cccc99","#cccccc","#ccccff","#ffcc00","#ffcc33",
+	"#ffcc66","#ffcc99","#ffcccc","#ffccff","#00ff00","#00ff33","#00ff66","#00ff99",
+	"#00ffcc","#00ffff","#33ff00","#33ff33","#33ff66","#33ff99","#33ffcc","#33ffff",
+	"#66ff00","#66ff33","#66ff66","#66ff99","#66ffcc","#66ffff","#99ff00","#99ff33",
+	"#99ff66","#99ff99","#99ffcc","#99ffff","#ccff00","#ccff33","#ccff66","#ccff99",
+	"#ccffcc","#ccffff","#ffff00","#ffff33","#ffff66","#ffff99","#ffffcc","#ffffff"
+];
+
+var named = {
+	'#F0F8FF':'Alice Blue','#FAEBD7':'Antique White','#00FFFF':'Aqua','#7FFFD4':'Aquamarine','#F0FFFF':'Azure','#F5F5DC':'Beige',
+	'#FFE4C4':'Bisque','#000000':'Black','#FFEBCD':'Blanched Almond','#0000FF':'Blue','#8A2BE2':'Blue Violet','#A52A2A':'Brown',
+	'#DEB887':'Burly Wood','#5F9EA0':'Cadet Blue','#7FFF00':'Chartreuse','#D2691E':'Chocolate','#FF7F50':'Coral','#6495ED':'Cornflower Blue',
+	'#FFF8DC':'Cornsilk','#DC143C':'Crimson','#00FFFF':'Cyan','#00008B':'Dark Blue','#008B8B':'Dark Cyan','#B8860B':'Dark Golden Rod',
+	'#A9A9A9':'Dark Gray','#A9A9A9':'Dark Grey','#006400':'Dark Green','#BDB76B':'Dark Khaki','#8B008B':'Dark Magenta','#556B2F':'Dark Olive Green',
+	'#FF8C00':'Darkorange','#9932CC':'Dark Orchid','#8B0000':'Dark Red','#E9967A':'Dark Salmon','#8FBC8F':'Dark Sea Green','#483D8B':'Dark Slate Blue',
+	'#2F4F4F':'Dark Slate Gray','#2F4F4F':'Dark Slate Grey','#00CED1':'Dark Turquoise','#9400D3':'Dark Violet','#FF1493':'Deep Pink','#00BFFF':'Deep Sky Blue',
+	'#696969':'Dim Gray','#696969':'Dim Grey','#1E90FF':'Dodger Blue','#B22222':'Fire Brick','#FFFAF0':'Floral White','#228B22':'Forest Green',
+	'#FF00FF':'Fuchsia','#DCDCDC':'Gainsboro','#F8F8FF':'Ghost White','#FFD700':'Gold','#DAA520':'Golden Rod','#808080':'Gray','#808080':'Grey',
+	'#008000':'Green','#ADFF2F':'Green Yellow','#F0FFF0':'Honey Dew','#FF69B4':'Hot Pink','#CD5C5C':'Indian Red','#4B0082':'Indigo','#FFFFF0':'Ivory',
+	'#F0E68C':'Khaki','#E6E6FA':'Lavender','#FFF0F5':'Lavender Blush','#7CFC00':'Lawn Green','#FFFACD':'Lemon Chiffon','#ADD8E6':'Light Blue',
+	'#F08080':'Light Coral','#E0FFFF':'Light Cyan','#FAFAD2':'Light Golden Rod Yellow','#D3D3D3':'Light Gray','#D3D3D3':'Light Grey','#90EE90':'Light Green',
+	'#FFB6C1':'Light Pink','#FFA07A':'Light Salmon','#20B2AA':'Light Sea Green','#87CEFA':'Light Sky Blue','#778899':'Light Slate Gray','#778899':'Light Slate Grey',
+	'#B0C4DE':'Light Steel Blue','#FFFFE0':'Light Yellow','#00FF00':'Lime','#32CD32':'Lime Green','#FAF0E6':'Linen','#FF00FF':'Magenta','#800000':'Maroon',
+	'#66CDAA':'Medium Aqua Marine','#0000CD':'Medium Blue','#BA55D3':'Medium Orchid','#9370D8':'Medium Purple','#3CB371':'Medium Sea Green','#7B68EE':'Medium Slate Blue',
+	'#00FA9A':'Medium Spring Green','#48D1CC':'Medium Turquoise','#C71585':'Medium Violet Red','#191970':'Midnight Blue','#F5FFFA':'Mint Cream','#FFE4E1':'Misty Rose','#FFE4B5':'Moccasin',
+	'#FFDEAD':'Navajo White','#000080':'Navy','#FDF5E6':'Old Lace','#808000':'Olive','#6B8E23':'Olive Drab','#FFA500':'Orange','#FF4500':'Orange Red','#DA70D6':'Orchid',
+	'#EEE8AA':'Pale Golden Rod','#98FB98':'Pale Green','#AFEEEE':'Pale Turquoise','#D87093':'Pale Violet Red','#FFEFD5':'Papaya Whip','#FFDAB9':'Peach Puff',
+	'#CD853F':'Peru','#FFC0CB':'Pink','#DDA0DD':'Plum','#B0E0E6':'Powder Blue','#800080':'Purple','#FF0000':'Red','#BC8F8F':'Rosy Brown','#4169E1':'Royal Blue',
+	'#8B4513':'Saddle Brown','#FA8072':'Salmon','#F4A460':'Sandy Brown','#2E8B57':'Sea Green','#FFF5EE':'Sea Shell','#A0522D':'Sienna','#C0C0C0':'Silver',
+	'#87CEEB':'Sky Blue','#6A5ACD':'Slate Blue','#708090':'Slate Gray','#708090':'Slate Grey','#FFFAFA':'Snow','#00FF7F':'Spring Green',
+	'#4682B4':'Steel Blue','#D2B48C':'Tan','#008080':'Teal','#D8BFD8':'Thistle','#FF6347':'Tomato','#40E0D0':'Turquoise','#EE82EE':'Violet',
+	'#F5DEB3':'Wheat','#FFFFFF':'White','#F5F5F5':'White Smoke','#FFFF00':'Yellow','#9ACD32':'Yellow Green'
+};
+
+var namedLookup = {};
+
+function init() {
+	var inputColor = convertRGBToHex(tinyMCEPopup.getWindowArg('input_color')), key, value;
+
+	tinyMCEPopup.resizeToInnerSize();
+
+	generatePicker();
+	generateWebColors();
+	generateNamedColors();
+
+	if (inputColor) {
+		changeFinalColor(inputColor);
+
+		col = convertHexToRGB(inputColor);
+
+		if (col)
+			updateLight(col.r, col.g, col.b);
+	}
+
+	for (key in named) {
+		value = named[key];
+		namedLookup[value.replace(/\s+/, '').toLowerCase()] = key.replace(/#/, '').toLowerCase();
+	}
+}
+
+function toHexColor(color) {
+	var matches, red, green, blue, toInt = parseInt;
+
+	function hex(value) {
+		value = parseInt(value).toString(16);
+
+		return value.length > 1 ? value : '0' + value; // Padd with leading zero
+	};
+
+	color = tinymce.trim(color);
+	color = color.replace(/^[#]/, '').toLowerCase();  // remove leading '#'
+	color = namedLookup[color] || color;
+
+	matches = /^rgb\((\d{1,3}),(\d{1,3}),(\d{1,3})\)$/.exec(color);
+
+	if (matches) {
+		red   = toInt(matches[1]);
+		green = toInt(matches[2]);
+		blue  = toInt(matches[3]);
+	} else {
+		matches = /^([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/.exec(color);
+
+		if (matches) {
+			red   = toInt(matches[1], 16);
+			green = toInt(matches[2], 16);
+			blue  = toInt(matches[3], 16);
+		} else {
+			matches = /^([0-9a-f])([0-9a-f])([0-9a-f])$/.exec(color);
+
+			if (matches) {
+				red   = toInt(matches[1] + matches[1], 16);
+				green = toInt(matches[2] + matches[2], 16);
+				blue  = toInt(matches[3] + matches[3], 16);
+			} else {
+				return '';
+			}
+		}
+	}
+
+	return '#' + hex(red) + hex(green) + hex(blue);
+}
+
+function insertAction() {
+	var color = document.getElementById("color").value, f = tinyMCEPopup.getWindowArg('func');
+
+	var hexColor = toHexColor(color);
+
+	if (hexColor === '') {
+		var text = tinyMCEPopup.editor.getLang('advanced_dlg.invalid_color_value');
+		tinyMCEPopup.alert(text + ': ' + color);
+	}
+	else {
+		tinyMCEPopup.restoreSelection();
+
+		if (f)
+			f(hexColor);
+
+		tinyMCEPopup.close();
+	}
+}
+
+function showColor(color, name) {
+	if (name)
+		document.getElementById("colorname").innerHTML = name;
+
+	document.getElementById("preview").style.backgroundColor = color;
+	document.getElementById("color").value = color.toUpperCase();
+}
+
+function convertRGBToHex(col) {
+	var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");
+
+	if (!col)
+		return col;
+
+	var rgb = col.replace(re, "$1,$2,$3").split(',');
+	if (rgb.length == 3) {
+		r = parseInt(rgb[0]).toString(16);
+		g = parseInt(rgb[1]).toString(16);
+		b = parseInt(rgb[2]).toString(16);
+
+		r = r.length == 1 ? '0' + r : r;
+		g = g.length == 1 ? '0' + g : g;
+		b = b.length == 1 ? '0' + b : b;
+
+		return "#" + r + g + b;
+	}
+
+	return col;
+}
+
+function convertHexToRGB(col) {
+	if (col.indexOf('#') != -1) {
+		col = col.replace(new RegExp('[^0-9A-F]', 'gi'), '');
+
+		r = parseInt(col.substring(0, 2), 16);
+		g = parseInt(col.substring(2, 4), 16);
+		b = parseInt(col.substring(4, 6), 16);
+
+		return {r : r, g : g, b : b};
+	}
+
+	return null;
+}
+
+function generatePicker() {
+	var el = document.getElementById('light'), h = '', i;
+
+	for (i = 0; i < detail; i++){
+		h += '<div id="gs'+i+'" style="background-color:#000000; width:15px; height:3px; border-style:none; border-width:0px;"'
+		+ ' onclick="changeFinalColor(this.style.backgroundColor)"'
+		+ ' onmousedown="isMouseDown = true; return false;"'
+		+ ' onmouseup="isMouseDown = false;"'
+		+ ' onmousemove="if (isMouseDown && isMouseOver) changeFinalColor(this.style.backgroundColor); return false;"'
+		+ ' onmouseover="isMouseOver = true;"'
+		+ ' onmouseout="isMouseOver = false;"'
+		+ '></div>';
+	}
+
+	el.innerHTML = h;
+}
+
+function generateWebColors() {
+	var el = document.getElementById('webcolors'), h = '', i;
+
+	if (el.className == 'generated')
+		return;
+
+	// TODO: VoiceOver doesn't seem to support legend as a label referenced by labelledby.
+	h += '<div role="listbox" aria-labelledby="webcolors_title" tabindex="0"><table role="presentation" border="0" cellspacing="1" cellpadding="0">'
+		+ '<tr>';
+
+	for (i=0; i<colors.length; i++) {
+		h += '<td bgcolor="' + colors[i] + '" width="10" height="10">'
+			+ '<a href="javascript:insertAction();" role="option" tabindex="-1" aria-labelledby="web_colors_' + i + '" onfocus="showColor(\'' + colors[i] + '\');" onmouseover="showColor(\'' + colors[i] + '\');" style="display:block;width:10px;height:10px;overflow:hidden;">';
+		if (tinyMCEPopup.editor.forcedHighContrastMode) {
+			h += '<canvas class="mceColorSwatch" height="10" width="10" data-color="' + colors[i] + '"></canvas>';
+		}
+		h += '<span class="mceVoiceLabel" style="display:none;" id="web_colors_' + i + '">' + colors[i].toUpperCase() + '</span>';
+		h += '</a></td>';
+		if ((i+1) % 18 == 0)
+			h += '</tr><tr>';
+	}
+
+	h += '</table></div>';
+
+	el.innerHTML = h;
+	el.className = 'generated';
+
+	paintCanvas(el);
+	enableKeyboardNavigation(el.firstChild);
+}
+
+function paintCanvas(el) {
+	tinyMCEPopup.getWin().tinymce.each(tinyMCEPopup.dom.select('canvas.mceColorSwatch', el), function(canvas) {
+		var context;
+		if (canvas.getContext && (context = canvas.getContext("2d"))) {
+			context.fillStyle = canvas.getAttribute('data-color');
+			context.fillRect(0, 0, 10, 10);
+		}
+	});
+}
+function generateNamedColors() {
+	var el = document.getElementById('namedcolors'), h = '', n, v, i = 0;
+
+	if (el.className == 'generated')
+		return;
+
+	for (n in named) {
+		v = named[n];
+		h += '<a href="javascript:insertAction();" role="option" tabindex="-1" aria-labelledby="named_colors_' + i + '" onfocus="showColor(\'' + n + '\',\'' + v + '\');" onmouseover="showColor(\'' + n + '\',\'' + v + '\');" style="background-color: ' + n + '">';
+		if (tinyMCEPopup.editor.forcedHighContrastMode) {
+			h += '<canvas class="mceColorSwatch" height="10" width="10" data-color="' + colors[i] + '"></canvas>';
+		}
+		h += '<span class="mceVoiceLabel" style="display:none;" id="named_colors_' + i + '">' + v + '</span>';
+		h += '</a>';
+		i++;
+	}
+
+	el.innerHTML = h;
+	el.className = 'generated';
+
+	paintCanvas(el);
+	enableKeyboardNavigation(el);
+}
+
+function enableKeyboardNavigation(el) {
+	tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', {
+		root: el,
+		items: tinyMCEPopup.dom.select('a', el)
+	}, tinyMCEPopup.dom);
+}
+
+function dechex(n) {
+	return strhex.charAt(Math.floor(n / 16)) + strhex.charAt(n % 16);
+}
+
+function computeColor(e) {
+	var x, y, partWidth, partDetail, imHeight, r, g, b, coef, i, finalCoef, finalR, finalG, finalB, pos = tinyMCEPopup.dom.getPos(e.target);
+
+	x = e.offsetX ? e.offsetX : (e.target ? e.clientX - pos.x : 0);
+	y = e.offsetY ? e.offsetY : (e.target ? e.clientY - pos.y : 0);
+
+	partWidth = document.getElementById('colors').width / 6;
+	partDetail = detail / 2;
+	imHeight = document.getElementById('colors').height;
+
+	r = (x >= 0)*(x < partWidth)*255 + (x >= partWidth)*(x < 2*partWidth)*(2*255 - x * 255 / partWidth) + (x >= 4*partWidth)*(x < 5*partWidth)*(-4*255 + x * 255 / partWidth) + (x >= 5*partWidth)*(x < 6*partWidth)*255;
+	g = (x >= 0)*(x < partWidth)*(x * 255 / partWidth) + (x >= partWidth)*(x < 3*partWidth)*255	+ (x >= 3*partWidth)*(x < 4*partWidth)*(4*255 - x * 255 / partWidth);
+	b = (x >= 2*partWidth)*(x < 3*partWidth)*(-2*255 + x * 255 / partWidth) + (x >= 3*partWidth)*(x < 5*partWidth)*255 + (x >= 5*partWidth)*(x < 6*partWidth)*(6*255 - x * 255 / partWidth);
+
+	coef = (imHeight - y) / imHeight;
+	r = 128 + (r - 128) * coef;
+	g = 128 + (g - 128) * coef;
+	b = 128 + (b - 128) * coef;
+
+	changeFinalColor('#' + dechex(r) + dechex(g) + dechex(b));
+	updateLight(r, g, b);
+}
+
+function updateLight(r, g, b) {
+	var i, partDetail = detail / 2, finalCoef, finalR, finalG, finalB, color;
+
+	for (i=0; i<detail; i++) {
+		if ((i>=0) && (i<partDetail)) {
+			finalCoef = i / partDetail;
+			finalR = dechex(255 - (255 - r) * finalCoef);
+			finalG = dechex(255 - (255 - g) * finalCoef);
+			finalB = dechex(255 - (255 - b) * finalCoef);
+		} else {
+			finalCoef = 2 - i / partDetail;
+			finalR = dechex(r * finalCoef);
+			finalG = dechex(g * finalCoef);
+			finalB = dechex(b * finalCoef);
+		}
+
+		color = finalR + finalG + finalB;
+
+		setCol('gs' + i, '#'+color);
+	}
+}
+
+function changeFinalColor(color) {
+	if (color.indexOf('#') == -1)
+		color = convertRGBToHex(color);
+
+	setCol('preview', color);
+	document.getElementById('color').value = color;
+}
+
+function setCol(e, c) {
+	try {
+		document.getElementById(e).style.backgroundColor = c;
+	} catch (ex) {
+		// Ignore IE warning
+	}
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
index 6423d9080..6c2489a16 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
@@ -18,7 +18,7 @@ var ImageDialog = {
 

 		e = ed.selection.getNode();

 

-		this.fillFileList('image_list', 'tinyMCEImageList');

+		this.fillFileList('image_list', tinyMCEPopup.getParam('external_image_list', 'tinyMCEImageList'));

 

 		if (e.nodeName == 'IMG') {

 			f.src.value = ed.dom.getAttrib(e, 'src');

@@ -39,7 +39,7 @@ var ImageDialog = {
 	fillFileList : function(id, l) {

 		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;

 

-		l = window[l];

+		l = typeof(l) === 'function' ? l() : window[l];

 

 		if (l && l.length > 0) {

 			lst.options[lst.options.length] = new Option('', '');

@@ -77,7 +77,7 @@ var ImageDialog = {
 			args.style = this.styleVal;

 

 		tinymce.extend(args, {

-			src : f.src.value,

+			src : f.src.value.replace(/ /g, '%20'),

 			alt : f.alt.value,

 			width : f.width.value,

 			height : f.height.value

@@ -87,10 +87,16 @@ var ImageDialog = {
 

 		if (el && el.nodeName == 'IMG') {

 			ed.dom.setAttribs(el, args);

+			tinyMCEPopup.editor.execCommand('mceRepaint');

+			tinyMCEPopup.editor.focus();

 		} else {

-			ed.execCommand('mceInsertContent', false, '<img id="__mce_tmp" />', {skip_undo : 1});

-			ed.dom.setAttribs('__mce_tmp', args);

-			ed.dom.setAttrib('__mce_tmp', 'id', '');

+			tinymce.each(args, function(value, name) {

+				if (value === "") {

+					delete args[name];

+				}

+			});

+

+			ed.execCommand('mceInsertContent', false, tinyMCEPopup.editor.dom.createHTML('img', args), {skip_undo : 1});

 			ed.undoManager.add();

 		}

 

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
index f67a5bc82..53ff409e7 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
@@ -31,7 +31,7 @@ var LinkDialog = {
 	},

 

 	update : function() {

-		var f = document.forms[0], ed = tinyMCEPopup.editor, e, b;

+		var f = document.forms[0], ed = tinyMCEPopup.editor, e, b, href = f.href.value.replace(/ /g, '%20');

 

 		tinyMCEPopup.restoreSelection();

 		e = ed.dom.getParent(ed.selection.getNode(), 'A');

@@ -39,7 +39,6 @@ var LinkDialog = {
 		// Remove element if there is no href

 		if (!f.href.value) {

 			if (e) {

-				tinyMCEPopup.execCommand("mceBeginUndoLevel");

 				b = ed.selection.getBookmark();

 				ed.dom.remove(e, 1);

 				ed.selection.moveToBookmark(b);

@@ -49,19 +48,17 @@ var LinkDialog = {
 			}

 		}

 

-		tinyMCEPopup.execCommand("mceBeginUndoLevel");

-

 		// Create new anchor elements

 		if (e == null) {

 			ed.getDoc().execCommand("unlink", false, null);

-			tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});

+			tinyMCEPopup.execCommand("mceInsertLink", false, "#mce_temp_url#", {skip_undo : 1});

 

 			tinymce.each(ed.dom.select("a"), function(n) {

 				if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') {

 					e = n;

 

 					ed.dom.setAttribs(e, {

-						href : f.href.value,

+						href : href,

 						title : f.linktitle.value,

 						target : f.target_list ? getSelectValue(f, "target_list") : null,

 						'class' : f.class_list ? getSelectValue(f, "class_list") : null

@@ -70,7 +67,7 @@ var LinkDialog = {
 			});

 		} else {

 			ed.dom.setAttribs(e, {

-				href : f.href.value,

+				href : href,

 				title : f.linktitle.value,

 				target : f.target_list ? getSelectValue(f, "target_list") : null,

 				'class' : f.class_list ? getSelectValue(f, "class_list") : null

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js
index 279328614..dd5e366fa 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js
@@ -16,7 +16,7 @@ function onLoadInit() {
 	document.getElementById('htmlSource').value = tinyMCEPopup.editor.getContent({source_view : true});

 

 	if (tinyMCEPopup.editor.getParam("theme_advanced_source_editor_wrap", true)) {

-		setWrap('soft');

+		turnWrapOn();

 		document.getElementById('wraped').checked = true;

 	}

 

@@ -37,26 +37,42 @@ function setWrap(val) {
 	}

 }

 

-function toggleWordWrap(elm) {

-	if (elm.checked)

-		setWrap('soft');

-	else

-		setWrap('off');

+function setWhiteSpaceCss(value) {

+	var el = document.getElementById('htmlSource');

+	tinymce.DOM.setStyle(el, 'white-space', value);

 }

 

-var wHeight=0, wWidth=0, owHeight=0, owWidth=0;

+function turnWrapOff() {

+	if (tinymce.isWebKit) {

+		setWhiteSpaceCss('pre');

+	} else {

+		setWrap('off');

+	}

+}

 

-function resizeInputs() {

-	var el = document.getElementById('htmlSource');

+function turnWrapOn() {

+	if (tinymce.isWebKit) {

+		setWhiteSpaceCss('pre-wrap');

+	} else {

+		setWrap('soft');

+	}

+}

 

-	if (!tinymce.isIE) {

-		 wHeight = self.innerHeight - 65;

-		 wWidth = self.innerWidth - 16;

+function toggleWordWrap(elm) {

+	if (elm.checked) {

+		turnWrapOn();

 	} else {

-		 wHeight = document.body.clientHeight - 70;

-		 wWidth = document.body.clientWidth - 16;

+		turnWrapOff();

 	}

+}

+

+function resizeInputs() {

+	var vp = tinyMCEPopup.dom.getViewPort(window), el;

 

-	el.style.height = Math.abs(wHeight) + 'px';

-	el.style.width  = Math.abs(wWidth) + 'px';

+	el = document.getElementById('htmlSource');

+

+	if (el) {

+		el.style.width = (vp.w - 20) + 'px';

+		el.style.height = (vp.h - 65) + 'px';

+	}

 }

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
index 502b00817..6e5848187 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
@@ -1,62 +1 @@
-tinyMCE.addI18n('en.advanced',{

-style_select:"Styles",

-font_size:"Font size",

-fontdefault:"Font family",

-block:"Format",

-paragraph:"Paragraph",

-div:"Div",

-address:"Address",

-pre:"Preformatted",

-h1:"Heading 1",

-h2:"Heading 2",

-h3:"Heading 3",

-h4:"Heading 4",

-h5:"Heading 5",

-h6:"Heading 6",

-blockquote:"Blockquote",

-code:"Code",

-samp:"Code sample",

-dt:"Definition term ",

-dd:"Definition description",

-bold_desc:"Bold (Ctrl+B)",

-italic_desc:"Italic (Ctrl+I)",

-underline_desc:"Underline (Ctrl+U)",

-striketrough_desc:"Strikethrough",

-justifyleft_desc:"Align left",

-justifycenter_desc:"Align center",

-justifyright_desc:"Align right",

-justifyfull_desc:"Align full",

-bullist_desc:"Unordered list",

-numlist_desc:"Ordered list",

-outdent_desc:"Outdent",

-indent_desc:"Indent",

-undo_desc:"Undo (Ctrl+Z)",

-redo_desc:"Redo (Ctrl+Y)",

-link_desc:"Insert/edit link",

-unlink_desc:"Unlink",

-image_desc:"Insert/edit image",

-cleanup_desc:"Cleanup messy code",

-code_desc:"Edit BBcode Source",

-sub_desc:"Subscript",

-sup_desc:"Superscript",

-hr_desc:"Insert horizontal ruler",

-removeformat_desc:"Remove formatting",

-custom1_desc:"Your custom description here",

-forecolor_desc:"Select text color",

-backcolor_desc:"Select background color",

-charmap_desc:"Insert custom character",

-visualaid_desc:"Toggle guidelines/invisible elements",

-anchor_desc:"Insert/edit anchor",

-cut_desc:"Cut",

-copy_desc:"Copy",

-paste_desc:"Paste",

-image_props_desc:"Image properties",

-newdocument_desc:"New document",

-help_desc:"Help",

-blockquote_desc:"Blockquote",

-clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\r\nDo you want more information about this issue?",

-path:"Path",

-newdocument:"Are you sure you want clear all contents?",

-toolbar_focus:"Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X",

-more_colors:"More colors"

-});
\ No newline at end of file
+tinyMCE.addI18n('en.advanced',{"underline_desc":"Underline (Ctrl+U)","italic_desc":"Italic (Ctrl+I)","bold_desc":"Bold (Ctrl+B)",dd:"Definition Description",dt:"Definition Term ",samp:"Code Sample",code:"Code",blockquote:"Block Quote",h6:"Heading 6",h5:"Heading 5",h4:"Heading 4",h3:"Heading 3",h2:"Heading 2",h1:"Heading 1",pre:"Preformatted",address:"Address",div:"DIV",paragraph:"Paragraph",block:"Format",fontdefault:"Font Family","font_size":"Font Size","style_select":"Styles","anchor_delta_height":"","anchor_delta_width":"","charmap_delta_height":"","charmap_delta_width":"","colorpicker_delta_height":"","colorpicker_delta_width":"","link_delta_height":"","link_delta_width":"","image_delta_height":"","image_delta_width":"","more_colors":"More Colors...","toolbar_focus":"Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X",newdocument:"Are you sure you want clear all contents?",path:"Path","clipboard_msg":"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?","blockquote_desc":"Block Quote","help_desc":"Help","newdocument_desc":"New Document","image_props_desc":"Image Properties","paste_desc":"Paste (Ctrl+V)","copy_desc":"Copy (Ctrl+C)","cut_desc":"Cut (Ctrl+X)","anchor_desc":"Insert/Edit Anchor","visualaid_desc":"show/Hide Guidelines/Invisible Elements","charmap_desc":"Insert Special Character","backcolor_desc":"Select Background Color","forecolor_desc":"Select Text Color","custom1_desc":"Your Custom Description Here","removeformat_desc":"Remove Formatting","hr_desc":"Insert Horizontal Line","sup_desc":"Superscript","sub_desc":"Subscript","code_desc":"Edit HTML Source","cleanup_desc":"Cleanup Messy Code","image_desc":"Insert/Edit Image","unlink_desc":"Unlink","link_desc":"Insert/Edit Link","redo_desc":"Redo (Ctrl+Y)","undo_desc":"Undo (Ctrl+Z)","indent_desc":"Increase Indent","outdent_desc":"Decrease Indent","numlist_desc":"Insert/Remove Numbered List","bullist_desc":"Insert/Remove Bulleted List","justifyfull_desc":"Align Full","justifyright_desc":"Align Right","justifycenter_desc":"Align Center","justifyleft_desc":"Align Left","striketrough_desc":"Strikethrough","help_shortcut":"Press ALT-F10 for toolbar. Press ALT-0 for help","rich_text_area":"Rich Text Area","shortcuts_desc":"Accessability Help",toolbar:"Toolbar"});
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
index ea5a6dae2..50cd87e3d 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
@@ -1,51 +1 @@
-tinyMCE.addI18n('en.advanced_dlg',{

-about_title:"About TinyMCE",

-about_general:"About",

-about_help:"Help",

-about_license:"License",

-about_plugins:"Plugins",

-about_plugin:"Plugin",

-about_author:"Author",

-about_version:"Version",

-about_loaded:"Loaded plugins",

-anchor_title:"Insert/edit anchor",

-anchor_name:"Anchor name",

-code_title:"BBcode Source Editor",

-code_wordwrap:"Word wrap",

-colorpicker_title:"Select a color",

-colorpicker_picker_tab:"Picker",

-colorpicker_picker_title:"Color picker",

-colorpicker_palette_tab:"Palette",

-colorpicker_palette_title:"Palette colors",

-colorpicker_named_tab:"Named",

-colorpicker_named_title:"Named colors",

-colorpicker_color:"Color:",

-colorpicker_name:"Name:",

-charmap_title:"Select custom character",

-image_title:"Insert/edit image",

-image_src:"Image URL",

-image_alt:"Image description",

-image_list:"Image list",

-image_border:"Border",

-image_dimensions:"Dimensions",

-image_vspace:"Vertical space",

-image_hspace:"Horizontal space",

-image_align:"Alignment",

-image_align_baseline:"Baseline",

-image_align_top:"Top",

-image_align_middle:"Middle",

-image_align_bottom:"Bottom",

-image_align_texttop:"Text top",

-image_align_textbottom:"Text bottom",

-image_align_left:"Left",

-image_align_right:"Right",

-link_title:"Insert/edit link",

-link_url:"Link URL",

-link_target:"Target",

-link_target_same:"Open link in the same window",

-link_target_blank:"Open link in a new window",

-link_titlefield:"Title",

-link_is_email:"The URL you entered seems to be an email address, do you want to add the required mailto: prefix?",

-link_is_external:"The URL you entered seems to external link, do you want to add the required http:// prefix?",

-link_list:"Link list"

-});
\ No newline at end of file
+tinyMCE.addI18n('en.advanced_dlg', {"link_list":"Link List","link_is_external":"The URL you entered seems to be an external link. Do you want to add the required http:// prefix?","link_is_email":"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?","link_titlefield":"Title","link_target_blank":"Open Link in a New Window","link_target_same":"Open Link in the Same Window","link_target":"Target","link_url":"Link URL","link_title":"Insert/Edit Link","image_align_right":"Right","image_align_left":"Left","image_align_textbottom":"Text Bottom","image_align_texttop":"Text Top","image_align_bottom":"Bottom","image_align_middle":"Middle","image_align_top":"Top","image_align_baseline":"Baseline","image_align":"Alignment","image_hspace":"Horizontal Space","image_vspace":"Vertical Space","image_dimensions":"Dimensions","image_alt":"Image Description","image_list":"Image List","image_border":"Border","image_src":"Image URL","image_title":"Insert/Edit Image","charmap_title":"Select Special Character", "charmap_usage":"Use left and right arrows to navigate.","colorpicker_name":"Name:","colorpicker_color":"Color:","colorpicker_named_title":"Named Colors","colorpicker_named_tab":"Named","colorpicker_palette_title":"Palette Colors","colorpicker_palette_tab":"Palette","colorpicker_picker_title":"Color Picker","colorpicker_picker_tab":"Picker","colorpicker_title":"Select a Color","code_wordwrap":"Word Wrap","code_title":"HTML Source Editor","anchor_name":"Anchor Name","anchor_title":"Insert/Edit Anchor","about_loaded":"Loaded Plugins","about_version":"Version","about_author":"Author","about_plugin":"Plugin","about_plugins":"Plugins","about_license":"License","about_help":"Help","about_general":"About","about_title":"About TinyMCE","anchor_invalid":"Please specify a valid anchor name.","accessibility_help":"Accessibility Help","accessibility_usage_title":"General Usage","invalid_color_value":"Invalid color value","":""});
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/link.htm b/library/tinymce/jscripts/tiny_mce/themes/advanced/link.htm
index 7565b9ae8..5d9dea9b8 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/link.htm
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/link.htm
@@ -18,34 +18,33 @@
 

 	<div class="panel_wrapper">

 		<div id="general_panel" class="panel current">

-

-		<table border="0" cellpadding="4" cellspacing="0">

-          <tr>

-            <td class="nowrap"><label for="href">{#advanced_dlg.link_url}</label></td>

-            <td><table border="0" cellspacing="0" cellpadding="0"> 

-				  <tr> 

-					<td><input id="href" name="href" type="text" class="mceFocus" value="" style="width: 200px" onchange="LinkDialog.checkPrefix(this);" /></td> 

-					<td id="hrefbrowsercontainer">&nbsp;</td>

-				  </tr> 

-				</table></td>

-          </tr>

-		  <tr>

-			<td><label for="link_list">{#advanced_dlg.link_list}</label></td>

-			<td><select id="link_list" name="link_list" onchange="document.getElementById('href').value=this.options[this.selectedIndex].value;"></select></td>

-		  </tr>

-		<tr>

-			<td><label id="targetlistlabel" for="targetlist">{#advanced_dlg.link_target}</label></td>

-			<td><select id="target_list" name="target_list"></select></td>

-		</tr>

-          <tr>

-            <td class="nowrap"><label for="linktitle">{#advanced_dlg.link_titlefield}</label></td>

-            <td><input id="linktitle" name="linktitle" type="text" value="" style="width: 200px" /></td>

-          </tr>

-			<tr>

-				<td><label for="class_list">{#class_name}</label></td>

-				<td><select id="class_list" name="class_list"></select></td>

-			</tr>

-        </table>

+			<table border="0" cellpadding="4" cellspacing="0">

+				<tr>

+					<td class="nowrap"><label for="href">{#advanced_dlg.link_url}</label></td>

+					<td><table border="0" cellspacing="0" cellpadding="0"> 

+						<tr> 

+							<td><input id="href" name="href" type="text" class="mceFocus" value="" style="width: 200px" onchange="LinkDialog.checkPrefix(this);" /></td> 

+							<td id="hrefbrowsercontainer">&nbsp;</td>

+						</tr> 

+					</table></td>

+				</tr>

+				<tr>

+					<td><label for="link_list">{#advanced_dlg.link_list}</label></td>

+					<td><select id="link_list" name="link_list" onchange="document.getElementById('href').value=this.options[this.selectedIndex].value;"></select></td>

+				</tr>

+				<tr>

+					<td><label id="targetlistlabel" for="targetlist">{#advanced_dlg.link_target}</label></td>

+					<td><select id="target_list" name="target_list"></select></td>

+				</tr>

+				<tr>

+					<td class="nowrap"><label for="linktitle">{#advanced_dlg.link_titlefield}</label></td>

+					<td><input id="linktitle" name="linktitle" type="text" value="" style="width: 200px" /></td>

+				</tr>

+				<tr>

+					<td><label for="class_list">{#class_name}</label></td>

+					<td><select id="class_list" name="class_list"></select></td>

+				</tr>

+			</table>

 		</div>

 	</div>

 

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/shortcuts.htm b/library/tinymce/jscripts/tiny_mce/themes/advanced/shortcuts.htm
new file mode 100644
index 000000000..20ec2f5a3
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/shortcuts.htm
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+	<head>

+		<title>{#advanced_dlg.accessibility_help}</title>

+		<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+		<script type="text/javascript">tinyMCEPopup.requireLangPack();</script>

+	</head>

+	<body id="content">

+		<h1>{#advanced_dlg.accessibility_usage_title}</h1>

+		<h2>Toolbars</h2>

+		<p>Press ALT-F10 to move focus to the toolbars. Navigate through the buttons using the arrow keys.

+		Press enter to activate a button and return focus to the editor.

+		Press escape to return focus to the editor without performing any actions.</p>

+		

+		<h2>Status Bar</h2>

+		<p>To access the editor status bar, press ALT-F11. Use the left and right arrow keys to navigate between elements in the path.

+		Press enter or space to select an element. Press escape to return focus to the editor without changing the selection.</p>

+		

+		<h2>Context Menu</h2>

+		<p>Press shift-F10 to activate the context menu. Use the up and down arrow keys to move between menu items. To open sub-menus press the right arrow key.

+		To close submenus press the left arrow key.  Press escape to close the context menu.</p>

+		

+		<h1>Keyboard Shortcuts</h1>

+		<table>

+			<thead>

+				<tr>

+					<th>Keystroke</th>

+					<th>Function</th>

+				</tr>

+			</thead>

+			<tbody>

+				<tr>

+					<td>Control-B</td><td>Bold</td>

+				</tr>

+				<tr>

+					<td>Control-I</td><td>Italic</td>

+				</tr>

+				<tr>

+					<td>Control-Z</td><td>Undo</td>

+				</tr>

+				<tr>

+					<td>Control-Y</td><td>Redo</td>

+				</tr>

+			</tbody>

+		</table>

+	</body>

+</html>

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
index 444063a82..52a1d67e2 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
@@ -1,6 +1,7 @@
 body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;}

 body {background:#FFF;}

 body.mceForceColors {background:#FFF; color:#000;}

+body.mceBrowserDefaults {background:transparent; color:inherit; font-size:inherit; font-family:inherit;}

 h1 {font-size: 2em}

 h2 {font-size: 1.5em}

 h3 {font-size: 1.17em}

@@ -8,28 +9,17 @@ h4 {font-size: 1em}
 h5 {font-size: .83em}

 h6 {font-size: .75em}

 .mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}

-a.mceItemAnchor {display:inline-block; width:11px !important; height:11px  !important; background:url(img/items.gif) no-repeat 0 0;}

+a.mceItemAnchor {display:inline-block; -webkit-user-select:all; -webkit-user-modify:read-only; -moz-user-select:all; -moz-user-modify:read-only; width:11px !important; height:11px !important; background:url(img/items.gif) no-repeat center center}

+span.mceItemNbsp {background: #DDD}

 td.mceSelected, th.mceSelected {background-color:#3399ff !important}

 img {border:0;}

-table {cursor:default}

+table, img, hr, .mceItemAnchor {cursor:default}

 table td, table th {cursor:text}

 ins {border-bottom:1px solid green; text-decoration: none; color:green}

 del {color:red; text-decoration:line-through}

 cite {border-bottom:1px dashed blue}

 acronym {border-bottom:1px dotted #CCC; cursor:help}

 abbr {border-bottom:1px dashed #CCC; cursor:help}

-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;

-}

-

 

 /* IE */

 * html body {

@@ -45,3 +35,17 @@ scrollbar-track-color:#F5F5F5;
 

 img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}

 font[face=mceinline] {font-family:inherit !important}

+*[contentEditable]:focus {outline:0}

+

+.mceItemMedia {border:1px dotted #cc0000; background-position:center; background-repeat:no-repeat; background-color:#ffffcc}

+.mceItemShockWave {background-image:url(../../img/shockwave.gif)}

+.mceItemFlash {background-image:url(../../img/flash.gif)}

+.mceItemQuickTime {background-image:url(../../img/quicktime.gif)}

+.mceItemWindowsMedia {background-image:url(../../img/windowsmedia.gif)}

+.mceItemRealMedia {background-image:url(../../img/realmedia.gif)}

+.mceItemVideo {background-image:url(../../img/video.gif)}

+.mceItemAudio {background-image:url(../../img/video.gif)}

+.mceItemEmbeddedAudio {background-image:url(../../img/video.gif)}

+.mceItemIframe {background-image:url(../../img/iframe.gif)}

+.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../../img/pagebreak.gif) no-repeat center top;}

+.mceHideBrInPre pre br {display: none}

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css
index f01222650..f01222650 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png
index 7dd58418b..1e53560e0 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif
index 2eafd7954..d2f93671c 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif
index 85e31dfb2..85e31dfb2 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_check.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_check.gif
index adfdddccd..adfdddccd 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_check.gif
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_check.gif
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/progress.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/progress.gif
index 5bb90fd6a..5bb90fd6a 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/progress.gif
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/progress.gif
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif
index ce4be6355..06812cb41 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
index 5f1f96448..5f1f96448 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css
new file mode 100644
index 000000000..fe09e2141
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css
@@ -0,0 +1,25 @@
+body, td, pre { margin:8px;}

+body.mceForceColors {background:#FFF; color:#000;}

+h1 {font-size: 2em}

+h2 {font-size: 1.5em}

+h3 {font-size: 1.17em}

+h4 {font-size: 1em}

+h5 {font-size: .83em}

+h6 {font-size: .75em}

+.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}

+a.mceItemAnchor {display:inline-block; width:11px !important; height:11px  !important; background:url(../default/img/items.gif) no-repeat 0 0;}

+span.mceItemNbsp {background: #DDD}

+td.mceSelected, th.mceSelected {background-color:#3399ff !important}

+img {border:0;}

+table, img, hr, .mceItemAnchor {cursor:default}

+table td, table th {cursor:text}

+ins {border-bottom:1px solid green; text-decoration: none; color:green}

+del {color:red; text-decoration:line-through}

+cite {border-bottom:1px dashed blue}

+acronym {border-bottom:1px dotted #CCC; cursor:help}

+abbr {border-bottom:1px dashed #CCC; cursor:help}

+

+img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}

+font[face=mceinline] {font-family:inherit !important}

+*[contentEditable]:focus {outline:0}

+.mceHideBrInPre pre br {display: none}

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css
new file mode 100644
index 000000000..b2ed097cd
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css
@@ -0,0 +1,105 @@
+/* Generic */

+body {

+font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px;

+background:#F0F0EE;
+color: black;

+padding:0;

+margin:8px 8px 0 8px;

+}

+

+html {background:#F0F0EE; color:#000;}

+td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}

+textarea {resize:none;outline:none;}

+a:link, a:visited {color:black;background-color:transparent;}

+a:hover {color:#2B6FB6;background-color:transparent;}

+.nowrap {white-space: nowrap}

+

+/* Forms */

+fieldset {margin:0; padding:4px; border:1px solid #919B9C; font-family:Verdana, Arial; font-size:10px;}

+legend {color:#2B6FB6; font-weight:bold;}

+label.msg {display:none;}

+label.invalid {color:#EE0000; display:inline;background-color:transparent;}

+input.invalid {border:1px solid #EE0000;background-color:transparent;}

+input {background:#FFF; border:1px solid #CCC;color:black;}

+input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}

+input, select, textarea {border:1px solid #808080;}

+input.radio {border:1px none #000000; background:transparent; vertical-align:middle;}

+input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;}

+.input_noborder {border:0;}

+

+/* Buttons */

+#insert, #cancel, input.button, .updateButton {

+font-weight:bold;

+width:94px; height:23px;

+cursor:pointer;

+padding-bottom:2px;

+float:left;

+}

+

+#cancel {float:right}

+

+/* Browse */

+a.pickcolor, a.browse {text-decoration:none}

+a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.gif) -860px 0; border:1px solid #FFF; margin-left:1px;}

+.mceOldBoxModel a.browse span {width:22px; height:20px;}

+a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;}

+a.browse span.disabled {border:1px solid white; opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}

+a.browse:hover span.disabled {border:1px solid white; background-color:transparent;}

+a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.gif) -840px 0; margin-left:2px;}

+.mceOldBoxModel a.pickcolor span {width:21px; height:17px;}

+a.pickcolor:hover span {background-color:#B2BBD0;}

+a.pickcolor:hover span.disabled {}

+

+/* Charmap */

+table.charmap {border:1px solid #AAA; text-align:center}

+td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;}

+#charmap a {display:block; color:#000; text-decoration:none; border:0}

+#charmap a:hover {background:#CCC;color:#2B6FB6}

+#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center}

+#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center}

+

+/* Source */

+.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;}

+.mceActionPanel {margin-top:5px;}

+

+/* Tabs classes */

+.tabs {width:100%; height:18px; line-height:normal;}

+.tabs ul {margin:0; padding:0; list-style:none;}

+.tabs li {float:left; border: 1px solid black; border-bottom:0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block; cursor:pointer;}

+.tabs li.current {font-weight: bold; margin-right:2px;}

+.tabs span {float:left; display:block; padding:0px 10px 0 0;}

+.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;}

+.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;}

+

+/* Panels */

+.panel_wrapper div.panel {display:none;}

+.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;}

+.panel_wrapper {border:1px solid #919B9C; padding:10px; padding-top:5px; clear:both; background:white;}

+

+/* Columns */

+.column {float:left;}

+.properties {width:100%;}

+.properties .column1 {}

+.properties .column2 {text-align:left;}

+

+/* Titles */

+h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;}

+h3 {font-size:14px;}

+.title {font-size:12px; font-weight:bold; color:#2B6FB6;}

+

+/* Dialog specific */

+#link .panel_wrapper, #link div.current {height:125px;}

+#image .panel_wrapper, #image div.current {height:200px;}

+#plugintable thead {font-weight:bold; background:#DDD;}

+#plugintable, #about #plugintable td {border:1px solid #919B9C;}

+#plugintable {width:96%; margin-top:10px;}

+#pluginscontainer {height:290px; overflow:auto;}

+#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;}

+#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}

+#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}

+#colorpicker #light div {overflow:hidden;}

+#colorpicker #previewblock {float:right; padding-left:10px; height:20px;}

+#colorpicker .panel_wrapper div.current {height:175px;}

+#colorpicker #namedcolors {width:150px;}

+#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}

+#colorpicker #colornamecontainer {margin-top:5px;}

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css
new file mode 100644
index 000000000..a2cfcc393
--- /dev/null
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css
@@ -0,0 +1,102 @@
+/* Reset */

+.highcontrastSkin table, .highcontrastSkin tbody, .highcontrastSkin a, .highcontrastSkin img, .highcontrastSkin tr, .highcontrastSkin div, .highcontrastSkin td, .highcontrastSkin iframe, .highcontrastSkin span, .highcontrastSkin *, .highcontrastSkin .mceText {border:0; margin:0; padding:0; vertical-align:baseline; border-collapse:separate;}

+.highcontrastSkin a:hover, .highcontrastSkin a:link, .highcontrastSkin a:visited, .highcontrastSkin a:active {text-decoration:none; font-weight:normal; cursor:default;}

+.highcontrastSkin table td {vertical-align:middle}

+

+.highcontrastSkin .mceIconOnly {display: block !important;}

+

+/* External */

+.highcontrastSkin .mceExternalToolbar {position:absolute; border:1px solid; border-bottom:0; display:none; background-color: white;}

+.highcontrastSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;}

+.highcontrastSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px;}

+

+/* Layout */

+.highcontrastSkin table.mceLayout {border: 1px solid;}

+.highcontrastSkin .mceIframeContainer {border-top:1px solid; border-bottom:1px solid}

+.highcontrastSkin .mceStatusbar a:hover {text-decoration:underline}

+.highcontrastSkin .mceStatusbar {display:block; line-height:1.5em; overflow:visible;}

+.highcontrastSkin .mceStatusbar div {float:left}

+.highcontrastSkin .mceStatusbar a.mceResize {display:block; float:right; width:20px; height:20px; cursor:se-resize; outline:0}

+

+.highcontrastSkin .mceToolbar td { display: inline-block; float: left;}

+.highcontrastSkin .mceToolbar tr { display: block;}

+.highcontrastSkin .mceToolbar table { display: block; }

+

+/* Button */

+

+.highcontrastSkin .mceButton { display:block; margin: 2px; padding: 5px 10px;border: 1px solid; border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; -ms-border-radius: 3px; height: 2em;}

+.highcontrastSkin .mceButton .mceVoiceLabel { height: 100%; vertical-align: center; line-height: 2em}

+.highcontrastSkin .mceButtonDisabled .mceVoiceLabel { opacity:0.6; -ms-filter:'alpha(opacity=60)'; filter:alpha(opacity=60);}

+.highcontrastSkin .mceButtonActive, .highcontrastSkin .mceButton:focus, .highcontrastSkin .mceButton:active { border: 5px solid; padding: 1px 6px;-webkit-focus-ring-color:none;outline:none;}

+

+/* Separator */

+.highcontrastSkin .mceSeparator {display:block; width:16px; height:26px;}

+

+/* ListBox */

+.highcontrastSkin .mceListBox { display: block; margin:2px;-webkit-focus-ring-color:none;outline:none;}

+.highcontrastSkin .mceListBox .mceText {padding: 5px 6px;  line-height: 2em; width: 15ex; overflow: hidden;}

+.highcontrastSkin .mceListBoxDisabled .mceText { opacity:0.6; -ms-filter:'alpha(opacity=60)'; filter:alpha(opacity=60);}

+.highcontrastSkin .mceListBox a.mceText { padding: 5px 10px; display: block; height: 2em; line-height: 2em; border: 1px solid; border-right: 0; border-radius: 3px 0px 0px 3px; -moz-border-radius: 3px 0px 0px 3px; -webkit-border-radius: 3px 0px 0px 3px; -ms-border-radius: 3px 0px 0px 3px;}

+.highcontrastSkin .mceListBox a.mceOpen { padding: 5px 4px; display: block; height: 2em; line-height: 2em; border: 1px solid; border-left: 0; border-radius: 0px 3px 3px 0px; -moz-border-radius: 0px 3px 3px 0px; -webkit-border-radius: 0px 3px 3px 0px; -ms-border-radius: 0px 3px 3px 0px;}

+.highcontrastSkin .mceListBox:focus a.mceText, .highcontrastSkin .mceListBox:active a.mceText { border-width: 5px; padding: 1px 10px 1px 6px;}

+.highcontrastSkin .mceListBox:focus a.mceOpen, .highcontrastSkin .mceListBox:active a.mceOpen { border-width: 5px; padding: 1px 0px 1px 4px;}

+

+.highcontrastSkin .mceListBoxMenu {overflow-y:auto}

+

+/* SplitButton */

+.highcontrastSkin .mceSplitButtonDisabled .mceAction {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}

+

+.highcontrastSkin .mceSplitButton { border-collapse: collapse; margin: 2px; height: 2em; line-height: 2em;-webkit-focus-ring-color:none;outline:none;}

+.highcontrastSkin .mceSplitButton td { display: table-cell; float: none; margin: 0; padding: 0; height: 2em;}

+.highcontrastSkin .mceSplitButton tr { display: table-row; }

+.highcontrastSkin table.mceSplitButton  { display: table; }

+.highcontrastSkin .mceSplitButton a.mceAction { padding: 5px 10px; display: block; height: 2em; line-height: 2em; overflow: hidden; border: 1px solid; border-right: 0; border-radius: 3px 0px 0px 3px; -moz-border-radius: 3px 0px 0px 3px; -webkit-border-radius: 3px 0px 0px 3px; -ms-border-radius: 3px 0px 0px 3px;}

+.highcontrastSkin .mceSplitButton a.mceOpen { padding: 5px 4px;  display: block; height: 2em; line-height: 2em; border: 1px solid; border-radius: 0px 3px 3px 0px; -moz-border-radius: 0px 3px 3px 0px; -webkit-border-radius: 0px 3px 3px 0px; -ms-border-radius: 0px 3px 3px 0px;}

+.highcontrastSkin .mceSplitButton .mceVoiceLabel { height: 2em; vertical-align: center; line-height: 2em; } 

+.highcontrastSkin .mceSplitButton:focus a.mceAction, .highcontrastSkin .mceSplitButton:active a.mceAction { border-width: 5px; border-right-width: 1px; padding: 1px 10px 1px 6px;-webkit-focus-ring-color:none;outline:none;}

+.highcontrastSkin .mceSplitButton:focus a.mceOpen, .highcontrastSkin .mceSplitButton:active a.mceOpen { border-width: 5px; border-left-width: 1px; padding: 1px 0px 1px 4px;-webkit-focus-ring-color:none;outline:none;}

+

+/* Menu */

+.highcontrastSkin .mceNoIcons span.mceIcon {width:0;}

+.highcontrastSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid; }

+.highcontrastSkin .mceMenu table {background:white; color: black}

+.highcontrastSkin .mceNoIcons a .mceText {padding-left:10px}

+.highcontrastSkin .mceMenu a, .highcontrastSkin .mceMenu span, .highcontrastSkin .mceMenu {display:block;background:white; color: black}

+.highcontrastSkin .mceMenu td {height:2em}

+.highcontrastSkin .mceMenu a {position:relative;padding:3px 0 4px 0; display: block;}

+.highcontrastSkin .mceMenu .mceText {position:relative; display:block; cursor:default; margin:0; padding:0 25px 0 25px;}

+.highcontrastSkin .mceMenu pre.mceText {font-family:Monospace}

+.highcontrastSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:26px;}

+.highcontrastSkin td.mceMenuItemSeparator {border-top:1px solid; height:1px}

+.highcontrastSkin .mceMenuItemTitle a {border:0; border-bottom:1px solid}

+.highcontrastSkin .mceMenuItemTitle span.mceText {font-weight:bold; padding-left:4px}

+.highcontrastSkin .mceNoIcons .mceMenuItemSelected span.mceText:before {content: "\2713\A0";}

+.highcontrastSkin .mceMenu span.mceMenuLine {display:none}

+.highcontrastSkin .mceMenuItemSub a .mceText:after {content: "\A0\25B8"}

+.highcontrastSkin .mceMenuItem td, .highcontrastSkin .mceMenuItem th {line-height: normal}

+

+/* ColorSplitButton */

+.highcontrastSkin div.mceColorSplitMenu table {background:#FFF; border:1px solid; color: #000}

+.highcontrastSkin .mceColorSplitMenu td {padding:2px}

+.highcontrastSkin .mceColorSplitMenu a {display:block; width:16px; height:16px; overflow:hidden; color:#000; margin: 0; padding: 0;}

+.highcontrastSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}

+.highcontrastSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF}

+.highcontrastSkin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid; background-color:#B6BDD2}

+.highcontrastSkin a.mceMoreColors:hover {border:1px solid #0A246A; color: #000;}

+.highcontrastSkin .mceColorPreview {display:none;}

+.highcontrastSkin .mce_forecolor span.mceAction, .highcontrastSkin .mce_backcolor span.mceAction {height:17px;overflow:hidden}

+

+/* Progress,Resize */

+.highcontrastSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=50); background:#FFF}

+.highcontrastSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(../default/img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}

+

+/* Formats */

+.highcontrastSkin .mce_p span.mceText {}

+.highcontrastSkin .mce_address span.mceText {font-style:italic}

+.highcontrastSkin .mce_pre span.mceText {font-family:monospace}

+.highcontrastSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}

+.highcontrastSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}

+.highcontrastSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}

+.highcontrastSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}

+.highcontrastSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}

+.highcontrastSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
index 3cea5ff1c..3537c8bc0 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
@@ -9,9 +9,10 @@ h5 {font-size: .83em}
 h6 {font-size: .75em}

 .mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}

 a.mceItemAnchor {display:inline-block; width:11px !important; height:11px  !important; background:url(../default/img/items.gif) no-repeat 0 0;}

+span.mceItemNbsp {background: #DDD}

 td.mceSelected, th.mceSelected {background-color:#3399ff !important}

 img {border:0;}

-table {cursor:default}

+table, img, hr, .mceItemAnchor {cursor:default}

 table td, table th {cursor:text}

 ins {border-bottom:1px solid green; text-decoration: none; color:green}

 del {color:red; text-decoration:line-through}

@@ -33,3 +34,16 @@ scrollbar-track-color:#F5F5F5;
 

 img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}

 font[face=mceinline] {font-family:inherit !important}

+*[contentEditable]:focus {outline:0}

+

+.mceItemMedia {border:1px dotted #cc0000; background-position:center; background-repeat:no-repeat; background-color:#ffffcc}

+.mceItemShockWave {background-image:url(../../img/shockwave.gif)}

+.mceItemFlash {background-image:url(../../img/flash.gif)}

+.mceItemQuickTime {background-image:url(../../img/quicktime.gif)}

+.mceItemWindowsMedia {background-image:url(../../img/windowsmedia.gif)}

+.mceItemRealMedia {background-image:url(../../img/realmedia.gif)}

+.mceItemVideo {background-image:url(../../img/video.gif)}

+.mceItemAudio {background-image:url(../../img/video.gif)}

+.mceItemIframe {background-image:url(../../img/iframe.gif)}

+.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../../img/pagebreak.gif) no-repeat center top;}

+.mceHideBrInPre pre br {display: none}

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css
index e3af1396e..ec0877224 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css
@@ -114,3 +114,4 @@ h3 {font-size:14px;}
 #colorpicker #namedcolors {width:150px;}

 #colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}

 #colorpicker #colornamecontainer {margin-top:5px;}

+#colorpicker #picker_panel fieldset {margin:auto;width:325px;}

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
index 12cfb419b..13a5cb030 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
index 8996c7493..7fc57f2bc 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
index bd5d2550c..c0dcc6cac 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
index a6253976a..7b5103be2 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
@@ -4,8 +4,8 @@
 .o2k7Skin table td {vertical-align:middle}

 

 /* Containers */

-.o2k7Skin table {background:#E5EFFD}

-.o2k7Skin iframe {display:block; background:#FFF}

+.o2k7Skin table {background:transparent}

+.o2k7Skin iframe {display:block;}

 .o2k7Skin .mceToolbar {height:26px}

 

 /* External */

@@ -19,7 +19,8 @@
 .o2k7Skin table.mceLayout tr.mceLast td {border-bottom:1px solid #ABC6DD}

 .o2k7Skin table.mceToolbar, .o2k7Skin tr.mceFirst .mceToolbar tr td, .o2k7Skin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0}

 .o2k7Skin .mceIframeContainer {border-top:1px solid #ABC6DD; border-bottom:1px solid #ABC6DD}

-.o2k7Skin .mceStatusbar {display:block; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; height:20px}

+.o2k7Skin td.mceToolbar{background:#E5EFFD}

+.o2k7Skin .mceStatusbar {background:#E5EFFD; display:block; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; height:20px}

 .o2k7Skin .mceStatusbar div {float:left; padding:2px}

 .o2k7Skin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize; outline:0}

 .o2k7Skin .mceStatusbar a:hover {text-decoration:underline}

@@ -50,19 +51,19 @@
 .o2k7Skin .mceSeparator {display:block; background:url(img/button_bg.png) -22px 0; width:5px; height:22px}

 

 /* ListBox */

-.o2k7Skin .mceListBox {margin-left:3px}

+.o2k7Skin .mceListBox  {padding-left: 3px}

 .o2k7Skin .mceListBox, .o2k7Skin .mceListBox a {display:block}

 .o2k7Skin .mceListBox .mceText {padding-left:4px; text-align:left; width:70px; border:1px solid #b3c7e1; border-right:0; background:#eaf2fb; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden}

 .o2k7Skin .mceListBox .mceOpen {width:14px; height:22px; background:url(img/button_bg.png) -66px 0}

 .o2k7Skin table.mceListBoxEnabled:hover .mceText, .o2k7Skin .mceListBoxHover .mceText, .o2k7Skin .mceListBoxSelected .mceText {background:#FFF}

 .o2k7Skin table.mceListBoxEnabled:hover .mceOpen, .o2k7Skin .mceListBoxHover .mceOpen, .o2k7Skin .mceListBoxSelected .mceOpen {background-position:-66px -22px}

 .o2k7Skin .mceListBoxDisabled .mceText {color:gray}

-.o2k7Skin .mceListBoxMenu {overflow:auto; overflow-x:hidden}

+.o2k7Skin .mceListBoxMenu {overflow:auto; overflow-x:hidden; margin-left:3px}

 .o2k7Skin .mceOldBoxModel .mceListBox .mceText {height:22px}

 .o2k7Skin select.mceListBox {font-family:Tahoma,Verdana,Arial,Helvetica; font-size:12px; border:1px solid #b3c7e1; background:#FFF;}

 

 /* SplitButton */

-.o2k7Skin .mceSplitButton, .o2k7Skin .mceSplitButton a, .o2k7Skin .mceSplitButton span {display:block; height:22px}

+.o2k7Skin .mceSplitButton, .o2k7Skin .mceSplitButton a, .o2k7Skin .mceSplitButton span {display:block; height:22px; direction:ltr}

 .o2k7Skin .mceSplitButton {background:url(img/button_bg.png)}

 .o2k7Skin .mceSplitButton a.mceAction {width:22px}

 .o2k7Skin .mceSplitButton span.mceAction {width:22px; background-image:url(../../img/icons.gif)}

@@ -105,6 +106,7 @@
 .o2k7Skin .mceNoIcons .mceMenuItemSelected a {background:url(../default/img/menu_arrow.gif) no-repeat -6px center}

 .o2k7Skin .mceMenu span.mceMenuLine {display:none}

 .o2k7Skin .mceMenuItemSub a {background:url(../default/img/menu_arrow.gif) no-repeat top right;}

+.o2k7Skin .mceMenuItem td, .o2k7Skin .mceMenuItem th {line-height: normal}

 

 /* Progress,Resize */

 .o2k7Skin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=50); background:#FFF}

@@ -213,3 +215,4 @@
 .o2k7Skin span.mce_pagebreak {background-position:0 -40px}

 .o2k7Skin span.mce_restoredraft {background-position:-20px -40px}

 .o2k7Skin span.mce_spellchecker {background-position:-540px -20px}

+.o2k7Skin span.mce_visualblocks {background-position: -40px -40px}

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
index 153f0c38a..50c9b76a2 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
@@ -1,6 +1,6 @@
 /* Black */

 .o2k7SkinBlack .mceToolbar .mceToolbarStart span, .o2k7SkinBlack .mceToolbar .mceToolbarEnd span, .o2k7SkinBlack .mceButton, .o2k7SkinBlack .mceSplitButton, .o2k7SkinBlack .mceSeparator, .o2k7SkinBlack .mceSplitButton a.mceOpen, .o2k7SkinBlack .mceListBox a.mceOpen {background-image:url(img/button_bg_black.png)}

-.o2k7SkinBlack table, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack .mceMenuItemTitle span.mceText, .o2k7SkinBlack .mceStatusbar div, .o2k7SkinBlack .mceStatusbar span, .o2k7SkinBlack .mceStatusbar a {background:#535353; color:#FFF}

+.o2k7SkinBlack td.mceToolbar, .o2k7SkinBlack td.mceStatusbar, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack .mceMenuItemTitle span.mceText, .o2k7SkinBlack .mceStatusbar div, .o2k7SkinBlack .mceStatusbar span, .o2k7SkinBlack .mceStatusbar a {background:#535353; color:#FFF}

 .o2k7SkinBlack table.mceListBoxEnabled .mceText, o2k7SkinBlack .mceListBox .mceText {background:#FFF; border:1px solid #CBCFD4; border-bottom-color:#989FA9; border-right:0}

 .o2k7SkinBlack table.mceListBoxEnabled:hover .mceText, .o2k7SkinBlack .mceListBoxHover .mceText, .o2k7SkinBlack .mceListBoxSelected .mceText {background:#FFF; border:1px solid #FFBD69; border-right:0}

 .o2k7SkinBlack .mceExternalToolbar, .o2k7SkinBlack .mceListBox .mceText, .o2k7SkinBlack div.mceMenu, .o2k7SkinBlack table.mceLayout, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack table.mceLayout tr.mceFirst td, .o2k7SkinBlack table.mceLayout, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack table.mceLayout tr.mceLast td, .o2k7SkinBlack .mceIframeContainer {border-color: #535353;}

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
index 7fe3b45e1..960a8e475 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
@@ -1,5 +1,5 @@
 /* Silver */

 .o2k7SkinSilver .mceToolbar .mceToolbarStart span, .o2k7SkinSilver .mceButton, .o2k7SkinSilver .mceSplitButton, .o2k7SkinSilver .mceSeparator, .o2k7SkinSilver .mceSplitButton a.mceOpen, .o2k7SkinSilver .mceListBox a.mceOpen {background-image:url(img/button_bg_silver.png)}

-.o2k7SkinSilver table, .o2k7SkinSilver .mceMenuItemTitle a {background:#eee}

+.o2k7SkinSilver td.mceToolbar, .o2k7SkinSilver td.mceStatusbar, .o2k7SkinSilver .mceMenuItemTitle a {background:#eee}

 .o2k7SkinSilver .mceListBox .mceText {background:#FFF}

 .o2k7SkinSilver .mceExternalToolbar, .o2k7SkinSilver .mceListBox .mceText, .o2k7SkinSilver div.mceMenu, .o2k7SkinSilver table.mceLayout, .o2k7SkinSilver .mceMenuItemTitle a, .o2k7SkinSilver table.mceLayout tr.mceFirst td, .o2k7SkinSilver table.mceLayout, .o2k7SkinSilver .mceMenuItemTitle a, .o2k7SkinSilver table.mceLayout tr.mceLast td, .o2k7SkinSilver .mceIframeContainer {border-color: #bbb}

diff --git a/library/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm b/library/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm
index 5957bbd17..3c6d65808 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm
+++ b/library/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm
@@ -6,7 +6,7 @@
 </head>

 <body onresize="resizeInputs();" style="display:none; overflow:hidden;">

 	<form name="source" onsubmit="saveContent();return false;" action="#">

-		<div style="float: left" class="title">{#advanced_dlg.code_title}</div>

+		<div style="float: left" class="title"><label for="htmlSource">{#advanced_dlg.code_title}</label></div>

 

 		<div id="wrapline" style="float: right">

 			<input type="checkbox" name="wraped" id="wraped" onclick="toggleWordWrap(this);" class="wordWrapCode" /><label for="wraped">{#advanced_dlg.code_wordwrap}</label>

@@ -17,8 +17,8 @@
 		<textarea name="htmlSource" id="htmlSource" rows="15" cols="100" style="width: 100%; height: 100%; font-family: 'Courier New',Courier,monospace; font-size: 12px;" dir="ltr" wrap="off" class="mceFocus"></textarea>

 

 		<div class="mceActionPanel">

-			<input type="submit" name="insert" value="{#update}" id="insert" />

-			<input type="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />

+			<input type="submit" role="button" name="insert" value="{#update}" id="insert" />

+			<input type="button" role="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />

 		</div>

 	</form>

 </body>

diff --git a/library/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js b/library/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js
index ed89abc06..4b3209cc9 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js
+++ b/library/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js
@@ -1 +1 @@
-(function(){var a=tinymce.DOM;tinymce.ThemeManager.requireLangPack("simple");tinymce.create("tinymce.themes.SimpleTheme",{init:function(c,d){var e=this,b=["Bold","Italic","Underline","Strikethrough","InsertUnorderedList","InsertOrderedList"],f=c.settings;e.editor=c;c.onInit.add(function(){c.onNodeChange.add(function(h,g){tinymce.each(b,function(i){g.get(i.toLowerCase()).setActive(h.queryCommandState(i))})});c.dom.loadCSS(d+"/skins/"+f.skin+"/content.css")});a.loadCSS((f.editor_css?c.documentBaseURI.toAbsolute(f.editor_css):"")||d+"/skins/"+f.skin+"/ui.css")},renderUI:function(h){var e=this,i=h.targetNode,b,c,d=e.editor,f=d.controlManager,g;i=a.insertAfter(a.create("span",{id:d.id+"_container","class":"mceEditor "+d.settings.skin+"SimpleSkin"}),i);i=g=a.add(i,"table",{cellPadding:0,cellSpacing:0,"class":"mceLayout"});i=c=a.add(i,"tbody");i=a.add(c,"tr");i=b=a.add(a.add(i,"td"),"div",{"class":"mceIframeContainer"});i=a.add(a.add(c,"tr",{"class":"last"}),"td",{"class":"mceToolbar mceLast",align:"center"});c=e.toolbar=f.createToolbar("tools1");c.add(f.createButton("bold",{title:"simple.bold_desc",cmd:"Bold"}));c.add(f.createButton("italic",{title:"simple.italic_desc",cmd:"Italic"}));c.add(f.createButton("underline",{title:"simple.underline_desc",cmd:"Underline"}));c.add(f.createButton("strikethrough",{title:"simple.striketrough_desc",cmd:"Strikethrough"}));c.add(f.createSeparator());c.add(f.createButton("undo",{title:"simple.undo_desc",cmd:"Undo"}));c.add(f.createButton("redo",{title:"simple.redo_desc",cmd:"Redo"}));c.add(f.createSeparator());c.add(f.createButton("cleanup",{title:"simple.cleanup_desc",cmd:"mceCleanup"}));c.add(f.createSeparator());c.add(f.createButton("insertunorderedlist",{title:"simple.bullist_desc",cmd:"InsertUnorderedList"}));c.add(f.createButton("insertorderedlist",{title:"simple.numlist_desc",cmd:"InsertOrderedList"}));c.renderTo(i);return{iframeContainer:b,editorContainer:d.id+"_container",sizeContainer:g,deltaHeight:-20}},getInfo:function(){return{longname:"Simple theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.ThemeManager.add("simple",tinymce.themes.SimpleTheme)})();
\ No newline at end of file
+(function(){var a=tinymce.DOM;tinymce.ThemeManager.requireLangPack("simple");tinymce.create("tinymce.themes.SimpleTheme",{init:function(c,d){var e=this,b=["Bold","Italic","Underline","Strikethrough","InsertUnorderedList","InsertOrderedList"],f=c.settings;e.editor=c;c.contentCSS.push(d+"/skins/"+f.skin+"/content.css");c.onInit.add(function(){c.onNodeChange.add(function(h,g){tinymce.each(b,function(i){g.get(i.toLowerCase()).setActive(h.queryCommandState(i))})})});a.loadCSS((f.editor_css?c.documentBaseURI.toAbsolute(f.editor_css):"")||d+"/skins/"+f.skin+"/ui.css")},renderUI:function(h){var e=this,i=h.targetNode,b,c,d=e.editor,f=d.controlManager,g;i=a.insertAfter(a.create("span",{id:d.id+"_container","class":"mceEditor "+d.settings.skin+"SimpleSkin"}),i);i=g=a.add(i,"table",{cellPadding:0,cellSpacing:0,"class":"mceLayout"});i=c=a.add(i,"tbody");i=a.add(c,"tr");i=b=a.add(a.add(i,"td"),"div",{"class":"mceIframeContainer"});i=a.add(a.add(c,"tr",{"class":"last"}),"td",{"class":"mceToolbar mceLast",align:"center"});c=e.toolbar=f.createToolbar("tools1");c.add(f.createButton("bold",{title:"simple.bold_desc",cmd:"Bold"}));c.add(f.createButton("italic",{title:"simple.italic_desc",cmd:"Italic"}));c.add(f.createButton("underline",{title:"simple.underline_desc",cmd:"Underline"}));c.add(f.createButton("strikethrough",{title:"simple.striketrough_desc",cmd:"Strikethrough"}));c.add(f.createSeparator());c.add(f.createButton("undo",{title:"simple.undo_desc",cmd:"Undo"}));c.add(f.createButton("redo",{title:"simple.redo_desc",cmd:"Redo"}));c.add(f.createSeparator());c.add(f.createButton("cleanup",{title:"simple.cleanup_desc",cmd:"mceCleanup"}));c.add(f.createSeparator());c.add(f.createButton("insertunorderedlist",{title:"simple.bullist_desc",cmd:"InsertUnorderedList"}));c.add(f.createButton("insertorderedlist",{title:"simple.numlist_desc",cmd:"InsertOrderedList"}));c.renderTo(i);return{iframeContainer:b,editorContainer:d.id+"_container",sizeContainer:g,deltaHeight:-20}},getInfo:function(){return{longname:"Simple theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.ThemeManager.add("simple",tinymce.themes.SimpleTheme)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js b/library/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js
index 4b862d49d..01ce87c58 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js
+++ b/library/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js
@@ -19,6 +19,7 @@
 			var t = this, states = ['Bold', 'Italic', 'Underline', 'Strikethrough', 'InsertUnorderedList', 'InsertOrderedList'], s = ed.settings;

 

 			t.editor = ed;

+			ed.contentCSS.push(url + "/skins/" + s.skin + "/content.css");

 

 			ed.onInit.add(function() {

 				ed.onNodeChange.add(function(ed, cm) {

@@ -26,8 +27,6 @@
 						cm.get(c.toLowerCase()).setActive(ed.queryCommandState(c));

 					});

 				});

-

-				ed.dom.loadCSS(url + "/skins/" + s.skin + "/content.css");

 			});

 

 			DOM.loadCSS((s.editor_css ? ed.documentBaseURI.toAbsolute(s.editor_css) : '') || url + "/skins/" + s.skin + "/ui.css");

diff --git a/library/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif b/library/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif
index 16af141ff..6fcbcb5de 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif
+++ b/library/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif
diff --git a/library/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js b/library/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js
index 9f08f102f..088ed0fcb 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js
+++ b/library/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js
@@ -1,11 +1 @@
-tinyMCE.addI18n('en.simple',{

-bold_desc:"Bold (Ctrl+B)",

-italic_desc:"Italic (Ctrl+I)",

-underline_desc:"Underline (Ctrl+U)",

-striketrough_desc:"Strikethrough",

-bullist_desc:"Unordered list",

-numlist_desc:"Ordered list",

-undo_desc:"Undo (Ctrl+Z)",

-redo_desc:"Redo (Ctrl+Y)",

-cleanup_desc:"Cleanup messy code"

-});
\ No newline at end of file
+tinyMCE.addI18n('en.simple',{"cleanup_desc":"Cleanup Messy Code","redo_desc":"Redo (Ctrl+Y)","undo_desc":"Undo (Ctrl+Z)","numlist_desc":"Insert/Remove Numbered List","bullist_desc":"Insert/Remove Bulleted List","striketrough_desc":"Strikethrough","underline_desc":"Underline (Ctrl+U)","italic_desc":"Italic (Ctrl+I)","bold_desc":"Bold (Ctrl+B)"});
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/themes/simple/skins/default/content.css b/library/tinymce/jscripts/tiny_mce/themes/simple/skins/default/content.css
index 2506c807c..2506c807c 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/simple/skins/default/content.css
+++ b/library/tinymce/jscripts/tiny_mce/themes/simple/skins/default/content.css
diff --git a/library/tinymce/jscripts/tiny_mce/themes/simple/skins/default/ui.css b/library/tinymce/jscripts/tiny_mce/themes/simple/skins/default/ui.css
index 076fe84e3..076fe84e3 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/simple/skins/default/ui.css
+++ b/library/tinymce/jscripts/tiny_mce/themes/simple/skins/default/ui.css
diff --git a/library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/content.css b/library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/content.css
index 595809fa6..595809fa6 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/content.css
+++ b/library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/content.css
diff --git a/library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png b/library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png
index 527e3495a..527e3495a 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png
+++ b/library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png
diff --git a/library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/ui.css b/library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/ui.css
index cf6c35d10..cf6c35d10 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/ui.css
+++ b/library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/ui.css
diff --git a/library/tinymce/jscripts/tiny_mce/tiny_mce.js b/library/tinymce/jscripts/tiny_mce/tiny_mce.js
index e9eb3ac2f..2d09557a1 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/tiny_mce.js
+++ b/library/tinymce/jscripts/tiny_mce/tiny_mce.js
@@ -1 +1 @@
-(function(c){var a=/^\s*|\s*$/g,d;var b={majorVersion:"3",minorVersion:"3.7",releaseDate:"2010-06-10",_init:function(){var r=this,o=document,m=navigator,f=m.userAgent,l,e,k,j,h,q;r.isOpera=c.opera&&opera.buildNumber;r.isWebKit=/WebKit/.test(f);r.isIE=!r.isWebKit&&!r.isOpera&&(/MSIE/gi).test(f)&&(/Explorer/gi).test(m.appName);r.isIE6=r.isIE&&/MSIE [56]/.test(f);r.isGecko=!r.isWebKit&&/Gecko/.test(f);r.isMac=f.indexOf("Mac")!=-1;r.isAir=/adobeair/i.test(f);r.isIDevice=/(iPad|iPhone)/.test(f);if(c.tinyMCEPreInit){r.suffix=tinyMCEPreInit.suffix;r.baseURL=tinyMCEPreInit.base;r.query=tinyMCEPreInit.query;return}r.suffix="";e=o.getElementsByTagName("base");for(l=0;l<e.length;l++){if(q=e[l].href){if(/^https?:\/\/[^\/]+$/.test(q)){q+="/"}j=q?q.match(/.*\//)[0]:""}}function g(i){if(i.src&&/tiny_mce(|_gzip|_jquery|_prototype)(_dev|_src)?.js/.test(i.src)){if(/_(src|dev)\.js/g.test(i.src)){r.suffix="_src"}if((h=i.src.indexOf("?"))!=-1){r.query=i.src.substring(h+1)}r.baseURL=i.src.substring(0,i.src.lastIndexOf("/"));if(j&&r.baseURL.indexOf("://")==-1&&r.baseURL.indexOf("/")!==0){r.baseURL=j+r.baseURL}return r.baseURL}return null}e=o.getElementsByTagName("script");for(l=0;l<e.length;l++){if(g(e[l])){return}}k=o.getElementsByTagName("head")[0];if(k){e=k.getElementsByTagName("script");for(l=0;l<e.length;l++){if(g(e[l])){return}}}return},is:function(f,e){if(!e){return f!==d}if(e=="array"&&(f.hasOwnProperty&&f instanceof Array)){return true}return typeof(f)==e},each:function(h,e,g){var i,f;if(!h){return 0}g=g||h;if(h.length!==d){for(i=0,f=h.length;i<f;i++){if(e.call(g,h[i],i,h)===false){return 0}}}else{for(i in h){if(h.hasOwnProperty(i)){if(e.call(g,h[i],i,h)===false){return 0}}}}return 1},map:function(e,g){var h=[];b.each(e,function(f){h.push(g(f))});return h},grep:function(e,g){var h=[];b.each(e,function(f){if(!g||g(f)){h.push(f)}});return h},inArray:function(f,g){var h,e;if(f){for(h=0,e=f.length;h<e;h++){if(f[h]===g){return h}}}return -1},extend:function(k,j){var h,g,f=arguments;for(h=1,g=f.length;h<g;h++){j=f[h];b.each(j,function(e,i){if(e!==d){k[i]=e}})}return k},trim:function(e){return(e?""+e:"").replace(a,"")},create:function(m,e){var l=this,f,h,i,j,g,k=0;m=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(m);i=m[3].match(/(^|\.)(\w+)$/i)[2];h=l.createNS(m[3].replace(/\.\w+$/,""));if(h[i]){return}if(m[2]=="static"){h[i]=e;if(this.onCreate){this.onCreate(m[2],m[3],h[i])}return}if(!e[i]){e[i]=function(){};k=1}h[i]=e[i];l.extend(h[i].prototype,e);if(m[5]){f=l.resolve(m[5]).prototype;j=m[5].match(/\.(\w+)$/i)[1];g=h[i];if(k){h[i]=function(){return f[j].apply(this,arguments)}}else{h[i]=function(){this.parent=f[j];return g.apply(this,arguments)}}h[i].prototype[i]=h[i];l.each(f,function(o,p){h[i].prototype[p]=f[p]});l.each(e,function(o,p){if(f[p]){h[i].prototype[p]=function(){this.parent=f[p];return o.apply(this,arguments)}}else{if(p!=i){h[i].prototype[p]=o}}})}l.each(e["static"],function(o,p){h[i][p]=o});if(this.onCreate){this.onCreate(m[2],m[3],h[i].prototype)}},walk:function(h,g,i,e){e=e||this;if(h){if(i){h=h[i]}b.each(h,function(j,f){if(g.call(e,j,f,i)===false){return false}b.walk(j,g,i,e)})}},createNS:function(h,g){var f,e;g=g||c;h=h.split(".");for(f=0;f<h.length;f++){e=h[f];if(!g[e]){g[e]={}}g=g[e]}return g},resolve:function(h,g){var f,e;g=g||c;h=h.split(".");for(f=0,e=h.length;f<e;f++){g=g[h[f]];if(!g){break}}return g},addUnload:function(i,h){var g=this;i={func:i,scope:h||this};if(!g.unloads){function e(){var f=g.unloads,k,l;if(f){for(l in f){k=f[l];if(k&&k.func){k.func.call(k.scope,1)}}if(c.detachEvent){c.detachEvent("onbeforeunload",j);c.detachEvent("onunload",e)}else{if(c.removeEventListener){c.removeEventListener("unload",e,false)}}g.unloads=k=f=w=e=0;if(c.CollectGarbage){CollectGarbage()}}}function j(){var k=document;if(k.readyState=="interactive"){function f(){k.detachEvent("onstop",f);if(e){e()}k=0}if(k){k.attachEvent("onstop",f)}c.setTimeout(function(){if(k){k.detachEvent("onstop",f)}},0)}}if(c.attachEvent){c.attachEvent("onunload",e);c.attachEvent("onbeforeunload",j)}else{if(c.addEventListener){c.addEventListener("unload",e,false)}}g.unloads=[i]}else{g.unloads.push(i)}return i},removeUnload:function(h){var e=this.unloads,g=null;b.each(e,function(j,f){if(j&&j.func==h){e.splice(f,1);g=h;return false}});return g},explode:function(e,f){return e?b.map(e.split(f||","),b.trim):e},_addVer:function(f){var e;if(!this.query){return f}e=(f.indexOf("?")==-1?"?":"&")+this.query;if(f.indexOf("#")==-1){return f+e}return f.replace("#",e+"#")}};b._init();c.tinymce=c.tinyMCE=b})(window);tinymce.create("tinymce.util.Dispatcher",{scope:null,listeners:null,Dispatcher:function(a){this.scope=a||this;this.listeners=[]},add:function(a,b){this.listeners.push({cb:a,scope:b||this.scope});return a},addToTop:function(a,b){this.listeners.unshift({cb:a,scope:b||this.scope});return a},remove:function(a){var b=this.listeners,c=null;tinymce.each(b,function(e,d){if(a==e.cb){c=a;b.splice(d,1);return false}});return c},dispatch:function(){var f,d=arguments,e,b=this.listeners,g;for(e=0;e<b.length;e++){g=b[e];f=g.cb.apply(g.scope,d);if(f===false){break}}return f}});(function(){var a=tinymce.each;tinymce.create("tinymce.util.URI",{URI:function(e,g){var f=this,h,d,c;e=tinymce.trim(e);g=f.settings=g||{};if(/^(mailto|tel|news|javascript|about|data):/i.test(e)||/^\s*#/.test(e)){f.source=e;return}if(e.indexOf("/")===0&&e.indexOf("//")!==0){e=(g.base_uri?g.base_uri.protocol||"http":"http")+"://mce_host"+e}if(!/^\w*:?\/\//.test(e)){e=(g.base_uri.protocol||"http")+"://mce_host"+f.toAbsPath(g.base_uri.path,e)}e=e.replace(/@@/g,"(mce_at)");e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e);a(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],function(b,j){var k=e[j];if(k){k=k.replace(/\(mce_at\)/g,"@@")}f[b]=k});if(c=g.base_uri){if(!f.protocol){f.protocol=c.protocol}if(!f.userInfo){f.userInfo=c.userInfo}if(!f.port&&f.host=="mce_host"){f.port=c.port}if(!f.host||f.host=="mce_host"){f.host=c.host}f.source=""}},setPath:function(c){var b=this;c=/^(.*?)\/?(\w+)?$/.exec(c);b.path=c[0];b.directory=c[1];b.file=c[2];b.source="";b.getURI()},toRelative:function(b){var c=this,d;if(b==="./"){return b}b=new tinymce.util.URI(b,{base_uri:c});if((b.host!="mce_host"&&c.host!=b.host&&b.host)||c.port!=b.port||c.protocol!=b.protocol){return b.getURI()}d=c.toRelPath(c.path,b.path);if(b.query){d+="?"+b.query}if(b.anchor){d+="#"+b.anchor}return d},toAbsolute:function(b,c){var b=new tinymce.util.URI(b,{base_uri:this});return b.getURI(this.host==b.host&&this.protocol==b.protocol?c:0)},toRelPath:function(g,h){var c,f=0,d="",e,b;g=g.substring(0,g.lastIndexOf("/"));g=g.split("/");c=h.split("/");if(g.length>=c.length){for(e=0,b=g.length;e<b;e++){if(e>=c.length||g[e]!=c[e]){f=e+1;break}}}if(g.length<c.length){for(e=0,b=c.length;e<b;e++){if(e>=g.length||g[e]!=c[e]){f=e+1;break}}}if(f==1){return h}for(e=0,b=g.length-(f-1);e<b;e++){d+="../"}for(e=f-1,b=c.length;e<b;e++){if(e!=f-1){d+="/"+c[e]}else{d+=c[e]}}return d},toAbsPath:function(e,f){var c,b=0,h=[],d,g;d=/\/$/.test(f)?"/":"";e=e.split("/");f=f.split("/");a(e,function(i){if(i){h.push(i)}});e=h;for(c=f.length-1,h=[];c>=0;c--){if(f[c].length==0||f[c]=="."){continue}if(f[c]==".."){b++;continue}if(b>0){b--;continue}h.push(f[c])}c=e.length-b;if(c<=0){g=h.reverse().join("/")}else{g=e.slice(0,c).join("/")+"/"+h.reverse().join("/")}if(g.indexOf("/")!==0){g="/"+g}if(d&&g.lastIndexOf("/")!==g.length-1){g+=d}return g},getURI:function(d){var c,b=this;if(!b.source||d){c="";if(!d){if(b.protocol){c+=b.protocol+"://"}if(b.userInfo){c+=b.userInfo+"@"}if(b.host){c+=b.host}if(b.port){c+=":"+b.port}}if(b.path){c+=b.path}if(b.query){c+="?"+b.query}if(b.anchor){c+="#"+b.anchor}b.source=c}return b.source}})})();(function(){var a=tinymce.each;tinymce.create("static tinymce.util.Cookie",{getHash:function(d){var b=this.get(d),c;if(b){a(b.split("&"),function(e){e=e.split("=");c=c||{};c[unescape(e[0])]=unescape(e[1])})}return c},setHash:function(j,b,g,f,i,c){var h="";a(b,function(e,d){h+=(!h?"":"&")+escape(d)+"="+escape(e)});this.set(j,h,g,f,i,c)},get:function(i){var h=document.cookie,g,f=i+"=",d;if(!h){return}d=h.indexOf("; "+f);if(d==-1){d=h.indexOf(f);if(d!=0){return null}}else{d+=2}g=h.indexOf(";",d);if(g==-1){g=h.length}return unescape(h.substring(d+f.length,g))},set:function(i,b,g,f,h,c){document.cookie=i+"="+escape(b)+((g)?"; expires="+g.toGMTString():"")+((f)?"; path="+escape(f):"")+((h)?"; domain="+h:"")+((c)?"; secure":"")},remove:function(e,b){var c=new Date();c.setTime(c.getTime()-1000);this.set(e,"",c,b,c)}})})();tinymce.create("static tinymce.util.JSON",{serialize:function(e){var c,a,d=tinymce.util.JSON.serialize,b;if(e==null){return"null"}b=typeof e;if(b=="string"){a="\bb\tt\nn\ff\rr\"\"''\\\\";return'"'+e.replace(/([\u0080-\uFFFF\x00-\x1f\"])/g,function(g,f){c=a.indexOf(f);if(c+1){return"\\"+a.charAt(c+1)}g=f.charCodeAt().toString(16);return"\\u"+"0000".substring(g.length)+g})+'"'}if(b=="object"){if(e.hasOwnProperty&&e instanceof Array){for(c=0,a="[";c<e.length;c++){a+=(c>0?",":"")+d(e[c])}return a+"]"}a="{";for(c in e){a+=typeof e[c]!="function"?(a.length>1?',"':'"')+c+'":'+d(e[c]):""}return a+"}"}return""+e},parse:function(s){try{return eval("("+s+")")}catch(ex){}}});tinymce.create("static tinymce.util.XHR",{send:function(g){var a,e,b=window,h=0;g.scope=g.scope||this;g.success_scope=g.success_scope||g.scope;g.error_scope=g.error_scope||g.scope;g.async=g.async===false?false:true;g.data=g.data||"";function d(i){a=0;try{a=new ActiveXObject(i)}catch(c){}return a}a=b.XMLHttpRequest?new XMLHttpRequest():d("Microsoft.XMLHTTP")||d("Msxml2.XMLHTTP");if(a){if(a.overrideMimeType){a.overrideMimeType(g.content_type)}a.open(g.type||(g.data?"POST":"GET"),g.url,g.async);if(g.content_type){a.setRequestHeader("Content-Type",g.content_type)}a.setRequestHeader("X-Requested-With","XMLHttpRequest");a.send(g.data);function f(){if(!g.async||a.readyState==4||h++>10000){if(g.success&&h<10000&&a.status==200){g.success.call(g.success_scope,""+a.responseText,a,g)}else{if(g.error){g.error.call(g.error_scope,h>10000?"TIMED_OUT":"GENERAL",a,g)}}a=null}else{b.setTimeout(f,10)}}if(!g.async){return f()}e=b.setTimeout(f,10)}}});(function(){var c=tinymce.extend,b=tinymce.util.JSON,a=tinymce.util.XHR;tinymce.create("tinymce.util.JSONRequest",{JSONRequest:function(d){this.settings=c({},d);this.count=0},send:function(f){var e=f.error,d=f.success;f=c(this.settings,f);f.success=function(h,g){h=b.parse(h);if(typeof(h)=="undefined"){h={error:"JSON Parse error."}}if(h.error){e.call(f.error_scope||f.scope,h.error,g)}else{d.call(f.success_scope||f.scope,h.result)}};f.error=function(h,g){e.call(f.error_scope||f.scope,h,g)};f.data=b.serialize({id:f.id||"c"+(this.count++),method:f.method,params:f.params});f.content_type="application/json";a.send(f)},"static":{sendRPC:function(d){return new tinymce.util.JSONRequest().send(d)}}})}());(function(m){var k=m.each,j=m.is,i=m.isWebKit,d=m.isIE,a=/^(H[1-6R]|P|DIV|ADDRESS|PRE|FORM|T(ABLE|BODY|HEAD|FOOT|H|R|D)|LI|OL|UL|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|NOSCRIPT|MENU|ISINDEX|SAMP)$/,e=g("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected"),f=g("src,href,style,coords,shape"),c={"&":"&amp;",'"':"&quot;","<":"&lt;",">":"&gt;"},n=/[<>&\"]/g,b=/^([a-z0-9],?)+$/i,h=/<(\w+)((?:\s+\w+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)(\s*\/?)>/g,l=/(\w+)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g;function g(q){var p={},o;q=q.split(",");for(o=q.length;o>=0;o--){p[q[o]]=1}return p}m.create("tinymce.dom.DOMUtils",{doc:null,root:null,files:null,pixelStyles:/^(top|left|bottom|right|width|height|borderWidth)$/,props:{"for":"htmlFor","class":"className",className:"className",checked:"checked",disabled:"disabled",maxlength:"maxLength",readonly:"readOnly",selected:"selected",value:"value",id:"id",name:"name",type:"type"},DOMUtils:function(u,q){var p=this,o;p.doc=u;p.win=window;p.files={};p.cssFlicker=false;p.counter=0;p.boxModel=!m.isIE||u.compatMode=="CSS1Compat";p.stdMode=u.documentMode===8;p.settings=q=m.extend({keep_values:false,hex_colors:1,process_html:1},q);if(m.isIE6){try{u.execCommand("BackgroundImageCache",false,true)}catch(r){p.cssFlicker=true}}if(q.valid_styles){p._styles={};k(q.valid_styles,function(t,s){p._styles[s]=m.explode(t)})}m.addUnload(p.destroy,p)},getRoot:function(){var o=this,p=o.settings;return(p&&o.get(p.root_element))||o.doc.body},getViewPort:function(p){var q,o;p=!p?this.win:p;q=p.document;o=this.boxModel?q.documentElement:q.body;return{x:p.pageXOffset||o.scrollLeft,y:p.pageYOffset||o.scrollTop,w:p.innerWidth||o.clientWidth,h:p.innerHeight||o.clientHeight}},getRect:function(s){var r,o=this,q;s=o.get(s);r=o.getPos(s);q=o.getSize(s);return{x:r.x,y:r.y,w:q.w,h:q.h}},getSize:function(r){var p=this,o,q;r=p.get(r);o=p.getStyle(r,"width");q=p.getStyle(r,"height");if(o.indexOf("px")===-1){o=0}if(q.indexOf("px")===-1){q=0}return{w:parseInt(o)||r.offsetWidth||r.clientWidth,h:parseInt(q)||r.offsetHeight||r.clientHeight}},getParent:function(q,p,o){return this.getParents(q,p,o,false)},getParents:function(z,v,s,y){var q=this,p,u=q.settings,x=[];z=q.get(z);y=y===undefined;if(u.strict_root){s=s||q.getRoot()}if(j(v,"string")){p=v;if(v==="*"){v=function(o){return o.nodeType==1}}else{v=function(o){return q.is(o,p)}}}while(z){if(z==s||!z.nodeType||z.nodeType===9){break}if(!v||v(z)){if(y){x.push(z)}else{return z}}z=z.parentNode}return y?x:null},get:function(o){var p;if(o&&this.doc&&typeof(o)=="string"){p=o;o=this.doc.getElementById(o);if(o&&o.id!==p){return this.doc.getElementsByName(p)[1]}}return o},getNext:function(p,o){return this._findSib(p,o,"nextSibling")},getPrev:function(p,o){return this._findSib(p,o,"previousSibling")},select:function(q,p){var o=this;return m.dom.Sizzle(q,o.get(p)||o.get(o.settings.root_element)||o.doc,[])},is:function(q,o){var p;if(q.length===undefined){if(o==="*"){return q.nodeType==1}if(b.test(o)){o=o.toLowerCase().split(/,/);q=q.nodeName.toLowerCase();for(p=o.length-1;p>=0;p--){if(o[p]==q){return true}}return false}}return m.dom.Sizzle.matches(o,q.nodeType?[q]:q).length>0},add:function(s,v,o,r,u){var q=this;return this.run(s,function(y){var x,t;x=j(v,"string")?q.doc.createElement(v):v;q.setAttribs(x,o);if(r){if(r.nodeType){x.appendChild(r)}else{q.setHTML(x,r)}}return !u?y.appendChild(x):x})},create:function(q,o,p){return this.add(this.doc.createElement(q),q,o,p,1)},createHTML:function(v,p,s){var u="",r=this,q;u+="<"+v;for(q in p){if(p.hasOwnProperty(q)){u+=" "+q+'="'+r.encode(p[q])+'"'}}if(m.is(s)){return u+">"+s+"</"+v+">"}return u+" />"},remove:function(o,p){return this.run(o,function(r){var q,s;q=r.parentNode;if(!q){return null}if(p){while(s=r.firstChild){if(!m.isIE||s.nodeType!==3||s.nodeValue){q.insertBefore(s,r)}else{r.removeChild(s)}}}return q.removeChild(r)})},setStyle:function(r,o,p){var q=this;return q.run(r,function(v){var u,t;u=v.style;o=o.replace(/-(\D)/g,function(x,s){return s.toUpperCase()});if(q.pixelStyles.test(o)&&(m.is(p,"number")||/^[\-0-9\.]+$/.test(p))){p+="px"}switch(o){case"opacity":if(d){u.filter=p===""?"":"alpha(opacity="+(p*100)+")";if(!r.currentStyle||!r.currentStyle.hasLayout){u.display="inline-block"}}u[o]=u["-moz-opacity"]=u["-khtml-opacity"]=p||"";break;case"float":d?u.styleFloat=p:u.cssFloat=p;break;default:u[o]=p||""}if(q.settings.update_styles){q.setAttrib(v,"_mce_style")}})},getStyle:function(r,o,q){r=this.get(r);if(!r){return false}if(this.doc.defaultView&&q){o=o.replace(/[A-Z]/g,function(s){return"-"+s});try{return this.doc.defaultView.getComputedStyle(r,null).getPropertyValue(o)}catch(p){return null}}o=o.replace(/-(\D)/g,function(t,s){return s.toUpperCase()});if(o=="float"){o=d?"styleFloat":"cssFloat"}if(r.currentStyle&&q){return r.currentStyle[o]}return r.style[o]},setStyles:function(u,v){var q=this,r=q.settings,p;p=r.update_styles;r.update_styles=0;k(v,function(o,s){q.setStyle(u,s,o)});r.update_styles=p;if(r.update_styles){q.setAttrib(u,r.cssText)}},setAttrib:function(q,r,o){var p=this;if(!q||!r){return}if(p.settings.strict){r=r.toLowerCase()}return this.run(q,function(u){var t=p.settings;switch(r){case"style":if(!j(o,"string")){k(o,function(s,x){p.setStyle(u,x,s)});return}if(t.keep_values){if(o&&!p._isRes(o)){u.setAttribute("_mce_style",o,2)}else{u.removeAttribute("_mce_style",2)}}u.style.cssText=o;break;case"class":u.className=o||"";break;case"src":case"href":if(t.keep_values){if(t.url_converter){o=t.url_converter.call(t.url_converter_scope||p,o,r,u)}p.setAttrib(u,"_mce_"+r,o,2)}break;case"shape":u.setAttribute("_mce_style",o);break}if(j(o)&&o!==null&&o.length!==0){u.setAttribute(r,""+o,2)}else{u.removeAttribute(r,2)}})},setAttribs:function(q,r){var p=this;return this.run(q,function(o){k(r,function(s,t){p.setAttrib(o,t,s)})})},getAttrib:function(r,s,q){var o,p=this;r=p.get(r);if(!r||r.nodeType!==1){return false}if(!j(q)){q=""}if(/^(src|href|style|coords|shape)$/.test(s)){o=r.getAttribute("_mce_"+s);if(o){return o}}if(d&&p.props[s]){o=r[p.props[s]];o=o&&o.nodeValue?o.nodeValue:o}if(!o){o=r.getAttribute(s,2)}if(/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(s)){if(r[p.props[s]]===true&&o===""){return s}return o?s:""}if(r.nodeName==="FORM"&&r.getAttributeNode(s)){return r.getAttributeNode(s).nodeValue}if(s==="style"){o=o||r.style.cssText;if(o){o=p.serializeStyle(p.parseStyle(o),r.nodeName);if(p.settings.keep_values&&!p._isRes(o)){r.setAttribute("_mce_style",o)}}}if(i&&s==="class"&&o){o=o.replace(/(apple|webkit)\-[a-z\-]+/gi,"")}if(d){switch(s){case"rowspan":case"colspan":if(o===1){o=""}break;case"size":if(o==="+0"||o===20||o===0){o=""}break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":if(o===0){o=""}break;case"hspace":if(o===-1){o=""}break;case"maxlength":case"tabindex":if(o===32768||o===2147483647||o==="32768"){o=""}break;case"multiple":case"compact":case"noshade":case"nowrap":if(o===65535){return s}return q;case"shape":o=o.toLowerCase();break;default:if(s.indexOf("on")===0&&o){o=(""+o).replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/,"$1")}}}return(o!==undefined&&o!==null&&o!=="")?""+o:q},getPos:function(A,s){var p=this,o=0,z=0,u,v=p.doc,q;A=p.get(A);s=s||v.body;if(A){if(d&&!p.stdMode){A=A.getBoundingClientRect();u=p.boxModel?v.documentElement:v.body;o=p.getStyle(p.select("html")[0],"borderWidth");o=(o=="medium"||p.boxModel&&!p.isIE6)&&2||o;A.top+=p.win.self!=p.win.top?2:0;return{x:A.left+u.scrollLeft-o,y:A.top+u.scrollTop-o}}q=A;while(q&&q!=s&&q.nodeType){o+=q.offsetLeft||0;z+=q.offsetTop||0;q=q.offsetParent}q=A.parentNode;while(q&&q!=s&&q.nodeType){o-=q.scrollLeft||0;z-=q.scrollTop||0;q=q.parentNode}}return{x:o,y:z}},parseStyle:function(r){var u=this,v=u.settings,x={};if(!r){return x}function p(D,A,C){var z,B,o,y;z=x[D+"-top"+A];if(!z){return}B=x[D+"-right"+A];if(z!=B){return}o=x[D+"-bottom"+A];if(B!=o){return}y=x[D+"-left"+A];if(o!=y){return}x[C]=y;delete x[D+"-top"+A];delete x[D+"-right"+A];delete x[D+"-bottom"+A];delete x[D+"-left"+A]}function q(y,s,o,A){var z;z=x[s];if(!z){return}z=x[o];if(!z){return}z=x[A];if(!z){return}x[y]=x[s]+" "+x[o]+" "+x[A];delete x[s];delete x[o];delete x[A]}r=r.replace(/&(#?[a-z0-9]+);/g,"&$1_MCE_SEMI_");k(r.split(";"),function(s){var o,t=[];if(s){s=s.replace(/_MCE_SEMI_/g,";");s=s.replace(/url\([^\)]+\)/g,function(y){t.push(y);return"url("+t.length+")"});s=s.split(":");o=m.trim(s[1]);o=o.replace(/url\(([^\)]+)\)/g,function(z,y){return t[parseInt(y)-1]});o=o.replace(/rgb\([^\)]+\)/g,function(y){return u.toHex(y)});if(v.url_converter){o=o.replace(/url\([\'\"]?([^\)\'\"]+)[\'\"]?\)/g,function(y,z){return"url("+v.url_converter.call(v.url_converter_scope||u,u.decode(z),"style",null)+")"})}x[m.trim(s[0]).toLowerCase()]=o}});p("border","","border");p("border","-width","border-width");p("border","-color","border-color");p("border","-style","border-style");p("padding","","padding");p("margin","","margin");q("border","border-width","border-style","border-color");if(d){if(x.border=="medium none"){x.border=""}}return x},serializeStyle:function(v,p){var q=this,r="";function u(s,o){if(o&&s){if(o.indexOf("-")===0){return}switch(o){case"font-weight":if(s==700){s="bold"}break;case"color":case"background-color":s=s.toLowerCase();break}r+=(r?" ":"")+o+": "+s+";"}}if(p&&q._styles){k(q._styles["*"],function(o){u(v[o],o)});k(q._styles[p.toLowerCase()],function(o){u(v[o],o)})}else{k(v,u)}return r},loadCSS:function(o){var q=this,r=q.doc,p;if(!o){o=""}p=q.select("head")[0];k(o.split(","),function(s){var t;if(q.files[s]){return}q.files[s]=true;t=q.create("link",{rel:"stylesheet",href:m._addVer(s)});if(d&&r.documentMode){t.onload=function(){r.recalc();t.onload=null}}p.appendChild(t)})},addClass:function(o,p){return this.run(o,function(q){var r;if(!p){return 0}if(this.hasClass(q,p)){return q.className}r=this.removeClass(q,p);return q.className=(r!=""?(r+" "):"")+p})},removeClass:function(q,r){var o=this,p;return o.run(q,function(t){var s;if(o.hasClass(t,r)){if(!p){p=new RegExp("(^|\\s+)"+r+"(\\s+|$)","g")}s=t.className.replace(p," ");s=m.trim(s!=" "?s:"");t.className=s;if(!s){t.removeAttribute("class");t.removeAttribute("className")}return s}return t.className})},hasClass:function(p,o){p=this.get(p);if(!p||!o){return false}return(" "+p.className+" ").indexOf(" "+o+" ")!==-1},show:function(o){return this.setStyle(o,"display","block")},hide:function(o){return this.setStyle(o,"display","none")},isHidden:function(o){o=this.get(o);return !o||o.style.display=="none"||this.getStyle(o,"display")=="none"},uniqueId:function(o){return(!o?"mce_":o)+(this.counter++)},setHTML:function(q,p){var o=this;return this.run(q,function(v){var r,t,s,z,u,r;p=o.processHTML(p);if(d){function y(){while(v.firstChild){v.firstChild.removeNode()}try{v.innerHTML="<br />"+p;v.removeChild(v.firstChild)}catch(x){r=o.create("div");r.innerHTML="<br />"+p;k(r.childNodes,function(B,A){if(A){v.appendChild(B)}})}}if(o.settings.fix_ie_paragraphs){p=p.replace(/<p><\/p>|<p([^>]+)><\/p>|<p[^\/+]\/>/gi,'<p$1 _mce_keep="true">&nbsp;</p>')}y();if(o.settings.fix_ie_paragraphs){s=v.getElementsByTagName("p");for(t=s.length-1,r=0;t>=0;t--){z=s[t];if(!z.hasChildNodes()){if(!z._mce_keep){r=1;break}z.removeAttribute("_mce_keep")}}}if(r){p=p.replace(/<p ([^>]+)>|<p>/ig,'<div $1 _mce_tmp="1">');p=p.replace(/<\/p>/gi,"</div>");y();if(o.settings.fix_ie_paragraphs){s=v.getElementsByTagName("DIV");for(t=s.length-1;t>=0;t--){z=s[t];if(z._mce_tmp){u=o.doc.createElement("p");z.cloneNode(false).outerHTML.replace(/([a-z0-9\-_]+)=/gi,function(A,x){var B;if(x!=="_mce_tmp"){B=z.getAttribute(x);if(!B&&x==="class"){B=z.className}u.setAttribute(x,B)}});for(r=0;r<z.childNodes.length;r++){u.appendChild(z.childNodes[r].cloneNode(true))}z.swapNode(u)}}}}}else{v.innerHTML=p}return p})},processHTML:function(r){var p=this,q=p.settings,v=[];if(!q.process_html){return r}if(d){r=r.replace(/&apos;/g,"&#39;");r=r.replace(/\s+(disabled|checked|readonly|selected)\s*=\s*[\"\']?(false|0)[\"\']?/gi,"")}r=r.replace(/<a( )([^>]+)\/>|<a\/>/gi,"<a$1$2></a>");if(q.keep_values){if(/<script|noscript|style/i.test(r)){function o(t){t=t.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n");t=t.replace(/^[\r\n]*|[\r\n]*$/g,"");t=t.replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g,"");t=t.replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g,"");return t}r=r.replace(/<script([^>]+|)>([\s\S]*?)<\/script>/gi,function(s,x,t){if(!x){x=' type="text/javascript"'}x=x.replace(/src=\"([^\"]+)\"?/i,function(y,z){if(q.url_converter){z=p.encode(q.url_converter.call(q.url_converter_scope||p,p.decode(z),"src","script"))}return'_mce_src="'+z+'"'});if(m.trim(t)){v.push(o(t));t="<!--\nMCE_SCRIPT:"+(v.length-1)+"\n// -->"}return"<mce:script"+x+">"+t+"</mce:script>"});r=r.replace(/<style([^>]+|)>([\s\S]*?)<\/style>/gi,function(s,x,t){if(t){v.push(o(t));t="<!--\nMCE_SCRIPT:"+(v.length-1)+"\n-->"}return"<mce:style"+x+">"+t+"</mce:style><style "+x+' _mce_bogus="1">'+t+"</style>"});r=r.replace(/<noscript([^>]+|)>([\s\S]*?)<\/noscript>/g,function(s,x,t){return"<mce:noscript"+x+"><!--"+p.encode(t).replace(/--/g,"&#45;&#45;")+"--></mce:noscript>"})}r=r.replace(/<!\[CDATA\[([\s\S]+)\]\]>/g,"<!--[CDATA[$1]]-->");function u(s){return s.replace(h,function(y,z,x,t){return"<"+z+x.replace(l,function(B,A,E,D,C){var F;A=A.toLowerCase();E=E||D||C||"";if(e[A]){if(E==="false"||E==="0"){return}return A+'="'+A+'"'}if(f[A]&&x.indexOf("_mce_"+A)==-1){F=p.decode(E);if(q.url_converter&&(A=="src"||A=="href")){F=q.url_converter.call(q.url_converter_scope||p,F,A,z)}if(A=="style"){F=p.serializeStyle(p.parseStyle(F),A)}return A+'="'+E+'" _mce_'+A+'="'+p.encode(F)+'"'}return B})+t+">"})}r=u(r);r=r.replace(/MCE_SCRIPT:([0-9]+)/g,function(t,s){return v[s]})}return r},getOuterHTML:function(o){var p;o=this.get(o);if(!o){return null}if(o.outerHTML!==undefined){return o.outerHTML}p=(o.ownerDocument||this.doc).createElement("body");p.appendChild(o.cloneNode(true));return p.innerHTML},setOuterHTML:function(r,p,s){var o=this;function q(u,t,x){var y,v;v=x.createElement("body");v.innerHTML=t;y=v.lastChild;while(y){o.insertAfter(y.cloneNode(true),u);y=y.previousSibling}o.remove(u)}return this.run(r,function(u){u=o.get(u);if(u.nodeType==1){s=s||u.ownerDocument||o.doc;if(d){try{if(d&&u.nodeType==1){u.outerHTML=p}else{q(u,p,s)}}catch(t){q(u,p,s)}}else{q(u,p,s)}}})},decode:function(p){var q,r,o;if(/&[\w#]+;/.test(p)){q=this.doc.createElement("div");q.innerHTML=p;r=q.firstChild;o="";if(r){do{o+=r.nodeValue}while(r=r.nextSibling)}return o||p}return p},encode:function(o){return(""+o).replace(n,function(p){return c[p]})},insertAfter:function(o,p){p=this.get(p);return this.run(o,function(r){var q,s;q=p.parentNode;s=p.nextSibling;if(s){q.insertBefore(r,s)}else{q.appendChild(r)}return r})},isBlock:function(o){if(o.nodeType&&o.nodeType!==1){return false}o=o.nodeName||o;return a.test(o)},replace:function(s,r,p){var q=this;if(j(r,"array")){s=s.cloneNode(true)}return q.run(r,function(t){if(p){k(m.grep(t.childNodes),function(o){s.appendChild(o)})}return t.parentNode.replaceChild(s,t)})},rename:function(r,o){var q=this,p;if(r.nodeName!=o.toUpperCase()){p=q.create(o);k(q.getAttribs(r),function(s){q.setAttrib(p,s.nodeName,q.getAttrib(r,s.nodeName))});q.replace(p,r,1)}return p||r},findCommonAncestor:function(q,o){var r=q,p;while(r){p=o;while(p&&r!=p){p=p.parentNode}if(r==p){break}r=r.parentNode}if(!r&&q.ownerDocument){return q.ownerDocument.documentElement}return r},toHex:function(o){var q=/^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(o);function p(r){r=parseInt(r).toString(16);return r.length>1?r:"0"+r}if(q){o="#"+p(q[1])+p(q[2])+p(q[3]);return o}return o},getClasses:function(){var s=this,o=[],r,u={},v=s.settings.class_filter,q;if(s.classes){return s.classes}function x(t){k(t.imports,function(y){x(y)});k(t.cssRules||t.rules,function(y){switch(y.type||1){case 1:if(y.selectorText){k(y.selectorText.split(","),function(z){z=z.replace(/^\s*|\s*$|^\s\./g,"");if(/\.mce/.test(z)||!/\.[\w\-]+$/.test(z)){return}q=z;z=z.replace(/.*\.([a-z0-9_\-]+).*/i,"$1");if(v&&!(z=v(z,q))){return}if(!u[z]){o.push({"class":z});u[z]=1}})}break;case 3:x(y.styleSheet);break}})}try{k(s.doc.styleSheets,x)}catch(p){}if(o.length>0){s.classes=o}return o},run:function(u,r,q){var p=this,v;if(p.doc&&typeof(u)==="string"){u=p.get(u)}if(!u){return false}q=q||this;if(!u.nodeType&&(u.length||u.length===0)){v=[];k(u,function(s,o){if(s){if(typeof(s)=="string"){s=p.doc.getElementById(s)}v.push(r.call(q,s,o))}});return v}return r.call(q,u)},getAttribs:function(q){var p;q=this.get(q);if(!q){return[]}if(d){p=[];if(q.nodeName=="OBJECT"){return q.attributes}if(q.nodeName==="OPTION"&&this.getAttrib(q,"selected")){p.push({specified:1,nodeName:"selected"})}q.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi,"").replace(/[\w:\-]+/gi,function(o){p.push({specified:1,nodeName:o})});return p}return q.attributes},destroy:function(p){var o=this;if(o.events){o.events.destroy()}o.win=o.doc=o.root=o.events=null;if(!p){m.removeUnload(o.destroy)}},createRng:function(){var o=this.doc;return o.createRange?o.createRange():new m.dom.Range(this)},nodeIndex:function(s,t){var o=0,q,r,p;if(s){for(q=s.nodeType,s=s.previousSibling,r=s;s;s=s.previousSibling){p=s.nodeType;if(t&&p==3){if(p==q||!s.nodeValue.length){continue}}o++;q=p}}return o},split:function(u,s,y){var z=this,o=z.createRng(),v,q,x;function p(A){var t,r=A.childNodes;if(A.nodeType==1&&A.getAttribute("_mce_type")=="bookmark"){return}for(t=r.length-1;t>=0;t--){p(r[t])}if(A.nodeType!=9){if(A.nodeType==3&&A.nodeValue.length>0){return}if(A.nodeType==1){r=A.childNodes;if(r.length==1&&r[0]&&r[0].nodeType==1&&r[0].getAttribute("_mce_type")=="bookmark"){A.parentNode.insertBefore(r[0],A)}if(r.length||/^(br|hr|input|img)$/i.test(A.nodeName)){return}}z.remove(A)}return A}if(u&&s){o.setStart(u.parentNode,z.nodeIndex(u));o.setEnd(s.parentNode,z.nodeIndex(s));v=o.extractContents();o=z.createRng();o.setStart(s.parentNode,z.nodeIndex(s)+1);o.setEnd(u.parentNode,z.nodeIndex(u)+1);q=o.extractContents();x=u.parentNode;x.insertBefore(p(v),u);if(y){x.replaceChild(y,s)}else{x.insertBefore(s,u)}x.insertBefore(p(q),u);z.remove(u);return y||s}},bind:function(s,o,r,q){var p=this;if(!p.events){p.events=new m.dom.EventUtils()}return p.events.add(s,o,r,q||this)},unbind:function(r,o,q){var p=this;if(!p.events){p.events=new m.dom.EventUtils()}return p.events.remove(r,o,q)},_findSib:function(r,o,p){var q=this,s=o;if(r){if(j(s,"string")){s=function(t){return q.is(t,o)}}for(r=r[p];r;r=r[p]){if(s(r)){return r}}}return null},_isRes:function(o){return/^(top|left|bottom|right|width|height)/i.test(o)||/;\s*(top|left|bottom|right|width|height)/i.test(o)}});m.DOM=new m.dom.DOMUtils(document,{process_html:0})})(tinymce);(function(a){function b(c){var N=this,e=c.doc,S=0,E=1,j=2,D=true,R=false,U="startOffset",h="startContainer",P="endContainer",z="endOffset",k=tinymce.extend,n=c.nodeIndex;k(N,{startContainer:e,startOffset:0,endContainer:e,endOffset:0,collapsed:D,commonAncestorContainer:e,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:q,setEnd:s,setStartBefore:g,setStartAfter:I,setEndBefore:J,setEndAfter:u,collapse:A,selectNode:x,selectNodeContents:F,compareBoundaryPoints:v,deleteContents:p,extractContents:H,cloneContents:d,insertNode:C,surroundContents:M,cloneRange:K});function q(V,t){B(D,V,t)}function s(V,t){B(R,V,t)}function g(t){q(t.parentNode,n(t))}function I(t){q(t.parentNode,n(t)+1)}function J(t){s(t.parentNode,n(t))}function u(t){s(t.parentNode,n(t)+1)}function A(t){if(t){N[P]=N[h];N[z]=N[U]}else{N[h]=N[P];N[U]=N[z]}N.collapsed=D}function x(t){g(t);u(t)}function F(t){q(t,0);s(t,t.nodeType===1?t.childNodes.length:t.nodeValue.length)}function v(W,X){var Z=N[h],Y=N[U],V=N[P],t=N[z];if(W===0){return G(Z,Y,Z,Y)}if(W===1){return G(Z,Y,V,t)}if(W===2){return G(V,t,V,t)}if(W===3){return G(V,t,Z,Y)}}function p(){m(j)}function H(){return m(S)}function d(){return m(E)}function C(Y){var V=this[h],t=this[U],X,W;if((V.nodeType===3||V.nodeType===4)&&V.nodeValue){if(!t){V.parentNode.insertBefore(Y,V)}else{if(t>=V.nodeValue.length){c.insertAfter(Y,V)}else{X=V.splitText(t);V.parentNode.insertBefore(Y,X)}}}else{if(V.childNodes.length>0){W=V.childNodes[t]}if(W){V.insertBefore(Y,W)}else{V.appendChild(Y)}}}function M(V){var t=N.extractContents();N.insertNode(V);V.appendChild(t);N.selectNode(V)}function K(){return k(new b(c),{startContainer:N[h],startOffset:N[U],endContainer:N[P],endOffset:N[z],collapsed:N.collapsed,commonAncestorContainer:N.commonAncestorContainer})}function O(t,V){var W;if(t.nodeType==3){return t}if(V<0){return t}W=t.firstChild;while(W&&V>0){--V;W=W.nextSibling}if(W){return W}return t}function l(){return(N[h]==N[P]&&N[U]==N[z])}function G(X,Z,V,Y){var aa,W,t,ab,ad,ac;if(X==V){if(Z==Y){return 0}if(Z<Y){return -1}return 1}aa=V;while(aa&&aa.parentNode!=X){aa=aa.parentNode}if(aa){W=0;t=X.firstChild;while(t!=aa&&W<Z){W++;t=t.nextSibling}if(Z<=W){return -1}return 1}aa=X;while(aa&&aa.parentNode!=V){aa=aa.parentNode}if(aa){W=0;t=V.firstChild;while(t!=aa&&W<Y){W++;t=t.nextSibling}if(W<Y){return -1}return 1}ab=c.findCommonAncestor(X,V);ad=X;while(ad&&ad.parentNode!=ab){ad=ad.parentNode}if(!ad){ad=ab}ac=V;while(ac&&ac.parentNode!=ab){ac=ac.parentNode}if(!ac){ac=ab}if(ad==ac){return 0}t=ab.firstChild;while(t){if(t==ad){return -1}if(t==ac){return 1}t=t.nextSibling}}function B(V,Y,X){var t,W;if(V){N[h]=Y;N[U]=X}else{N[P]=Y;N[z]=X}t=N[P];while(t.parentNode){t=t.parentNode}W=N[h];while(W.parentNode){W=W.parentNode}if(W==t){if(G(N[h],N[U],N[P],N[z])>0){N.collapse(V)}}else{N.collapse(V)}N.collapsed=l();N.commonAncestorContainer=c.findCommonAncestor(N[h],N[P])}function m(ab){var aa,X=0,ad=0,V,Z,W,Y,t,ac;if(N[h]==N[P]){return f(ab)}for(aa=N[P],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[h]){return r(aa,ab)}++X}for(aa=N[h],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[P]){return T(aa,ab)}++ad}Z=ad-X;W=N[h];while(Z>0){W=W.parentNode;Z--}Y=N[P];while(Z<0){Y=Y.parentNode;Z++}for(t=W.parentNode,ac=Y.parentNode;t!=ac;t=t.parentNode,ac=ac.parentNode){W=t;Y=ac}return o(W,Y,ab)}function f(Z){var ab,Y,X,aa,t,W,V;if(Z!=j){ab=e.createDocumentFragment()}if(N[U]==N[z]){return ab}if(N[h].nodeType==3){Y=N[h].nodeValue;X=Y.substring(N[U],N[z]);if(Z!=E){N[h].deleteData(N[U],N[z]-N[U]);N.collapse(D)}if(Z==j){return}ab.appendChild(e.createTextNode(X));return ab}aa=O(N[h],N[U]);t=N[z]-N[U];while(t>0){W=aa.nextSibling;V=y(aa,Z);if(ab){ab.appendChild(V)}--t;aa=W}if(Z!=E){N.collapse(D)}return ab}function r(ab,Y){var aa,Z,V,t,X,W;if(Y!=j){aa=e.createDocumentFragment()}Z=i(ab,Y);if(aa){aa.appendChild(Z)}V=n(ab);t=V-N[U];if(t<=0){if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}Z=ab.previousSibling;while(t>0){X=Z.previousSibling;W=y(Z,Y);if(aa){aa.insertBefore(W,aa.firstChild)}--t;Z=X}if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}function T(Z,Y){var ab,V,aa,t,X,W;if(Y!=j){ab=e.createDocumentFragment()}aa=Q(Z,Y);if(ab){ab.appendChild(aa)}V=n(Z);++V;t=N[z]-V;aa=Z.nextSibling;while(t>0){X=aa.nextSibling;W=y(aa,Y);if(ab){ab.appendChild(W)}--t;aa=X}if(Y!=E){N.setStartAfter(Z);N.collapse(D)}return ab}function o(Z,t,ac){var W,ae,Y,aa,ab,V,ad,X;if(ac!=j){ae=e.createDocumentFragment()}W=Q(Z,ac);if(ae){ae.appendChild(W)}Y=Z.parentNode;aa=n(Z);ab=n(t);++aa;V=ab-aa;ad=Z.nextSibling;while(V>0){X=ad.nextSibling;W=y(ad,ac);if(ae){ae.appendChild(W)}ad=X;--V}W=i(t,ac);if(ae){ae.appendChild(W)}if(ac!=E){N.setStartAfter(Z);N.collapse(D)}return ae}function i(aa,ab){var W=O(N[P],N[z]-1),ac,Z,Y,t,V,X=W!=N[P];if(W==aa){return L(W,X,R,ab)}ac=W.parentNode;Z=L(ac,R,R,ab);while(ac){while(W){Y=W.previousSibling;t=L(W,X,R,ab);if(ab!=j){Z.insertBefore(t,Z.firstChild)}X=D;W=Y}if(ac==aa){return Z}W=ac.previousSibling;ac=ac.parentNode;V=L(ac,R,R,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function Q(aa,ab){var X=O(N[h],N[U]),Y=X!=N[h],ac,Z,W,t,V;if(X==aa){return L(X,Y,D,ab)}ac=X.parentNode;Z=L(ac,R,D,ab);while(ac){while(X){W=X.nextSibling;t=L(X,Y,D,ab);if(ab!=j){Z.appendChild(t)}Y=D;X=W}if(ac==aa){return Z}X=ac.nextSibling;ac=ac.parentNode;V=L(ac,R,D,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function L(t,Y,ab,ac){var X,W,Z,V,aa;if(Y){return y(t,ac)}if(t.nodeType==3){X=t.nodeValue;if(ab){V=N[U];W=X.substring(V);Z=X.substring(0,V)}else{V=N[z];W=X.substring(0,V);Z=X.substring(V)}if(ac!=E){t.nodeValue=Z}if(ac==j){return}aa=t.cloneNode(R);aa.nodeValue=W;return aa}if(ac==j){return}return t.cloneNode(R)}function y(V,t){if(t!=j){return t==E?V.cloneNode(D):V}V.parentNode.removeChild(V)}}a.Range=b})(tinymce.dom);(function(){function a(g){var i=this,j="\uFEFF",e,h,d=g.dom,c=true,f=false;function b(){var n=g.getRng(),k=d.createRng(),m,o;m=n.item?n.item(0):n.parentElement();if(m.ownerDocument!=d.doc){return k}if(n.item||!m.hasChildNodes()){k.setStart(m.parentNode,d.nodeIndex(m));k.setEnd(k.startContainer,k.startOffset+1);return k}o=g.isCollapsed();function l(s){var u,q,t,p,A=0,x,y,z,r,v;r=n.duplicate();r.collapse(s);u=d.create("a");z=r.parentElement();if(!z.hasChildNodes()){k[s?"setStart":"setEnd"](z,0);return}z.appendChild(u);r.moveToElementText(u);v=n.compareEndPoints(s?"StartToStart":"EndToEnd",r);if(v>0){k[s?"setStartAfter":"setEndAfter"](z);d.remove(u);return}p=tinymce.grep(z.childNodes);x=p.length-1;while(A<=x){y=Math.floor((A+x)/2);z.insertBefore(u,p[y]);r.moveToElementText(u);v=n.compareEndPoints(s?"StartToStart":"EndToEnd",r);if(v>0){A=y+1}else{if(v<0){x=y-1}else{found=true;break}}}q=v>0||y==0?u.nextSibling:u.previousSibling;if(q.nodeType==1){d.remove(u);t=d.nodeIndex(q);q=q.parentNode;if(!s||y>0){t++}}else{if(v>0||y==0){r.setEndPoint(s?"StartToStart":"EndToEnd",n);t=r.text.length}else{r.setEndPoint(s?"StartToStart":"EndToEnd",n);t=q.nodeValue.length-r.text.length}d.remove(u)}k[s?"setStart":"setEnd"](q,t)}l(true);if(!o){l()}return k}this.addRange=function(l){var t,A,z=g.dom.doc,r=z.body,u,n,y,o,s,k,p,q,x,m;this.destroy();y=l.startContainer;o=l.startOffset;s=l.endContainer;k=l.endOffset;t=r.createTextRange();if(y==z||s==z){t=r.createTextRange();t.collapse();t.select();return}if(y.nodeType==1&&y.hasChildNodes()){q=y.childNodes.length-1;if(o>q){x=1;y=y.childNodes[q]}else{y=y.childNodes[o]}if(y.nodeType==3){o=0}}if(s.nodeType==1&&s.hasChildNodes()){q=s.childNodes.length-1;if(k==0){m=1;s=s.childNodes[0]}else{s=s.childNodes[Math.min(q,k-1)];if(s.nodeType==3){k=s.nodeValue.length}}}if(y==s&&y.nodeType==1){if(/^(IMG|TABLE)$/.test(y.nodeName)&&o!=k){t=r.createControlRange();t.addElement(y)}else{t=r.createTextRange();if(!y.hasChildNodes()&&y.canHaveHTML){y.innerHTML=j}t.moveToElementText(y);if(y.innerHTML==j){t.collapse(c);y.removeChild(y.firstChild)}}if(o==k){t.collapse(k<=l.endContainer.childNodes.length-1)}t.select();t.scrollIntoView();return}t=r.createTextRange();p=z.createElement("span");p.innerHTML=" ";if(y.nodeType==3){if(x){d.insertAfter(p,y)}else{y.parentNode.insertBefore(p,y)}t.moveToElementText(p);p.parentNode.removeChild(p);if(o>0){t.move("character",o)}}else{t.moveToElementText(y);if(x){t.collapse(f)}}if(y==s&&y.nodeType==3){try{t.moveEnd("character",k-o);t.select();t.scrollIntoView()}catch(v){}return}A=r.createTextRange();if(s.nodeType==3){s.parentNode.insertBefore(p,s);A.moveToElementText(p);p.parentNode.removeChild(p);A.move("character",k);t.setEndPoint("EndToStart",A)}else{A.moveToElementText(s);A.collapse(!!m);t.setEndPoint("EndToEnd",A)}t.select();t.scrollIntoView()};this.getRangeAt=function(){if(!e||!tinymce.dom.RangeUtils.compareRanges(h,g.getRng())){e=b();h=g.getRng()}try{e.startContainer.nextSibling}catch(k){e=b();h=null}return e};this.destroy=function(){h=e=null};if(g.dom.boxModel){(function(){var q=d.doc,l=q.body,n,o;q.documentElement.unselectable=c;function p(r,u){var s=l.createTextRange();try{s.moveToPoint(r,u)}catch(t){s=null}return s}function m(s){var r;if(s.button){r=p(s.x,s.y);if(r){if(r.compareEndPoints("StartToStart",o)>0){r.setEndPoint("StartToStart",o)}else{r.setEndPoint("EndToEnd",o)}r.select()}}else{k()}}function k(){d.unbind(q,"mouseup",k);d.unbind(q,"mousemove",m);n=0}d.bind(q,"mousedown",function(r){if(r.target.nodeName==="HTML"){if(n){k()}n=1;o=p(r.x,r.y);if(o){d.bind(q,"mouseup",k);d.bind(q,"mousemove",m);o.select()}}})})()}}tinymce.dom.TridentSelection=a})();(function(){var p=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,j=0,d=Object.prototype.toString,o=false,i=true;[0,0].sort(function(){i=false;return 0});var b=function(v,e,z,A){z=z||[];e=e||document;var C=e;if(e.nodeType!==1&&e.nodeType!==9){return[]}if(!v||typeof v!=="string"){return z}var x=[],s,E,H,r,u=true,t=b.isXML(e),B=v,D,G,F,y;do{p.exec("");s=p.exec(B);if(s){B=s[3];x.push(s[1]);if(s[2]){r=s[3];break}}}while(s);if(x.length>1&&k.exec(v)){if(x.length===2&&f.relative[x[0]]){E=h(x[0]+x[1],e)}else{E=f.relative[x[0]]?[e]:b(x.shift(),e);while(x.length){v=x.shift();if(f.relative[v]){v+=x.shift()}E=h(v,E)}}}else{if(!A&&x.length>1&&e.nodeType===9&&!t&&f.match.ID.test(x[0])&&!f.match.ID.test(x[x.length-1])){D=b.find(x.shift(),e,t);e=D.expr?b.filter(D.expr,D.set)[0]:D.set[0]}if(e){D=A?{expr:x.pop(),set:a(A)}:b.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&e.parentNode?e.parentNode:e,t);E=D.expr?b.filter(D.expr,D.set):D.set;if(x.length>0){H=a(E)}else{u=false}while(x.length){G=x.pop();F=G;if(!f.relative[G]){G=""}else{F=x.pop()}if(F==null){F=e}f.relative[G](H,F,t)}}else{H=x=[]}}if(!H){H=E}if(!H){b.error(G||v)}if(d.call(H)==="[object Array]"){if(!u){z.push.apply(z,H)}else{if(e&&e.nodeType===1){for(y=0;H[y]!=null;y++){if(H[y]&&(H[y]===true||H[y].nodeType===1&&b.contains(e,H[y]))){z.push(E[y])}}}else{for(y=0;H[y]!=null;y++){if(H[y]&&H[y].nodeType===1){z.push(E[y])}}}}}else{a(H,z)}if(r){b(r,C,z,A);b.uniqueSort(z)}return z};b.uniqueSort=function(r){if(c){o=i;r.sort(c);if(o){for(var e=1;e<r.length;e++){if(r[e]===r[e-1]){r.splice(e--,1)}}}}return r};b.matches=function(e,r){return b(e,null,null,r)};b.find=function(y,e,z){var x;if(!y){return[]}for(var t=0,s=f.order.length;t<s;t++){var v=f.order[t],u;if((u=f.leftMatch[v].exec(y))){var r=u[1];u.splice(1,1);if(r.substr(r.length-1)!=="\\"){u[1]=(u[1]||"").replace(/\\/g,"");x=f.find[v](u,e,z);if(x!=null){y=y.replace(f.match[v],"");break}}}}if(!x){x=e.getElementsByTagName("*")}return{set:x,expr:y}};b.filter=function(C,B,F,u){var s=C,H=[],z=B,x,e,y=B&&B[0]&&b.isXML(B[0]);while(C&&B.length){for(var A in f.filter){if((x=f.leftMatch[A].exec(C))!=null&&x[2]){var r=f.filter[A],G,E,t=x[1];e=false;x.splice(1,1);if(t.substr(t.length-1)==="\\"){continue}if(z===H){H=[]}if(f.preFilter[A]){x=f.preFilter[A](x,z,F,H,u,y);if(!x){e=G=true}else{if(x===true){continue}}}if(x){for(var v=0;(E=z[v])!=null;v++){if(E){G=r(E,x,v,z);var D=u^!!G;if(F&&G!=null){if(D){e=true}else{z[v]=false}}else{if(D){H.push(E);e=true}}}}}if(G!==undefined){if(!F){z=H}C=C.replace(f.match[A],"");if(!e){return[]}break}}}if(C===s){if(e==null){b.error(C)}else{break}}s=C}return z};b.error=function(e){throw"Syntax error, unrecognized expression: "+e};var f=b.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(e){return e.getAttribute("href")}},relative:{"+":function(x,r){var t=typeof r==="string",v=t&&!/\W/.test(r),y=t&&!v;if(v){r=r.toLowerCase()}for(var s=0,e=x.length,u;s<e;s++){if((u=x[s])){while((u=u.previousSibling)&&u.nodeType!==1){}x[s]=y||u&&u.nodeName.toLowerCase()===r?u||false:u===r}}if(y){b.filter(r,x,true)}},">":function(x,r){var u=typeof r==="string",v,s=0,e=x.length;if(u&&!/\W/.test(r)){r=r.toLowerCase();for(;s<e;s++){v=x[s];if(v){var t=v.parentNode;x[s]=t.nodeName.toLowerCase()===r?t:false}}}else{for(;s<e;s++){v=x[s];if(v){x[s]=u?v.parentNode:v.parentNode===r}}if(u){b.filter(r,x,true)}}},"":function(t,r,v){var s=j++,e=q,u;if(typeof r==="string"&&!/\W/.test(r)){r=r.toLowerCase();u=r;e=n}e("parentNode",r,s,t,u,v)},"~":function(t,r,v){var s=j++,e=q,u;if(typeof r==="string"&&!/\W/.test(r)){r=r.toLowerCase();u=r;e=n}e("previousSibling",r,s,t,u,v)}},find:{ID:function(r,s,t){if(typeof s.getElementById!=="undefined"&&!t){var e=s.getElementById(r[1]);return e?[e]:[]}},NAME:function(s,v){if(typeof v.getElementsByName!=="undefined"){var r=[],u=v.getElementsByName(s[1]);for(var t=0,e=u.length;t<e;t++){if(u[t].getAttribute("name")===s[1]){r.push(u[t])}}return r.length===0?null:r}},TAG:function(e,r){return r.getElementsByTagName(e[1])}},preFilter:{CLASS:function(t,r,s,e,x,y){t=" "+t[1].replace(/\\/g,"")+" ";if(y){return t}for(var u=0,v;(v=r[u])!=null;u++){if(v){if(x^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(t)>=0)){if(!s){e.push(v)}}else{if(s){r[u]=false}}}}return false},ID:function(e){return e[1].replace(/\\/g,"")},TAG:function(r,e){return r[1].toLowerCase()},CHILD:function(e){if(e[1]==="nth"){var r=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(e[2]==="even"&&"2n"||e[2]==="odd"&&"2n+1"||!/\D/.test(e[2])&&"0n+"+e[2]||e[2]);e[2]=(r[1]+(r[2]||1))-0;e[3]=r[3]-0}e[0]=j++;return e},ATTR:function(u,r,s,e,v,x){var t=u[1].replace(/\\/g,"");if(!x&&f.attrMap[t]){u[1]=f.attrMap[t]}if(u[2]==="~="){u[4]=" "+u[4]+" "}return u},PSEUDO:function(u,r,s,e,v){if(u[1]==="not"){if((p.exec(u[3])||"").length>1||/^\w/.test(u[3])){u[3]=b(u[3],null,null,r)}else{var t=b.filter(u[3],r,s,true^v);if(!s){e.push.apply(e,t)}return false}}else{if(f.match.POS.test(u[0])||f.match.CHILD.test(u[0])){return true}}return u},POS:function(e){e.unshift(true);return e}},filters:{enabled:function(e){return e.disabled===false&&e.type!=="hidden"},disabled:function(e){return e.disabled===true},checked:function(e){return e.checked===true},selected:function(e){e.parentNode.selectedIndex;return e.selected===true},parent:function(e){return !!e.firstChild},empty:function(e){return !e.firstChild},has:function(s,r,e){return !!b(e[3],s).length},header:function(e){return(/h\d/i).test(e.nodeName)},text:function(e){return"text"===e.type},radio:function(e){return"radio"===e.type},checkbox:function(e){return"checkbox"===e.type},file:function(e){return"file"===e.type},password:function(e){return"password"===e.type},submit:function(e){return"submit"===e.type},image:function(e){return"image"===e.type},reset:function(e){return"reset"===e.type},button:function(e){return"button"===e.type||e.nodeName.toLowerCase()==="button"},input:function(e){return(/input|select|textarea|button/i).test(e.nodeName)}},setFilters:{first:function(r,e){return e===0},last:function(s,r,e,t){return r===t.length-1},even:function(r,e){return e%2===0},odd:function(r,e){return e%2===1},lt:function(s,r,e){return r<e[3]-0},gt:function(s,r,e){return r>e[3]-0},nth:function(s,r,e){return e[3]-0===r},eq:function(s,r,e){return e[3]-0===r}},filter:{PSEUDO:function(s,y,x,z){var e=y[1],r=f.filters[e];if(r){return r(s,x,y,z)}else{if(e==="contains"){return(s.textContent||s.innerText||b.getText([s])||"").indexOf(y[3])>=0}else{if(e==="not"){var t=y[3];for(var v=0,u=t.length;v<u;v++){if(t[v]===s){return false}}return true}else{b.error("Syntax error, unrecognized expression: "+e)}}}},CHILD:function(e,t){var x=t[1],r=e;switch(x){case"only":case"first":while((r=r.previousSibling)){if(r.nodeType===1){return false}}if(x==="first"){return true}r=e;case"last":while((r=r.nextSibling)){if(r.nodeType===1){return false}}return true;case"nth":var s=t[2],A=t[3];if(s===1&&A===0){return true}var v=t[0],z=e.parentNode;if(z&&(z.sizcache!==v||!e.nodeIndex)){var u=0;for(r=z.firstChild;r;r=r.nextSibling){if(r.nodeType===1){r.nodeIndex=++u}}z.sizcache=v}var y=e.nodeIndex-A;if(s===0){return y===0}else{return(y%s===0&&y/s>=0)}}},ID:function(r,e){return r.nodeType===1&&r.getAttribute("id")===e},TAG:function(r,e){return(e==="*"&&r.nodeType===1)||r.nodeName.toLowerCase()===e},CLASS:function(r,e){return(" "+(r.className||r.getAttribute("class"))+" ").indexOf(e)>-1},ATTR:function(v,t){var s=t[1],e=f.attrHandle[s]?f.attrHandle[s](v):v[s]!=null?v[s]:v.getAttribute(s),x=e+"",u=t[2],r=t[4];return e==null?u==="!=":u==="="?x===r:u==="*="?x.indexOf(r)>=0:u==="~="?(" "+x+" ").indexOf(r)>=0:!r?x&&e!==false:u==="!="?x!==r:u==="^="?x.indexOf(r)===0:u==="$="?x.substr(x.length-r.length)===r:u==="|="?x===r||x.substr(0,r.length+1)===r+"-":false},POS:function(u,r,s,v){var e=r[2],t=f.setFilters[e];if(t){return t(u,s,r,v)}}}};var k=f.match.POS,g=function(r,e){return"\\"+(e-0+1)};for(var m in f.match){f.match[m]=new RegExp(f.match[m].source+(/(?![^\[]*\])(?![^\(]*\))/.source));f.leftMatch[m]=new RegExp(/(^(?:.|\r|\n)*?)/.source+f.match[m].source.replace(/\\(\d+)/g,g))}var a=function(r,e){r=Array.prototype.slice.call(r,0);if(e){e.push.apply(e,r);return e}return r};try{Array.prototype.slice.call(document.documentElement.childNodes,0)[0].nodeType}catch(l){a=function(u,t){var r=t||[],s=0;if(d.call(u)==="[object Array]"){Array.prototype.push.apply(r,u)}else{if(typeof u.length==="number"){for(var e=u.length;s<e;s++){r.push(u[s])}}else{for(;u[s];s++){r.push(u[s])}}}return r}}var c;if(document.documentElement.compareDocumentPosition){c=function(r,e){if(!r.compareDocumentPosition||!e.compareDocumentPosition){if(r==e){o=true}return r.compareDocumentPosition?-1:1}var s=r.compareDocumentPosition(e)&4?-1:r===e?0:1;if(s===0){o=true}return s}}else{if("sourceIndex" in document.documentElement){c=function(r,e){if(!r.sourceIndex||!e.sourceIndex){if(r==e){o=true}return r.sourceIndex?-1:1}var s=r.sourceIndex-e.sourceIndex;if(s===0){o=true}return s}}else{if(document.createRange){c=function(t,r){if(!t.ownerDocument||!r.ownerDocument){if(t==r){o=true}return t.ownerDocument?-1:1}var s=t.ownerDocument.createRange(),e=r.ownerDocument.createRange();s.setStart(t,0);s.setEnd(t,0);e.setStart(r,0);e.setEnd(r,0);var u=s.compareBoundaryPoints(Range.START_TO_END,e);if(u===0){o=true}return u}}}}b.getText=function(e){var r="",t;for(var s=0;e[s];s++){t=e[s];if(t.nodeType===3||t.nodeType===4){r+=t.nodeValue}else{if(t.nodeType!==8){r+=b.getText(t.childNodes)}}}return r};(function(){var r=document.createElement("div"),s="script"+(new Date()).getTime();r.innerHTML="<a name='"+s+"'/>";var e=document.documentElement;e.insertBefore(r,e.firstChild);if(document.getElementById(s)){f.find.ID=function(u,v,x){if(typeof v.getElementById!=="undefined"&&!x){var t=v.getElementById(u[1]);return t?t.id===u[1]||typeof t.getAttributeNode!=="undefined"&&t.getAttributeNode("id").nodeValue===u[1]?[t]:undefined:[]}};f.filter.ID=function(v,t){var u=typeof v.getAttributeNode!=="undefined"&&v.getAttributeNode("id");return v.nodeType===1&&u&&u.nodeValue===t}}e.removeChild(r);e=r=null})();(function(){var e=document.createElement("div");e.appendChild(document.createComment(""));if(e.getElementsByTagName("*").length>0){f.find.TAG=function(r,v){var u=v.getElementsByTagName(r[1]);if(r[1]==="*"){var t=[];for(var s=0;u[s];s++){if(u[s].nodeType===1){t.push(u[s])}}u=t}return u}}e.innerHTML="<a href='#'></a>";if(e.firstChild&&typeof e.firstChild.getAttribute!=="undefined"&&e.firstChild.getAttribute("href")!=="#"){f.attrHandle.href=function(r){return r.getAttribute("href",2)}}e=null})();if(document.querySelectorAll){(function(){var e=b,s=document.createElement("div");s.innerHTML="<p class='TEST'></p>";if(s.querySelectorAll&&s.querySelectorAll(".TEST").length===0){return}b=function(x,v,t,u){v=v||document;if(!u&&v.nodeType===9&&!b.isXML(v)){try{return a(v.querySelectorAll(x),t)}catch(y){}}return e(x,v,t,u)};for(var r in e){b[r]=e[r]}s=null})()}(function(){var e=document.createElement("div");e.innerHTML="<div class='test e'></div><div class='test'></div>";if(!e.getElementsByClassName||e.getElementsByClassName("e").length===0){return}e.lastChild.className="e";if(e.getElementsByClassName("e").length===1){return}f.order.splice(1,0,"CLASS");f.find.CLASS=function(r,s,t){if(typeof s.getElementsByClassName!=="undefined"&&!t){return s.getElementsByClassName(r[1])}};e=null})();function n(r,x,v,A,y,z){for(var t=0,s=A.length;t<s;t++){var e=A[t];if(e){e=e[r];var u=false;while(e){if(e.sizcache===v){u=A[e.sizset];break}if(e.nodeType===1&&!z){e.sizcache=v;e.sizset=t}if(e.nodeName.toLowerCase()===x){u=e;break}e=e[r]}A[t]=u}}}function q(r,x,v,A,y,z){for(var t=0,s=A.length;t<s;t++){var e=A[t];if(e){e=e[r];var u=false;while(e){if(e.sizcache===v){u=A[e.sizset];break}if(e.nodeType===1){if(!z){e.sizcache=v;e.sizset=t}if(typeof x!=="string"){if(e===x){u=true;break}}else{if(b.filter(x,[e]).length>0){u=e;break}}}e=e[r]}A[t]=u}}}b.contains=document.compareDocumentPosition?function(r,e){return !!(r.compareDocumentPosition(e)&16)}:function(r,e){return r!==e&&(r.contains?r.contains(e):true)};b.isXML=function(e){var r=(e?e.ownerDocument||e:0).documentElement;return r?r.nodeName!=="HTML":false};var h=function(e,y){var t=[],u="",v,s=y.nodeType?[y]:y;while((v=f.match.PSEUDO.exec(e))){u+=v[0];e=e.replace(f.match.PSEUDO,"")}e=f.relative[e]?e+"*":e;for(var x=0,r=s.length;x<r;x++){b(e,s[x],t)}return b.filter(u,t)};window.tinymce.dom.Sizzle=b})();(function(d){var f=d.each,c=d.DOM,b=d.isIE,e=d.isWebKit,a;d.create("tinymce.dom.EventUtils",{EventUtils:function(){this.inits=[];this.events=[]},add:function(m,p,l,j){var g,h=this,i=h.events,k;if(p instanceof Array){k=[];f(p,function(o){k.push(h.add(m,o,l,j))});return k}if(m&&m.hasOwnProperty&&m instanceof Array){k=[];f(m,function(n){n=c.get(n);k.push(h.add(n,p,l,j))});return k}m=c.get(m);if(!m){return}g=function(n){if(h.disabled){return}n=n||window.event;if(n&&b){if(!n.target){n.target=n.srcElement}d.extend(n,h._stoppers)}if(!j){return l(n)}return l.call(j,n)};if(p=="unload"){d.unloads.unshift({func:g});return g}if(p=="init"){if(h.domLoaded){g()}else{h.inits.push(g)}return g}i.push({obj:m,name:p,func:l,cfunc:g,scope:j});h._add(m,p,g);return l},remove:function(l,m,k){var h=this,g=h.events,i=false,j;if(l&&l.hasOwnProperty&&l instanceof Array){j=[];f(l,function(n){n=c.get(n);j.push(h.remove(n,m,k))});return j}l=c.get(l);f(g,function(o,n){if(o.obj==l&&o.name==m&&(!k||(o.func==k||o.cfunc==k))){g.splice(n,1);h._remove(l,m,o.cfunc);i=true;return false}});return i},clear:function(l){var j=this,g=j.events,h,k;if(l){l=c.get(l);for(h=g.length-1;h>=0;h--){k=g[h];if(k.obj===l){j._remove(k.obj,k.name,k.cfunc);k.obj=k.cfunc=null;g.splice(h,1)}}}},cancel:function(g){if(!g){return false}this.stop(g);return this.prevent(g)},stop:function(g){if(g.stopPropagation){g.stopPropagation()}else{g.cancelBubble=true}return false},prevent:function(g){if(g.preventDefault){g.preventDefault()}else{g.returnValue=false}return false},destroy:function(){var g=this;f(g.events,function(j,h){g._remove(j.obj,j.name,j.cfunc);j.obj=j.cfunc=null});g.events=[];g=null},_add:function(h,i,g){if(h.attachEvent){h.attachEvent("on"+i,g)}else{if(h.addEventListener){h.addEventListener(i,g,false)}else{h["on"+i]=g}}},_remove:function(i,j,h){if(i){try{if(i.detachEvent){i.detachEvent("on"+j,h)}else{if(i.removeEventListener){i.removeEventListener(j,h,false)}else{i["on"+j]=null}}}catch(g){}}},_pageInit:function(h){var g=this;if(g.domLoaded){return}g.domLoaded=true;f(g.inits,function(i){i()});g.inits=[]},_wait:function(i){var g=this,h=i.document;if(i.tinyMCE_GZ&&tinyMCE_GZ.loaded){g.domLoaded=1;return}if(h.attachEvent){h.attachEvent("onreadystatechange",function(){if(h.readyState==="complete"){h.detachEvent("onreadystatechange",arguments.callee);g._pageInit(i)}});if(h.documentElement.doScroll&&i==i.top){(function(){if(g.domLoaded){return}try{h.documentElement.doScroll("left")}catch(j){setTimeout(arguments.callee,0);return}g._pageInit(i)})()}}else{if(h.addEventListener){g._add(i,"DOMContentLoaded",function(){g._pageInit(i)})}}g._add(i,"load",function(){g._pageInit(i)})},_stoppers:{preventDefault:function(){this.returnValue=false},stopPropagation:function(){this.cancelBubble=true}}});a=d.dom.Event=new d.dom.EventUtils();a._wait(window);d.addUnload(function(){a.destroy()})})(tinymce);(function(a){a.dom.Element=function(f,d){var b=this,e,c;b.settings=d=d||{};b.id=f;b.dom=e=d.dom||a.DOM;if(!a.isIE){c=e.get(b.id)}a.each(("getPos,getRect,getParent,add,setStyle,getStyle,setStyles,setAttrib,setAttribs,getAttrib,addClass,removeClass,hasClass,getOuterHTML,setOuterHTML,remove,show,hide,isHidden,setHTML,get").split(/,/),function(g){b[g]=function(){var h=[f],j;for(j=0;j<arguments.length;j++){h.push(arguments[j])}h=e[g].apply(e,h);b.update(g);return h}});a.extend(b,{on:function(i,h,g){return a.dom.Event.add(b.id,i,h,g)},getXY:function(){return{x:parseInt(b.getStyle("left")),y:parseInt(b.getStyle("top"))}},getSize:function(){var g=e.get(b.id);return{w:parseInt(b.getStyle("width")||g.clientWidth),h:parseInt(b.getStyle("height")||g.clientHeight)}},moveTo:function(g,h){b.setStyles({left:g,top:h})},moveBy:function(g,i){var h=b.getXY();b.moveTo(h.x+g,h.y+i)},resizeTo:function(g,i){b.setStyles({width:g,height:i})},resizeBy:function(g,j){var i=b.getSize();b.resizeTo(i.w+g,i.h+j)},update:function(h){var g;if(a.isIE6&&d.blocker){h=h||"";if(h.indexOf("get")===0||h.indexOf("has")===0||h.indexOf("is")===0){return}if(h=="remove"){e.remove(b.blocker);return}if(!b.blocker){b.blocker=e.uniqueId();g=e.add(d.container||e.getRoot(),"iframe",{id:b.blocker,style:"position:absolute;",frameBorder:0,src:'javascript:""'});e.setStyle(g,"opacity",0)}else{g=e.get(b.blocker)}e.setStyles(g,{left:b.getStyle("left",1),top:b.getStyle("top",1),width:b.getStyle("width",1),height:b.getStyle("height",1),display:b.getStyle("display",1),zIndex:parseInt(b.getStyle("zIndex",1)||0)-1})}}})}})(tinymce);(function(c){function e(f){return f.replace(/[\n\r]+/g,"")}var b=c.is,a=c.isIE,d=c.each;c.create("tinymce.dom.Selection",{Selection:function(i,h,g){var f=this;f.dom=i;f.win=h;f.serializer=g;d(["onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent"],function(j){f[j]=new c.util.Dispatcher(f)});if(!f.win.getSelection){f.tridentSel=new c.dom.TridentSelection(f)}c.addUnload(f.destroy,f)},getContent:function(g){var f=this,h=f.getRng(),l=f.dom.create("body"),j=f.getSel(),i,k,m;g=g||{};i=k="";g.get=true;g.format=g.format||"html";f.onBeforeGetContent.dispatch(f,g);if(g.format=="text"){return f.isCollapsed()?"":(h.text||(j.toString?j.toString():""))}if(h.cloneContents){m=h.cloneContents();if(m){l.appendChild(m)}}else{if(b(h.item)||b(h.htmlText)){l.innerHTML=h.item?h.item(0).outerHTML:h.htmlText}else{l.innerHTML=h.toString()}}if(/^\s/.test(l.innerHTML)){i=" "}if(/\s+$/.test(l.innerHTML)){k=" "}g.getInner=true;g.content=f.isCollapsed()?"":i+f.serializer.serialize(l,g)+k;f.onGetContent.dispatch(f,g);return g.content},setContent:function(i,g){var f=this,j=f.getRng(),l,k=f.win.document;g=g||{format:"html"};g.set=true;i=g.content=f.dom.processHTML(i);f.onBeforeSetContent.dispatch(f,g);i=g.content;if(j.insertNode){i+='<span id="__caret">_</span>';if(j.startContainer==k&&j.endContainer==k){k.body.innerHTML=i}else{j.deleteContents();if(k.body.childNodes.length==0){k.body.innerHTML=i}else{j.insertNode(j.createContextualFragment(i))}}l=f.dom.get("__caret");j=k.createRange();j.setStartBefore(l);j.setEndBefore(l);f.setRng(j);f.dom.remove("__caret")}else{if(j.item){k.execCommand("Delete",false,null);j=f.getRng()}j.pasteHTML(i)}f.onSetContent.dispatch(f,g)},getStart:function(){var g=this.getRng(),h,f,j,i;if(g.duplicate||g.item){if(g.item){return g.item(0)}j=g.duplicate();j.collapse(1);h=j.parentElement();f=i=g.parentElement();while(i=i.parentNode){if(i==h){h=f;break}}if(h&&h.nodeName=="BODY"){return h.firstChild||h}return h}else{h=g.startContainer;if(h.nodeType==1&&h.hasChildNodes()){h=h.childNodes[Math.min(h.childNodes.length-1,g.startOffset)]}if(h&&h.nodeType==3){return h.parentNode}return h}},getEnd:function(){var g=this,h=g.getRng(),i,f;if(h.duplicate||h.item){if(h.item){return h.item(0)}h=h.duplicate();h.collapse(0);i=h.parentElement();if(i&&i.nodeName=="BODY"){return i.lastChild||i}return i}else{i=h.endContainer;f=h.endOffset;if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[f>0?f-1:f]}if(i&&i.nodeType==3){return i.parentNode}return i}},getBookmark:function(q,r){var u=this,m=u.dom,g,j,i,n,h,o,p,l="\uFEFF",s;function f(v,x){var t=0;d(m.select(v),function(z,y){if(z==x){t=y}});return t}if(q==2){function k(){var v=u.getRng(true),t=m.getRoot(),x={};function y(B,G){var A=B[G?"startContainer":"endContainer"],F=B[G?"startOffset":"endOffset"],z=[],C,E,D=0;if(A.nodeType==3){if(r){for(C=A.previousSibling;C&&C.nodeType==3;C=C.previousSibling){F+=C.nodeValue.length}}z.push(F)}else{E=A.childNodes;if(F>=E.length&&E.length){D=1;F=Math.max(0,E.length-1)}z.push(u.dom.nodeIndex(E[F],r)+D)}for(;A&&A!=t;A=A.parentNode){z.push(u.dom.nodeIndex(A,r))}return z}x.start=y(v,true);if(!u.isCollapsed()){x.end=y(v)}return x}return k()}if(q){return{rng:u.getRng()}}g=u.getRng();i=m.uniqueId();n=tinyMCE.activeEditor.selection.isCollapsed();s="overflow:hidden;line-height:0px";if(g.duplicate||g.item){if(!g.item){j=g.duplicate();g.collapse();g.pasteHTML('<span _mce_type="bookmark" id="'+i+'_start" style="'+s+'">'+l+"</span>");if(!n){j.collapse(false);j.pasteHTML('<span _mce_type="bookmark" id="'+i+'_end" style="'+s+'">'+l+"</span>")}}else{o=g.item(0);h=o.nodeName;return{name:h,index:f(h,o)}}}else{o=u.getNode();h=o.nodeName;if(h=="IMG"){return{name:h,index:f(h,o)}}j=g.cloneRange();if(!n){j.collapse(false);j.insertNode(m.create("span",{_mce_type:"bookmark",id:i+"_end",style:s},l))}g.collapse(true);g.insertNode(m.create("span",{_mce_type:"bookmark",id:i+"_start",style:s},l))}u.moveToBookmark({id:i,keep:1});return{id:i}},moveToBookmark:function(n){var r=this,l=r.dom,i,h,f,q,j,s,o,p;if(r.tridentSel){r.tridentSel.destroy()}if(n){if(n.start){f=l.createRng();q=l.getRoot();function g(z){var t=n[z?"start":"end"],v,x,y,u;if(t){for(x=q,v=t.length-1;v>=1;v--){u=x.childNodes;if(u.length){x=u[t[v]]}}if(z){f.setStart(x,t[0])}else{f.setEnd(x,t[0])}}}g(true);g();r.setRng(f)}else{if(n.id){function k(A){var u=l.get(n.id+"_"+A),z,t,x,y,v=n.keep;if(u){z=u.parentNode;if(A=="start"){if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}j=s=z;o=p=t}else{if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}s=z;p=t}if(!v){y=u.previousSibling;x=u.nextSibling;d(c.grep(u.childNodes),function(B){if(B.nodeType==3){B.nodeValue=B.nodeValue.replace(/\uFEFF/g,"")}});while(u=l.get(n.id+"_"+A)){l.remove(u,1)}if(y&&x&&y.nodeType==x.nodeType&&y.nodeType==3){t=y.nodeValue.length;y.appendData(x.nodeValue);l.remove(x);if(A=="start"){j=s=y;o=p=t}else{s=y;p=t}}}}}function m(t){if(!a&&l.isBlock(t)&&!t.innerHTML){t.innerHTML='<br _mce_bogus="1" />'}return t}k("start");k("end");f=l.createRng();f.setStart(m(j),o);f.setEnd(m(s),p);r.setRng(f)}else{if(n.name){r.select(l.select(n.name)[n.index])}else{if(n.rng){r.setRng(n.rng)}}}}}},select:function(k,j){var i=this,l=i.dom,g=l.createRng(),f;f=l.nodeIndex(k);g.setStart(k.parentNode,f);g.setEnd(k.parentNode,f+1);if(j){function h(m,o){var n=new c.dom.TreeWalker(m,m);do{if(m.nodeType==3&&c.trim(m.nodeValue).length!=0){if(o){g.setStart(m,0)}else{g.setEnd(m,m.nodeValue.length)}return}if(m.nodeName=="BR"){if(o){g.setStartBefore(m)}else{g.setEndBefore(m)}return}}while(m=(o?n.next():n.prev()))}h(k,1);h(k)}i.setRng(g);return k},isCollapsed:function(){var f=this,h=f.getRng(),g=f.getSel();if(!h||h.item){return false}if(h.compareEndPoints){return h.compareEndPoints("StartToEnd",h)===0}return !g||h.collapsed},collapse:function(f){var g=this,h=g.getRng(),i;if(h.item){i=h.item(0);h=this.win.document.body.createTextRange();h.moveToElementText(i)}h.collapse(!!f);g.setRng(h)},getSel:function(){var g=this,f=this.win;return f.getSelection?f.getSelection():f.document.selection},getRng:function(j){var g=this,h,i;if(j&&g.tridentSel){return g.tridentSel.getRangeAt(0)}try{if(h=g.getSel()){i=h.rangeCount>0?h.getRangeAt(0):(h.createRange?h.createRange():g.win.document.createRange())}}catch(f){}if(!i){i=g.win.document.createRange?g.win.document.createRange():g.win.document.body.createTextRange()}if(g.selectedRange&&g.explicitRange){if(i.compareBoundaryPoints(i.START_TO_START,g.selectedRange)===0&&i.compareBoundaryPoints(i.END_TO_END,g.selectedRange)===0){i=g.explicitRange}else{g.selectedRange=null;g.explicitRange=null}}return i},setRng:function(i){var h,g=this;if(!g.tridentSel){h=g.getSel();if(h){g.explicitRange=i;h.removeAllRanges();h.addRange(i);g.selectedRange=h.getRangeAt(0)}}else{if(i.cloneRange){g.tridentSel.addRange(i);return}try{i.select()}catch(f){}}},setNode:function(g){var f=this;f.setContent(f.dom.getOuterHTML(g));return g},getNode:function(){var g=this,f=g.getRng(),h=g.getSel(),i;if(f.setStart){if(!f){return g.dom.getRoot()}i=f.commonAncestorContainer;if(!f.collapsed){if(f.startContainer==f.endContainer){if(f.startOffset-f.endOffset<2){if(f.startContainer.hasChildNodes()){i=f.startContainer.childNodes[f.startOffset]}}}if(c.isWebKit&&h.anchorNode&&h.anchorNode.nodeType==1){return h.anchorNode.childNodes[h.anchorOffset]}}if(i&&i.nodeType==3){return i.parentNode}return i}return f.item?f.item(0):f.parentElement()},getSelectedBlocks:function(g,f){var i=this,j=i.dom,m,h,l,k=[];m=j.getParent(g||i.getStart(),j.isBlock);h=j.getParent(f||i.getEnd(),j.isBlock);if(m){k.push(m)}if(m&&h&&m!=h){l=m;while((l=l.nextSibling)&&l!=h){if(j.isBlock(l)){k.push(l)}}}if(h&&m!=h){k.push(h)}return k},destroy:function(g){var f=this;f.win=null;if(f.tridentSel){f.tridentSel.destroy()}if(!g){c.removeUnload(f.destroy)}}})})(tinymce);(function(a){a.create("tinymce.dom.XMLWriter",{node:null,XMLWriter:function(c){function b(){var e=document.implementation;if(!e||!e.createDocument){try{return new ActiveXObject("MSXML2.DOMDocument")}catch(d){}try{return new ActiveXObject("Microsoft.XmlDom")}catch(d){}}else{return e.createDocument("","",null)}}this.doc=b();this.valid=a.isOpera||a.isWebKit;this.reset()},reset:function(){var b=this,c=b.doc;if(c.firstChild){c.removeChild(c.firstChild)}b.node=c.appendChild(c.createElement("html"))},writeStartElement:function(c){var b=this;b.node=b.node.appendChild(b.doc.createElement(c))},writeAttribute:function(c,b){if(this.valid){b=b.replace(/>/g,"%MCGT%")}this.node.setAttribute(c,b)},writeEndElement:function(){this.node=this.node.parentNode},writeFullEndElement:function(){var b=this,c=b.node;c.appendChild(b.doc.createTextNode(""));b.node=c.parentNode},writeText:function(b){if(this.valid){b=b.replace(/>/g,"%MCGT%")}this.node.appendChild(this.doc.createTextNode(b))},writeCDATA:function(b){this.node.appendChild(this.doc.createCDATASection(b))},writeComment:function(b){if(a.isIE){b=b.replace(/^\-|\-$/g," ")}this.node.appendChild(this.doc.createComment(b.replace(/\-\-/g," ")))},getContent:function(){var b;b=this.doc.xml||new XMLSerializer().serializeToString(this.doc);b=b.replace(/<\?[^?]+\?>|<html>|<\/html>|<html\/>|<!DOCTYPE[^>]+>/g,"");b=b.replace(/ ?\/>/g," />");if(this.valid){b=b.replace(/\%MCGT%/g,"&gt;")}return b}})})(tinymce);(function(a){a.create("tinymce.dom.StringWriter",{str:null,tags:null,count:0,settings:null,indent:null,StringWriter:function(b){this.settings=a.extend({indent_char:" ",indentation:0},b);this.reset()},reset:function(){this.indent="";this.str="";this.tags=[];this.count=0},writeStartElement:function(b){this._writeAttributesEnd();this.writeRaw("<"+b);this.tags.push(b);this.inAttr=true;this.count++;this.elementCount=this.count},writeAttribute:function(d,b){var c=this;c.writeRaw(" "+c.encode(d)+'="'+c.encode(b)+'"')},writeEndElement:function(){var b;if(this.tags.length>0){b=this.tags.pop();if(this._writeAttributesEnd(1)){this.writeRaw("</"+b+">")}if(this.settings.indentation>0){this.writeRaw("\n")}}},writeFullEndElement:function(){if(this.tags.length>0){this._writeAttributesEnd();this.writeRaw("</"+this.tags.pop()+">");if(this.settings.indentation>0){this.writeRaw("\n")}}},writeText:function(b){this._writeAttributesEnd();this.writeRaw(this.encode(b));this.count++},writeCDATA:function(b){this._writeAttributesEnd();this.writeRaw("<![CDATA["+b+"]]>");this.count++},writeComment:function(b){this._writeAttributesEnd();this.writeRaw("<!-- "+b+"-->");this.count++},writeRaw:function(b){this.str+=b},encode:function(b){return b.replace(/[<>&"]/g,function(c){switch(c){case"<":return"&lt;";case">":return"&gt;";case"&":return"&amp;";case'"':return"&quot;"}return c})},getContent:function(){return this.str},_writeAttributesEnd:function(b){if(!this.inAttr){return}this.inAttr=false;if(b&&this.elementCount==this.count){this.writeRaw(" />");return false}this.writeRaw(">");return true}})})(tinymce);(function(e){var g=e.extend,f=e.each,b=e.util.Dispatcher,d=e.isIE,a=e.isGecko;function c(h){return h.replace(/([?+*])/g,".$1")}e.create("tinymce.dom.Serializer",{Serializer:function(j){var i=this;i.key=0;i.onPreProcess=new b(i);i.onPostProcess=new b(i);try{i.writer=new e.dom.XMLWriter()}catch(h){i.writer=new e.dom.StringWriter()}i.settings=j=g({dom:e.DOM,valid_nodes:0,node_filter:0,attr_filter:0,invalid_attrs:/^(_mce_|_moz_|sizset|sizcache)/,closed:/^(br|hr|input|meta|img|link|param|area)$/,entity_encoding:"named",entities:"160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,913,Alpha,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro",valid_elements:"*[*]",extended_valid_elements:0,invalid_elements:0,fix_table_elements:1,fix_list_elements:true,fix_content_duplication:true,convert_fonts_to_spans:false,font_size_classes:0,apply_source_formatting:0,indent_mode:"simple",indent_char:"\t",indent_levels:1,remove_linebreaks:1,remove_redundant_brs:1,element_format:"xhtml"},j);i.dom=j.dom;i.schema=j.schema;if(j.entity_encoding=="named"&&!j.entities){j.entity_encoding="raw"}if(j.remove_redundant_brs){i.onPostProcess.add(function(k,l){l.content=l.content.replace(/(<br \/>\s*)+<\/(p|h[1-6]|div|li)>/gi,function(n,m,o){if(/^<br \/>\s*<\//.test(n)){return"</"+o+">"}return n})})}if(j.element_format=="html"){i.onPostProcess.add(function(k,l){l.content=l.content.replace(/<([^>]+) \/>/g,"<$1>")})}if(j.fix_list_elements){i.onPreProcess.add(function(v,s){var l,z,y=["ol","ul"],u,t,q,k=/^(OL|UL)$/,A;function m(r,x){var o=x.split(","),p;while((r=r.previousSibling)!=null){for(p=0;p<o.length;p++){if(r.nodeName==o[p]){return r}}}return null}for(z=0;z<y.length;z++){l=i.dom.select(y[z],s.node);for(u=0;u<l.length;u++){t=l[u];q=t.parentNode;if(k.test(q.nodeName)){A=m(t,"LI");if(!A){A=i.dom.create("li");A.innerHTML="&nbsp;";A.appendChild(t);q.insertBefore(A,q.firstChild)}else{A.appendChild(t)}}}}})}if(j.fix_table_elements){i.onPreProcess.add(function(k,l){if(!e.isOpera||opera.buildNumber()>=1767){f(i.dom.select("p table",l.node).reverse(),function(p){var o=i.dom.getParent(p.parentNode,"table,p");if(o.nodeName!="TABLE"){try{i.dom.split(o,p)}catch(m){}}})}})}},setEntities:function(o){var n=this,j,m,h={},k;if(n.entityLookup){return}j=o.split(",");for(m=0;m<j.length;m+=2){k=j[m];if(k==34||k==38||k==60||k==62){continue}h[String.fromCharCode(j[m])]=j[m+1];k=parseInt(j[m]).toString(16)}n.entityLookup=h},setRules:function(i){var h=this;h._setup();h.rules={};h.wildRules=[];h.validElements={};return h.addRules(i)},addRules:function(i){var h=this,j;if(!i){return}h._setup();f(i.split(","),function(m){var q=m.split(/\[|\]/),l=q[0].split("/"),r,k,o,n=[];if(j){k=e.extend([],j.attribs)}if(q.length>1){f(q[1].split("|"),function(u){var p={},t;k=k||[];u=u.replace(/::/g,"~");u=/^([!\-])?([\w*.?~_\-]+|)([=:<])?(.+)?$/.exec(u);u[2]=u[2].replace(/~/g,":");if(u[1]=="!"){r=r||[];r.push(u[2])}if(u[1]=="-"){for(t=0;t<k.length;t++){if(k[t].name==u[2]){k.splice(t,1);return}}}switch(u[3]){case"=":p.defaultVal=u[4]||"";break;case":":p.forcedVal=u[4];break;case"<":p.validVals=u[4].split("?");break}if(/[*.?]/.test(u[2])){o=o||[];p.nameRE=new RegExp("^"+c(u[2])+"$");o.push(p)}else{p.name=u[2];k.push(p)}n.push(u[2])})}f(l,function(v,u){var y=v.charAt(0),t=1,p={};if(j){if(j.noEmpty){p.noEmpty=j.noEmpty}if(j.fullEnd){p.fullEnd=j.fullEnd}if(j.padd){p.padd=j.padd}}switch(y){case"-":p.noEmpty=true;break;case"+":p.fullEnd=true;break;case"#":p.padd=true;break;default:t=0}l[u]=v=v.substring(t);h.validElements[v]=1;if(/[*.?]/.test(l[0])){p.nameRE=new RegExp("^"+c(l[0])+"$");h.wildRules=h.wildRules||{};h.wildRules.push(p)}else{p.name=l[0];if(l[0]=="@"){j=p}h.rules[v]=p}p.attribs=k;if(r){p.requiredAttribs=r}if(o){v="";f(n,function(s){if(v){v+="|"}v+="("+c(s)+")"});p.validAttribsRE=new RegExp("^"+v.toLowerCase()+"$");p.wildAttribs=o}})});i="";f(h.validElements,function(m,l){if(i){i+="|"}if(l!="@"){i+=l}});h.validElementsRE=new RegExp("^("+c(i.toLowerCase())+")$")},findRule:function(m){var j=this,l=j.rules,h,k;j._setup();k=l[m];if(k){return k}l=j.wildRules;for(h=0;h<l.length;h++){if(l[h].nameRE.test(m)){return l[h]}}return null},findAttribRule:function(h,l){var j,k=h.wildAttribs;for(j=0;j<k.length;j++){if(k[j].nameRE.test(l)){return k[j]}}return null},serialize:function(r,q){var m,k=this,p,i,j,l;k._setup();q=q||{};q.format=q.format||"html";k.processObj=q;if(d){l=[];f(r.getElementsByTagName("option"),function(o){var h=k.dom.getAttrib(o,"selected");l.push(h?h:null)})}r=r.cloneNode(true);if(d){f(r.getElementsByTagName("option"),function(o,h){k.dom.setAttrib(o,"selected",l[h])})}j=r.ownerDocument.implementation;if(j.createHTMLDocument&&(e.isOpera&&opera.buildNumber()>=1767)){p=j.createHTMLDocument("");f(r.nodeName=="BODY"?r.childNodes:[r],function(h){p.body.appendChild(p.importNode(h,true))});if(r.nodeName!="BODY"){r=p.body.firstChild}else{r=p.body}i=k.dom.doc;k.dom.doc=p}k.key=""+(parseInt(k.key)+1);if(!q.no_events){q.node=r;k.onPreProcess.dispatch(k,q)}k.writer.reset();k._info=q;k._serializeNode(r,q.getInner);q.content=k.writer.getContent();if(i){k.dom.doc=i}if(!q.no_events){k.onPostProcess.dispatch(k,q)}k._postProcess(q);q.node=null;return e.trim(q.content)},_postProcess:function(n){var i=this,k=i.settings,j=n.content,m=[],l;if(n.format=="html"){l=i._protect({content:j,patterns:[{pattern:/(<script[^>]*>)(.*?)(<\/script>)/g},{pattern:/(<noscript[^>]*>)(.*?)(<\/noscript>)/g},{pattern:/(<style[^>]*>)(.*?)(<\/style>)/g},{pattern:/(<pre[^>]*>)(.*?)(<\/pre>)/g,encode:1},{pattern:/(<!--\[CDATA\[)(.*?)(\]\]-->)/g}]});j=l.content;if(k.entity_encoding!=="raw"){j=i._encode(j)}if(!n.set){j=j.replace(/<p>\s+<\/p>|<p([^>]+)>\s+<\/p>/g,k.entity_encoding=="numeric"?"<p$1>&#160;</p>":"<p$1>&nbsp;</p>");if(k.remove_linebreaks){j=j.replace(/\r?\n|\r/g," ");j=j.replace(/(<[^>]+>)\s+/g,"$1 ");j=j.replace(/\s+(<\/[^>]+>)/g," $1");j=j.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object) ([^>]+)>\s+/g,"<$1 $2>");j=j.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>\s+/g,"<$1>");j=j.replace(/\s+<\/(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>/g,"</$1>")}if(k.apply_source_formatting&&k.indent_mode=="simple"){j=j.replace(/<(\/?)(ul|hr|table|meta|link|tbody|tr|object|body|head|html|map)(|[^>]+)>\s*/g,"\n<$1$2$3>\n");j=j.replace(/\s*<(p|h[1-6]|blockquote|div|title|style|pre|script|td|li|area)(|[^>]+)>/g,"\n<$1$2>");j=j.replace(/<\/(p|h[1-6]|blockquote|div|title|style|pre|script|td|li)>\s*/g,"</$1>\n");j=j.replace(/\n\n/g,"\n")}}j=i._unprotect(j,l);j=j.replace(/<!--\[CDATA\[([\s\S]+)\]\]-->/g,"<![CDATA[$1]]>");if(k.entity_encoding=="raw"){j=j.replace(/<p>&nbsp;<\/p>|<p([^>]+)>&nbsp;<\/p>/g,"<p$1>\u00a0</p>")}j=j.replace(/<noscript([^>]+|)>([\s\S]*?)<\/noscript>/g,function(h,p,o){return"<noscript"+p+">"+i.dom.decode(o.replace(/<!--|-->/g,""))+"</noscript>"})}n.content=j},_serializeNode:function(D,I){var z=this,A=z.settings,x=z.writer,q,j,u,F,E,H,B,h,y,k,r,C,p,m,G,o;if(!A.node_filter||A.node_filter(D)){switch(D.nodeType){case 1:if(D.hasAttribute?D.hasAttribute("_mce_bogus"):D.getAttribute("_mce_bogus")){return}p=G=false;q=D.hasChildNodes();k=D.getAttribute("_mce_name")||D.nodeName.toLowerCase();o=D.getAttribute("_mce_type");if(o){if(!z._info.cleanup){p=true;return}else{G=1}}if(d){if(D.scopeName!=="HTML"&&D.scopeName!=="html"){k=D.scopeName+":"+k}}if(k.indexOf("mce:")===0){k=k.substring(4)}if(!G){if(!z.validElementsRE||!z.validElementsRE.test(k)||(z.invalidElementsRE&&z.invalidElementsRE.test(k))||I){p=true;break}}if(d){if(A.fix_content_duplication){if(D._mce_serialized==z.key){return}D._mce_serialized=z.key}if(k.charAt(0)=="/"){k=k.substring(1)}}else{if(a){if(D.nodeName==="BR"&&D.getAttribute("type")=="_moz"){return}}}if(A.validate_children){if(z.elementName&&!z.schema.isValid(z.elementName,k)){p=true;break}z.elementName=k}r=z.findRule(k);if(!r){p=true;break}k=r.name||k;m=A.closed.test(k);if((!q&&r.noEmpty)||(d&&!k)){p=true;break}if(r.requiredAttribs){H=r.requiredAttribs;for(F=H.length-1;F>=0;F--){if(this.dom.getAttrib(D,H[F])!==""){break}}if(F==-1){p=true;break}}x.writeStartElement(k);if(r.attribs){for(F=0,B=r.attribs,E=B.length;F<E;F++){H=B[F];y=z._getAttrib(D,H);if(y!==null){x.writeAttribute(H.name,y)}}}if(r.validAttribsRE){B=z.dom.getAttribs(D);for(F=B.length-1;F>-1;F--){h=B[F];if(h.specified){H=h.nodeName.toLowerCase();if(A.invalid_attrs.test(H)||!r.validAttribsRE.test(H)){continue}C=z.findAttribRule(r,H);y=z._getAttrib(D,C,H);if(y!==null){x.writeAttribute(H,y)}}}}if(o&&G){x.writeAttribute("_mce_type",o)}if(k==="script"&&e.trim(D.innerHTML)){x.writeText("// ");x.writeCDATA(D.innerHTML.replace(/<!--|-->|<\[CDATA\[|\]\]>/g,""));q=false;break}if(r.padd){if(q&&(u=D.firstChild)&&u.nodeType===1&&D.childNodes.length===1){if(u.hasAttribute?u.hasAttribute("_mce_bogus"):u.getAttribute("_mce_bogus")){x.writeText("\u00a0")}}else{if(!q){x.writeText("\u00a0")}}}break;case 3:if(A.validate_children&&z.elementName&&!z.schema.isValid(z.elementName,"#text")){return}return x.writeText(D.nodeValue);case 4:return x.writeCDATA(D.nodeValue);case 8:return x.writeComment(D.nodeValue)}}else{if(D.nodeType==1){q=D.hasChildNodes()}}if(q&&!m){u=D.firstChild;while(u){z._serializeNode(u);z.elementName=k;u=u.nextSibling}}if(!p){if(!m){x.writeFullEndElement()}else{x.writeEndElement()}}},_protect:function(j){var i=this;j.items=j.items||[];function h(l){return l.replace(/[\r\n\\]/g,function(m){if(m==="\n"){return"\\n"}else{if(m==="\\"){return"\\\\"}}return"\\r"})}function k(l){return l.replace(/\\[\\rn]/g,function(m){if(m==="\\n"){return"\n"}else{if(m==="\\\\"){return"\\"}}return"\r"})}f(j.patterns,function(l){j.content=k(h(j.content).replace(l.pattern,function(n,o,m,p){m=k(m);if(l.encode){m=i._encode(m)}j.items.push(m);return o+"<!--mce:"+(j.items.length-1)+"-->"+p}))});return j},_unprotect:function(i,j){i=i.replace(/\<!--mce:([0-9]+)--\>/g,function(k,h){return j.items[parseInt(h)]});j.items=[];return i},_encode:function(m){var j=this,k=j.settings,i;if(k.entity_encoding!=="raw"){if(k.entity_encoding.indexOf("named")!=-1){j.setEntities(k.entities);i=j.entityLookup;m=m.replace(/[\u007E-\uFFFF]/g,function(h){var l;if(l=i[h]){h="&"+l+";"}return h})}if(k.entity_encoding.indexOf("numeric")!=-1){m=m.replace(/[\u007E-\uFFFF]/g,function(h){return"&#"+h.charCodeAt(0)+";"})}}return m},_setup:function(){var h=this,i=this.settings;if(h.done){return}h.done=1;h.setRules(i.valid_elements);h.addRules(i.extended_valid_elements);if(i.invalid_elements){h.invalidElementsRE=new RegExp("^("+c(i.invalid_elements.replace(/,/g,"|").toLowerCase())+")$")}if(i.attrib_value_filter){h.attribValueFilter=i.attribValueFilter}},_getAttrib:function(m,j,h){var l,k;h=h||j.name;if(j.forcedVal&&(k=j.forcedVal)){if(k==="{$uid}"){return this.dom.uniqueId()}return k}k=this.dom.getAttrib(m,h);switch(h){case"rowspan":case"colspan":if(k=="1"){k=""}break}if(this.attribValueFilter){k=this.attribValueFilter(h,k,m)}if(j.validVals){for(l=j.validVals.length-1;l>=0;l--){if(k==j.validVals[l]){break}}if(l==-1){return null}}if(k===""&&typeof(j.defaultVal)!="undefined"){k=j.defaultVal;if(k==="{$uid}"){return this.dom.uniqueId()}return k}else{if(h=="class"&&this.processObj.get){k=k.replace(/\s?mceItem\w+\s?/g,"")}}if(k===""){return null}return k}})})(tinymce);(function(a){a.dom.ScriptLoader=function(h){var c=0,k=1,i=2,l={},j=[],f={},d=[],g=0,e;function b(m,u){var v=this,q=a.DOM,s,o,r,n;function p(){q.remove(n);if(s){s.onreadystatechange=s.onload=s=null}u()}n=q.uniqueId();if(a.isIE6){o=new a.util.URI(m);r=location;if(o.host==r.hostname&&o.port==r.port&&(o.protocol+":")==r.protocol){a.util.XHR.send({url:a._addVer(o.getURI()),success:function(x){var t=q.create("script",{type:"text/javascript"});t.text=x;document.getElementsByTagName("head")[0].appendChild(t);q.remove(t);p()}});return}}s=q.create("script",{id:n,type:"text/javascript",src:a._addVer(m)});s.onload=p;s.onreadystatechange=function(){var t=s.readyState;if(t=="complete"||t=="loaded"){p()}};(document.getElementsByTagName("head")[0]||document.body).appendChild(s)}this.isDone=function(m){return l[m]==i};this.markDone=function(m){l[m]=i};this.add=this.load=function(m,q,n){var o,p=l[m];if(p==e){j.push(m);l[m]=c}if(q){if(!f[m]){f[m]=[]}f[m].push({func:q,scope:n||this})}};this.loadQueue=function(n,m){this.loadScripts(j,n,m)};this.loadScripts=function(m,q,p){var o;function n(r){a.each(f[r],function(s){s.func.call(s.scope)});f[r]=e}d.push({func:q,scope:p||this});o=function(){var r=a.grep(m);m.length=0;a.each(r,function(s){if(l[s]==i){n(s);return}if(l[s]!=k){l[s]=k;g++;b(s,function(){l[s]=i;g--;n(s);o()})}});if(!g){a.each(d,function(s){s.func.call(s.scope)});d.length=0}};o()}};a.ScriptLoader=new a.dom.ScriptLoader()})(tinymce);tinymce.dom.TreeWalker=function(a,c){var b=a;function d(i,f,e,j){var h,g;if(i){if(!j&&i[f]){return i[f]}if(i!=c){h=i[e];if(h){return h}for(g=i.parentNode;g&&g!=c;g=g.parentNode){h=g[e];if(h){return h}}}}}this.current=function(){return b};this.next=function(e){return(b=d(b,"firstChild","nextSibling",e))};this.prev=function(e){return(b=d(b,"lastChild","lastSibling",e))}};(function(){var a={};function b(f,e){var d;function c(g){return g.replace(/[A-Z]+/g,function(h){return c(f[h])})}for(d in f){if(f.hasOwnProperty(d)){f[d]=c(f[d])}}c(e).replace(/#/g,"#text").replace(/(\w+)\[([^\]]+)\]/g,function(l,g,j){var h,k={};j=j.split(/\|/);for(h=j.length-1;h>=0;h--){k[j[h]]=1}a[g]=k})}b({Z:"#|H|K|N|O|P",Y:"#|X|form|R|Q",X:"p|T|div|U|W|isindex|fieldset|table",W:"pre|hr|blockquote|address|center|noframes",U:"ul|ol|dl|menu|dir",ZC:"#|p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q",T:"h1|h2|h3|h4|h5|h6",ZB:"#|X|S|Q",S:"R|P",ZA:"#|a|G|J|M|O|P",R:"#|a|H|K|N|O",Q:"noscript|P",P:"ins|del|script",O:"input|select|textarea|label|button",N:"M|L",M:"em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym",L:"sub|sup",K:"J|I",J:"tt|i|b|u|s|strike",I:"big|small|font|basefont",H:"G|F",G:"br|span|bdo",F:"object|applet|img|map|iframe"},"script[]style[]object[#|param|X|form|a|H|K|N|O|Q]param[]p[S]a[Z]br[]span[S]bdo[S]applet[#|param|X|form|a|H|K|N|O|Q]h1[S]img[]map[X|form|Q|area]h2[S]iframe[#|X|form|a|H|K|N|O|Q]h3[S]tt[S]i[S]b[S]u[S]s[S]strike[S]big[S]small[S]font[S]basefont[]em[S]strong[S]dfn[S]code[S]q[S]samp[S]kbd[S]var[S]cite[S]abbr[S]acronym[S]sub[S]sup[S]input[]select[optgroup|option]optgroup[option]option[]textarea[]label[S]button[#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]h4[S]ins[#|X|form|a|H|K|N|O|Q]h5[S]del[#|X|form|a|H|K|N|O|Q]h6[S]div[#|X|form|a|H|K|N|O|Q]ul[li]li[#|X|form|a|H|K|N|O|Q]ol[li]dl[dt|dd]dt[S]dd[#|X|form|a|H|K|N|O|Q]menu[li]dir[li]pre[ZA]hr[]blockquote[#|X|form|a|H|K|N|O|Q]address[S|p]center[#|X|form|a|H|K|N|O|Q]noframes[#|X|form|a|H|K|N|O|Q]isindex[]fieldset[#|legend|X|form|a|H|K|N|O|Q]legend[S]table[caption|col|colgroup|thead|tfoot|tbody|tr]caption[S]col[]colgroup[col]thead[tr]tr[th|td]th[#|X|form|a|H|K|N|O|Q]form[#|X|a|H|K|N|O|Q]noscript[#|X|form|a|H|K|N|O|Q]td[#|X|form|a|H|K|N|O|Q]tfoot[tr]tbody[tr]area[]base[]body[#|X|form|a|H|K|N|O|Q]");tinymce.dom.Schema=function(){var c=this,d=a;c.isValid=function(f,e){var g=d[f];return !!(g&&(!e||g[e]))}}})();(function(a){a.dom.RangeUtils=function(c){var b="\uFEFF";this.walk=function(d,r){var h=d.startContainer,k=d.startOffset,s=d.endContainer,l=d.endOffset,i,f,n,g,q,p,e;e=c.select("td.mceSelected,th.mceSelected");if(e.length>0){a.each(e,function(t){r([t])});return}function o(v,u,t){var x=[];for(;v&&v!=t;v=v[u]){x.push(v)}return x}function m(u,t){do{if(u.parentNode==t){return u}u=u.parentNode}while(u)}function j(v,u,x){var t=x?"nextSibling":"previousSibling";for(g=v,q=g.parentNode;g&&g!=u;g=q){q=g.parentNode;p=o(g==v?g:g[t],t);if(p.length){if(!x){p.reverse()}r(p)}}}if(h.nodeType==1&&h.hasChildNodes()){h=h.childNodes[k]}if(s.nodeType==1&&s.hasChildNodes()){s=s.childNodes[Math.min(k==l?l:l-1,s.childNodes.length-1)]}i=c.findCommonAncestor(h,s);if(h==s){return r([h])}for(g=h;g;g=g.parentNode){if(g==s){return j(h,i,true)}if(g==i){break}}for(g=s;g;g=g.parentNode){if(g==h){return j(s,i)}if(g==i){break}}f=m(h,i)||h;n=m(s,i)||s;j(h,f,true);p=o(f==h?f:f.nextSibling,"nextSibling",n==s?n.nextSibling:n);if(p.length){r(p)}j(s,n)}};a.dom.RangeUtils.compareRanges=function(c,b){if(c&&b){if(c.item||c.duplicate){if(c.item&&b.item&&c.item(0)===b.item(0)){return true}if(c.isEqual&&b.isEqual&&b.isEqual(c)){return true}}else{return c.startContainer==b.startContainer&&c.startOffset==b.startOffset}}return false}})(tinymce);(function(c){var b=c.DOM,a=c.is;c.create("tinymce.ui.Control",{Control:function(e,d){this.id=e;this.settings=d=d||{};this.rendered=false;this.onRender=new c.util.Dispatcher(this);this.classPrefix="";this.scope=d.scope||this;this.disabled=0;this.active=0},setDisabled:function(d){var f;if(d!=this.disabled){f=b.get(this.id);if(f&&this.settings.unavailable_prefix){if(d){this.prevTitle=f.title;f.title=this.settings.unavailable_prefix+": "+f.title}else{f.title=this.prevTitle}}this.setState("Disabled",d);this.setState("Enabled",!d);this.disabled=d}},isDisabled:function(){return this.disabled},setActive:function(d){if(d!=this.active){this.setState("Active",d);this.active=d}},isActive:function(){return this.active},setState:function(f,d){var e=b.get(this.id);f=this.classPrefix+f;if(d){b.addClass(e,f)}else{b.removeClass(e,f)}},isRendered:function(){return this.rendered},renderHTML:function(){},renderTo:function(d){b.setHTML(d,this.renderHTML())},postRender:function(){var e=this,d;if(a(e.disabled)){d=e.disabled;e.disabled=-1;e.setDisabled(d)}if(a(e.active)){d=e.active;e.active=-1;e.setActive(d)}},remove:function(){b.remove(this.id);this.destroy()},destroy:function(){c.dom.Event.clear(this.id)}})})(tinymce);tinymce.create("tinymce.ui.Container:tinymce.ui.Control",{Container:function(b,a){this.parent(b,a);this.controls=[];this.lookup={}},add:function(a){this.lookup[a.id]=a;this.controls.push(a);return a},get:function(a){return this.lookup[a]}});tinymce.create("tinymce.ui.Separator:tinymce.ui.Control",{Separator:function(b,a){this.parent(b,a);this.classPrefix="mceSeparator"},renderHTML:function(){return tinymce.DOM.createHTML("span",{"class":this.classPrefix})}});(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.MenuItem:tinymce.ui.Control",{MenuItem:function(g,f){this.parent(g,f);this.classPrefix="mceMenuItem"},setSelected:function(f){this.setState("Selected",f);this.selected=f},isSelected:function(){return this.selected},postRender:function(){var f=this;f.parent();if(c(f.selected)){f.setSelected(f.selected)}}})})(tinymce);(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.Menu:tinymce.ui.MenuItem",{Menu:function(h,g){var f=this;f.parent(h,g);f.items={};f.collapsed=false;f.menuCount=0;f.onAddItem=new d.util.Dispatcher(this)},expand:function(g){var f=this;if(g){a(f,function(h){if(h.expand){h.expand()}},"items",f)}f.collapsed=false},collapse:function(g){var f=this;if(g){a(f,function(h){if(h.collapse){h.collapse()}},"items",f)}f.collapsed=true},isCollapsed:function(){return this.collapsed},add:function(f){if(!f.settings){f=new d.ui.MenuItem(f.id||b.uniqueId(),f)}this.onAddItem.dispatch(this,f);return this.items[f.id]=f},addSeparator:function(){return this.add({separator:true})},addMenu:function(f){if(!f.collapse){f=this.createMenu(f)}this.menuCount++;return this.add(f)},hasMenus:function(){return this.menuCount!==0},remove:function(f){delete this.items[f.id]},removeAll:function(){var f=this;a(f,function(g){if(g.removeAll){g.removeAll()}else{g.remove()}g.destroy()},"items",f);f.items={}},createMenu:function(g){var f=new d.ui.Menu(g.id||b.uniqueId(),g);f.onAddItem.add(this.onAddItem.dispatch,this.onAddItem);return f}})})(tinymce);(function(e){var d=e.is,c=e.DOM,f=e.each,a=e.dom.Event,b=e.dom.Element;e.create("tinymce.ui.DropMenu:tinymce.ui.Menu",{DropMenu:function(h,g){g=g||{};g.container=g.container||c.doc.body;g.offset_x=g.offset_x||0;g.offset_y=g.offset_y||0;g.vp_offset_x=g.vp_offset_x||0;g.vp_offset_y=g.vp_offset_y||0;if(d(g.icons)&&!g.icons){g["class"]+=" mceNoIcons"}this.parent(h,g);this.onShowMenu=new e.util.Dispatcher(this);this.onHideMenu=new e.util.Dispatcher(this);this.classPrefix="mceMenu"},createMenu:function(j){var h=this,i=h.settings,g;j.container=j.container||i.container;j.parent=h;j.constrain=j.constrain||i.constrain;j["class"]=j["class"]||i["class"];j.vp_offset_x=j.vp_offset_x||i.vp_offset_x;j.vp_offset_y=j.vp_offset_y||i.vp_offset_y;g=new e.ui.DropMenu(j.id||c.uniqueId(),j);g.onAddItem.add(h.onAddItem.dispatch,h.onAddItem);return g},update:function(){var i=this,j=i.settings,g=c.get("menu_"+i.id+"_tbl"),l=c.get("menu_"+i.id+"_co"),h,k;h=j.max_width?Math.min(g.clientWidth,j.max_width):g.clientWidth;k=j.max_height?Math.min(g.clientHeight,j.max_height):g.clientHeight;if(!c.boxModel){i.element.setStyles({width:h+2,height:k+2})}else{i.element.setStyles({width:h,height:k})}if(j.max_width){c.setStyle(l,"width",h)}if(j.max_height){c.setStyle(l,"height",k);if(g.clientHeight<j.max_height){c.setStyle(l,"overflow","hidden")}}},showMenu:function(p,n,r){var z=this,A=z.settings,o,g=c.getViewPort(),u,l,v,q,i=2,k,j,m=z.classPrefix;z.collapse(1);if(z.isMenuVisible){return}if(!z.rendered){o=c.add(z.settings.container,z.renderNode());f(z.items,function(h){h.postRender()});z.element=new b("menu_"+z.id,{blocker:1,container:A.container})}else{o=c.get("menu_"+z.id)}if(!e.isOpera){c.setStyles(o,{left:-65535,top:-65535})}c.show(o);z.update();p+=A.offset_x||0;n+=A.offset_y||0;g.w-=4;g.h-=4;if(A.constrain){u=o.clientWidth-i;l=o.clientHeight-i;v=g.x+g.w;q=g.y+g.h;if((p+A.vp_offset_x+u)>v){p=r?r-u:Math.max(0,(v-A.vp_offset_x)-u)}if((n+A.vp_offset_y+l)>q){n=Math.max(0,(q-A.vp_offset_y)-l)}}c.setStyles(o,{left:p,top:n});z.element.update();z.isMenuVisible=1;z.mouseClickFunc=a.add(o,"click",function(s){var h;s=s.target;if(s&&(s=c.getParent(s,"tr"))&&!c.hasClass(s,m+"ItemSub")){h=z.items[s.id];if(h.isDisabled()){return}k=z;while(k){if(k.hideMenu){k.hideMenu()}k=k.settings.parent}if(h.settings.onclick){h.settings.onclick(s)}return a.cancel(s)}});if(z.hasMenus()){z.mouseOverFunc=a.add(o,"mouseover",function(x){var h,t,s;x=x.target;if(x&&(x=c.getParent(x,"tr"))){h=z.items[x.id];if(z.lastMenu){z.lastMenu.collapse(1)}if(h.isDisabled()){return}if(x&&c.hasClass(x,m+"ItemSub")){t=c.getRect(x);h.showMenu((t.x+t.w-i),t.y-i,t.x);z.lastMenu=h;c.addClass(c.get(h.id).firstChild,m+"ItemActive")}}})}z.onShowMenu.dispatch(z);if(A.keyboard_focus){a.add(o,"keydown",z._keyHandler,z);c.select("a","menu_"+z.id)[0].focus();z._focusIdx=0}},hideMenu:function(j){var g=this,i=c.get("menu_"+g.id),h;if(!g.isMenuVisible){return}a.remove(i,"mouseover",g.mouseOverFunc);a.remove(i,"click",g.mouseClickFunc);a.remove(i,"keydown",g._keyHandler);c.hide(i);g.isMenuVisible=0;if(!j){g.collapse(1)}if(g.element){g.element.hide()}if(h=c.get(g.id)){c.removeClass(h.firstChild,g.classPrefix+"ItemActive")}g.onHideMenu.dispatch(g)},add:function(i){var g=this,h;i=g.parent(i);if(g.isRendered&&(h=c.get("menu_"+g.id))){g._add(c.select("tbody",h)[0],i)}return i},collapse:function(g){this.parent(g);this.hideMenu(1)},remove:function(g){c.remove(g.id);this.destroy();return this.parent(g)},destroy:function(){var g=this,h=c.get("menu_"+g.id);a.remove(h,"mouseover",g.mouseOverFunc);a.remove(h,"click",g.mouseClickFunc);if(g.element){g.element.remove()}c.remove(h)},renderNode:function(){var i=this,j=i.settings,l,h,k,g;g=c.create("div",{id:"menu_"+i.id,"class":j["class"],style:"position:absolute;left:0;top:0;z-index:200000"});k=c.add(g,"div",{id:"menu_"+i.id+"_co","class":i.classPrefix+(j["class"]?" "+j["class"]:"")});i.element=new b("menu_"+i.id,{blocker:1,container:j.container});if(j.menu_line){c.add(k,"span",{"class":i.classPrefix+"Line"})}l=c.add(k,"table",{id:"menu_"+i.id+"_tbl",border:0,cellPadding:0,cellSpacing:0});h=c.add(l,"tbody");f(i.items,function(m){i._add(h,m)});i.rendered=true;return g},_keyHandler:function(j){var i=this,h=j.keyCode;function g(m){var k=i._focusIdx+m,l=c.select("a","menu_"+i.id)[k];if(l){i._focusIdx=k;l.focus()}}switch(h){case 38:g(-1);return;case 40:g(1);return;case 13:return;case 27:return this.hideMenu()}},_add:function(j,h){var i,q=h.settings,p,l,k,m=this.classPrefix,g;if(q.separator){l=c.add(j,"tr",{id:h.id,"class":m+"ItemSeparator"});c.add(l,"td",{"class":m+"ItemSeparator"});if(i=l.previousSibling){c.addClass(i,"mceLast")}return}i=l=c.add(j,"tr",{id:h.id,"class":m+"Item "+m+"ItemEnabled"});i=k=c.add(i,"td");i=p=c.add(i,"a",{href:"javascript:;",onclick:"return false;",onmousedown:"return false;"});c.addClass(k,q["class"]);g=c.add(i,"span",{"class":"mceIcon"+(q.icon?" mce_"+q.icon:"")});if(q.icon_src){c.add(g,"img",{src:q.icon_src})}i=c.add(i,q.element||"span",{"class":"mceText",title:h.settings.title},h.settings.title);if(h.settings.style){c.setAttrib(i,"style",h.settings.style)}if(j.childNodes.length==1){c.addClass(l,"mceFirst")}if((i=l.previousSibling)&&c.hasClass(i,m+"ItemSeparator")){c.addClass(l,"mceFirst")}if(h.collapse){c.addClass(l,m+"ItemSub")}if(i=l.previousSibling){c.removeClass(i,"mceLast")}c.addClass(l,"mceLast")}})})(tinymce);(function(b){var a=b.DOM;b.create("tinymce.ui.Button:tinymce.ui.Control",{Button:function(d,c){this.parent(d,c);this.classPrefix="mceButton"},renderHTML:function(){var f=this.classPrefix,e=this.settings,d,c;c=a.encode(e.label||"");d='<a id="'+this.id+'" href="javascript:;" class="'+f+" "+f+"Enabled "+e["class"]+(c?" "+f+"Labeled":"")+'" onmousedown="return false;" onclick="return false;" title="'+a.encode(e.title)+'">';if(e.image){d+='<img class="mceIcon" src="'+e.image+'" />'+c+"</a>"}else{d+='<span class="mceIcon '+e["class"]+'"></span>'+(c?'<span class="'+f+'Label">'+c+"</span>":"")+"</a>"}return d},postRender:function(){var c=this,d=c.settings;b.dom.Event.add(c.id,"click",function(f){if(!c.isDisabled()){return d.onclick.call(d.scope,f)}})}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.ListBox:tinymce.ui.Control",{ListBox:function(h,g){var f=this;f.parent(h,g);f.items=[];f.onChange=new a(f);f.onPostRender=new a(f);f.onAdd=new a(f);f.onRenderMenu=new d.util.Dispatcher(this);f.classPrefix="mceListBox"},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){var g=this,h,i;if(f!=g.selectedIndex){h=c.get(g.id+"_text");i=g.items[f];if(i){g.selectedValue=i.value;g.selectedIndex=f;c.setHTML(h,c.encode(i.title));c.removeClass(h,"mceTitle")}else{c.setHTML(h,c.encode(g.settings.title));c.addClass(h,"mceTitle");g.selectedValue=g.selectedIndex=null}h=0}},add:function(i,f,h){var g=this;h=h||{};h=d.extend(h,{title:i,value:f});g.items.push(h);g.onAdd.dispatch(g,h)},getLength:function(){return this.items.length},renderHTML:function(){var i="",f=this,g=f.settings,j=f.classPrefix;i='<table id="'+f.id+'" cellpadding="0" cellspacing="0" class="'+j+" "+j+"Enabled"+(g["class"]?(" "+g["class"]):"")+'"><tbody><tr>';i+="<td>"+c.createHTML("a",{id:f.id+"_text",href:"javascript:;","class":"mceText",onclick:"return false;",onmousedown:"return false;"},c.encode(f.settings.title))+"</td>";i+="<td>"+c.createHTML("a",{id:f.id+"_open",tabindex:-1,href:"javascript:;","class":"mceOpen",onclick:"return false;",onmousedown:"return false;"},"<span></span>")+"</td>";i+="</tr></tbody></table>";return i},showMenu:function(){var g=this,j,i,h=c.get(this.id),f;if(g.isDisabled()||g.items.length==0){return}if(g.menu&&g.menu.isMenuVisible){return g.hideMenu()}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}j=c.getPos(this.settings.menu_container);i=c.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.keyboard_focus=!d.isOpera;if(g.oldID){f.items[g.oldID].setSelected(0)}e(g.items,function(k){if(k.value===g.selectedValue){f.items[k.id].setSelected(1);g.oldID=k.id}});f.showMenu(0,h.clientHeight);b.add(c.doc,"mousedown",g.hideMenu,g);c.addClass(g.id,g.classPrefix+"Selected")},hideMenu:function(g){var f=this;if(f.menu&&f.menu.isMenuVisible){if(g&&g.type=="mousedown"&&(g.target.id==f.id+"_text"||g.target.id==f.id+"_open")){return}if(!g||!c.getParent(g.target,".mceMenu")){c.removeClass(f.id,f.classPrefix+"Selected");b.remove(c.doc,"mousedown",f.hideMenu,f);f.menu.hideMenu()}}},renderMenu:function(){var g=this,f;f=g.settings.control_manager.createDropMenu(g.id+"_menu",{menu_line:1,"class":g.classPrefix+"Menu mceNoIcons",max_width:150,max_height:150});f.onHideMenu.add(g.hideMenu,g);f.add({title:g.settings.title,"class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}});e(g.items,function(h){if(h.value===undefined){f.add({title:h.title,"class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}})}else{h.id=c.uniqueId();h.onclick=function(){if(g.settings.onselect(h.value)!==false){g.select(h.value)}};f.add(h)}});g.onRenderMenu.dispatch(g,f);g.menu=f},postRender:function(){var f=this,g=f.classPrefix;b.add(f.id,"click",f.showMenu,f);b.add(f.id+"_text","focus",function(){if(!f._focused){f.keyDownHandler=b.add(f.id+"_text","keydown",function(k){var h=-1,i,j=k.keyCode;e(f.items,function(l,m){if(f.selectedValue==l.value){h=m}});if(j==38){i=f.items[h-1]}else{if(j==40){i=f.items[h+1]}else{if(j==13){i=f.selectedValue;f.selectedValue=null;f.settings.onselect(i);return b.cancel(k)}}}if(i){f.hideMenu();f.select(i.value)}})}f._focused=1});b.add(f.id+"_text","blur",function(){b.remove(f.id+"_text","keydown",f.keyDownHandler);f._focused=0});if(d.isIE6||!c.boxModel){b.add(f.id,"mouseover",function(){if(!c.hasClass(f.id,g+"Disabled")){c.addClass(f.id,g+"Hover")}});b.add(f.id,"mouseout",function(){if(!c.hasClass(f.id,g+"Disabled")){c.removeClass(f.id,g+"Hover")}})}f.onPostRender.dispatch(f,c.get(f.id))},destroy:function(){this.parent();b.clear(this.id+"_text");b.clear(this.id+"_open")}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.NativeListBox:tinymce.ui.ListBox",{NativeListBox:function(g,f){this.parent(g,f);this.classPrefix="mceNativeListBox"},setDisabled:function(f){c.get(this.id).disabled=f},isDisabled:function(){return c.get(this.id).disabled},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){c.get(this.id).selectedIndex=f+1;this.selectedValue=this.items[f]?this.items[f].value:null},add:function(j,g,f){var i,h=this;f=f||{};f.value=g;if(h.isRendered()){c.add(c.get(this.id),"option",f,j)}i={title:j,value:g,attribs:f};h.items.push(i);h.onAdd.dispatch(h,i)},getLength:function(){return this.items.length},renderHTML:function(){var g,f=this;g=c.createHTML("option",{value:""},"-- "+f.settings.title+" --");e(f.items,function(h){g+=c.createHTML("option",{value:h.value},h.title)});g=c.createHTML("select",{id:f.id,"class":"mceNativeListBox"},g);return g},postRender:function(){var g=this,h;g.rendered=true;function f(j){var i=g.items[j.target.selectedIndex-1];if(i&&(i=i.value)){g.onChange.dispatch(g,i);if(g.settings.onselect){g.settings.onselect(i)}}}b.add(g.id,"change",f);b.add(g.id,"keydown",function(j){var i;b.remove(g.id,"change",h);i=b.add(g.id,"blur",function(){b.add(g.id,"change",f);b.remove(g.id,"blur",i)});if(j.keyCode==13||j.keyCode==32){f(j);return b.cancel(j)}});g.onPostRender.dispatch(g,c.get(g.id))}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.MenuButton:tinymce.ui.Button",{MenuButton:function(f,e){this.parent(f,e);this.onRenderMenu=new c.util.Dispatcher(this);e.menu_container=e.menu_container||b.doc.body},showMenu:function(){var g=this,j,i,h=b.get(g.id),f;if(g.isDisabled()){return}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}if(g.isMenuVisible){return g.hideMenu()}j=b.getPos(g.settings.menu_container);i=b.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.vp_offset_x=i.x;f.settings.vp_offset_y=i.y;f.settings.keyboard_focus=g._focused;f.showMenu(0,h.clientHeight);a.add(b.doc,"mousedown",g.hideMenu,g);g.setState("Selected",1);g.isMenuVisible=1},renderMenu:function(){var f=this,e;e=f.settings.control_manager.createDropMenu(f.id+"_menu",{menu_line:1,"class":this.classPrefix+"Menu",icons:f.settings.icons});e.onHideMenu.add(f.hideMenu,f);f.onRenderMenu.dispatch(f,e);f.menu=e},hideMenu:function(g){var f=this;if(g&&g.type=="mousedown"&&b.getParent(g.target,function(h){return h.id===f.id||h.id===f.id+"_open"})){return}if(!g||!b.getParent(g.target,".mceMenu")){f.setState("Selected",0);a.remove(b.doc,"mousedown",f.hideMenu,f);if(f.menu){f.menu.hideMenu()}}f.isMenuVisible=0},postRender:function(){var e=this,f=e.settings;a.add(e.id,"click",function(){if(!e.isDisabled()){if(f.onclick){f.onclick(e.value)}e.showMenu()}})}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.SplitButton:tinymce.ui.MenuButton",{SplitButton:function(f,e){this.parent(f,e);this.classPrefix="mceSplitButton"},renderHTML:function(){var i,f=this,g=f.settings,e;i="<tbody><tr>";if(g.image){e=b.createHTML("img ",{src:g.image,"class":"mceAction "+g["class"]})}else{e=b.createHTML("span",{"class":"mceAction "+g["class"]},"")}i+="<td>"+b.createHTML("a",{id:f.id+"_action",href:"javascript:;","class":"mceAction "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";e=b.createHTML("span",{"class":"mceOpen "+g["class"]});i+="<td>"+b.createHTML("a",{id:f.id+"_open",href:"javascript:;","class":"mceOpen "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";i+="</tr></tbody>";return b.createHTML("table",{id:f.id,"class":"mceSplitButton mceSplitButtonEnabled "+g["class"],cellpadding:"0",cellspacing:"0",onmousedown:"return false;",title:g.title},i)},postRender:function(){var e=this,f=e.settings;if(f.onclick){a.add(e.id+"_action","click",function(){if(!e.isDisabled()){f.onclick(e.value)}})}a.add(e.id+"_open","click",e.showMenu,e);a.add(e.id+"_open","focus",function(){e._focused=1});a.add(e.id+"_open","blur",function(){e._focused=0});if(c.isIE6||!b.boxModel){a.add(e.id,"mouseover",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.addClass(e.id,"mceSplitButtonHover")}});a.add(e.id,"mouseout",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.removeClass(e.id,"mceSplitButtonHover")}})}},destroy:function(){this.parent();a.clear(this.id+"_action");a.clear(this.id+"_open")}})})(tinymce);(function(d){var c=d.DOM,a=d.dom.Event,b=d.is,e=d.each;d.create("tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton",{ColorSplitButton:function(h,g){var f=this;f.parent(h,g);f.settings=g=d.extend({colors:"000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,008000,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF",grid_width:8,default_color:"#888888"},f.settings);f.onShowMenu=new d.util.Dispatcher(f);f.onHideMenu=new d.util.Dispatcher(f);f.value=g.default_color},showMenu:function(){var f=this,g,j,i,h;if(f.isDisabled()){return}if(!f.isMenuRendered){f.renderMenu();f.isMenuRendered=true}if(f.isMenuVisible){return f.hideMenu()}i=c.get(f.id);c.show(f.id+"_menu");c.addClass(i,"mceSplitButtonSelected");h=c.getPos(i);c.setStyles(f.id+"_menu",{left:h.x,top:h.y+i.clientHeight,zIndex:200000});i=0;a.add(c.doc,"mousedown",f.hideMenu,f);f.onShowMenu.dispatch(f);if(f._focused){f._keyHandler=a.add(f.id+"_menu","keydown",function(k){if(k.keyCode==27){f.hideMenu()}});c.select("a",f.id+"_menu")[0].focus()}f.isMenuVisible=1},hideMenu:function(g){var f=this;if(g&&g.type=="mousedown"&&c.getParent(g.target,function(h){return h.id===f.id+"_open"})){return}if(!g||!c.getParent(g.target,".mceSplitButtonMenu")){c.removeClass(f.id,"mceSplitButtonSelected");a.remove(c.doc,"mousedown",f.hideMenu,f);a.remove(f.id+"_menu","keydown",f._keyHandler);c.hide(f.id+"_menu")}f.onHideMenu.dispatch(f);f.isMenuVisible=0},renderMenu:function(){var k=this,f,j=0,l=k.settings,p,h,o,g;g=c.add(l.menu_container,"div",{id:k.id+"_menu","class":l.menu_class+" "+l["class"],style:"position:absolute;left:0;top:-1000px;"});f=c.add(g,"div",{"class":l["class"]+" mceSplitButtonMenu"});c.add(f,"span",{"class":"mceMenuLine"});p=c.add(f,"table",{"class":"mceColorSplitMenu"});h=c.add(p,"tbody");j=0;e(b(l.colors,"array")?l.colors:l.colors.split(","),function(i){i=i.replace(/^#/,"");if(!j--){o=c.add(h,"tr");j=l.grid_width-1}p=c.add(o,"td");p=c.add(p,"a",{href:"javascript:;",style:{backgroundColor:"#"+i},_mce_color:"#"+i})});if(l.more_colors_func){p=c.add(h,"tr");p=c.add(p,"td",{colspan:l.grid_width,"class":"mceMoreColors"});p=c.add(p,"a",{id:k.id+"_more",href:"javascript:;",onclick:"return false;","class":"mceMoreColors"},l.more_colors_title);a.add(p,"click",function(i){l.more_colors_func.call(l.more_colors_scope||this);return a.cancel(i)})}c.addClass(f,"mceColorSplitMenu");a.add(k.id+"_menu","click",function(i){var m;i=i.target;if(i.nodeName=="A"&&(m=i.getAttribute("_mce_color"))){k.setColor(m)}return a.cancel(i)});return g},setColor:function(g){var f=this;c.setStyle(f.id+"_preview","backgroundColor",g);f.value=g;f.hideMenu();f.settings.onselect(g)},postRender:function(){var f=this,g=f.id;f.parent();c.add(g+"_action","div",{id:g+"_preview","class":"mceColorPreview"});c.setStyle(f.id+"_preview","backgroundColor",f.value)},destroy:function(){this.parent();a.clear(this.id+"_menu");a.clear(this.id+"_more");c.remove(this.id+"_menu")}})})(tinymce);tinymce.create("tinymce.ui.Toolbar:tinymce.ui.Container",{renderHTML:function(){var l=this,e="",g,j,b=tinymce.DOM,m=l.settings,d,a,f,k;k=l.controls;for(d=0;d<k.length;d++){j=k[d];a=k[d-1];f=k[d+1];if(d===0){g="mceToolbarStart";if(j.Button){g+=" mceToolbarStartButton"}else{if(j.SplitButton){g+=" mceToolbarStartSplitButton"}else{if(j.ListBox){g+=" mceToolbarStartListBox"}}}e+=b.createHTML("td",{"class":g},b.createHTML("span",null,"<!-- IE -->"))}if(a&&j.ListBox){if(a.Button||a.SplitButton){e+=b.createHTML("td",{"class":"mceToolbarEnd"},b.createHTML("span",null,"<!-- IE -->"))}}if(b.stdMode){e+='<td style="position: relative">'+j.renderHTML()+"</td>"}else{e+="<td>"+j.renderHTML()+"</td>"}if(f&&j.ListBox){if(f.Button||f.SplitButton){e+=b.createHTML("td",{"class":"mceToolbarStart"},b.createHTML("span",null,"<!-- IE -->"))}}}g="mceToolbarEnd";if(j.Button){g+=" mceToolbarEndButton"}else{if(j.SplitButton){g+=" mceToolbarEndSplitButton"}else{if(j.ListBox){g+=" mceToolbarEndListBox"}}}e+=b.createHTML("td",{"class":g},b.createHTML("span",null,"<!-- IE -->"));return b.createHTML("table",{id:l.id,"class":"mceToolbar"+(m["class"]?" "+m["class"]:""),cellpadding:"0",cellspacing:"0",align:l.settings.align||""},"<tbody><tr>"+e+"</tr></tbody>")}});(function(b){var a=b.util.Dispatcher,c=b.each;b.create("tinymce.AddOnManager",{items:[],urls:{},lookup:{},onAdd:new a(this),get:function(d){return this.lookup[d]},requireLangPack:function(e){var d=b.settings;if(d&&d.language){b.ScriptLoader.add(this.urls[e]+"/langs/"+d.language+".js")}},add:function(e,d){this.items.push(d);this.lookup[e]=d;this.onAdd.dispatch(this,e,d);return d},load:function(h,e,d,g){var f=this;if(f.urls[h]){return}if(e.indexOf("/")!=0&&e.indexOf("://")==-1){e=b.baseURL+"/"+e}f.urls[h]=e.substring(0,e.lastIndexOf("/"));b.ScriptLoader.add(e,d,g)}});b.PluginManager=new b.AddOnManager();b.ThemeManager=new b.AddOnManager()}(tinymce));(function(j){var g=j.each,d=j.extend,k=j.DOM,i=j.dom.Event,f=j.ThemeManager,b=j.PluginManager,e=j.explode,h=j.util.Dispatcher,a,c=0;j.documentBaseURL=window.location.href.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,"");if(!/[\/\\]$/.test(j.documentBaseURL)){j.documentBaseURL+="/"}j.baseURL=new j.util.URI(j.documentBaseURL).toAbsolute(j.baseURL);j.baseURI=new j.util.URI(j.baseURL);j.onBeforeUnload=new h(j);i.add(window,"beforeunload",function(l){j.onBeforeUnload.dispatch(j,l)});j.onAddEditor=new h(j);j.onRemoveEditor=new h(j);j.EditorManager=d(j,{editors:[],i18n:{},activeEditor:null,init:function(q){var n=this,p,l=j.ScriptLoader,u,o=[],m;function r(x,y,t){var v=x[y];if(!v){return}if(j.is(v,"string")){t=v.replace(/\.\w+$/,"");t=t?j.resolve(t):0;v=j.resolve(v)}return v.apply(t||this,Array.prototype.slice.call(arguments,2))}q=d({theme:"simple",language:"en"},q);n.settings=q;i.add(document,"init",function(){var s,v;r(q,"onpageload");switch(q.mode){case"exact":s=q.elements||"";if(s.length>0){g(e(s),function(x){if(k.get(x)){m=new j.Editor(x,q);o.push(m);m.render(1)}else{g(document.forms,function(y){g(y.elements,function(z){if(z.name===x){x="mce_editor_"+c++;k.setAttrib(z,"id",x);m=new j.Editor(x,q);o.push(m);m.render(1)}})})}})}break;case"textareas":case"specific_textareas":function t(y,x){return x.constructor===RegExp?x.test(y.className):k.hasClass(y,x)}g(k.select("textarea"),function(x){if(q.editor_deselector&&t(x,q.editor_deselector)){return}if(!q.editor_selector||t(x,q.editor_selector)){u=k.get(x.name);if(!x.id&&!u){x.id=x.name}if(!x.id||n.get(x.id)){x.id=k.uniqueId()}m=new j.Editor(x.id,q);o.push(m);m.render(1)}});break}if(q.oninit){s=v=0;g(o,function(x){v++;if(!x.initialized){x.onInit.add(function(){s++;if(s==v){r(q,"oninit")}})}else{s++}if(s==v){r(q,"oninit")}})}})},get:function(l){if(l===a){return this.editors}return this.editors[l]},getInstanceById:function(l){return this.get(l)},add:function(m){var l=this,n=l.editors;n[m.id]=m;n.push(m);l._setActive(m);l.onAddEditor.dispatch(l,m);return m},remove:function(n){var m=this,l,o=m.editors;if(!o[n.id]){return null}delete o[n.id];for(l=0;l<o.length;l++){if(o[l]==n){o.splice(l,1);break}}if(m.activeEditor==n){m._setActive(o[0])}n.destroy();m.onRemoveEditor.dispatch(m,n);return n},execCommand:function(r,p,o){var q=this,n=q.get(o),l;switch(r){case"mceFocus":n.focus();return true;case"mceAddEditor":case"mceAddControl":if(!q.get(o)){new j.Editor(o,q.settings).render()}return true;case"mceAddFrameControl":l=o.window;l.tinyMCE=tinyMCE;l.tinymce=j;j.DOM.doc=l.document;j.DOM.win=l;n=new j.Editor(o.element_id,o);n.render();if(j.isIE){function m(){n.destroy();l.detachEvent("onunload",m);l=l.tinyMCE=l.tinymce=null}l.attachEvent("onunload",m)}o.page_window=null;return true;case"mceRemoveEditor":case"mceRemoveControl":if(n){n.remove()}return true;case"mceToggleEditor":if(!n){q.execCommand("mceAddControl",0,o);return true}if(n.isHidden()){n.show()}else{n.hide()}return true}if(q.activeEditor){return q.activeEditor.execCommand(r,p,o)}return false},execInstanceCommand:function(p,o,n,m){var l=this.get(p);if(l){return l.execCommand(o,n,m)}return false},triggerSave:function(){g(this.editors,function(l){l.save()})},addI18n:function(n,q){var l,m=this.i18n;if(!j.is(n,"string")){g(n,function(r,p){g(r,function(t,s){g(t,function(v,u){if(s==="common"){m[p+"."+u]=v}else{m[p+"."+s+"."+u]=v}})})})}else{g(q,function(r,p){m[n+"."+p]=r})}},_setActive:function(l){this.selectedInstance=this.activeEditor=l}})})(tinymce);(function(m){var n=m.DOM,j=m.dom.Event,f=m.extend,k=m.util.Dispatcher,i=m.each,a=m.isGecko,b=m.isIE,e=m.isWebKit,d=m.is,h=m.ThemeManager,c=m.PluginManager,o=m.inArray,l=m.grep,g=m.explode;m.create("tinymce.Editor",{Editor:function(r,q){var p=this;p.id=p.editorId=r;p.execCommands={};p.queryStateCommands={};p.queryValueCommands={};p.isNotDirty=false;p.plugins={};i(["onPreInit","onBeforeRenderUI","onPostRender","onInit","onRemove","onActivate","onDeactivate","onClick","onEvent","onMouseUp","onMouseDown","onDblClick","onKeyDown","onKeyUp","onKeyPress","onContextMenu","onSubmit","onReset","onPaste","onPreProcess","onPostProcess","onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent","onLoadContent","onSaveContent","onNodeChange","onChange","onBeforeExecCommand","onExecCommand","onUndo","onRedo","onVisualAid","onSetProgressState"],function(s){p[s]=new k(p)});p.settings=q=f({id:r,language:"en",docs_language:"en",theme:"simple",skin:"default",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:m.documentBaseURL,add_form_submit_trigger:1,submit_patch:1,add_unload_trigger:1,convert_urls:1,relative_urls:1,remove_script_host:1,table_inline_editing:0,object_resizing:1,cleanup:1,accessibility_focus:1,custom_shortcuts:1,custom_undo_redo_keyboard_shortcuts:1,custom_undo_redo_restore_selection:1,custom_undo_redo:1,doctype:m.isIE6?'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">':"<!DOCTYPE>",visual_table_class:"mceItemTable",visual:1,font_size_style_values:"xx-small,x-small,small,medium,large,x-large,xx-large",apply_source_formatting:1,directionality:"ltr",forced_root_block:"p",valid_elements:"@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],a[rel|rev|charset|hreflang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur],strong/b,em/i,strike,u,#p,-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|src|border|alt=|title|hspace|vspace|width|height|align],-sub,-sup,-blockquote[cite],-table[border|cellspacing|cellpadding|width|frame|rules|height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot,#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div,-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite],object[classid|width|height|codebase|*],param[name|value],embed[type|width|height|src|*],script[src|type],map[name],area[shape|coords|href|alt|target],bdo,button,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|valign|width],dfn,fieldset,form[action|accept|accept-charset|enctype|method],input[accept|alt|checked|disabled|maxlength|name|readonly|size|src|type|value|tabindex|accesskey],kbd,label[for],legend,noscript,optgroup[label|disabled],option[disabled|label|selected|value],q[cite],samp,select[disabled|multiple|name|size],small,textarea[cols|rows|disabled|name|readonly],tt,var,big",hidden_input:1,padd_empty_editor:1,render_ui:1,init_theme:1,force_p_newlines:1,indentation:"30px",keep_styles:1,fix_table_elements:1,inline_styles:1,convert_fonts_to_spans:true},q);p.documentBaseURI=new m.util.URI(q.document_base_url||m.documentBaseURL,{base_uri:tinyMCE.baseURI});p.baseURI=m.baseURI;p.execCallback("setup",p)},render:function(r){var u=this,v=u.settings,x=u.id,p=m.ScriptLoader;if(!j.domLoaded){j.add(document,"init",function(){u.render()});return}tinyMCE.settings=v;if(!u.getElement()){return}if(m.isIDevice){return}if(!/TEXTAREA|INPUT/i.test(u.getElement().nodeName)&&v.hidden_input&&n.getParent(x,"form")){n.insertAfter(n.create("input",{type:"hidden",name:x}),x)}if(m.WindowManager){u.windowManager=new m.WindowManager(u)}if(v.encoding=="xml"){u.onGetContent.add(function(s,t){if(t.save){t.content=n.encode(t.content)}})}if(v.add_form_submit_trigger){u.onSubmit.addToTop(function(){if(u.initialized){u.save();u.isNotDirty=1}})}if(v.add_unload_trigger){u._beforeUnload=tinyMCE.onBeforeUnload.add(function(){if(u.initialized&&!u.destroyed&&!u.isHidden()){u.save({format:"raw",no_events:true})}})}m.addUnload(u.destroy,u);if(v.submit_patch){u.onBeforeRenderUI.add(function(){var s=u.getElement().form;if(!s){return}if(s._mceOldSubmit){return}if(!s.submit.nodeType&&!s.submit.length){u.formElement=s;s._mceOldSubmit=s.submit;s.submit=function(){m.triggerSave();u.isNotDirty=1;return u.formElement._mceOldSubmit(u.formElement)}}s=null})}function q(){if(v.language){p.add(m.baseURL+"/langs/"+v.language+".js")}if(v.theme&&v.theme.charAt(0)!="-"&&!h.urls[v.theme]){h.load(v.theme,"themes/"+v.theme+"/editor_template"+m.suffix+".js")}i(g(v.plugins),function(s){if(s&&s.charAt(0)!="-"&&!c.urls[s]){if(s=="safari"){return}c.load(s,"plugins/"+s+"/editor_plugin"+m.suffix+".js")}});p.loadQueue(function(){if(!u.removed){u.init()}})}q()},init:function(){var r,E=this,F=E.settings,B,y,A=E.getElement(),q,p,C,x,z,D;m.add(E);if(F.theme){F.theme=F.theme.replace(/-/,"");q=h.get(F.theme);E.theme=new q();if(E.theme.init&&F.init_theme){E.theme.init(E,h.urls[F.theme]||m.documentBaseURL.replace(/\/$/,""))}}i(g(F.plugins.replace(/\-/g,"")),function(G){var H=c.get(G),t=c.urls[G]||m.documentBaseURL.replace(/\/$/,""),s;if(H){s=new H(E,t);E.plugins[G]=s;if(s.init){s.init(E,t)}}});if(F.popup_css!==false){if(F.popup_css){F.popup_css=E.documentBaseURI.toAbsolute(F.popup_css)}else{F.popup_css=E.baseURI.toAbsolute("themes/"+F.theme+"/skins/"+F.skin+"/dialog.css")}}if(F.popup_css_add){F.popup_css+=","+E.documentBaseURI.toAbsolute(F.popup_css_add)}E.controlManager=new m.ControlManager(E);if(F.custom_undo_redo){E.onBeforeExecCommand.add(function(t,G,u,H,s){if(G!="Undo"&&G!="Redo"&&G!="mceRepaint"&&(!s||!s.skip_undo)){if(!E.undoManager.hasUndo()){E.undoManager.add()}}});E.onExecCommand.add(function(t,G,u,H,s){if(G!="Undo"&&G!="Redo"&&G!="mceRepaint"&&(!s||!s.skip_undo)){E.undoManager.add()}})}E.onExecCommand.add(function(s,t){if(!/^(FontName|FontSize)$/.test(t)){E.nodeChanged()}});if(a){function v(s,t){if(!t||!t.initial){E.execCommand("mceRepaint")}}E.onUndo.add(v);E.onRedo.add(v);E.onSetContent.add(v)}E.onBeforeRenderUI.dispatch(E,E.controlManager);if(F.render_ui){B=F.width||A.style.width||A.offsetWidth;y=F.height||A.style.height||A.offsetHeight;E.orgDisplay=A.style.display;D=/^[0-9\.]+(|px)$/i;if(D.test(""+B)){B=Math.max(parseInt(B)+(q.deltaWidth||0),100)}if(D.test(""+y)){y=Math.max(parseInt(y)+(q.deltaHeight||0),100)}q=E.theme.renderUI({targetNode:A,width:B,height:y,deltaWidth:F.delta_width,deltaHeight:F.delta_height});E.editorContainer=q.editorContainer}if(document.domain&&location.hostname!=document.domain){m.relaxedDomain=document.domain}n.setStyles(q.sizeContainer||q.editorContainer,{width:B,height:y});y=(q.iframeHeight||y)+(typeof(y)=="number"?(q.deltaHeight||0):"");if(y<100){y=100}E.iframeHTML=F.doctype+'<html><head xmlns="http://www.w3.org/1999/xhtml">';if(F.document_base_url!=m.documentBaseURL){E.iframeHTML+='<base href="'+E.documentBaseURI.getURI()+'" />'}E.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=7" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';if(m.relaxedDomain){E.iframeHTML+='<script type="text/javascript">document.domain = "'+m.relaxedDomain+'";<\/script>'}x=F.body_id||"tinymce";if(x.indexOf("=")!=-1){x=E.getParam("body_id","","hash");x=x[E.id]||x}z=F.body_class||"";if(z.indexOf("=")!=-1){z=E.getParam("body_class","","hash");z=z[E.id]||""}E.iframeHTML+='</head><body id="'+x+'" class="mceContentBody '+z+'"></body></html>';if(m.relaxedDomain){if(b||(m.isOpera&&parseFloat(opera.version())>=9.5)){C='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinyMCE.get("'+E.id+'");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()'}else{if(m.isOpera){C='javascript:(function(){document.open();document.domain="'+document.domain+'";document.close();ed.setupIframe();})()'}}}r=n.add(q.iframeContainer,"iframe",{id:E.id+"_ifr",src:C||'javascript:""',frameBorder:"0",style:{width:"100%",height:y}});E.contentAreaContainer=q.iframeContainer;n.get(q.editorContainer).style.display=E.orgDisplay;n.get(E.id).style.display="none";if(!b||!m.relaxedDomain){E.setupIframe()}A=r=q=null},setupIframe:function(){var z=this,A=z.settings,r=n.get(z.id),u=z.getDoc(),q,x;if(!b||!m.relaxedDomain){u.open();u.write(z.iframeHTML);u.close()}if(!b){try{if(!A.readonly){u.designMode="On"}}catch(v){}}if(b){x=z.getBody();n.hide(x);if(!A.readonly){x.contentEditable=true}n.show(x)}z.dom=new m.dom.DOMUtils(z.getDoc(),{keep_values:true,url_converter:z.convertURL,url_converter_scope:z,hex_colors:A.force_hex_style_colors,class_filter:A.class_filter,update_styles:1,fix_ie_paragraphs:1,valid_styles:A.valid_styles});z.schema=new m.dom.Schema();z.serializer=new m.dom.Serializer(f(A,{valid_elements:A.verify_html===false?"*[*]":A.valid_elements,dom:z.dom,schema:z.schema}));z.selection=new m.dom.Selection(z.dom,z.getWin(),z.serializer);z.formatter=new m.Formatter(this);z.formatter.register({alignleft:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"left"}},{selector:"img,table",styles:{"float":"left"}}],aligncenter:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"center"}},{selector:"img",styles:{display:"block",marginLeft:"auto",marginRight:"auto"}},{selector:"table",styles:{marginLeft:"auto",marginRight:"auto"}}],alignright:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"right"}},{selector:"img,table",styles:{"float":"right"}}],alignfull:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"justify"}}],bold:[{inline:"strong"},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b"}],italic:[{inline:"em"},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i"}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:true},{inline:"u"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:true},{inline:"u"}],forecolor:{inline:"span",styles:{color:"%value"}},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"}},fontname:{inline:"span",styles:{fontFamily:"%value"}},fontsize:{inline:"span",styles:{fontSize:"%value"}},fontsize_class:{inline:"span",attributes:{"class":"%value"}},blockquote:{block:"blockquote",wrapper:1,remove:"all"},removeformat:[{selector:"b,strong,em,i,font,u,strike",remove:"all",split:true,expand:false,block_expand:true,deep:true},{selector:"span",attributes:["style","class"],remove:"empty",split:true,expand:false,deep:true},{selector:"*",attributes:["style","class"],split:false,expand:false,deep:true}]});i("p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp".split(/\s/),function(s){z.formatter.register(s,{block:s,remove:"all"})});z.formatter.register(z.settings.formats);z.undoManager=new m.UndoManager(z);z.undoManager.onAdd.add(function(t,s){if(!s.initial){return z.onChange.dispatch(z,s,t)}});z.undoManager.onUndo.add(function(t,s){return z.onUndo.dispatch(z,s,t)});z.undoManager.onRedo.add(function(t,s){return z.onRedo.dispatch(z,s,t)});z.forceBlocks=new m.ForceBlocks(z,{forced_root_block:A.forced_root_block});z.editorCommands=new m.EditorCommands(z);z.serializer.onPreProcess.add(function(s,t){return z.onPreProcess.dispatch(z,t,s)});z.serializer.onPostProcess.add(function(s,t){return z.onPostProcess.dispatch(z,t,s)});z.onPreInit.dispatch(z);if(!A.gecko_spellcheck){z.getBody().spellcheck=0}if(!A.readonly){z._addEvents()}z.controlManager.onPostRender.dispatch(z,z.controlManager);z.onPostRender.dispatch(z);if(A.directionality){z.getBody().dir=A.directionality}if(A.nowrap){z.getBody().style.whiteSpace="nowrap"}if(A.custom_elements){function y(s,t){i(g(A.custom_elements),function(B){var C;if(B.indexOf("~")===0){B=B.substring(1);C="span"}else{C="div"}t.content=t.content.replace(new RegExp("<("+B+")([^>]*)>","g"),"<"+C+' _mce_name="$1"$2>');t.content=t.content.replace(new RegExp("</("+B+")>","g"),"</"+C+">")})}z.onBeforeSetContent.add(y);z.onPostProcess.add(function(s,t){if(t.set){y(s,t)}})}if(A.handle_node_change_callback){z.onNodeChange.add(function(t,s,B){z.execCallback("handle_node_change_callback",z.id,B,-1,-1,true,z.selection.isCollapsed())})}if(A.save_callback){z.onSaveContent.add(function(s,B){var t=z.execCallback("save_callback",z.id,B.content,z.getBody());if(t){B.content=t}})}if(A.onchange_callback){z.onChange.add(function(t,s){z.execCallback("onchange_callback",z,s)})}if(A.convert_newlines_to_brs){z.onBeforeSetContent.add(function(s,t){if(t.initial){t.content=t.content.replace(/\r?\n/g,"<br />")}})}if(A.fix_nesting&&b){z.onBeforeSetContent.add(function(s,t){t.content=z._fixNesting(t.content)})}if(A.preformatted){z.onPostProcess.add(function(s,t){t.content=t.content.replace(/^\s*<pre.*?>/,"");t.content=t.content.replace(/<\/pre>\s*$/,"");if(t.set){t.content='<pre class="mceItemHidden">'+t.content+"</pre>"}})}if(A.verify_css_classes){z.serializer.attribValueFilter=function(D,B){var C,t;if(D=="class"){if(!z.classesRE){t=z.dom.getClasses();if(t.length>0){C="";i(t,function(s){C+=(C?"|":"")+s["class"]});z.classesRE=new RegExp("("+C+")","gi")}}return !z.classesRE||/(\bmceItem\w+\b|\bmceTemp\w+\b)/g.test(B)||z.classesRE.test(B)?B:""}return B}}if(A.cleanup_callback){z.onBeforeSetContent.add(function(s,t){t.content=z.execCallback("cleanup_callback","insert_to_editor",t.content,t)});z.onPreProcess.add(function(s,t){if(t.set){z.execCallback("cleanup_callback","insert_to_editor_dom",t.node,t)}if(t.get){z.execCallback("cleanup_callback","get_from_editor_dom",t.node,t)}});z.onPostProcess.add(function(s,t){if(t.set){t.content=z.execCallback("cleanup_callback","insert_to_editor",t.content,t)}if(t.get){t.content=z.execCallback("cleanup_callback","get_from_editor",t.content,t)}})}if(A.save_callback){z.onGetContent.add(function(s,t){if(t.save){t.content=z.execCallback("save_callback",z.id,t.content,z.getBody())}})}if(A.handle_event_callback){z.onEvent.add(function(s,t,B){if(z.execCallback("handle_event_callback",t,s,B)===false){j.cancel(t)}})}z.onSetContent.add(function(){z.addVisual(z.getBody())});if(A.padd_empty_editor){z.onPostProcess.add(function(s,t){t.content=t.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/,"")})}if(a){function p(s,t){i(s.dom.select("a"),function(C){var B=C.parentNode;if(s.dom.isBlock(B)&&B.lastChild===C){s.dom.add(B,"br",{_mce_bogus:1})}})}z.onExecCommand.add(function(s,t){if(t==="CreateLink"){p(s)}});z.onSetContent.add(z.selection.onSetContent.add(p));if(!A.readonly){try{u.designMode="Off";u.designMode="On"}catch(v){}}}setTimeout(function(){if(z.removed){return}z.load({initial:true,format:(A.cleanup_on_startup?"html":"raw")});z.startContent=z.getContent({format:"raw"});z.initialized=true;z.onInit.dispatch(z);z.execCallback("setupcontent_callback",z.id,z.getBody(),z.getDoc());z.execCallback("init_instance_callback",z);z.focus(true);z.nodeChanged({initial:1});if(A.content_css){m.each(g(A.content_css),function(s){z.dom.loadCSS(z.documentBaseURI.toAbsolute(s))})}if(A.auto_focus){setTimeout(function(){var s=m.get(A.auto_focus);s.selection.select(s.getBody(),1);s.selection.collapse(1);s.getWin().focus()},100)}},1);r=null},focus:function(s){var x,q=this,v=q.settings.content_editable,r,p,u=q.getDoc();if(!s){r=q.selection.getRng();if(r.item){p=r.item(0)}if(!v){q.getWin().focus()}if(p&&p.ownerDocument==u){r=u.body.createControlRange();r.addElement(p);r.select()}}if(m.activeEditor!=q){if((x=m.activeEditor)!=null){x.onDeactivate.dispatch(x,q)}q.onActivate.dispatch(q,x)}m._setActive(q)},execCallback:function(u){var p=this,r=p.settings[u],q;if(!r){return}if(p.callbackLookup&&(q=p.callbackLookup[u])){r=q.func;q=q.scope}if(d(r,"string")){q=r.replace(/\.\w+$/,"");q=q?m.resolve(q):0;r=m.resolve(r);p.callbackLookup=p.callbackLookup||{};p.callbackLookup[u]={func:r,scope:q}}return r.apply(q||p,Array.prototype.slice.call(arguments,1))},translate:function(p){var r=this.settings.language||"en",q=m.i18n;if(!p){return""}return q[r+"."+p]||p.replace(/{\#([^}]+)\}/g,function(t,s){return q[r+"."+s]||"{#"+s+"}"})},getLang:function(q,p){return m.i18n[(this.settings.language||"en")+"."+q]||(d(p)?p:"{#"+q+"}")},getParam:function(u,r,p){var s=m.trim,q=d(this.settings[u])?this.settings[u]:r,t;if(p==="hash"){t={};if(d(q,"string")){i(q.indexOf("=")>0?q.split(/[;,](?![^=;,]*(?:[;,]|$))/):q.split(","),function(x){x=x.split("=");if(x.length>1){t[s(x[0])]=s(x[1])}else{t[s(x[0])]=s(x)}})}else{t=q}return t}return q},nodeChanged:function(r){var p=this,q=p.selection,u=(b?q.getNode():q.getStart())||p.getBody();if(p.initialized){r=r||{};u=b&&u.ownerDocument!=p.getDoc()?p.getBody():u;r.parents=[];p.dom.getParent(u,function(s){if(s.nodeName=="BODY"){return true}r.parents.push(s)});p.onNodeChange.dispatch(p,r?r.controlManager||p.controlManager:p.controlManager,u,q.isCollapsed(),r)}},addButton:function(r,q){var p=this;p.buttons=p.buttons||{};p.buttons[r]=q},addCommand:function(r,q,p){this.execCommands[r]={func:q,scope:p||this}},addQueryStateHandler:function(r,q,p){this.queryStateCommands[r]={func:q,scope:p||this}},addQueryValueHandler:function(r,q,p){this.queryValueCommands[r]={func:q,scope:p||this}},addShortcut:function(r,u,p,s){var q=this,v;if(!q.settings.custom_shortcuts){return false}q.shortcuts=q.shortcuts||{};if(d(p,"string")){v=p;p=function(){q.execCommand(v,false,null)}}if(d(p,"object")){v=p;p=function(){q.execCommand(v[0],v[1],v[2])}}i(g(r),function(t){var x={func:p,scope:s||this,desc:u,alt:false,ctrl:false,shift:false};i(g(t,"+"),function(y){switch(y){case"alt":case"ctrl":case"shift":x[y]=true;break;default:x.charCode=y.charCodeAt(0);x.keyCode=y.toUpperCase().charCodeAt(0)}});q.shortcuts[(x.ctrl?"ctrl":"")+","+(x.alt?"alt":"")+","+(x.shift?"shift":"")+","+x.keyCode]=x});return true},execCommand:function(x,v,z,p){var r=this,u=0,y,q;if(!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(x)&&(!p||!p.skip_focus)){r.focus()}y={};r.onBeforeExecCommand.dispatch(r,x,v,z,y);if(y.terminate){return false}if(r.execCallback("execcommand_callback",r.id,r.selection.getNode(),x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(y=r.execCommands[x]){q=y.func.call(y.scope,v,z);if(q!==true){r.onExecCommand.dispatch(r,x,v,z,p);return q}}i(r.plugins,function(s){if(s.execCommand&&s.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);u=1;return false}});if(u){return true}if(r.theme&&r.theme.execCommand&&r.theme.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(m.GlobalCommands.execCommand(r,x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(r.editorCommands.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}r.getDoc().execCommand(x,v,z);r.onExecCommand.dispatch(r,x,v,z,p)},queryCommandState:function(u){var q=this,v,r;if(q._isHidden()){return}if(v=q.queryStateCommands[u]){r=v.func.call(v.scope);if(r!==true){return r}}v=q.editorCommands.queryCommandState(u);if(v!==-1){return v}try{return this.getDoc().queryCommandState(u)}catch(p){}},queryCommandValue:function(v){var q=this,u,r;if(q._isHidden()){return}if(u=q.queryValueCommands[v]){r=u.func.call(u.scope);if(r!==true){return r}}u=q.editorCommands.queryCommandValue(v);if(d(u)){return u}try{return this.getDoc().queryCommandValue(v)}catch(p){}},show:function(){var p=this;n.show(p.getContainer());n.hide(p.id);p.load()},hide:function(){var p=this,q=p.getDoc();if(b&&q){q.execCommand("SelectAll")}p.save();n.hide(p.getContainer());n.setStyle(p.id,"display",p.orgDisplay)},isHidden:function(){return !n.isHidden(this.id)},setProgressState:function(p,q,r){this.onSetProgressState.dispatch(this,p,q,r);return p},load:function(s){var p=this,r=p.getElement(),q;if(r){s=s||{};s.load=true;q=p.setContent(d(r.value)?r.value:r.innerHTML,s);s.element=r;if(!s.no_events){p.onLoadContent.dispatch(p,s)}s.element=r=null;return q}},save:function(u){var p=this,s=p.getElement(),q,r;if(!s||!p.initialized){return}u=u||{};u.save=true;if(!u.no_events){p.undoManager.typing=0;p.undoManager.add()}u.element=s;q=u.content=p.getContent(u);if(!u.no_events){p.onSaveContent.dispatch(p,u)}q=u.content;if(!/TEXTAREA|INPUT/i.test(s.nodeName)){s.innerHTML=q;if(r=n.getParent(p.id,"form")){i(r.elements,function(t){if(t.name==p.id){t.value=q;return false}})}}else{s.value=q}u.element=s=null;return q},setContent:function(q,r){var p=this;r=r||{};r.format=r.format||"html";r.set=true;r.content=q;if(!r.no_events){p.onBeforeSetContent.dispatch(p,r)}if(!m.isIE&&(q.length===0||/^\s+$/.test(q))){r.content=p.dom.setHTML(p.getBody(),'<br _mce_bogus="1" />');r.format="raw"}r.content=p.dom.setHTML(p.getBody(),m.trim(r.content));if(r.format!="raw"&&p.settings.cleanup){r.getInner=true;r.content=p.dom.setHTML(p.getBody(),p.serializer.serialize(p.getBody(),r))}if(!r.no_events){p.onSetContent.dispatch(p,r)}return r.content},getContent:function(r){var p=this,q;r=r||{};r.format=r.format||"html";r.get=true;if(!r.no_events){p.onBeforeGetContent.dispatch(p,r)}if(r.format!="raw"&&p.settings.cleanup){r.getInner=true;q=p.serializer.serialize(p.getBody(),r)}else{q=p.getBody().innerHTML}q=q.replace(/^\s*|\s*$/g,"");r.content=q;if(!r.no_events){p.onGetContent.dispatch(p,r)}return r.content},isDirty:function(){var p=this;return m.trim(p.startContent)!=m.trim(p.getContent({format:"raw",no_events:1}))&&!p.isNotDirty},getContainer:function(){var p=this;if(!p.container){p.container=n.get(p.editorContainer||p.id+"_parent")}return p.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return n.get(this.settings.content_element||this.id)},getWin:function(){var p=this,q;if(!p.contentWindow){q=n.get(p.id+"_ifr");if(q){p.contentWindow=q.contentWindow}}return p.contentWindow},getDoc:function(){var q=this,p;if(!q.contentDocument){p=q.getWin();if(p){q.contentDocument=p.document}}return q.contentDocument},getBody:function(){return this.bodyElement||this.getDoc().body},convertURL:function(p,x,v){var q=this,r=q.settings;if(r.urlconverter_callback){return q.execCallback("urlconverter_callback",p,v,true,x)}if(!r.convert_urls||(v&&v.nodeName=="LINK")||p.indexOf("file:")===0){return p}if(r.relative_urls){return q.documentBaseURI.toRelative(p)}p=q.documentBaseURI.toAbsolute(p,r.remove_script_host);return p},addVisual:function(r){var p=this,q=p.settings;r=r||p.getBody();if(!d(p.hasVisual)){p.hasVisual=q.visual}i(p.dom.select("table,a",r),function(t){var s;switch(t.nodeName){case"TABLE":s=p.dom.getAttrib(t,"border");if(!s||s=="0"){if(p.hasVisual){p.dom.addClass(t,q.visual_table_class)}else{p.dom.removeClass(t,q.visual_table_class)}}return;case"A":s=p.dom.getAttrib(t,"name");if(s){if(p.hasVisual){p.dom.addClass(t,"mceItemAnchor")}else{p.dom.removeClass(t,"mceItemAnchor")}}return}});p.onVisualAid.dispatch(p,r,p.hasVisual)},remove:function(){var p=this,q=p.getContainer();p.removed=1;p.hide();p.execCallback("remove_instance_callback",p);p.onRemove.dispatch(p);p.onExecCommand.listeners=[];m.remove(p);n.remove(q)},destroy:function(q){var p=this;if(p.destroyed){return}if(!q){m.removeUnload(p.destroy);tinyMCE.onBeforeUnload.remove(p._beforeUnload);if(p.theme&&p.theme.destroy){p.theme.destroy()}p.controlManager.destroy();p.selection.destroy();p.dom.destroy();if(!p.settings.content_editable){j.clear(p.getWin());j.clear(p.getDoc())}j.clear(p.getBody());j.clear(p.formElement)}if(p.formElement){p.formElement.submit=p.formElement._mceOldSubmit;p.formElement._mceOldSubmit=null}p.contentAreaContainer=p.formElement=p.container=p.settings.content_element=p.bodyElement=p.contentDocument=p.contentWindow=null;if(p.selection){p.selection=p.selection.win=p.selection.dom=p.selection.dom.doc=null}p.destroyed=1},_addEvents:function(){var v=this,u,y=v.settings,x={mouseup:"onMouseUp",mousedown:"onMouseDown",click:"onClick",keyup:"onKeyUp",keydown:"onKeyDown",keypress:"onKeyPress",submit:"onSubmit",reset:"onReset",contextmenu:"onContextMenu",dblclick:"onDblClick",paste:"onPaste"};function r(t,A){var s=t.type;if(v.removed){return}if(v.onEvent.dispatch(v,t,A)!==false){v[x[t.fakeType||t.type]].dispatch(v,t,A)}}i(x,function(t,s){switch(s){case"contextmenu":if(m.isOpera){v.dom.bind(v.getBody(),"mousedown",function(A){if(A.ctrlKey){A.fakeType="contextmenu";r(A)}})}else{v.dom.bind(v.getBody(),s,r)}break;case"paste":v.dom.bind(v.getBody(),s,function(A){r(A)});break;case"submit":case"reset":v.dom.bind(v.getElement().form||n.getParent(v.id,"form"),s,r);break;default:v.dom.bind(y.content_editable?v.getBody():v.getDoc(),s,r)}});v.dom.bind(y.content_editable?v.getBody():(a?v.getDoc():v.getWin()),"focus",function(s){v.focus(true)});if(m.isGecko){v.dom.bind(v.getDoc(),"DOMNodeInserted",function(t){var s;t=t.target;if(t.nodeType===1&&t.nodeName==="IMG"&&(s=t.getAttribute("_mce_src"))){t.src=v.documentBaseURI.toAbsolute(s)}})}if(a){function p(){var B=this,D=B.getDoc(),C=B.settings;if(a&&!C.readonly){if(B._isHidden()){try{if(!C.content_editable){D.designMode="On"}}catch(A){}}try{D.execCommand("styleWithCSS",0,false)}catch(A){if(!B._isHidden()){try{D.execCommand("useCSS",0,true)}catch(A){}}}if(!C.table_inline_editing){try{D.execCommand("enableInlineTableEditing",false,false)}catch(A){}}if(!C.object_resizing){try{D.execCommand("enableObjectResizing",false,false)}catch(A){}}}}v.onBeforeExecCommand.add(p);v.onMouseDown.add(p)}if(m.isWebKit){v.onClick.add(function(s,t){t=t.target;if(t.nodeName=="IMG"||(t.nodeName=="A"&&v.dom.hasClass(t,"mceItemAnchor"))){v.selection.getSel().setBaseAndExtent(t,0,t,1)}})}v.onMouseUp.add(v.nodeChanged);v.onKeyUp.add(function(s,t){var A=t.keyCode;if((A>=33&&A<=36)||(A>=37&&A<=40)||A==13||A==45||A==46||A==8||(m.isMac&&(A==91||A==93))||t.ctrlKey){v.nodeChanged()}});v.onReset.add(function(){v.setContent(v.startContent,{format:"raw"})});if(y.custom_shortcuts){if(y.custom_undo_redo_keyboard_shortcuts){v.addShortcut("ctrl+z",v.getLang("undo_desc"),"Undo");v.addShortcut("ctrl+y",v.getLang("redo_desc"),"Redo")}v.addShortcut("ctrl+b",v.getLang("bold_desc"),"Bold");v.addShortcut("ctrl+i",v.getLang("italic_desc"),"Italic");v.addShortcut("ctrl+u",v.getLang("underline_desc"),"Underline");for(u=1;u<=6;u++){v.addShortcut("ctrl+"+u,"",["FormatBlock",false,"h"+u])}v.addShortcut("ctrl+7","",["FormatBlock",false,"<p>"]);v.addShortcut("ctrl+8","",["FormatBlock",false,"<div>"]);v.addShortcut("ctrl+9","",["FormatBlock",false,"<address>"]);function z(t){var s=null;if(!t.altKey&&!t.ctrlKey&&!t.metaKey){return s}i(v.shortcuts,function(A){if(m.isMac&&A.ctrl!=t.metaKey){return}else{if(!m.isMac&&A.ctrl!=t.ctrlKey){return}}if(A.alt!=t.altKey){return}if(A.shift!=t.shiftKey){return}if(t.keyCode==A.keyCode||(t.charCode&&t.charCode==A.charCode)){s=A;return false}});return s}v.onKeyUp.add(function(s,t){var A=z(t);if(A){return j.cancel(t)}});v.onKeyPress.add(function(s,t){var A=z(t);if(A){return j.cancel(t)}});v.onKeyDown.add(function(s,t){var A=z(t);if(A){A.func.call(A.scope);return j.cancel(t)}})}if(m.isIE){v.dom.bind(v.getDoc(),"controlselect",function(A){var t=v.resizeInfo,s;A=A.target;if(A.nodeName!=="IMG"){return}if(t){v.dom.unbind(t.node,t.ev,t.cb)}if(!v.dom.hasClass(A,"mceItemNoResize")){ev="resizeend";s=v.dom.bind(A,ev,function(C){var B;C=C.target;if(B=v.dom.getStyle(C,"width")){v.dom.setAttrib(C,"width",B.replace(/[^0-9%]+/g,""));v.dom.setStyle(C,"width","")}if(B=v.dom.getStyle(C,"height")){v.dom.setAttrib(C,"height",B.replace(/[^0-9%]+/g,""));v.dom.setStyle(C,"height","")}})}else{ev="resizestart";s=v.dom.bind(A,"resizestart",j.cancel,j)}t=v.resizeInfo={node:A,ev:ev,cb:s}});v.onKeyDown.add(function(s,t){switch(t.keyCode){case 8:if(v.selection.getRng().item){s.dom.remove(v.selection.getRng().item(0));return j.cancel(t)}}})}if(m.isOpera){v.onClick.add(function(s,t){j.prevent(t)})}if(y.custom_undo_redo){function q(){v.undoManager.typing=0;v.undoManager.add()}v.dom.bind(v.getDoc(),"focusout",function(s){if(!v.removed&&v.undoManager.typing){q()}});v.onKeyUp.add(function(s,t){if((t.keyCode>=33&&t.keyCode<=36)||(t.keyCode>=37&&t.keyCode<=40)||t.keyCode==13||t.keyCode==45||t.ctrlKey){q()}});v.onKeyDown.add(function(t,D){var s,A,C,E;if(b&&D.keyCode==46){s=v.selection.getRng();if(s.parentElement){C=s.parentElement();A=s.duplicate();A.moveToElementText(C);A.setEndPoint("EndToEnd",s);E=A.text.length;if(D.ctrlKey){s.moveEnd("word",1);s.select()}v.selection.getSel().clear();if(s.parentElement()==C){try{C.innerHTML=C.innerHTML}catch(B){}A.moveToElementText(C);A.collapse();A.move("character",E);A.select()}D.preventDefault();return}}if((D.keyCode>=33&&D.keyCode<=36)||(D.keyCode>=37&&D.keyCode<=40)||D.keyCode==13||D.keyCode==45){if(v.undoManager.typing){q()}return}if(!v.undoManager.typing){v.undoManager.add();v.undoManager.typing=1}});v.onMouseDown.add(function(){if(v.undoManager.typing){q()}})}},_isHidden:function(){var p;if(!a){return 0}p=this.selection.getSel();return(!p||!p.rangeCount||p.rangeCount==0)},_fixNesting:function(q){var r=[],p;q=q.replace(/<(\/)?([^\s>]+)[^>]*?>/g,function(t,s,v){var u;if(s==="/"){if(!r.length){return""}if(v!==r[r.length-1].tag){for(p=r.length-1;p>=0;p--){if(r[p].tag===v){r[p].close=1;break}}return""}else{r.pop();if(r.length&&r[r.length-1].close){t=t+"</"+r[r.length-1].tag+">";r.pop()}}}else{if(/^(br|hr|input|meta|img|link|param)$/i.test(v)){return t}if(/\/>$/.test(t)){return t}r.push({tag:v})}return t});for(p=r.length-1;p>=0;p--){q+="</"+r[p].tag+">"}return q}})})(tinymce);(function(c){var d=c.each,e,a=true,b=false;c.EditorCommands=function(n){var l=n.dom,p=n.selection,j={state:{},exec:{},value:{}},k=n.settings,o;function q(y,x,v){var u;y=y.toLowerCase();if(u=j.exec[y]){u(y,x,v);return a}return b}function m(v){var u;v=v.toLowerCase();if(u=j.state[v]){return u(v)}return -1}function h(v){var u;v=v.toLowerCase();if(u=j.value[v]){return u(v)}return b}function t(u,v){v=v||"exec";d(u,function(y,x){d(x.toLowerCase().split(","),function(z){j[v][z]=y})})}c.extend(this,{execCommand:q,queryCommandState:m,queryCommandValue:h,addCommands:t});function f(x,v,u){if(v===e){v=b}if(u===e){u=null}return n.getDoc().execCommand(x,v,u)}function s(u){return n.formatter.match(u)}function r(u,v){n.formatter.toggle(u,v?{value:v}:e)}function i(u){o=p.getBookmark(u)}function g(){p.moveToBookmark(o)}t({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){n.undoManager.add()},"Cut,Copy,Paste":function(y){var x=n.getDoc(),u;try{f(y)}catch(v){u=a}if(u||!x.queryCommandSupported(y)){if(c.isGecko){n.windowManager.confirm(n.getLang("clipboard_msg"),function(z){if(z){open("http://www.mozilla.org/editor/midasdemo/securityprefs.html","_blank")}})}else{n.windowManager.alert(n.getLang("clipboard_no_support"))}}},unlink:function(u){if(p.isCollapsed()){p.select(p.getNode())}f(u);p.collapse(b)},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(u){var v=u.substring(7);d("left,center,right,full".split(","),function(x){if(v!=x){n.formatter.remove("align"+x)}});r("align"+v)},"InsertUnorderedList,InsertOrderedList":function(x){var u,v;f(x);u=l.getParent(p.getNode(),"ol,ul");if(u){v=u.parentNode;if(/^(H[1-6]|P|ADDRESS|PRE)$/.test(v.nodeName)){i();l.split(v,u);g()}}},"Bold,Italic,Underline,Strikethrough":function(u){r(u)},"ForeColor,HiliteColor,FontName":function(x,v,u){r(x,u)},FontSize:function(y,x,v){var u,z;if(v>=1&&v<=7){z=c.explode(k.font_size_style_values);u=c.explode(k.font_size_classes);if(u){v=u[v-1]||v}else{v=z[v-1]||v}}r(y,v)},RemoveFormat:function(u){n.formatter.remove(u)},mceBlockQuote:function(u){r("blockquote")},FormatBlock:function(x,v,u){return r(u)},mceCleanup:function(){var u=p.getBookmark();n.setContent(n.getContent({cleanup:a}),{cleanup:a});p.moveToBookmark(u)},mceRemoveNode:function(y,x,v){var u=v||p.getNode();if(u!=n.getBody()){i();n.dom.remove(u,a);g()}},mceSelectNodeDepth:function(y,x,v){var u=0;l.getParent(p.getNode(),function(z){if(z.nodeType==1&&u++==v){p.select(z);return b}},n.getBody())},mceSelectNode:function(x,v,u){p.select(u)},mceInsertContent:function(x,v,u){p.setContent(u)},mceInsertRawHTML:function(x,v,u){p.setContent("tiny_mce_marker");n.setContent(n.getContent().replace(/tiny_mce_marker/g,u))},mceSetContent:function(x,v,u){n.setContent(u)},"Indent,Outdent":function(y){var v,u,x;v=k.indentation;u=/[a-z%]+$/i.exec(v);v=parseInt(v);if(!m("InsertUnorderedList")&&!m("InsertOrderedList")){d(p.getSelectedBlocks(),function(z){if(y=="outdent"){x=Math.max(0,parseInt(z.style.paddingLeft||0)-v);l.setStyle(z,"paddingLeft",x?x+u:"")}else{l.setStyle(z,"paddingLeft",(parseInt(z.style.paddingLeft||0)+v)+u)}})}else{f(y)}},mceRepaint:function(){var v;if(c.isGecko){try{i(a);if(p.getSel()){p.getSel().selectAllChildren(n.getBody())}p.collapse(a);g()}catch(u){}}},mceToggleFormat:function(x,v,u){n.formatter.toggle(u)},InsertHorizontalRule:function(){p.setContent("<hr />")},mceToggleVisualAid:function(){n.hasVisual=!n.hasVisual;n.addVisual()},mceReplaceContent:function(x,v,u){p.setContent(u.replace(/\{\$selection\}/g,p.getContent({format:"text"})))},mceInsertLink:function(y,x,v){var u=l.getParent(p.getNode(),"a");if(c.is(v,"string")){v={href:v}}if(!u){f("CreateLink",b,"javascript:mctmp(0);");d(l.select("a[href=javascript:mctmp(0);]"),function(z){l.setAttribs(z,v)})}else{if(v.href){l.setAttribs(u,v)}else{n.dom.remove(u,a)}}},selectAll:function(){var v=l.getRoot();var u=l.createRng();u.setStart(v,0);u.setEnd(v,v.childNodes.length);n.selection.setRng(u)}});t({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(u){return s("align"+u.substring(7))},"Bold,Italic,Underline,Strikethrough":function(u){return s(u)},mceBlockQuote:function(){return s("blockquote")},Outdent:function(){var u;if(k.inline_styles){if((u=l.getParent(p.getStart(),l.isBlock))&&parseInt(u.style.paddingLeft)>0){return a}if((u=l.getParent(p.getEnd(),l.isBlock))&&parseInt(u.style.paddingLeft)>0){return a}}return m("InsertUnorderedList")||m("InsertOrderedList")||(!k.inline_styles&&!!l.getParent(p.getNode(),"BLOCKQUOTE"))},"InsertUnorderedList,InsertOrderedList":function(u){return l.getParent(p.getNode(),u=="insertunorderedlist"?"UL":"OL")}},"state");t({"FontSize,FontName":function(x){var v=0,u;if(u=l.getParent(p.getNode(),"span")){if(x=="fontsize"){v=u.style.fontSize}else{v=u.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()}}return v}},"value");if(k.custom_undo_redo){t({Undo:function(){n.undoManager.undo()},Redo:function(){n.undoManager.redo()}})}}})(tinymce);(function(b){var a=b.util.Dispatcher;b.UndoManager=function(e){var c,d=0,g=[];function f(){return b.trim(e.getContent({format:"raw",no_events:1}))}return c={typing:0,onAdd:new a(c),onUndo:new a(c),onRedo:new a(c),add:function(l){var h,j=e.settings,k;l=l||{};l.content=f();k=g[d];if(k&&k.content==l.content){if(d>0||g.length==1){return null}}if(j.custom_undo_redo_levels){if(g.length>j.custom_undo_redo_levels){for(h=0;h<g.length-1;h++){g[h]=g[h+1]}g.length--;d=g.length}}l.bookmark=e.selection.getBookmark(2,true);if(d<g.length-1){if(d==0){g=[]}else{g.length=d+1}}g.push(l);d=g.length-1;c.onAdd.dispatch(c,l);e.isNotDirty=0;return l},undo:function(){var j,h;if(c.typing){c.add();c.typing=0}if(d>0){j=g[--d];e.setContent(j.content,{format:"raw"});e.selection.moveToBookmark(j.bookmark);c.onUndo.dispatch(c,j)}return j},redo:function(){var h;if(d<g.length-1){h=g[++d];e.setContent(h.content,{format:"raw"});e.selection.moveToBookmark(h.bookmark);c.onRedo.dispatch(c,h)}return h},clear:function(){g=[];d=c.typing=0},hasUndo:function(){return d>0||c.typing},hasRedo:function(){return d<g.length-1}}}})(tinymce);(function(m){var k=m.dom.Event,c=m.isIE,a=m.isGecko,b=m.isOpera,j=m.each,i=m.extend,d=true,h=false;function l(p){var q,o,n;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(p.nodeName)){if(q){o=p.cloneNode(false);o.appendChild(q);q=o}else{q=n=p.cloneNode(false)}q.removeAttribute("id")}}while(p=p.parentNode);if(q){return{wrapper:q,inner:n}}}function g(o,p){var n=p.ownerDocument.createRange();n.setStart(o.endContainer,o.endOffset);n.setEndAfter(p);return n.cloneContents().textContent.length==0}function f(o){o=o.innerHTML;o=o.replace(/<(img|hr|table|input|select|textarea)[ \>]/gi,"-");o=o.replace(/<[^>]+>/g,"");return o.replace(/[ \u00a0\t\r\n]+/g,"")==""}function e(p,r,n){var o,q;if(f(n)){o=r.getParent(n,"ul,ol");if(!r.getParent(o.parentNode,"ul,ol")){r.split(o,n);q=r.create("p",0,'<br _mce_bogus="1" />');r.replace(q,n);p.select(q,1)}return h}return d}m.create("tinymce.ForceBlocks",{ForceBlocks:function(o){var p=this,q=o.settings,r;p.editor=o;p.dom=o.dom;r=(q.forced_root_block||"p").toLowerCase();q.element=r.toUpperCase();o.onPreInit.add(p.setup,p);p.reOpera=new RegExp("(\\u00a0|&#160;|&nbsp;)</"+r+">","gi");p.rePadd=new RegExp("<p( )([^>]+)><\\/p>|<p( )([^>]+)\\/>|<p( )([^>]+)>\\s+<\\/p>|<p><\\/p>|<p\\/>|<p>\\s+<\\/p>".replace(/p/g,r),"gi");p.reNbsp2BR1=new RegExp("<p( )([^>]+)>[\\s\\u00a0]+<\\/p>|<p>[\\s\\u00a0]+<\\/p>".replace(/p/g,r),"gi");p.reNbsp2BR2=new RegExp("<%p()([^>]+)>(&nbsp;|&#160;)<\\/%p>|<%p>(&nbsp;|&#160;)<\\/%p>".replace(/%p/g,r),"gi");p.reBR2Nbsp=new RegExp("<p( )([^>]+)>\\s*<br \\/>\\s*<\\/p>|<p>\\s*<br \\/>\\s*<\\/p>".replace(/p/g,r),"gi");function n(s,t){if(b){t.content=t.content.replace(p.reOpera,"</"+r+">")}t.content=t.content.replace(p.rePadd,"<"+r+"$1$2$3$4$5$6>\u00a0</"+r+">");if(!c&&!b&&t.set){t.content=t.content.replace(p.reNbsp2BR1,"<"+r+"$1$2><br /></"+r+">");t.content=t.content.replace(p.reNbsp2BR2,"<"+r+"$1$2><br /></"+r+">")}else{t.content=t.content.replace(p.reBR2Nbsp,"<"+r+"$1$2>\u00a0</"+r+">")}}o.onBeforeSetContent.add(n);o.onPostProcess.add(n);if(q.forced_root_block){o.onInit.add(p.forceRoots,p);o.onSetContent.add(p.forceRoots,p);o.onBeforeGetContent.add(p.forceRoots,p)}},setup:function(){var o=this,n=o.editor,q=n.settings,u=n.dom,p=n.selection;if(q.forced_root_block){n.onBeforeExecCommand.add(o.forceRoots,o);n.onKeyUp.add(o.forceRoots,o);n.onPreProcess.add(o.forceRoots,o)}if(q.force_br_newlines){if(c){n.onKeyPress.add(function(s,t){var v;if(t.keyCode==13&&p.getNode().nodeName!="LI"){p.setContent('<br id="__" /> ',{format:"raw"});v=u.get("__");v.removeAttribute("id");p.select(v);p.collapse();return k.cancel(t)}})}}if(q.force_p_newlines){if(!c){n.onKeyPress.add(function(s,t){if(t.keyCode==13&&!t.shiftKey&&!o.insertPara(t)){k.cancel(t)}})}else{m.addUnload(function(){o._previousFormats=0});n.onKeyPress.add(function(s,t){o._previousFormats=0;if(t.keyCode==13&&!t.shiftKey&&s.selection.isCollapsed()&&q.keep_styles){o._previousFormats=l(s.selection.getStart())}});n.onKeyUp.add(function(t,x){if(x.keyCode==13&&!x.shiftKey){var v=t.selection.getStart(),s=o._previousFormats;if(!v.hasChildNodes()){v=u.getParent(v,u.isBlock);if(v){v.innerHTML="";if(o._previousFormats){v.appendChild(s.wrapper);s.inner.innerHTML="\uFEFF"}else{v.innerHTML="\uFEFF"}p.select(v,1);t.getDoc().execCommand("Delete",false,null)}}}})}if(a){n.onKeyDown.add(function(s,t){if((t.keyCode==8||t.keyCode==46)&&!t.shiftKey){o.backspaceDelete(t,t.keyCode==8)}})}}if(m.isWebKit){function r(t){var s=p.getRng(),v,z=u.create("div",null," "),y,x=u.getViewPort(t.getWin()).h;s.insertNode(v=u.create("br"));s.setStartAfter(v);s.setEndAfter(v);p.setRng(s);if(p.getSel().focusNode==v.previousSibling){p.select(u.insertAfter(u.doc.createTextNode("\u00a0"),v));p.collapse(d)}u.insertAfter(z,v);y=u.getPos(z).y;u.remove(z);if(y>x){t.getWin().scrollTo(0,y)}}n.onKeyPress.add(function(s,t){if(t.keyCode==13&&(t.shiftKey||(q.force_br_newlines&&!u.getParent(p.getNode(),"h1,h2,h3,h4,h5,h6,ol,ul")))){r(s);k.cancel(t)}})}n.onPreProcess.add(function(s,t){j(u.select("p,h1,h2,h3,h4,h5,h6,div",t.node),function(v){if(f(v)){j(u.select("span,em,strong,b,i",t.node),function(x){if(!x.hasChildNodes()){x.appendChild(s.getDoc().createTextNode("\u00a0"));return h}})}})});if(c){if(q.element!="P"){n.onKeyPress.add(function(s,t){o.lastElm=p.getNode().nodeName});n.onKeyUp.add(function(t,v){var y,x=p.getNode(),s=t.getBody();if(s.childNodes.length===1&&x.nodeName=="P"){x=u.rename(x,q.element);p.select(x);p.collapse();t.nodeChanged()}else{if(v.keyCode==13&&!v.shiftKey&&o.lastElm!="P"){y=u.getParent(x,"p");if(y){u.rename(y,q.element);t.nodeChanged()}}}})}}},find:function(v,q,r){var p=this.editor,o=p.getDoc().createTreeWalker(v,4,null,h),u=-1;while(v=o.nextNode()){u++;if(q==0&&v==r){return u}if(q==1&&u==r){return v}}return -1},forceRoots:function(x,I){var z=this,x=z.editor,M=x.getBody(),J=x.getDoc(),P=x.selection,A=P.getSel(),B=P.getRng(),N=-2,v,G,o,p,K=-16777215;var L,q,O,F,C,u=M.childNodes,E,D,y;for(E=u.length-1;E>=0;E--){L=u[E];if(L.nodeType===1&&L.getAttribute("_mce_type")){q=null;continue}if(L.nodeType===3||(!z.dom.isBlock(L)&&L.nodeType!==8&&!/^(script|mce:script|style|mce:style)$/i.test(L.nodeName))){if(!q){if(L.nodeType!=3||/[^\s]/g.test(L.nodeValue)){if(N==-2&&B){if(!c){if(B.startContainer.nodeType==1&&(D=B.startContainer.childNodes[B.startOffset])&&D.nodeType==1){y=D.getAttribute("id");D.setAttribute("id","__mce")}else{if(x.dom.getParent(B.startContainer,function(n){return n===M})){G=B.startOffset;o=B.endOffset;N=z.find(M,0,B.startContainer);v=z.find(M,0,B.endContainer)}}}else{if(B.item){p=J.body.createTextRange();p.moveToElementText(B.item(0));B=p}p=J.body.createTextRange();p.moveToElementText(M);p.collapse(1);O=p.move("character",K)*-1;p=B.duplicate();p.collapse(1);F=p.move("character",K)*-1;p=B.duplicate();p.collapse(0);C=(p.move("character",K)*-1)-F;N=F-O;v=C}}q=x.dom.create(x.settings.forced_root_block);L.parentNode.replaceChild(q,L);q.appendChild(L)}}else{if(q.hasChildNodes()){q.insertBefore(L,q.firstChild)}else{q.appendChild(L)}}}else{q=null}}if(N!=-2){if(!c){q=M.getElementsByTagName(x.settings.element)[0];B=J.createRange();if(N!=-1){B.setStart(z.find(M,1,N),G)}else{B.setStart(q,0)}if(v!=-1){B.setEnd(z.find(M,1,v),o)}else{B.setEnd(q,0)}if(A){A.removeAllRanges();A.addRange(B)}}else{try{B=A.createRange();B.moveToElementText(M);B.collapse(1);B.moveStart("character",N);B.moveEnd("character",v);B.select()}catch(H){}}}else{if(!c&&(D=x.dom.get("__mce"))){if(y){D.setAttribute("id",y)}else{D.removeAttribute("id")}B=J.createRange();B.setStartBefore(D);B.setEndBefore(D);P.setRng(B)}}},getParentBlock:function(p){var o=this.dom;return o.getParent(p,o.isBlock)},insertPara:function(S){var G=this,x=G.editor,O=x.dom,T=x.getDoc(),X=x.settings,H=x.selection.getSel(),I=H.getRangeAt(0),W=T.body;var L,M,J,Q,P,u,p,v,A,o,E,V,q,z,K,N=O.getViewPort(x.getWin()),D,F,C;L=T.createRange();L.setStart(H.anchorNode,H.anchorOffset);L.collapse(d);M=T.createRange();M.setStart(H.focusNode,H.focusOffset);M.collapse(d);J=L.compareBoundaryPoints(L.START_TO_END,M)<0;Q=J?H.anchorNode:H.focusNode;P=J?H.anchorOffset:H.focusOffset;u=J?H.focusNode:H.anchorNode;p=J?H.focusOffset:H.anchorOffset;if(Q===u&&/^(TD|TH)$/.test(Q.nodeName)){if(Q.firstChild.nodeName=="BR"){O.remove(Q.firstChild)}if(Q.childNodes.length==0){x.dom.add(Q,X.element,null,"<br />");V=x.dom.add(Q,X.element,null,"<br />")}else{K=Q.innerHTML;Q.innerHTML="";x.dom.add(Q,X.element,null,K);V=x.dom.add(Q,X.element,null,"<br />")}I=T.createRange();I.selectNodeContents(V);I.collapse(1);x.selection.setRng(I);return h}if(Q==W&&u==W&&W.firstChild&&x.dom.isBlock(W.firstChild)){Q=u=Q.firstChild;P=p=0;L=T.createRange();L.setStart(Q,0);M=T.createRange();M.setStart(u,0)}Q=Q.nodeName=="HTML"?T.body:Q;Q=Q.nodeName=="BODY"?Q.firstChild:Q;u=u.nodeName=="HTML"?T.body:u;u=u.nodeName=="BODY"?u.firstChild:u;v=G.getParentBlock(Q);A=G.getParentBlock(u);o=v?v.nodeName:X.element;if(K=G.dom.getParent(v,"li,pre")){if(K.nodeName=="LI"){return e(x.selection,G.dom,K)}return d}if(v&&(v.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(O.getStyle(v,"position",1)))){o=X.element;v=null}if(A&&(A.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(O.getStyle(v,"position",1)))){o=X.element;A=null}if(/(TD|TABLE|TH|CAPTION)/.test(o)||(v&&o=="DIV"&&/left|right/gi.test(O.getStyle(v,"float",1)))){o=X.element;v=A=null}E=(v&&v.nodeName==o)?v.cloneNode(0):x.dom.create(o);V=(A&&A.nodeName==o)?A.cloneNode(0):x.dom.create(o);V.removeAttribute("id");if(/^(H[1-6])$/.test(o)&&g(I,v)){V=x.dom.create(X.element)}K=q=Q;do{if(K==W||K.nodeType==9||G.dom.isBlock(K)||/(TD|TABLE|TH|CAPTION)/.test(K.nodeName)){break}q=K}while((K=K.previousSibling?K.previousSibling:K.parentNode));K=z=u;do{if(K==W||K.nodeType==9||G.dom.isBlock(K)||/(TD|TABLE|TH|CAPTION)/.test(K.nodeName)){break}z=K}while((K=K.nextSibling?K.nextSibling:K.parentNode));if(q.nodeName==o){L.setStart(q,0)}else{L.setStartBefore(q)}L.setEnd(Q,P);E.appendChild(L.cloneContents()||T.createTextNode(""));try{M.setEndAfter(z)}catch(R){}M.setStart(u,p);V.appendChild(M.cloneContents()||T.createTextNode(""));I=T.createRange();if(!q.previousSibling&&q.parentNode.nodeName==o){I.setStartBefore(q.parentNode)}else{if(L.startContainer.nodeName==o&&L.startOffset==0){I.setStartBefore(L.startContainer)}else{I.setStart(L.startContainer,L.startOffset)}}if(!z.nextSibling&&z.parentNode.nodeName==o){I.setEndAfter(z.parentNode)}else{I.setEnd(M.endContainer,M.endOffset)}I.deleteContents();if(b){x.getWin().scrollTo(0,N.y)}if(E.firstChild&&E.firstChild.nodeName==o){E.innerHTML=E.firstChild.innerHTML}if(V.firstChild&&V.firstChild.nodeName==o){V.innerHTML=V.firstChild.innerHTML}if(f(E)){E.innerHTML="<br />"}function U(y,s){var r=[],Z,Y,t;y.innerHTML="";if(X.keep_styles){Y=s;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(Y.nodeName)){Z=Y.cloneNode(h);O.setAttrib(Z,"id","");r.push(Z)}}while(Y=Y.parentNode)}if(r.length>0){for(t=r.length-1,Z=y;t>=0;t--){Z=Z.appendChild(r[t])}r[0].innerHTML=b?"&nbsp;":"<br />";return r[0]}else{y.innerHTML=b?"&nbsp;":"<br />"}}if(f(V)){C=U(V,u)}if(b&&parseFloat(opera.version())<9.5){I.insertNode(E);I.insertNode(V)}else{I.insertNode(V);I.insertNode(E)}V.normalize();E.normalize();function B(r){return T.createTreeWalker(r,NodeFilter.SHOW_TEXT,null,h).nextNode()||r}I=T.createRange();I.selectNodeContents(a?B(C||V):C||V);I.collapse(1);H.removeAllRanges();H.addRange(I);D=x.dom.getPos(V).y;F=V.clientHeight;if(D<N.y||D+F>N.y+N.h){x.getWin().scrollTo(0,D<N.y?D:D-N.h+25)}return h},backspaceDelete:function(v,C){var D=this,u=D.editor,z=u.getBody(),s=u.dom,q,x=u.selection,p=x.getRng(),y=p.startContainer,q,A,B,o;if(!C&&p.collapsed&&y.nodeType==1&&p.startOffset==y.childNodes.length){o=new m.dom.TreeWalker(y.lastChild,y);for(q=y.lastChild;q;q=o.prev()){if(q.nodeType==3){p.setStart(q,q.nodeValue.length);p.collapse(true);x.setRng(p);return}}}if(y&&u.dom.isBlock(y)&&!/^(TD|TH)$/.test(y.nodeName)&&C){if(y.childNodes.length==0||(y.childNodes.length==1&&y.firstChild.nodeName=="BR")){q=y;while((q=q.previousSibling)&&!u.dom.isBlock(q)){}if(q){if(y!=z.firstChild){A=u.dom.doc.createTreeWalker(q,NodeFilter.SHOW_TEXT,null,h);while(B=A.nextNode()){q=B}p=u.getDoc().createRange();p.setStart(q,q.nodeValue?q.nodeValue.length:0);p.setEnd(q,q.nodeValue?q.nodeValue.length:0);x.setRng(p);u.dom.remove(y)}return k.cancel(v)}}}}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each,e=c.extend;c.create("tinymce.ControlManager",{ControlManager:function(f,j){var h=this,g;j=j||{};h.editor=f;h.controls={};h.onAdd=new c.util.Dispatcher(h);h.onPostRender=new c.util.Dispatcher(h);h.prefix=j.prefix||f.id+"_";h._cls={};h.onPostRender.add(function(){d(h.controls,function(i){i.postRender()})})},get:function(f){return this.controls[this.prefix+f]||this.controls[f]},setActive:function(h,f){var g=null;if(g=this.get(h)){g.setActive(f)}return g},setDisabled:function(h,f){var g=null;if(g=this.get(h)){g.setDisabled(f)}return g},add:function(g){var f=this;if(g){f.controls[g.id]=g;f.onAdd.dispatch(g,f)}return g},createControl:function(i){var h,g=this,f=g.editor;d(f.plugins,function(j){if(j.createControl){h=j.createControl(i,g);if(h){return false}}});switch(i){case"|":case"separator":return g.createSeparator()}if(!h&&f.buttons&&(h=f.buttons[i])){return g.createButton(i,h)}return g.add(h)},createDropMenu:function(f,n,h){var m=this,i=m.editor,j,g,k,l;n=e({"class":"mceDropDown",constrain:i.settings.constrain_menus},n);n["class"]=n["class"]+" "+i.getParam("skin")+"Skin";if(k=i.getParam("skin_variant")){n["class"]+=" "+i.getParam("skin")+"Skin"+k.substring(0,1).toUpperCase()+k.substring(1)}f=m.prefix+f;l=h||m._cls.dropmenu||c.ui.DropMenu;j=m.controls[f]=new l(f,n);j.onAddItem.add(function(r,q){var p=q.settings;p.title=i.getLang(p.title,p.title);if(!p.onclick){p.onclick=function(o){if(p.cmd){i.execCommand(p.cmd,p.ui||false,p.value)}}}});i.onRemove.add(function(){j.destroy()});if(c.isIE){j.onShowMenu.add(function(){i.focus();g=i.selection.getBookmark(1)});j.onHideMenu.add(function(){if(g){i.selection.moveToBookmark(g);g=0}})}return m.add(j)},createListBox:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;if(g.settings.use_native_selects){k=new c.ui.NativeListBox(m,i)}else{f=l||h._cls.listbox||c.ui.ListBox;k=new f(m,i)}h.controls[m]=k;if(c.isWebKit){k.onPostRender.add(function(p,o){a.add(o,"mousedown",function(){g.bookmark=g.selection.getBookmark(1)});a.add(o,"focus",function(){g.selection.moveToBookmark(g.bookmark);g.bookmark=null})})}if(k.hideMenu){g.onMouseDown.add(k.hideMenu,k)}return h.add(k)},createButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.label=g.translate(i.label);i.scope=i.scope||g;if(!i.onclick&&!i.menu_button){i.onclick=function(){g.execCommand(i.cmd,i.ui||false,i.value)}}i=e({title:i.title,"class":"mce_"+m,unavailable_prefix:g.getLang("unavailable",""),scope:i.scope,control_manager:h},i);m=h.prefix+m;if(i.menu_button){f=l||h._cls.menubutton||c.ui.MenuButton;k=new f(m,i);g.onMouseDown.add(k.hideMenu,k)}else{f=h._cls.button||c.ui.Button;k=new f(m,i)}return h.add(k)},createMenuButton:function(h,f,g){f=f||{};f.menu_button=1;return this.createButton(h,f,g)},createSplitButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onclick){i.onclick=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;f=l||h._cls.splitbutton||c.ui.SplitButton;k=h.add(new f(m,i));g.onMouseDown.add(k.hideMenu,k);return k},createColorSplitButton:function(f,n,h){var l=this,j=l.editor,i,k,m,g;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onclick){n.onclick=function(o){if(c.isIE){g=j.selection.getBookmark(1)}j.execCommand(n.cmd,n.ui||false,o||n.value)}}if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,menu_class:j.getParam("skin")+"Skin",scope:n.scope,more_colors_title:j.getLang("more_colors")},n);f=l.prefix+f;m=h||l._cls.colorsplitbutton||c.ui.ColorSplitButton;k=new m(f,n);j.onMouseDown.add(k.hideMenu,k);j.onRemove.add(function(){k.destroy()});if(c.isIE){k.onShowMenu.add(function(){j.focus();g=j.selection.getBookmark(1)});k.onHideMenu.add(function(){if(g){j.selection.moveToBookmark(g);g=0}})}return l.add(k)},createToolbar:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||g._cls.toolbar||c.ui.Toolbar;i=new f(k,h);if(g.get(k)){return null}return g.add(i)},createSeparator:function(g){var f=g||this._cls.separator||c.ui.Separator;return new f()},setControlType:function(g,f){return this._cls[g.toLowerCase()]=f},destroy:function(){d(this.controls,function(f){f.destroy()});this.controls=null}})})(tinymce);(function(d){var a=d.util.Dispatcher,e=d.each,c=d.isIE,b=d.isOpera;d.create("tinymce.WindowManager",{WindowManager:function(f){var g=this;g.editor=f;g.onOpen=new a(g);g.onClose=new a(g);g.params={};g.features={}},open:function(z,h){var v=this,k="",n,m,i=v.editor.settings.dialog_type=="modal",q,o,j,g=d.DOM.getViewPort(),r;z=z||{};h=h||{};o=b?g.w:screen.width;j=b?g.h:screen.height;z.name=z.name||"mc_"+new Date().getTime();z.width=parseInt(z.width||320);z.height=parseInt(z.height||240);z.resizable=true;z.left=z.left||parseInt(o/2)-(z.width/2);z.top=z.top||parseInt(j/2)-(z.height/2);h.inline=false;h.mce_width=z.width;h.mce_height=z.height;h.mce_auto_focus=z.auto_focus;if(i){if(c){z.center=true;z.help=false;z.dialogWidth=z.width+"px";z.dialogHeight=z.height+"px";z.scroll=z.scrollbars||false}}e(z,function(p,f){if(d.is(p,"boolean")){p=p?"yes":"no"}if(!/^(name|url)$/.test(f)){if(c&&i){k+=(k?";":"")+f+":"+p}else{k+=(k?",":"")+f+"="+p}}});v.features=z;v.params=h;v.onOpen.dispatch(v,z,h);r=z.url||z.file;r=d._addVer(r);try{if(c&&i){q=1;window.showModalDialog(r,window,k)}else{q=window.open(r,z.name,k)}}catch(l){}if(!q){alert(v.editor.getLang("popup_blocked"))}},close:function(f){f.close();this.onClose.dispatch(this)},createInstance:function(i,h,g,m,l,k){var j=d.resolve(i);return new j(h,g,m,l,k)},confirm:function(h,f,i,g){g=g||window;f.call(i||this,g.confirm(this._decode(this.editor.getLang(h,h))))},alert:function(h,f,j,g){var i=this;g=g||window;g.alert(i._decode(i.editor.getLang(h,h)));if(f){f.call(j||i)}},resizeBy:function(f,g,h){h.resizeBy(f,g)},_decode:function(f){return d.DOM.decode(f).replace(/\\n/g,"\n")}})}(tinymce));(function(a){function b(){var d={},c={},e={};function f(j,i,h,g){if(typeof(i)=="string"){i=[i]}a.each(i,function(k){j[k.toLowerCase()]={func:h,scope:g}})}a.extend(this,{add:function(i,h,g){f(d,i,h,g)},addQueryStateHandler:function(i,h,g){f(c,i,h,g)},addQueryValueHandler:function(i,h,g){f(e,i,h,g)},execCommand:function(h,k,j,i,g){if(k=d[k.toLowerCase()]){if(k.func.call(h||k.scope,j,i,g)!==false){return true}}},queryCommandValue:function(){if(cmd=e[cmd.toLowerCase()]){return cmd.func.call(scope||cmd.scope,ui,value,args)}},queryCommandState:function(){if(cmd=c[cmd.toLowerCase()]){return cmd.func.call(scope||cmd.scope,ui,value,args)}}})}a.GlobalCommands=new b()})(tinymce);(function(a){a.Formatter=function(T){var K={},M=a.each,c=T.dom,p=T.selection,s=a.dom.TreeWalker,I=new a.dom.RangeUtils(c),d=T.schema.isValid,E=c.isBlock,k=T.settings.forced_root_block,r=c.nodeIndex,D="\uFEFF",e=/^(src|href|style)$/,Q=false,A=true,o,N={apply:[],remove:[]};function y(U){return U instanceof Array}function l(V,U){return c.getParents(V,U,c.getRoot())}function b(U){return U.nodeType===1&&(U.face==="mceinline"||U.style.fontFamily==="mceinline")}function P(U){return U?K[U]:K}function j(U,V){if(U){if(typeof(U)!=="string"){M(U,function(X,W){j(W,X)})}else{V=V.length?V:[V];M(V,function(W){if(W.deep===o){W.deep=!W.selector}if(W.split===o){W.split=!W.selector||W.inline}if(W.remove===o&&W.selector&&!W.inline){W.remove="none"}if(W.selector&&W.inline){W.mixed=true;W.block_expand=true}if(typeof(W.classes)==="string"){W.classes=W.classes.split(/\s+/)}});K[U]=V}}}function R(W,ac,Y){var Z=P(W),ad=Z[0],ab,V,aa;function X(ag){var af=ag.startContainer,aj=ag.startOffset,ai,ah;if(af.nodeType==1||af.nodeValue===""){af=af.nodeType==1?af.childNodes[aj]:af;if(af){ai=new s(af,af.parentNode);for(ah=ai.current();ah;ah=ai.next()){if(ah.nodeType==3&&!f(ah)){ag.setStart(ah,0);break}}}}return ag}function U(ag,af){af=af||ad;if(ag){M(af.styles,function(ai,ah){c.setStyle(ag,ah,q(ai,ac))});M(af.attributes,function(ai,ah){c.setAttrib(ag,ah,q(ai,ac))});M(af.classes,function(ah){ah=q(ah,ac);if(!c.hasClass(ag,ah)){c.addClass(ag,ah)}})}}function ae(ag){var af=[],ai,ah;ai=ad.inline||ad.block;ah=c.create(ai);U(ah);I.walk(ag,function(aj){var ak;function al(am){var ap=am.nodeName.toLowerCase(),ao=am.parentNode.nodeName.toLowerCase(),an;if(g(ap,"br")){ak=0;if(ad.block){c.remove(am)}return}if(ad.wrapper&&v(am,W,ac)){ak=0;return}if(ad.block&&!ad.wrapper&&F(ap)){am=c.rename(am,ai);U(am);af.push(am);ak=0;return}if(ad.selector){M(Z,function(aq){if(c.is(am,aq.selector)&&!b(am)){U(am,aq);an=true}});if(!ad.inline||an){ak=0;return}}if(d(ai,ap)&&d(ao,ai)){if(!ak){ak=ah.cloneNode(Q);am.parentNode.insertBefore(ak,am);af.push(ak)}ak.appendChild(am)}else{ak=0;M(a.grep(am.childNodes),al);ak=0}}M(aj,al)});M(af,function(al){var aj;function am(ao){var an=0;M(ao.childNodes,function(ap){if(!f(ap)&&!G(ap)){an++}});return an}function ak(an){var ap,ao;M(an.childNodes,function(aq){if(aq.nodeType==1&&!G(aq)&&!b(aq)){ap=aq;return Q}});if(ap&&h(ap,ad)){ao=ap.cloneNode(Q);U(ao);c.replace(ao,an,A);c.remove(ap,1)}return ao||an}aj=am(al);if(aj===0){c.remove(al,1);return}if(ad.inline||ad.wrapper){if(!ad.exact&&aj===1){al=ak(al)}M(Z,function(an){M(c.select(an.inline,al),function(ao){S(an,ac,ao,an.exact?ao:null)})});if(v(al.parentNode,W,ac)){c.remove(al,1);al=0;return A}if(ad.merge_with_parents){c.getParent(al.parentNode,function(an){if(v(an,W,ac)){c.remove(al,1);al=0;return A}})}if(al){al=t(B(al),al);al=t(al,B(al,A))}}})}if(ad){if(Y){V=c.createRng();V.setStartBefore(Y);V.setEndAfter(Y);ae(n(V,Z))}else{if(!p.isCollapsed()||!ad.inline){ab=p.getBookmark();ae(n(p.getRng(A),Z));p.moveToBookmark(ab);p.setRng(X(p.getRng(A)));T.nodeChanged()}else{O("apply",W,ac)}}}}function z(W,ae,Y){var Z=P(W),ag=Z[0],ad,ac,V;function X(al){var ak,aj,ai;ak=a.grep(al.childNodes);for(aj=0,ai=Z.length;aj<ai;aj++){if(S(Z[aj],ae,al,al)){break}}if(ag.deep){for(aj=0,ai=ak.length;aj<ai;aj++){X(ak[aj])}}}function aa(ai){var aj;M(l(ai.parentNode).reverse(),function(ak){var al;if(!aj&&ak.id!="_start"&&ak.id!="_end"){al=v(ak,W,ae);if(al&&al.split!==false){aj=ak}}});return aj}function U(al,ai,an,aq){var ar,ap,ao,ak,am,aj;if(al){aj=al.parentNode;for(ar=ai.parentNode;ar&&ar!=aj;ar=ar.parentNode){ap=ar.cloneNode(Q);for(am=0;am<Z.length;am++){if(S(Z[am],ae,ap,ap)){ap=0;break}}if(ap){if(ao){ap.appendChild(ao)}if(!ak){ak=ap}ao=ap}}if(aq&&(!ag.mixed||!E(al))){ai=c.split(al,ai)}if(ao){an.parentNode.insertBefore(ao,an);ak.appendChild(an)}}return ai}function af(ai){return U(aa(ai),ai,ai,true)}function ab(ak){var aj=c.get(ak?"_start":"_end"),ai=aj[ak?"firstChild":"lastChild"];if(G(ai)){ai=ai[ak?"firstChild":"lastChild"]}c.remove(aj,true);return ai}function ah(ai){var aj,ak;ai=n(ai,Z,A);if(ag.split){aj=H(ai,A);ak=H(ai);if(aj!=ak){aj=L(aj,"span",{id:"_start",_mce_type:"bookmark"});ak=L(ak,"span",{id:"_end",_mce_type:"bookmark"});af(aj);af(ak);aj=ab(A);ak=ab()}else{aj=ak=af(aj)}ai.startContainer=aj.parentNode;ai.startOffset=r(aj);ai.endContainer=ak.parentNode;ai.endOffset=r(ak)+1}I.walk(ai,function(al){M(al,function(am){X(am)})})}if(Y){V=c.createRng();V.setStartBefore(Y);V.setEndAfter(Y);ah(V);return}if(!p.isCollapsed()||!ag.inline){ad=p.getBookmark();ah(p.getRng(A));p.moveToBookmark(ad);T.nodeChanged()}else{O("remove",W,ae)}}function C(U,W,V){if(i(U,W,V)){z(U,W,V)}else{R(U,W,V)}}function v(V,U,aa,Y){var W=P(U),ab,Z,X;function ac(ag,ai,aj){var af,ah,ad=ai[aj],ae;if(ad){if(ad.length===o){for(af in ad){if(ad.hasOwnProperty(af)){if(aj==="attributes"){ah=c.getAttrib(ag,af)}else{ah=J(ag,af)}if(Y&&!ah&&!ai.exact){return}if((!Y||ai.exact)&&!g(ah,q(ad[af],aa))){return}}}}else{for(ae=0;ae<ad.length;ae++){if(aj==="attributes"?c.getAttrib(ag,ad[ae]):J(ag,ad[ae])){return ai}}}}return ai}if(W&&V){for(Z=0;Z<W.length;Z++){ab=W[Z];if(h(V,ab)&&ac(V,ab,"attributes")&&ac(V,ab,"styles")){if(X=ab.classes){for(Z=0;Z<X.length;Z++){if(!c.hasClass(V,X[Z])){return}}}return ab}}}}function i(W,Z,Y){var V,X;function U(aa){aa=c.getParent(aa,function(ab){return !!v(ab,W,Z,true)});return v(aa,W,Z)}if(Y){return U(Y)}if(p.isCollapsed()){for(X=N.apply.length-1;X>=0;X--){if(N.apply[X].name==W){return true}}for(X=N.remove.length-1;X>=0;X--){if(N.remove[X].name==W){return false}}return U(p.getNode())}Y=p.getNode();if(U(Y)){return A}V=p.getStart();if(V!=Y){if(U(V)){return A}}return Q}function u(ab,aa){var Y,Z=[],X={},W,V,U;if(p.isCollapsed()){for(V=0;V<ab.length;V++){for(W=N.remove.length-1;W>=0;W--){U=ab[V];if(N.remove[W].name==U){X[U]=true;break}}}for(W=N.apply.length-1;W>=0;W--){for(V=0;V<ab.length;V++){U=ab[V];if(!X[U]&&N.apply[W].name==U){X[U]=true;Z.push(U)}}}}Y=p.getStart();c.getParent(Y,function(ae){var ad,ac;for(ad=0;ad<ab.length;ad++){ac=ab[ad];if(!X[ac]&&v(ae,ac,aa)){X[ac]=true;Z.push(ac)}}});return Z}function x(Y){var aa=P(Y),X,W,Z,V,U;if(aa){X=p.getStart();W=l(X);for(V=aa.length-1;V>=0;V--){U=aa[V].selector;if(!U){return A}for(Z=W.length-1;Z>=0;Z--){if(c.is(W[Z],U)){return A}}}}return Q}a.extend(this,{get:P,register:j,apply:R,remove:z,toggle:C,match:i,matchAll:u,matchNode:v,canApply:x});function h(U,V){if(g(U,V.inline)){return A}if(g(U,V.block)){return A}if(V.selector){return c.is(U,V.selector)}}function g(V,U){V=V||"";U=U||"";V=""+(V.nodeName||V);U=""+(U.nodeName||U);return V.toLowerCase()==U.toLowerCase()}function J(V,U){var W=c.getStyle(V,U);if(U=="color"||U=="backgroundColor"){W=c.toHex(W)}if(U=="fontWeight"&&W==700){W="bold"}return""+W}function q(U,V){if(typeof(U)!="string"){U=U(V)}else{if(V){U=U.replace(/%(\w+)/g,function(X,W){return V[W]||X})}}return U}function f(U){return U&&U.nodeType===3&&/^([\s\r\n]+|)$/.test(U.nodeValue)}function L(W,V,U){var X=c.create(V,U);W.parentNode.insertBefore(X,W);X.appendChild(W);return X}function n(U,ac,X){var W=U.startContainer,Z=U.startOffset,af=U.endContainer,aa=U.endOffset,ae,ab;function ad(ai,aj,ag,ah){var ak,al;ah=ah||c.getRoot();for(;;){ak=ai.parentNode;if(ak==ah||(!ac[0].block_expand&&E(ak))){return ai}for(ae=ak[aj];ae&&ae!=ai;ae=ae[ag]){if(ae.nodeType==1&&!G(ae)){return ai}if(ae.nodeType==3&&!f(ae)){return ai}}ai=ai.parentNode}return ai}if(W.nodeType==1&&W.hasChildNodes()){ab=W.childNodes.length-1;W=W.childNodes[Z>ab?ab:Z];if(W.nodeType==3){Z=0}}if(af.nodeType==1&&af.hasChildNodes()){ab=af.childNodes.length-1;af=af.childNodes[aa>ab?ab:aa-1];if(af.nodeType==3){aa=af.nodeValue.length}}if(G(W.parentNode)){W=W.parentNode}if(G(W)){W=W.nextSibling||W}if(G(af.parentNode)){af=af.parentNode}if(G(af)){af=af.previousSibling||af}if(ac[0].inline||ac[0].block_expand){W=ad(W,"firstChild","nextSibling");af=ad(af,"lastChild","previousSibling")}if(ac[0].selector&&ac[0].expand!==Q&&!ac[0].inline){function Y(ah,ag){var ai,aj,ak;if(ah.nodeType==3&&ah.nodeValue.length==0&&ah[ag]){ah=ah[ag]}ai=l(ah);for(aj=0;aj<ai.length;aj++){for(ak=0;ak<ac.length;ak++){if(c.is(ai[aj],ac[ak].selector)){return ai[aj]}}}return ah}W=Y(W,"previousSibling");af=Y(af,"nextSibling")}if(ac[0].block||ac[0].selector){function V(ah,ag,aj){var ai;if(!ac[0].wrapper){ai=c.getParent(ah,ac[0].block)}if(!ai){ai=c.getParent(ah.nodeType==3?ah.parentNode:ah,E)}if(ai&&ac[0].wrapper){ai=l(ai,"ul,ol").reverse()[0]||ai}if(!ai){ai=ah;while(ai[ag]&&!E(ai[ag])){ai=ai[ag];if(g(ai,"br")){break}}}return ai||ah}W=V(W,"previousSibling");af=V(af,"nextSibling");if(ac[0].block){if(!E(W)){W=ad(W,"firstChild","nextSibling")}if(!E(af)){af=ad(af,"lastChild","previousSibling")}}}if(W.nodeType==1){Z=r(W);W=W.parentNode}if(af.nodeType==1){aa=r(af)+1;af=af.parentNode}return{startContainer:W,startOffset:Z,endContainer:af,endOffset:aa}}function S(aa,Z,X,U){var W,V,Y;if(!h(X,aa)){return Q}if(aa.remove!="all"){M(aa.styles,function(ac,ab){ac=q(ac,Z);if(typeof(ab)==="number"){ab=ac;U=0}if(!U||g(J(U,ab),ac)){c.setStyle(X,ab,"")}Y=1});if(Y&&c.getAttrib(X,"style")==""){X.removeAttribute("style");X.removeAttribute("_mce_style")}M(aa.attributes,function(ad,ab){var ac;ad=q(ad,Z);if(typeof(ab)==="number"){ab=ad;U=0}if(!U||g(c.getAttrib(U,ab),ad)){if(ab=="class"){ad=c.getAttrib(X,ab);if(ad){ac="";M(ad.split(/\s+/),function(ae){if(/mce\w+/.test(ae)){ac+=(ac?" ":"")+ae}});if(ac){c.setAttrib(X,ab,ac);return}}}if(ab=="class"){X.removeAttribute("className")}if(e.test(ab)){X.removeAttribute("_mce_"+ab)}X.removeAttribute(ab)}});M(aa.classes,function(ab){ab=q(ab,Z);if(!U||c.hasClass(U,ab)){c.removeClass(X,ab)}});V=c.getAttribs(X);for(W=0;W<V.length;W++){if(V[W].nodeName.indexOf("_")!==0){return Q}}}if(aa.remove!="none"){m(X,aa);return A}}function m(W,X){var U=W.parentNode,V;if(X.block){if(!k){function Y(aa,Z,ab){aa=B(aa,Z,ab);return !aa||(aa.nodeName=="BR"||E(aa))}if(E(W)&&!E(U)){if(!Y(W,Q)&&!Y(W.firstChild,A,1)){W.insertBefore(c.create("br"),W.firstChild)}if(!Y(W,A)&&!Y(W.lastChild,Q,1)){W.appendChild(c.create("br"))}}}else{if(U==c.getRoot()){if(!X.list_block||!g(W,X.list_block)){M(a.grep(W.childNodes),function(Z){if(d(k,Z.nodeName.toLowerCase())){if(!V){V=L(Z,k)}else{V.appendChild(Z)}}else{V=0}})}}}}if(X.selector&&X.inline&&!g(X.inline,W)){return}c.remove(W,1)}function B(V,U,W){if(V){U=U?"nextSibling":"previousSibling";for(V=W?V:V[U];V;V=V[U]){if(V.nodeType==1||!f(V)){return V}}}}function G(U){return U&&U.nodeType==1&&U.getAttribute("_mce_type")=="bookmark"}function t(Y,X){var U,W,V;function aa(ad,ac){if(ad.nodeName!=ac.nodeName){return Q}function ab(af){var ag={};M(c.getAttribs(af),function(ah){var ai=ah.nodeName.toLowerCase();if(ai.indexOf("_")!==0&&ai!=="style"){ag[ai]=c.getAttrib(af,ai)}});return ag}function ae(ai,ah){var ag,af;for(af in ai){if(ai.hasOwnProperty(af)){ag=ah[af];if(ag===o){return Q}if(ai[af]!=ag){return Q}delete ah[af]}}for(af in ah){if(ah.hasOwnProperty(af)){return Q}}return A}if(!ae(ab(ad),ab(ac))){return Q}if(!ae(c.parseStyle(c.getAttrib(ad,"style")),c.parseStyle(c.getAttrib(ac,"style")))){return Q}return A}if(Y&&X){function Z(ac,ab){for(W=ac;W;W=W[ab]){if(W.nodeType==3&&!f(W)){return ac}if(W.nodeType==1&&!G(W)){return W}}return ac}Y=Z(Y,"previousSibling");X=Z(X,"nextSibling");if(aa(Y,X)){for(W=Y.nextSibling;W&&W!=X;){V=W;W=W.nextSibling;Y.appendChild(V)}c.remove(X);M(a.grep(X.childNodes),function(ab){Y.appendChild(ab)});return Y}}return X}function F(U){return/^(h[1-6]|p|div|pre|address|dl|dt|dd)$/.test(U)}function H(V,Y){var U,X,W;U=V[Y?"startContainer":"endContainer"];X=V[Y?"startOffset":"endOffset"];if(U.nodeType==1){W=U.childNodes.length-1;if(!Y&&X){X--}U=U.childNodes[X>W?W:X]}return U}function O(Z,V,Y){var W,U=N[Z],aa=N[Z=="apply"?"remove":"apply"];function ab(){return N.apply.length||N.remove.length}function X(){N.apply=[];N.remove=[]}function ac(ad){M(N.apply.reverse(),function(ae){R(ae.name,ae.vars,ad)});M(N.remove.reverse(),function(ae){z(ae.name,ae.vars,ad)});c.remove(ad,1);X()}for(W=U.length-1;W>=0;W--){if(U[W].name==V){return}}U.push({name:V,vars:Y});for(W=aa.length-1;W>=0;W--){if(aa[W].name==V){aa.splice(W,1)}}if(ab()){T.getDoc().execCommand("FontName",false,"mceinline");N.lastRng=p.getRng();M(c.select("font,span"),function(ae){var ad;if(b(ae)){ad=p.getBookmark();ac(ae);p.moveToBookmark(ad);T.nodeChanged()}});if(!N.isListening&&ab()){N.isListening=true;M("onKeyDown,onKeyUp,onKeyPress,onMouseUp".split(","),function(ad){T[ad].addToTop(function(ae,af){if(ab()&&!a.dom.RangeUtils.compareRanges(N.lastRng,p.getRng())){M(c.select("font,span"),function(ah){var ai,ag;if(b(ah)){ai=ah.firstChild;if(ai){ac(ah);ag=c.createRng();ag.setStart(ai,ai.nodeValue.length);ag.setEnd(ai,ai.nodeValue.length);p.setRng(ag);ae.nodeChanged()}else{c.remove(ah)}}});if(af.type=="keyup"||af.type=="mouseup"){X()}}})})}}}}})(tinymce);tinymce.onAddEditor.add(function(e,a){var d,h,g,c=a.settings;if(c.inline_styles){h=e.explode(c.font_size_style_values);function b(j,i){g.replace(g.create("span",{style:i}),j,1)}d={font:function(j,i){b(i,{backgroundColor:i.style.backgroundColor,color:i.color,fontFamily:i.face,fontSize:h[parseInt(i.size)-1]})},u:function(j,i){b(i,{textDecoration:"underline"})},strike:function(j,i){b(i,{textDecoration:"line-through"})}};function f(i,j){g=i.dom;if(c.convert_fonts_to_spans){e.each(g.select("font,u,strike",j.node),function(k){d[k.nodeName.toLowerCase()](a.dom,k)})}}a.onPreProcess.add(f);a.onInit.add(function(){a.selection.onSetContent.add(f)})}});
\ No newline at end of file
+(function(d){var a=/^\s*|\s*$/g,e,c="B".replace(/A(.)|B/,"$1")==="$1";var b={majorVersion:"3",minorVersion:"5b2",releaseDate:"2012-03-15",_init:function(){var s=this,q=document,o=navigator,g=o.userAgent,m,f,l,k,j,r;s.isOpera=d.opera&&opera.buildNumber;s.isWebKit=/WebKit/.test(g);s.isIE=!s.isWebKit&&!s.isOpera&&(/MSIE/gi).test(g)&&(/Explorer/gi).test(o.appName);s.isIE6=s.isIE&&/MSIE [56]/.test(g);s.isIE7=s.isIE&&/MSIE [7]/.test(g);s.isIE8=s.isIE&&/MSIE [8]/.test(g);s.isIE9=s.isIE&&/MSIE [9]/.test(g);s.isGecko=!s.isWebKit&&/Gecko/.test(g);s.isMac=g.indexOf("Mac")!=-1;s.isAir=/adobeair/i.test(g);s.isIDevice=/(iPad|iPhone)/.test(g);s.isIOS5=s.isIDevice&&g.match(/AppleWebKit\/(\d*)/)[1]>=534;if(d.tinyMCEPreInit){s.suffix=tinyMCEPreInit.suffix;s.baseURL=tinyMCEPreInit.base;s.query=tinyMCEPreInit.query;return}s.suffix="";f=q.getElementsByTagName("base");for(m=0;m<f.length;m++){if(r=f[m].href){if(/^https?:\/\/[^\/]+$/.test(r)){r+="/"}k=r?r.match(/.*\//)[0]:""}}function h(i){if(i.src&&/tiny_mce(|_gzip|_jquery|_prototype|_full)(_dev|_src)?.js/.test(i.src)){if(/_(src|dev)\.js/g.test(i.src)){s.suffix="_src"}if((j=i.src.indexOf("?"))!=-1){s.query=i.src.substring(j+1)}s.baseURL=i.src.substring(0,i.src.lastIndexOf("/"));if(k&&s.baseURL.indexOf("://")==-1&&s.baseURL.indexOf("/")!==0){s.baseURL=k+s.baseURL}return s.baseURL}return null}f=q.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}l=q.getElementsByTagName("head")[0];if(l){f=l.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}}return},is:function(g,f){if(!f){return g!==e}if(f=="array"&&(g.hasOwnProperty&&g instanceof Array)){return true}return typeof(g)==f},makeMap:function(f,j,h){var g;f=f||[];j=j||",";if(typeof(f)=="string"){f=f.split(j)}h=h||{};g=f.length;while(g--){h[f[g]]={}}return h},each:function(i,f,h){var j,g;if(!i){return 0}h=h||i;if(i.length!==e){for(j=0,g=i.length;j<g;j++){if(f.call(h,i[j],j,i)===false){return 0}}}else{for(j in i){if(i.hasOwnProperty(j)){if(f.call(h,i[j],j,i)===false){return 0}}}}return 1},map:function(g,h){var i=[];b.each(g,function(f){i.push(h(f))});return i},grep:function(g,h){var i=[];b.each(g,function(f){if(!h||h(f)){i.push(f)}});return i},inArray:function(g,h){var j,f;if(g){for(j=0,f=g.length;j<f;j++){if(g[j]===h){return j}}}return -1},extend:function(k,j){var h,g,f=arguments;for(h=1,g=f.length;h<g;h++){j=f[h];b.each(j,function(i,l){if(i!==e){k[l]=i}})}return k},trim:function(f){return(f?""+f:"").replace(a,"")},create:function(o,f,j){var n=this,g,i,k,l,h,m=0;o=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(o);k=o[3].match(/(^|\.)(\w+)$/i)[2];i=n.createNS(o[3].replace(/\.\w+$/,""),j);if(i[k]){return}if(o[2]=="static"){i[k]=f;if(this.onCreate){this.onCreate(o[2],o[3],i[k])}return}if(!f[k]){f[k]=function(){};m=1}i[k]=f[k];n.extend(i[k].prototype,f);if(o[5]){g=n.resolve(o[5]).prototype;l=o[5].match(/\.(\w+)$/i)[1];h=i[k];if(m){i[k]=function(){return g[l].apply(this,arguments)}}else{i[k]=function(){this.parent=g[l];return h.apply(this,arguments)}}i[k].prototype[k]=i[k];n.each(g,function(p,q){i[k].prototype[q]=g[q]});n.each(f,function(p,q){if(g[q]){i[k].prototype[q]=function(){this.parent=g[q];return p.apply(this,arguments)}}else{if(q!=k){i[k].prototype[q]=p}}})}n.each(f["static"],function(p,q){i[k][q]=p});if(this.onCreate){this.onCreate(o[2],o[3],i[k].prototype)}},walk:function(i,h,j,g){g=g||this;if(i){if(j){i=i[j]}b.each(i,function(k,f){if(h.call(g,k,f,j)===false){return false}b.walk(k,h,j,g)})}},createNS:function(j,h){var g,f;h=h||d;j=j.split(".");for(g=0;g<j.length;g++){f=j[g];if(!h[f]){h[f]={}}h=h[f]}return h},resolve:function(j,h){var g,f;h=h||d;j=j.split(".");for(g=0,f=j.length;g<f;g++){h=h[j[g]];if(!h){break}}return h},addUnload:function(j,i){var h=this;j={func:j,scope:i||this};if(!h.unloads){function g(){var f=h.unloads,l,m;if(f){for(m in f){l=f[m];if(l&&l.func){l.func.call(l.scope,1)}}if(d.detachEvent){d.detachEvent("onbeforeunload",k);d.detachEvent("onunload",g)}else{if(d.removeEventListener){d.removeEventListener("unload",g,false)}}h.unloads=l=f=w=g=0;if(d.CollectGarbage){CollectGarbage()}}}function k(){var l=document;if(l.readyState=="interactive"){function f(){l.detachEvent("onstop",f);if(g){g()}l=0}if(l){l.attachEvent("onstop",f)}d.setTimeout(function(){if(l){l.detachEvent("onstop",f)}},0)}}if(d.attachEvent){d.attachEvent("onunload",g);d.attachEvent("onbeforeunload",k)}else{if(d.addEventListener){d.addEventListener("unload",g,false)}}h.unloads=[j]}else{h.unloads.push(j)}return j},removeUnload:function(i){var g=this.unloads,h=null;b.each(g,function(j,f){if(j&&j.func==i){g.splice(f,1);h=i;return false}});return h},explode:function(f,g){return f?b.map(f.split(g||","),b.trim):f},_addVer:function(g){var f;if(!this.query){return g}f=(g.indexOf("?")==-1?"?":"&")+this.query;if(g.indexOf("#")==-1){return g+f}return g.replace("#",f+"#")},_replace:function(h,f,g){if(c){return g.replace(h,function(){var l=f,j=arguments,k;for(k=0;k<j.length-2;k++){if(j[k]===e){l=l.replace(new RegExp("\\$"+k,"g"),"")}else{l=l.replace(new RegExp("\\$"+k,"g"),j[k])}}return l})}return g.replace(h,f)}};b._init();d.tinymce=d.tinyMCE=b})(window);tinymce.create("tinymce.util.Dispatcher",{scope:null,listeners:null,Dispatcher:function(a){this.scope=a||this;this.listeners=[]},add:function(a,b){this.listeners.push({cb:a,scope:b||this.scope});return a},addToTop:function(a,b){this.listeners.unshift({cb:a,scope:b||this.scope});return a},remove:function(a){var b=this.listeners,c=null;tinymce.each(b,function(e,d){if(a==e.cb){c=a;b.splice(d,1);return false}});return c},dispatch:function(){var f,d=arguments,e,b=this.listeners,g;for(e=0;e<b.length;e++){g=b[e];f=g.cb.apply(g.scope,d.length>0?d:[g.scope]);if(f===false){break}}return f}});(function(){var a=tinymce.each;tinymce.create("tinymce.util.URI",{URI:function(e,g){var f=this,i,d,c,h;e=tinymce.trim(e);g=f.settings=g||{};if(/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e)){f.source=e;return}if(e.indexOf("/")===0&&e.indexOf("//")!==0){e=(g.base_uri?g.base_uri.protocol||"http":"http")+"://mce_host"+e}if(!/^[\w-]*:?\/\//.test(e)){h=g.base_uri?g.base_uri.path:new tinymce.util.URI(location.href).directory;e=((g.base_uri&&g.base_uri.protocol)||"http")+"://mce_host"+f.toAbsPath(h,e)}e=e.replace(/@@/g,"(mce_at)");e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e);a(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],function(b,j){var k=e[j];if(k){k=k.replace(/\(mce_at\)/g,"@@")}f[b]=k});if(c=g.base_uri){if(!f.protocol){f.protocol=c.protocol}if(!f.userInfo){f.userInfo=c.userInfo}if(!f.port&&f.host=="mce_host"){f.port=c.port}if(!f.host||f.host=="mce_host"){f.host=c.host}f.source=""}},setPath:function(c){var b=this;c=/^(.*?)\/?(\w+)?$/.exec(c);b.path=c[0];b.directory=c[1];b.file=c[2];b.source="";b.getURI()},toRelative:function(b){var c=this,d;if(b==="./"){return b}b=new tinymce.util.URI(b,{base_uri:c});if((b.host!="mce_host"&&c.host!=b.host&&b.host)||c.port!=b.port||c.protocol!=b.protocol){return b.getURI()}d=c.toRelPath(c.path,b.path);if(b.query){d+="?"+b.query}if(b.anchor){d+="#"+b.anchor}return d},toAbsolute:function(b,c){var b=new tinymce.util.URI(b,{base_uri:this});return b.getURI(this.host==b.host&&this.protocol==b.protocol?c:0)},toRelPath:function(g,h){var c,f=0,d="",e,b;g=g.substring(0,g.lastIndexOf("/"));g=g.split("/");c=h.split("/");if(g.length>=c.length){for(e=0,b=g.length;e<b;e++){if(e>=c.length||g[e]!=c[e]){f=e+1;break}}}if(g.length<c.length){for(e=0,b=c.length;e<b;e++){if(e>=g.length||g[e]!=c[e]){f=e+1;break}}}if(f==1){return h}for(e=0,b=g.length-(f-1);e<b;e++){d+="../"}for(e=f-1,b=c.length;e<b;e++){if(e!=f-1){d+="/"+c[e]}else{d+=c[e]}}return d},toAbsPath:function(e,f){var c,b=0,h=[],d,g;d=/\/$/.test(f)?"/":"";e=e.split("/");f=f.split("/");a(e,function(i){if(i){h.push(i)}});e=h;for(c=f.length-1,h=[];c>=0;c--){if(f[c].length==0||f[c]=="."){continue}if(f[c]==".."){b++;continue}if(b>0){b--;continue}h.push(f[c])}c=e.length-b;if(c<=0){g=h.reverse().join("/")}else{g=e.slice(0,c).join("/")+"/"+h.reverse().join("/")}if(g.indexOf("/")!==0){g="/"+g}if(d&&g.lastIndexOf("/")!==g.length-1){g+=d}return g},getURI:function(d){var c,b=this;if(!b.source||d){c="";if(!d){if(b.protocol){c+=b.protocol+"://"}if(b.userInfo){c+=b.userInfo+"@"}if(b.host){c+=b.host}if(b.port){c+=":"+b.port}}if(b.path){c+=b.path}if(b.query){c+="?"+b.query}if(b.anchor){c+="#"+b.anchor}b.source=c}return b.source}})})();(function(){var a=tinymce.each;tinymce.create("static tinymce.util.Cookie",{getHash:function(d){var b=this.get(d),c;if(b){a(b.split("&"),function(e){e=e.split("=");c=c||{};c[unescape(e[0])]=unescape(e[1])})}return c},setHash:function(j,b,g,f,i,c){var h="";a(b,function(e,d){h+=(!h?"":"&")+escape(d)+"="+escape(e)});this.set(j,h,g,f,i,c)},get:function(i){var h=document.cookie,g,f=i+"=",d;if(!h){return}d=h.indexOf("; "+f);if(d==-1){d=h.indexOf(f);if(d!=0){return null}}else{d+=2}g=h.indexOf(";",d);if(g==-1){g=h.length}return unescape(h.substring(d+f.length,g))},set:function(i,b,g,f,h,c){document.cookie=i+"="+escape(b)+((g)?"; expires="+g.toGMTString():"")+((f)?"; path="+escape(f):"")+((h)?"; domain="+h:"")+((c)?"; secure":"")},remove:function(e,b){var c=new Date();c.setTime(c.getTime()-1000);this.set(e,"",c,b,c)}})})();(function(){function serialize(o,quote){var i,v,t;quote=quote||'"';if(o==null){return"null"}t=typeof o;if(t=="string"){v="\bb\tt\nn\ff\rr\"\"''\\\\";return quote+o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g,function(a,b){if(quote==='"'&&a==="'"){return a}i=v.indexOf(b);if(i+1){return"\\"+v.charAt(i+1)}a=b.charCodeAt().toString(16);return"\\u"+"0000".substring(a.length)+a})+quote}if(t=="object"){if(o.hasOwnProperty&&o instanceof Array){for(i=0,v="[";i<o.length;i++){v+=(i>0?",":"")+serialize(o[i],quote)}return v+"]"}v="{";for(i in o){if(o.hasOwnProperty(i)){v+=typeof o[i]!="function"?(v.length>1?","+quote:quote)+i+quote+":"+serialize(o[i],quote):""}}return v+"}"}return""+o}tinymce.util.JSON={serialize:serialize,parse:function(s){try{return eval("("+s+")")}catch(ex){}}}})();tinymce.create("static tinymce.util.XHR",{send:function(g){var a,e,b=window,h=0;g.scope=g.scope||this;g.success_scope=g.success_scope||g.scope;g.error_scope=g.error_scope||g.scope;g.async=g.async===false?false:true;g.data=g.data||"";function d(i){a=0;try{a=new ActiveXObject(i)}catch(c){}return a}a=b.XMLHttpRequest?new XMLHttpRequest():d("Microsoft.XMLHTTP")||d("Msxml2.XMLHTTP");if(a){if(a.overrideMimeType){a.overrideMimeType(g.content_type)}a.open(g.type||(g.data?"POST":"GET"),g.url,g.async);if(g.content_type){a.setRequestHeader("Content-Type",g.content_type)}a.setRequestHeader("X-Requested-With","XMLHttpRequest");a.send(g.data);function f(){if(!g.async||a.readyState==4||h++>10000){if(g.success&&h<10000&&a.status==200){g.success.call(g.success_scope,""+a.responseText,a,g)}else{if(g.error){g.error.call(g.error_scope,h>10000?"TIMED_OUT":"GENERAL",a,g)}}a=null}else{b.setTimeout(f,10)}}if(!g.async){return f()}e=b.setTimeout(f,10)}}});(function(){var c=tinymce.extend,b=tinymce.util.JSON,a=tinymce.util.XHR;tinymce.create("tinymce.util.JSONRequest",{JSONRequest:function(d){this.settings=c({},d);this.count=0},send:function(f){var e=f.error,d=f.success;f=c(this.settings,f);f.success=function(h,g){h=b.parse(h);if(typeof(h)=="undefined"){h={error:"JSON Parse error."}}if(h.error){e.call(f.error_scope||f.scope,h.error,g)}else{d.call(f.success_scope||f.scope,h.result)}};f.error=function(h,g){if(e){e.call(f.error_scope||f.scope,h,g)}};f.data=b.serialize({id:f.id||"c"+(this.count++),method:f.method,params:f.params});f.content_type="application/json";a.send(f)},"static":{sendRPC:function(d){return new tinymce.util.JSONRequest().send(d)}}})}());(function(a){a.VK={BACKSPACE:8,DELETE:46,DOWN:40,ENTER:13,LEFT:37,RIGHT:39,SPACEBAR:32,TAB:9,UP:38,modifierPressed:function(b){return b.shiftKey||b.ctrlKey||b.altKey}}})(tinymce);(function(n){var l=n.VK,m=l.BACKSPACE,j=l.DELETE;function p(r,t,s){try{r.getDoc().execCommand(t,false,s)}catch(q){}}function d(q){var s=q.dom,r=q.selection;q.onKeyDown.add(function(u,z){var t,A,x,y,v;if(z.isDefaultPrevented()){return}v=z.keyCode==j;if((v||z.keyCode==m)&&!l.modifierPressed(z)){z.preventDefault();t=r.getRng();A=s.getParent(t.startContainer,s.isBlock);if(v){A=s.getNext(A,s.isBlock)}if(A){x=A.firstChild;while(x&&x.nodeType==3&&x.nodeValue.length==0){x=x.nextSibling}if(x&&x.nodeName==="SPAN"){y=x.cloneNode(false)}}u.getDoc().execCommand(v?"ForwardDelete":"Delete",false,null);A=s.getParent(t.startContainer,s.isBlock);n.each(s.select("span.Apple-style-span,font.Apple-style-span",A),function(B){var C=r.getBookmark();if(y){s.replace(y.cloneNode(false),B,true)}else{s.remove(B,true)}r.moveToBookmark(C)})}})}function e(q){function r(u){var t=q.dom.create("body");var v=u.cloneContents();t.appendChild(v);return q.selection.serializer.serialize(t,{format:"html"})}function s(t){var v=r(t);var x=q.dom.createRng();x.selectNode(q.getBody());var u=r(x);return v===u}q.onKeyDown.addToTop(function(u,x){var v=x.keyCode;if(v==j||v==m){var t=u.selection.getRng(true);if(!t.collapsed&&s(t)){u.setContent("",{format:"raw"});u.nodeChanged();x.preventDefault()}}})}function c(q){q.dom.bind(q.getDoc(),"focusin",function(){q.selection.setRng(q.selection.getRng())})}function g(q){q.onKeyDown.add(function(r,u){if(u.keyCode===m){if(r.selection.isCollapsed()&&r.selection.getRng(true).startOffset===0){var t=r.selection.getNode();var s=t.previousSibling;if(s&&s.nodeName&&s.nodeName.toLowerCase()==="hr"){r.dom.remove(s);n.dom.Event.cancel(u)}}}})}function i(q){if(!Range.prototype.getClientRects){q.onMouseDown.add(function(s,t){if(t.target.nodeName==="HTML"){var r=s.getBody();r.blur();setTimeout(function(){r.focus()},0)}})}}function h(q){q.onClick.add(function(r,s){s=s.target;if(/^(IMG|HR)$/.test(s.nodeName)){r.selection.getSel().setBaseAndExtent(s,0,s,1)}if(s.nodeName=="A"&&r.dom.hasClass(s,"mceItemAnchor")){r.selection.select(s)}r.nodeChanged()})}function b(q){var s=q.selection,v=q.dom;function t(){var x=v.getAttribs(s.getStart().cloneNode(false));return function(){var y=s.getStart();if(y!==q.getBody()){v.setAttrib(y,"style",null);n.each(x,function(z){y.setAttributeNode(z.cloneNode(true))})}}}function r(){return !s.isCollapsed()&&s.getStart()!=s.getEnd()}function u(x,y){y.preventDefault();return false}q.onKeyPress.add(function(x,z){var y;if((z.keyCode==8||z.keyCode==46)&&r()){y=t();x.getDoc().execCommand("delete",false,null);y();z.preventDefault();return false}});v.bind(q.getDoc(),"cut",function(y){var x;if(r()){x=t();q.onKeyUp.addToTop(u);setTimeout(function(){x();q.onKeyUp.remove(u)},0)}})}function o(q){var s,r;q.dom.bind(q.getDoc(),"selectionchange",function(){if(r){clearTimeout(r);r=0}r=window.setTimeout(function(){var t=q.selection.getRng();if(!s||!n.dom.RangeUtils.compareRanges(t,s)){q.nodeChanged();s=t}},50)})}function a(q){document.body.setAttribute("role","application")}function f(q){q.onKeyDown.add(function(r,t){if(t.keyCode===m){if(r.selection.isCollapsed()&&r.selection.getRng(true).startOffset===0){var s=r.selection.getNode().previousSibling;if(s&&s.nodeName&&s.nodeName.toLowerCase()==="table"){return n.dom.Event.cancel(t)}}}})}function k(r){var q=r.getDoc().documentMode;if(q&&q>7){return}p(r,"RespectVisibilityInDesign",true);r.dom.addClass(r.getBody(),"mceHideBrInPre");r.parser.addNodeFilter("pre",function(s,u){var v=s.length,y,t,z,x;while(v--){y=s[v].getAll("br");t=y.length;while(t--){z=y[t];x=z.prev;if(x&&x.type===3&&x.value.charAt(x.value-1)!="\n"){x.value+="\n"}else{z.parent.insert(new n.html.Node("#text",3),z,true).value="\n"}}}});r.serializer.addNodeFilter("pre",function(s,u){var v=s.length,y,t,z,x;while(v--){y=s[v].getAll("br");t=y.length;while(t--){z=y[t];x=z.prev;if(x&&x.type==3){x.value=x.value.replace(/\r?\n$/,"")}}}})}n.create("tinymce.util.Quirks",{Quirks:function(q){f(q);if(n.isWebKit){d(q);e(q);c(q);h(q);if(n.isIDevice){o(q)}}if(n.isIE){g(q);e(q);a(q);k(q)}if(n.isGecko){g(q);i(q);b(q)}}})})(tinymce);(function(j){var a,g,d,k=/[&<>\"\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,b=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,f=/[<>&\"\']/g,c=/&(#x|#)?([\w]+);/g,i={128:"\u20AC",130:"\u201A",131:"\u0192",132:"\u201E",133:"\u2026",134:"\u2020",135:"\u2021",136:"\u02C6",137:"\u2030",138:"\u0160",139:"\u2039",140:"\u0152",142:"\u017D",145:"\u2018",146:"\u2019",147:"\u201C",148:"\u201D",149:"\u2022",150:"\u2013",151:"\u2014",152:"\u02DC",153:"\u2122",154:"\u0161",155:"\u203A",156:"\u0153",158:"\u017E",159:"\u0178"};g={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;"};d={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"};function h(l){var m;m=document.createElement("div");m.innerHTML=l;return m.textContent||m.innerText||l}function e(m,p){var n,o,l,q={};if(m){m=m.split(",");p=p||10;for(n=0;n<m.length;n+=2){o=String.fromCharCode(parseInt(m[n],p));if(!g[o]){l="&"+m[n+1]+";";q[o]=l;q[l]=o}}return q}}a=e("50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,t9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro",32);j.html=j.html||{};j.html.Entities={encodeRaw:function(m,l){return m.replace(l?k:b,function(n){return g[n]||n})},encodeAllRaw:function(l){return(""+l).replace(f,function(m){return g[m]||m})},encodeNumeric:function(m,l){return m.replace(l?k:b,function(n){if(n.length>1){return"&#"+(((n.charCodeAt(0)-55296)*1024)+(n.charCodeAt(1)-56320)+65536)+";"}return g[n]||"&#"+n.charCodeAt(0)+";"})},encodeNamed:function(n,l,m){m=m||a;return n.replace(l?k:b,function(o){return g[o]||m[o]||o})},getEncodeFunc:function(l,o){var p=j.html.Entities;o=e(o)||a;function m(r,q){return r.replace(q?k:b,function(s){return g[s]||o[s]||"&#"+s.charCodeAt(0)+";"||s})}function n(r,q){return p.encodeNamed(r,q,o)}l=j.makeMap(l.replace(/\+/g,","));if(l.named&&l.numeric){return m}if(l.named){if(o){return n}return p.encodeNamed}if(l.numeric){return p.encodeNumeric}return p.encodeRaw},decode:function(l){return l.replace(c,function(n,m,o){if(m){o=parseInt(o,m.length===2?16:10);if(o>65535){o-=65536;return String.fromCharCode(55296+(o>>10),56320+(o&1023))}else{return i[o]||String.fromCharCode(o)}}return d[n]||a[n]||h(n)})}}})(tinymce);tinymce.html.Styles=function(d,f){var k=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,h=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,b=/\s*([^:]+):\s*([^;]+);?/g,l=/\s+$/,m=/rgb/,e,g,a={},j;d=d||{};j="\\\" \\' \\; \\: ; : \uFEFF".split(" ");for(g=0;g<j.length;g++){a[j[g]]="\uFEFF"+g;a["\uFEFF"+g]=j[g]}function c(n,q,p,i){function o(r){r=parseInt(r).toString(16);return r.length>1?r:"0"+r}return"#"+o(q)+o(p)+o(i)}return{toHex:function(i){return i.replace(k,c)},parse:function(r){var y={},p,n,v,q,u=d.url_converter,x=d.url_converter_scope||this;function o(C,F){var E,B,A,D;E=y[C+"-top"+F];if(!E){return}B=y[C+"-right"+F];if(E!=B){return}A=y[C+"-bottom"+F];if(B!=A){return}D=y[C+"-left"+F];if(A!=D){return}y[C+F]=D;delete y[C+"-top"+F];delete y[C+"-right"+F];delete y[C+"-bottom"+F];delete y[C+"-left"+F]}function t(B){var C=y[B],A;if(!C||C.indexOf(" ")<0){return}C=C.split(" ");A=C.length;while(A--){if(C[A]!==C[0]){return false}}y[B]=C[0];return true}function z(C,B,A,D){if(!t(B)){return}if(!t(A)){return}if(!t(D)){return}y[C]=y[B]+" "+y[A]+" "+y[D];delete y[B];delete y[A];delete y[D]}function s(A){q=true;return a[A]}function i(B,A){if(q){B=B.replace(/\uFEFF[0-9]/g,function(C){return a[C]})}if(!A){B=B.replace(/\\([\'\";:])/g,"$1")}return B}if(r){r=r.replace(/\\[\"\';:\uFEFF]/g,s).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(A){return A.replace(/[;:]/g,s)});while(p=b.exec(r)){n=p[1].replace(l,"").toLowerCase();v=p[2].replace(l,"");if(n&&v.length>0){if(n==="font-weight"&&v==="700"){v="bold"}else{if(n==="color"||n==="background-color"){v=v.toLowerCase()}}v=v.replace(k,c);v=v.replace(h,function(B,A,E,D,F,C){F=F||C;if(F){F=i(F);return"'"+F.replace(/\'/g,"\\'")+"'"}A=i(A||E||D);if(u){A=u.call(x,A,"style")}return"url('"+A.replace(/\'/g,"\\'")+"')"});y[n]=q?i(v,true):v}b.lastIndex=p.index+p[0].length}o("border","");o("border","-width");o("border","-color");o("border","-style");o("padding","");o("margin","");z("border","border-width","border-style","border-color");if(y.border==="medium none"){delete y.border}}return y},serialize:function(p,r){var o="",n,q;function i(t){var x,u,s,v;x=f.styles[t];if(x){for(u=0,s=x.length;u<s;u++){t=x[u];v=p[t];if(v!==e&&v.length>0){o+=(o.length>0?" ":"")+t+": "+v+";"}}}}if(r&&f&&f.styles){i("*");i(r)}else{for(n in p){q=p[n];if(q!==e&&q.length>0){o+=(o.length>0?" ":"")+n+": "+q+";"}}}return o}}};(function(f){var a={},e=f.makeMap,g=f.each;function d(j,i){return j.split(i||",")}function h(m,l){var j,k={};function i(n){return n.replace(/[A-Z]+/g,function(o){return i(m[o])})}for(j in m){if(m.hasOwnProperty(j)){m[j]=i(m[j])}}i(l).replace(/#/g,"#text").replace(/(\w+)\[([^\]]+)\]\[([^\]]*)\]/g,function(q,o,n,p){n=d(n,"|");k[o]={attributes:e(n),attributesOrder:n,children:e(p,"|",{"#comment":{}})}});return k}function b(){var i=a.html5;if(!i){i=a.html5=h({A:"id|accesskey|class|dir|draggable|item|hidden|itemprop|role|spellcheck|style|subject|title",B:"#|a|abbr|area|audio|b|bdo|br|button|canvas|cite|code|command|datalist|del|dfn|em|embed|i|iframe|img|input|ins|kbd|keygen|label|link|map|mark|meta|meter|noscript|object|output|progress|q|ruby|samp|script|select|small|span|strong|sub|sup|svg|textarea|time|var|video",C:"#|a|abbr|area|address|article|aside|audio|b|bdo|blockquote|br|button|canvas|cite|code|command|datalist|del|details|dfn|dialog|div|dl|em|embed|fieldset|figure|footer|form|h1|h2|h3|h4|h5|h6|header|hgroup|hr|i|iframe|img|input|ins|kbd|keygen|label|link|map|mark|menu|meta|meter|nav|noscript|ol|object|output|p|pre|progress|q|ruby|samp|script|section|select|small|span|strong|style|sub|sup|svg|table|textarea|time|ul|var|video"},"html[A|manifest][body|head]head[A][base|command|link|meta|noscript|script|style|title]title[A][#]base[A|href|target][]link[A|href|rel|media|type|sizes][]meta[A|http-equiv|name|content|charset][]style[A|type|media|scoped][#]script[A|charset|type|src|defer|async][#]noscript[A][C]body[A][C]section[A][C]nav[A][C]article[A][C]aside[A][C]h1[A][B]h2[A][B]h3[A][B]h4[A][B]h5[A][B]h6[A][B]hgroup[A][h1|h2|h3|h4|h5|h6]header[A][C]footer[A][C]address[A][C]p[A][B]br[A][]pre[A][B]dialog[A][dd|dt]blockquote[A|cite][C]ol[A|start|reversed][li]ul[A][li]li[A|value][C]dl[A][dd|dt]dt[A][B]dd[A][C]a[A|href|target|ping|rel|media|type][C]em[A][B]strong[A][B]small[A][B]cite[A][B]q[A|cite][B]dfn[A][B]abbr[A][B]code[A][B]var[A][B]samp[A][B]kbd[A][B]sub[A][B]sup[A][B]i[A][B]b[A][B]mark[A][B]progress[A|value|max][B]meter[A|value|min|max|low|high|optimum][B]time[A|datetime][B]ruby[A][B|rt|rp]rt[A][B]rp[A][B]bdo[A][B]span[A][B]ins[A|cite|datetime][B]del[A|cite|datetime][B]figure[A][C|legend]img[A|alt|src|height|width|usemap|ismap][]iframe[A|name|src|height|width|sandbox|seamless][]embed[A|src|height|width|type][]object[A|data|type|height|width|usemap|name|form|classid][param]param[A|name|value][]details[A|open][C|legend]command[A|type|label|icon|disabled|checked|radiogroup][]menu[A|type|label][C|li]legend[A][C|B]div[A][C]source[A|src|type|media][]audio[A|src|autobuffer|autoplay|loop|controls][source]video[A|src|autobuffer|autoplay|loop|controls|width|height|poster][source]hr[A][]form[A|accept-charset|action|autocomplete|enctype|method|name|novalidate|target][C]fieldset[A|disabled|form|name][C|legend]label[A|form|for][B]input[A|type|accept|alt|autocomplete|checked|disabled|form|formaction|formenctype|formmethod|formnovalidate|formtarget|height|list|max|maxlength|min|multiple|pattern|placeholder|readonly|required|size|src|step|width|files|value][]button[A|autofocus|disabled|form|formaction|formenctype|formmethod|formnovalidate|formtarget|name|value|type][B]select[A|autofocus|disabled|form|multiple|name|size][option|optgroup]datalist[A][B|option]optgroup[A|disabled|label][option]option[A|disabled|selected|label|value][]textarea[A|autofocus|disabled|form|maxlength|name|placeholder|readonly|required|rows|cols|wrap][]keygen[A|autofocus|challenge|disabled|form|keytype|name][]output[A|for|form|name][B]canvas[A|width|height][]map[A|name][B|C]area[A|shape|coords|href|alt|target|media|rel|ping|type][]mathml[A][]svg[A][]table[A|summary][caption|colgroup|thead|tfoot|tbody|tr]caption[A][C]colgroup[A|span][col]col[A|span][]thead[A][tr]tfoot[A][tr]tbody[A][tr]tr[A][th|td]th[A|headers|rowspan|colspan|scope][B]td[A|headers|rowspan|colspan][C]")}return i}function c(){var i=a.html4;if(!i){i=a.html4=h({Z:"H|K|N|O|P",Y:"X|form|R|Q",ZG:"E|span|width|align|char|charoff|valign",X:"p|T|div|U|W|isindex|fieldset|table",ZF:"E|align|char|charoff|valign",W:"pre|hr|blockquote|address|center|noframes",ZE:"abbr|axis|headers|scope|rowspan|colspan|align|char|charoff|valign|nowrap|bgcolor|width|height",ZD:"[E][S]",U:"ul|ol|dl|menu|dir",ZC:"p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q",T:"h1|h2|h3|h4|h5|h6",ZB:"X|S|Q",S:"R|P",ZA:"a|G|J|M|O|P",R:"a|H|K|N|O",Q:"noscript|P",P:"ins|del|script",O:"input|select|textarea|label|button",N:"M|L",M:"em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym",L:"sub|sup",K:"J|I",J:"tt|i|b|u|s|strike",I:"big|small|font|basefont",H:"G|F",G:"br|span|bdo",F:"object|applet|img|map|iframe",E:"A|B|C",D:"accesskey|tabindex|onfocus|onblur",C:"onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup",B:"lang|xml:lang|dir",A:"id|class|style|title"},"script[id|charset|type|language|src|defer|xml:space][]style[B|id|type|media|title|xml:space][]object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]param[id|name|value|valuetype|type][]p[E|align][#|S]a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]br[A|clear][]span[E][#|S]bdo[A|C|B][#|S]applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]h1[E|align][#|S]img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]map[B|C|A|name][X|form|Q|area]h2[E|align][#|S]iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]h3[E|align][#|S]tt[E][#|S]i[E][#|S]b[E][#|S]u[E][#|S]s[E][#|S]strike[E][#|S]big[E][#|S]small[E][#|S]font[A|B|size|color|face][#|S]basefont[id|size|color|face][]em[E][#|S]strong[E][#|S]dfn[E][#|S]code[E][#|S]q[E|cite][#|S]samp[E][#|S]kbd[E][#|S]var[E][#|S]cite[E][#|S]abbr[E][#|S]acronym[E][#|S]sub[E][#|S]sup[E][#|S]input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]optgroup[E|disabled|label][option]option[E|selected|disabled|label|value][]textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]label[E|for|accesskey|onfocus|onblur][#|S]button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]h4[E|align][#|S]ins[E|cite|datetime][#|Y]h5[E|align][#|S]del[E|cite|datetime][#|Y]h6[E|align][#|S]div[E|align][#|Y]ul[E|type|compact][li]li[E|type|value][#|Y]ol[E|type|compact|start][li]dl[E|compact][dt|dd]dt[E][#|S]dd[E][#|Y]menu[E|compact][li]dir[E|compact][li]pre[E|width|xml:space][#|ZA]hr[E|align|noshade|size|width][]blockquote[E|cite][#|Y]address[E][#|S|p]center[E][#|Y]noframes[E][#|Y]isindex[A|B|prompt][]fieldset[E][#|legend|Y]legend[E|accesskey|align][#|S]table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]caption[E|align][#|S]col[ZG][]colgroup[ZG][col]thead[ZF][tr]tr[ZF|bgcolor][th|td]th[E|ZE][#|Y]form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]noscript[E][#|Y]td[E|ZE][#|Y]tfoot[ZF][tr]tbody[ZF][tr]area[E|D|shape|coords|href|nohref|alt|target][]base[id|href|target][]body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]")}return i}f.html.Schema=function(A){var u=this,s={},k={},j=[],D,y;var o,q,z,r,v,n,p={};function m(F,E,H){var G=A[F];if(!G){G=a[F];if(!G){G=e(E," ",e(E.toUpperCase()," "));G=f.extend(G,H);a[F]=G}}else{G=e(G,",",e(G.toUpperCase()," "))}return G}A=A||{};y=A.schema=="html5"?b():c();if(A.verify_html===false){A.valid_elements="*[*]"}if(A.valid_styles){D={};g(A.valid_styles,function(F,E){D[E]=f.explode(F)})}o=m("whitespace_elements","pre script style textarea");q=m("self_closing_elements","colgroup dd dt li options p td tfoot th thead tr");z=m("short_ended_elements","area base basefont br col frame hr img input isindex link meta param embed source");r=m("boolean_attributes","checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls");n=m("non_empty_elements","td th iframe video audio object",z);v=m("block_elements","h1 h2 h3 h4 h5 h6 hr p div address pre form table tbody thead tfoot th tr td li ol ul caption blockquote center dl dt dd dir fieldset noscript menu isindex samp header footer article section hgroup aside nav");function i(E){return new RegExp("^"+E.replace(/([?+*])/g,".$1")+"$")}function C(L){var K,G,Z,V,aa,F,I,U,X,Q,Y,ac,O,J,W,E,S,H,ab,ad,P,T,N=/^([#+-])?([^\[\/]+)(?:\/([^\[]+))?(?:\[([^\]]+)\])?$/,R=/^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,M=/[*?+]/;if(L){L=d(L);if(s["@"]){S=s["@"].attributes;H=s["@"].attributesOrder}for(K=0,G=L.length;K<G;K++){F=N.exec(L[K]);if(F){W=F[1];Q=F[2];E=F[3];X=F[4];O={};J=[];I={attributes:O,attributesOrder:J};if(W==="#"){I.paddEmpty=true}if(W==="-"){I.removeEmpty=true}if(S){for(ad in S){O[ad]=S[ad]}J.push.apply(J,H)}if(X){X=d(X,"|");for(Z=0,V=X.length;Z<V;Z++){F=R.exec(X[Z]);if(F){U={};ac=F[1];Y=F[2].replace(/::/g,":");W=F[3];T=F[4];if(ac==="!"){I.attributesRequired=I.attributesRequired||[];I.attributesRequired.push(Y);U.required=true}if(ac==="-"){delete O[Y];J.splice(f.inArray(J,Y),1);continue}if(W){if(W==="="){I.attributesDefault=I.attributesDefault||[];I.attributesDefault.push({name:Y,value:T});U.defaultValue=T}if(W===":"){I.attributesForced=I.attributesForced||[];I.attributesForced.push({name:Y,value:T});U.forcedValue=T}if(W==="<"){U.validValues=e(T,"?")}}if(M.test(Y)){I.attributePatterns=I.attributePatterns||[];U.pattern=i(Y);I.attributePatterns.push(U)}else{if(!O[Y]){J.push(Y)}O[Y]=U}}}}if(!S&&Q=="@"){S=O;H=J}if(E){I.outputName=Q;s[E]=I}if(M.test(Q)){I.pattern=i(Q);j.push(I)}else{s[Q]=I}}}}}function t(E){s={};j=[];C(E);g(y,function(G,F){k[F]=G.children})}function l(F){var E=/^(~)?(.+)$/;if(F){g(d(F),function(J){var H=E.exec(J),I=H[1]==="~",K=I?"span":"div",G=H[2];k[G]=k[K];p[G]=K;if(!I){v[G]={}}g(k,function(L,M){if(L[K]){L[G]=L[K]}})})}}function x(F){var E=/^([+\-]?)(\w+)\[([^\]]+)\]$/;if(F){g(d(F),function(J){var I=E.exec(J),G,H;if(I){H=I[1];if(H){G=k[I[2]]}else{G=k[I[2]]={"#comment":{}}}G=k[I[2]];g(d(I[3],"|"),function(K){if(H==="-"){delete G[K]}else{G[K]={}}})}})}}function B(E){var G=s[E],F;if(G){return G}F=j.length;while(F--){G=j[F];if(G.pattern.test(E)){return G}}}if(!A.valid_elements){g(y,function(F,E){s[E]={attributes:F.attributes,attributesOrder:F.attributesOrder};k[E]=F.children});if(A.schema!="html5"){g(d("strong/b,em/i"),function(E){E=d(E,"/");s[E[1]].outputName=E[0]})}s.img.attributesDefault=[{name:"alt",value:""}];g(d("ol,ul,sub,sup,blockquote,span,font,a,table,tbody,tr,strong,em,b,i"),function(E){if(s[E]){s[E].removeEmpty=true}});g(d("p,h1,h2,h3,h4,h5,h6,th,td,pre,div,address,caption"),function(E){s[E].paddEmpty=true})}else{t(A.valid_elements)}l(A.custom_elements);x(A.valid_children);C(A.extended_valid_elements);x("+ol[ul|ol],+ul[ul|ol]");if(A.invalid_elements){f.each(f.explode(A.invalid_elements),function(E){if(s[E]){delete s[E]}})}if(!B("span")){C("span[!data-mce-type|*]")}u.children=k;u.styles=D;u.getBoolAttrs=function(){return r};u.getBlockElements=function(){return v};u.getShortEndedElements=function(){return z};u.getSelfClosingElements=function(){return q};u.getNonEmptyElements=function(){return n};u.getWhiteSpaceElements=function(){return o};u.isValidChild=function(E,G){var F=k[E];return !!(F&&F[G])};u.getElementRule=B;u.getCustomElements=function(){return p};u.addValidElements=C;u.setValidElements=t;u.addCustomElements=l;u.addValidChildren=x}})(tinymce);(function(a){a.html.SaxParser=function(c,e){var b=this,d=function(){};c=c||{};b.schema=e=e||new a.html.Schema();if(c.fix_self_closing!==false){c.fix_self_closing=true}a.each("comment cdata text start end pi doctype".split(" "),function(f){if(f){b[f]=c[f]||d}});b.parse=function(D){var n=this,g,F=0,H,A,z=[],M,P,B,q,y,r,L,G,N,u,m,k,s,Q,o,O,E,R,K,f,I,l,C,J,h,v=0,j=a.html.Entities.decode,x,p;function t(S){var U,T;U=z.length;while(U--){if(z[U].name===S){break}}if(U>=0){for(T=z.length-1;T>=U;T--){S=z[T];if(S.valid){n.end(S.name)}}z.length=U}}l=new RegExp("<(?:(?:!--([\\w\\W]*?)-->)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:!DOCTYPE([\\w\\W]*?)>)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([^>]+)>)|(?:([A-Za-z0-9-:]+)((?:\\s+[^\"'>]+(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>]*))*|\\/|\\s+)>))","g");C=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:\\.|[^\"])*)\")|(?:\'((?:\\.|[^\'])*)\')|([^>\s]+)))?/g;J={script:/<\/script[^>]*>/gi,style:/<\/style[^>]*>/gi,noscript:/<\/noscript[^>]*>/gi};L=e.getShortEndedElements();I=e.getSelfClosingElements();G=e.getBoolAttrs();u=c.validate;r=c.remove_internals;x=c.fix_self_closing;p=a.isIE;o=/^:/;while(g=l.exec(D)){if(F<g.index){n.text(j(D.substr(F,g.index-F)))}if(H=g[6]){H=H.toLowerCase();if(p&&o.test(H)){H=H.substr(1)}t(H)}else{if(H=g[7]){H=H.toLowerCase();if(p&&o.test(H)){H=H.substr(1)}N=H in L;if(x&&I[H]&&z.length>0&&z[z.length-1].name===H){t(H)}if(!u||(m=e.getElementRule(H))){k=true;if(u){O=m.attributes;E=m.attributePatterns}if(Q=g[8]){y=Q.indexOf("data-mce-type")!==-1;if(y&&r){k=false}M=[];M.map={};Q.replace(C,function(T,S,X,W,V){var Y,U;S=S.toLowerCase();X=S in G?S:j(X||W||V||"");if(u&&!y&&S.indexOf("data-")!==0){Y=O[S];if(!Y&&E){U=E.length;while(U--){Y=E[U];if(Y.pattern.test(S)){break}}if(U===-1){Y=null}}if(!Y){return}if(Y.validValues&&!(X in Y.validValues)){return}}M.map[S]=X;M.push({name:S,value:X})})}else{M=[];M.map={}}if(u&&!y){R=m.attributesRequired;K=m.attributesDefault;f=m.attributesForced;if(f){P=f.length;while(P--){s=f[P];q=s.name;h=s.value;if(h==="{$uid}"){h="mce_"+v++}M.map[q]=h;M.push({name:q,value:h})}}if(K){P=K.length;while(P--){s=K[P];q=s.name;if(!(q in M.map)){h=s.value;if(h==="{$uid}"){h="mce_"+v++}M.map[q]=h;M.push({name:q,value:h})}}}if(R){P=R.length;while(P--){if(R[P] in M.map){break}}if(P===-1){k=false}}if(M.map["data-mce-bogus"]){k=false}}if(k){n.start(H,M,N)}}else{k=false}if(A=J[H]){A.lastIndex=F=g.index+g[0].length;if(g=A.exec(D)){if(k){B=D.substr(F,g.index-F)}F=g.index+g[0].length}else{B=D.substr(F);F=D.length}if(k&&B.length>0){n.text(B,true)}if(k){n.end(H)}l.lastIndex=F;continue}if(!N){if(!Q||Q.indexOf("/")!=Q.length-1){z.push({name:H,valid:k})}else{if(k){n.end(H)}}}}else{if(H=g[1]){n.comment(H)}else{if(H=g[2]){n.cdata(H)}else{if(H=g[3]){n.doctype(H)}else{if(H=g[4]){n.pi(H,g[5])}}}}}}F=g.index+g[0].length}if(F<D.length){n.text(j(D.substr(F)))}for(P=z.length-1;P>=0;P--){H=z[P];if(H.valid){n.end(H.name)}}}}})(tinymce);(function(d){var c=/^[ \t\r\n]*$/,e={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11};function a(k,l,j){var i,h,f=j?"lastChild":"firstChild",g=j?"prev":"next";if(k[f]){return k[f]}if(k!==l){i=k[g];if(i){return i}for(h=k.parent;h&&h!==l;h=h.parent){i=h[g];if(i){return i}}}}function b(f,g){this.name=f;this.type=g;if(g===1){this.attributes=[];this.attributes.map={}}}d.extend(b.prototype,{replace:function(g){var f=this;if(g.parent){g.remove()}f.insert(g,f);f.remove();return f},attr:function(h,l){var f=this,g,j,k;if(typeof h!=="string"){for(j in h){f.attr(j,h[j])}return f}if(g=f.attributes){if(l!==k){if(l===null){if(h in g.map){delete g.map[h];j=g.length;while(j--){if(g[j].name===h){g=g.splice(j,1);return f}}}return f}if(h in g.map){j=g.length;while(j--){if(g[j].name===h){g[j].value=l;break}}}else{g.push({name:h,value:l})}g.map[h]=l;return f}else{return g.map[h]}}},clone:function(){var g=this,n=new b(g.name,g.type),h,f,m,j,k;if(m=g.attributes){k=[];k.map={};for(h=0,f=m.length;h<f;h++){j=m[h];if(j.name!=="id"){k[k.length]={name:j.name,value:j.value};k.map[j.name]=j.value}}n.attributes=k}n.value=g.value;n.shortEnded=g.shortEnded;return n},wrap:function(g){var f=this;f.parent.insert(g,f);g.append(f);return f},unwrap:function(){var f=this,h,g;for(h=f.firstChild;h;){g=h.next;f.insert(h,f,true);h=g}f.remove()},remove:function(){var f=this,h=f.parent,g=f.next,i=f.prev;if(h){if(h.firstChild===f){h.firstChild=g;if(g){g.prev=null}}else{i.next=g}if(h.lastChild===f){h.lastChild=i;if(i){i.next=null}}else{g.prev=i}f.parent=f.next=f.prev=null}return f},append:function(h){var f=this,g;if(h.parent){h.remove()}g=f.lastChild;if(g){g.next=h;h.prev=g;f.lastChild=h}else{f.lastChild=f.firstChild=h}h.parent=f;return h},insert:function(h,f,i){var g;if(h.parent){h.remove()}g=f.parent||this;if(i){if(f===g.firstChild){g.firstChild=h}else{f.prev.next=h}h.prev=f.prev;h.next=f;f.prev=h}else{if(f===g.lastChild){g.lastChild=h}else{f.next.prev=h}h.next=f.next;h.prev=f;f.next=h}h.parent=g;return h},getAll:function(g){var f=this,h,i=[];for(h=f.firstChild;h;h=a(h,f)){if(h.name===g){i.push(h)}}return i},empty:function(){var g=this,f,h,j;if(g.firstChild){f=[];for(j=g.firstChild;j;j=a(j,g)){f.push(j)}h=f.length;while(h--){j=f[h];j.parent=j.firstChild=j.lastChild=j.next=j.prev=null}}g.firstChild=g.lastChild=null;return g},isEmpty:function(k){var f=this,j=f.firstChild,h,g;if(j){do{if(j.type===1){if(j.attributes.map["data-mce-bogus"]){continue}if(k[j.name]){return false}h=j.attributes.length;while(h--){g=j.attributes[h].name;if(g==="name"||g.indexOf("data-")===0){return false}}}if(j.type===8){return false}if((j.type===3&&!c.test(j.value))){return false}}while(j=a(j,f))}return true},walk:function(f){return a(this,null,f)}});d.extend(b,{create:function(g,f){var i,h;i=new b(g,e[g]||1);if(f){for(h in f){i.attr(h,f[h])}}return i}});d.html.Node=b})(tinymce);(function(b){var a=b.html.Node;b.html.DomParser=function(g,h){var f=this,e={},d=[],i={},c={};g=g||{};g.validate="validate" in g?g.validate:true;g.root_name=g.root_name||"body";f.schema=h=h||new b.html.Schema();function j(m){var o,p,x,v,z,n,q,l,t,u,k,s,y,r;s=b.makeMap("tr,td,th,tbody,thead,tfoot,table");k=h.getNonEmptyElements();for(o=0;o<m.length;o++){p=m[o];if(!p.parent){continue}v=[p];for(x=p.parent;x&&!h.isValidChild(x.name,p.name)&&!s[x.name];x=x.parent){v.push(x)}if(x&&v.length>1){v.reverse();z=n=f.filterNode(v[0].clone());for(t=0;t<v.length-1;t++){if(h.isValidChild(n.name,v[t].name)){q=f.filterNode(v[t].clone());n.append(q)}else{q=n}for(l=v[t].firstChild;l&&l!=v[t+1];){r=l.next;q.append(l);l=r}n=q}if(!z.isEmpty(k)){x.insert(z,v[0],true);x.insert(p,z)}else{x.insert(p,v[0],true)}x=v[0];if(x.isEmpty(k)||x.firstChild===x.lastChild&&x.firstChild.name==="br"){x.empty().remove()}}else{if(p.parent){if(p.name==="li"){y=p.prev;if(y&&(y.name==="ul"||y.name==="ul")){y.append(p);continue}y=p.next;if(y&&(y.name==="ul"||y.name==="ul")){y.insert(p,y.firstChild,true);continue}p.wrap(f.filterNode(new a("ul",1)));continue}if(h.isValidChild(p.parent.name,"div")&&h.isValidChild("div",p.name)){p.wrap(f.filterNode(new a("div",1)))}else{if(p.name==="style"||p.name==="script"){p.empty().remove()}else{p.unwrap()}}}}}}f.filterNode=function(m){var l,k,n;if(k in e){n=i[k];if(n){n.push(m)}else{i[k]=[m]}}l=d.length;while(l--){k=d[l].name;if(k in m.attributes.map){n=c[k];if(n){n.push(m)}else{c[k]=[m]}}}return m};f.addNodeFilter=function(k,l){b.each(b.explode(k),function(m){var n=e[m];if(!n){e[m]=n=[]}n.push(l)})};f.addAttributeFilter=function(k,l){b.each(b.explode(k),function(m){var n;for(n=0;n<d.length;n++){if(d[n].name===m){d[n].callbacks.push(l);return}}d.push({name:m,callbacks:[l]})})};f.parse=function(v,m){var n,H,A,z,C,B,x,r,E,L,y,o,D,K=[],J,t,k,s,p,u,q;m=m||{};i={};c={};o=b.extend(b.makeMap("script,style,head,html,body,title,meta,param"),h.getBlockElements());u=h.getNonEmptyElements();p=h.children;y=g.validate;q="forced_root_block" in m?m.forced_root_block:g.forced_root_block;s=h.getWhiteSpaceElements();D=/^[ \t\r\n]+/;t=/[ \t\r\n]+$/;k=/[ \t\r\n]+/g;function F(){var M=H.firstChild,l,N;while(M){l=M.next;if(M.type==3||(M.type==1&&M.name!=="p"&&!o[M.name]&&!M.attr("data-mce-type"))){if(!N){N=I(q,1);H.insert(N,M);N.append(M)}else{N.append(M)}}else{N=null}M=l}}function I(l,M){var N=new a(l,M),O;if(l in e){O=i[l];if(O){O.push(N)}else{i[l]=[N]}}return N}function G(N){var O,l,M;for(O=N.prev;O&&O.type===3;){l=O.value.replace(t,"");if(l.length>0){O.value=l;O=O.prev}else{M=O.prev;O.remove();O=M}}}n=new b.html.SaxParser({validate:y,fix_self_closing:!y,cdata:function(l){A.append(I("#cdata",4)).value=l},text:function(N,l){var M;if(!J){N=N.replace(k," ");if(A.lastChild&&o[A.lastChild.name]){N=N.replace(D,"")}}if(N.length!==0){M=I("#text",3);M.raw=!!l;A.append(M).value=N}},comment:function(l){A.append(I("#comment",8)).value=l},pi:function(l,M){A.append(I(l,7)).value=M;G(A)},doctype:function(M){var l;l=A.append(I("#doctype",10));l.value=M;G(A)},start:function(l,U,N){var S,P,O,M,Q,V,T,R;O=y?h.getElementRule(l):{};if(O){S=I(O.outputName||l,1);S.attributes=U;S.shortEnded=N;A.append(S);R=p[A.name];if(R&&p[S.name]&&!R[S.name]){K.push(S)}P=d.length;while(P--){Q=d[P].name;if(Q in U.map){E=c[Q];if(E){E.push(S)}else{c[Q]=[S]}}}if(o[l]){G(S)}if(!N){A=S}if(!J&&s[l]){J=true}}},end:function(l){var Q,N,P,M,O;N=y?h.getElementRule(l):{};if(N){if(o[l]){if(!J){for(Q=A.firstChild;Q&&Q.type===3;){P=Q.value.replace(D,"");if(P.length>0){Q.value=P;Q=Q.next}else{M=Q.next;Q.remove();Q=M}}for(Q=A.lastChild;Q&&Q.type===3;){P=Q.value.replace(t,"");if(P.length>0){Q.value=P;Q=Q.prev}else{M=Q.prev;Q.remove();Q=M}}}Q=A.prev;if(Q&&Q.type===3){P=Q.value.replace(D,"");if(P.length>0){Q.value=P}else{Q.remove()}}}if(J&&s[l]){J=false}if(N.removeEmpty||N.paddEmpty){if(A.isEmpty(u)){if(N.paddEmpty){A.empty().append(new a("#text","3")).value="\u00a0"}else{if(!A.attributes.map.name){O=A.parent;A.empty().remove();A=O;return}}}}A=A.parent}}},h);H=A=new a(m.context||g.root_name,11);n.parse(v);if(y&&K.length){if(!m.context){j(K)}else{m.invalid=true}}if(q&&H.name=="body"){F()}if(!m.invalid){for(L in i){E=e[L];z=i[L];x=z.length;while(x--){if(!z[x].parent){z.splice(x,1)}}for(C=0,B=E.length;C<B;C++){E[C](z,L,m)}}for(C=0,B=d.length;C<B;C++){E=d[C];if(E.name in c){z=c[E.name];x=z.length;while(x--){if(!z[x].parent){z.splice(x,1)}}for(x=0,r=E.callbacks.length;x<r;x++){E.callbacks[x](z,E.name,m)}}}}return H};if(g.remove_trailing_brs){f.addNodeFilter("br",function(n,m){var r,q=n.length,o,u=h.getBlockElements(),k=h.getNonEmptyElements(),s,p,t;u.body=1;for(r=0;r<q;r++){o=n[r];s=o.parent;if(u[o.parent.name]&&o===s.lastChild){p=o.prev;while(p){t=p.name;if(t!=="span"||p.attr("data-mce-type")!=="bookmark"){if(t!=="br"){break}if(t==="br"){o=null;break}}p=p.prev}if(o){o.remove();if(s.isEmpty(k)){elementRule=h.getElementRule(s.name);if(elementRule){if(elementRule.removeEmpty){s.remove()}else{if(elementRule.paddEmpty){s.empty().append(new b.html.Node("#text",3)).value="\u00a0"}}}}}}}})}}})(tinymce);tinymce.html.Writer=function(e){var c=[],a,b,d,f,g;e=e||{};a=e.indent;b=tinymce.makeMap(e.indent_before||"");d=tinymce.makeMap(e.indent_after||"");f=tinymce.html.Entities.getEncodeFunc(e.entity_encoding||"raw",e.entities);g=e.element_format=="html";return{start:function(m,k,p){var n,j,h,o;if(a&&b[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}c.push("<",m);if(k){for(n=0,j=k.length;n<j;n++){h=k[n];c.push(" ",h.name,'="',f(h.value,true),'"')}}if(!p||g){c[c.length]=">"}else{c[c.length]=" />"}if(p&&a&&d[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}},end:function(h){var i;c.push("</",h,">");if(a&&d[h]&&c.length>0){i=c[c.length-1];if(i.length>0&&i!=="\n"){c.push("\n")}}},text:function(i,h){if(i.length>0){c[c.length]=h?i:f(i)}},cdata:function(h){c.push("<![CDATA[",h,"]]>")},comment:function(h){c.push("<!--",h,"-->")},pi:function(h,i){if(i){c.push("<?",h," ",i,"?>")}else{c.push("<?",h,"?>")}if(a){c.push("\n")}},doctype:function(h){c.push("<!DOCTYPE",h,">",a?"\n":"")},reset:function(){c.length=0},getContent:function(){return c.join("").replace(/\n$/,"")}}};(function(a){a.html.Serializer=function(c,d){var b=this,e=new a.html.Writer(c);c=c||{};c.validate="validate" in c?c.validate:true;b.schema=d=d||new a.html.Schema();b.writer=e;b.serialize=function(h){var g,i;i=c.validate;g={3:function(k,j){e.text(k.value,k.raw)},8:function(j){e.comment(j.value)},7:function(j){e.pi(j.name,j.value)},10:function(j){e.doctype(j.value)},4:function(j){e.cdata(j.value)},11:function(j){if((j=j.firstChild)){do{f(j)}while(j=j.next)}}};e.reset();function f(k){var t=g[k.type],j,o,s,r,p,u,n,m,q;if(!t){j=k.name;o=k.shortEnded;s=k.attributes;if(i&&s&&s.length>1){u=[];u.map={};q=d.getElementRule(k.name);for(n=0,m=q.attributesOrder.length;n<m;n++){r=q.attributesOrder[n];if(r in s.map){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}for(n=0,m=s.length;n<m;n++){r=s[n].name;if(!(r in u.map)){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}s=u}e.start(k.name,s,o);if(!o){if((k=k.firstChild)){do{f(k)}while(k=k.next)}e.end(j)}}else{t(k)}}if(h.type==1&&!c.inner){f(h)}else{g[11](h)}return e.getContent()}}})(tinymce);tinymce.dom={};(function(b,h){var g=!!document.addEventListener;function c(k,j,l,i){if(k.addEventListener){k.addEventListener(j,l,i||false)}else{if(k.attachEvent){k.attachEvent("on"+j,l)}}}function e(k,j,l,i){if(k.removeEventListener){k.removeEventListener(j,l,i||false)}else{if(k.detachEvent){k.detachEvent("on"+j,l)}}}function a(n,l){var i,k=l||{};function j(){return false}function m(){return true}for(i in n){if(i!=="layerX"&&i!=="layerY"){k[i]=n[i]}}if(!k.target){k.target=k.srcElement||document}k.preventDefault=function(){k.isDefaultPrevented=m;if(n){if(n.preventDefault){n.preventDefault()}else{n.returnValue=false}}};k.stopPropagation=function(){k.isPropagationStopped=m;if(n){if(n.stopPropagation){n.stopPropagation()}else{n.cancelBubble=true}}};k.stopImmediatePropagation=function(){k.isImmediatePropagationStopped=m;k.stopPropagation()};if(!k.isDefaultPrevented){k.isDefaultPrevented=j;k.isPropagationStopped=j;k.isImmediatePropagationStopped=j}return k}function d(m,n,l){var k=m.document,j={type:"ready"};function i(){if(!l.domLoaded){l.domLoaded=true;n(j)}}if(g){c(m,"DOMContentLoaded",i)}else{c(k,"readystatechange",function(){if(k.readyState==="complete"){e(k,"readystatechange",arguments.callee);i()}});if(k.documentElement.doScroll&&m===m.top){(function(){try{k.documentElement.doScroll("left")}catch(o){setTimeout(arguments.callee,0);return}i()})()}}c(m,"load",i)}function f(k){var q=this,p={},i,o,n,m,l;m="onmouseenter" in document.documentElement;n="onfocusin" in document.documentElement;l={mouseenter:"mouseover",mouseleave:"mouseout"};i=1;q.domLoaded=false;q.events=p;function j(t,x){var s,u,r,v;s=p[x][t.type];if(s){for(u=0,r=s.length;u<r;u++){v=s[u];if(v&&v.func.call(v.scope,t)===false){t.preventDefault()}if(t.isImmediatePropagationStopped()){return}}}}q.bind=function(x,A,D,E){var s,t,u,r,B,z,C,v=window;function y(F){j(a(F||v.event),s)}if(!x||x.nodeType===3||x.nodeType===8){return}if(!x[h]){s=i++;x[h]=s;p[s]={}}else{s=x[h];if(!p[s]){p[s]={}}}E=E||x;A=A.split(" ");u=A.length;while(u--){r=A[u];z=y;B=C=false;if(r==="DOMContentLoaded"){r="ready"}if((q.domLoaded||x.readyState=="complete")&&r==="ready"){q.domLoaded=true;D.call(E,a({type:r}));continue}if(!m){B=l[r];if(B){z=function(F){var H,G;H=F.currentTarget;G=F.relatedTarget;if(G&&H.contains){G=H.contains(G)}else{while(G&&G!==H){G=G.parentNode}}if(!G){F=a(F||v.event);F.type=F.type==="mouseout"?"mouseleave":"mouseenter";F.target=H;j(F,s)}}}}if(!n&&(r==="focusin"||r==="focusout")){C=true;B=r==="focusin"?"focus":"blur";z=function(F){F=a(F||v.event);F.type=F.type==="focus"?"focusin":"focusout";j(F,s)}}t=p[s][r];if(!t){p[s][r]=t=[{func:D,scope:E}];t.fakeName=B;t.capture=C;t.nativeHandler=z;if(!g){t.proxyHandler=k(s)}if(r==="ready"){d(x,z,q)}else{c(x,B||r,g?z:t.proxyHandler,C)}}else{t.push({func:D,scope:E})}}x=t=0;return D};q.unbind=function(x,z,A){var s,u,v,B,r,t;if(!x||x.nodeType===3||x.nodeType===8){return q}s=x[h];if(s){t=p[s];if(z){z=z.split(" ");v=z.length;while(v--){r=z[v];u=t[r];if(u){if(A){B=u.length;while(B--){if(u[B].func===A){u.splice(B,1)}}}if(!A||u.length===0){delete t[r];e(x,u.fakeName||r,g?u.nativeHandler:u.proxyHandler,u.capture)}}}}else{for(r in t){u=t[r];e(x,u.fakeName||r,g?u.nativeHandler:u.proxyHandler,u.capture)}t={}}for(r in t){return q}delete p[s];try{delete x[h]}catch(y){x[h]=null}}return q};q.fire=function(u,s,r){var v,t;if(!u||u.nodeType===3||u.nodeType===8){return q}t=a(null,r);t.type=s;do{v=u[h];if(v){j(t,v)}u=u.parentNode||u.ownerDocument||u.defaultView||u.parentWindow}while(u&&!t.isPropagationStopped());return q};q.clean=function(u){var s,r,t=q.unbind;if(!u||u.nodeType===3||u.nodeType===8){return q}if(u[h]){t(u)}if(!u.getElementsByTagName){u=u.document}if(u&&u.getElementsByTagName){t(u);r=u.getElementsByTagName("*");s=r.length;while(s--){u=r[s];if(u[h]){t(u)}}}return q};q.callNativeHandler=function(s,r){if(p){p[s][r.type].nativeHandler(r)}};q.destory=function(){p={}};q.add=function(v,s,u,t){if(typeof(v)==="string"){v=document.getElementById(v)}if(v&&v instanceof Array){var r=v;while(r--){q.add(v[r],s,u,t)}return}if(s==="init"){s="ready"}return q.bind(v,s instanceof Array?s.join(" "):s,u,t)};q.remove=function(u,s,t){if(typeof(u)==="string"){u=document.getElementById(u)}if(u instanceof Array){var r=u;while(r--){q.remove(u[r],s,t,scope)}return q}return q.unbind(u,s instanceof Array?s.join(" "):s,t)};q.clear=function(r){if(typeof(r)==="string"){r=document.getElementById(r)}return q.clean(r)};q.cancel=function(r){if(r){q.prevent(r);q.stop(r)}return false};q.prevent=function(r){r.preventDefault();return false};q.stop=function(r){r.stopPropagation();return false}}b.EventUtils=f;b.Event=new f(function(i){return function(j){tinymce.dom.Event.callNativeHandler(i,j)}});b.Event.bind(window,"ready",function(){});b=0})(tinymce.dom,"data-mce-expando");(function(e){var g=e.each,d=e.is,f=e.isWebKit,b=e.isIE,h=e.html.Entities,c=/^([a-z0-9],?)+$/i,a=/^[ \t\r\n]*$/;e.create("tinymce.dom.DOMUtils",{doc:null,root:null,files:null,pixelStyles:/^(top|left|bottom|right|width|height|borderWidth)$/,props:{"for":"htmlFor","class":"className",className:"className",checked:"checked",disabled:"disabled",maxlength:"maxLength",readonly:"readOnly",selected:"selected",value:"value",id:"id",name:"name",type:"type"},DOMUtils:function(o,l){var k=this,i,j,n;k.doc=o;k.win=window;k.files={};k.cssFlicker=false;k.counter=0;k.stdMode=!e.isIE||o.documentMode>=8;k.boxModel=!e.isIE||o.compatMode=="CSS1Compat"||k.stdMode;k.hasOuterHTML="outerHTML" in o.createElement("a");k.settings=l=e.extend({keep_values:false,hex_colors:1},l);k.schema=l.schema;k.styles=new e.html.Styles({url_converter:l.url_converter,url_converter_scope:l.url_converter_scope},l.schema);if(e.isIE6){try{o.execCommand("BackgroundImageCache",false,true)}catch(m){k.cssFlicker=true}}k.fixDoc(o);k.events=l.ownEvents?new e.dom.EventUtils(l.proxy):e.dom.Event;e.addUnload(k.destroy,k);n=l.schema?l.schema.getBlockElements():{};k.isBlock=function(q){var p=q.nodeType;if(p){return !!(p===1&&n[q.nodeName])}return !!n[q]}},fixDoc:function(k){var j=this.settings,i;if(b&&j.schema){("abbr article aside audio canvas details figcaption figure footer header hgroup mark menu meter nav output progress section summary time video").replace(/\w+/g,function(l){k.createElement(l)});for(i in j.schema.getCustomElements()){k.createElement(i)}}},clone:function(k,i){var j=this,m,l;if(!b||k.nodeType!==1||i){return k.cloneNode(i)}l=j.doc;if(!i){m=l.createElement(k.nodeName);g(j.getAttribs(k),function(n){j.setAttrib(m,n.nodeName,j.getAttrib(k,n.nodeName))});return m}return m.firstChild},getRoot:function(){var i=this,j=i.settings;return(j&&i.get(j.root_element))||i.doc.body},getViewPort:function(j){var k,i;j=!j?this.win:j;k=j.document;i=this.boxModel?k.documentElement:k.body;return{x:j.pageXOffset||i.scrollLeft,y:j.pageYOffset||i.scrollTop,w:j.innerWidth||i.clientWidth,h:j.innerHeight||i.clientHeight}},getRect:function(l){var k,i=this,j;l=i.get(l);k=i.getPos(l);j=i.getSize(l);return{x:k.x,y:k.y,w:j.w,h:j.h}},getSize:function(l){var j=this,i,k;l=j.get(l);i=j.getStyle(l,"width");k=j.getStyle(l,"height");if(i.indexOf("px")===-1){i=0}if(k.indexOf("px")===-1){k=0}return{w:parseInt(i)||l.offsetWidth||l.clientWidth,h:parseInt(k)||l.offsetHeight||l.clientHeight}},getParent:function(k,j,i){return this.getParents(k,j,i,false)},getParents:function(s,m,k,q){var j=this,i,l=j.settings,p=[];s=j.get(s);q=q===undefined;if(l.strict_root){k=k||j.getRoot()}if(d(m,"string")){i=m;if(m==="*"){m=function(o){return o.nodeType==1}}else{m=function(o){return j.is(o,i)}}}while(s){if(s==k||!s.nodeType||s.nodeType===9){break}if(!m||m(s)){if(q){p.push(s)}else{return s}}s=s.parentNode}return q?p:null},get:function(i){var j;if(i&&this.doc&&typeof(i)=="string"){j=i;i=this.doc.getElementById(i);if(i&&i.id!==j){return this.doc.getElementsByName(j)[1]}}return i},getNext:function(j,i){return this._findSib(j,i,"nextSibling")},getPrev:function(j,i){return this._findSib(j,i,"previousSibling")},select:function(k,j){var i=this;return e.dom.Sizzle(k,i.get(j)||i.get(i.settings.root_element)||i.doc,[])},is:function(l,j){var k;if(l.length===undefined){if(j==="*"){return l.nodeType==1}if(c.test(j)){j=j.toLowerCase().split(/,/);l=l.nodeName.toLowerCase();for(k=j.length-1;k>=0;k--){if(j[k]==l){return true}}return false}}return e.dom.Sizzle.matches(j,l.nodeType?[l]:l).length>0},add:function(l,o,i,k,m){var j=this;return this.run(l,function(r){var q,n;q=d(o,"string")?j.doc.createElement(o):o;j.setAttribs(q,i);if(k){if(k.nodeType){q.appendChild(k)}else{j.setHTML(q,k)}}return !m?r.appendChild(q):q})},create:function(k,i,j){return this.add(this.doc.createElement(k),k,i,j,1)},createHTML:function(q,i,m){var p="",l=this,j;p+="<"+q;for(j in i){if(i.hasOwnProperty(j)){p+=" "+j+'="'+l.encode(i[j])+'"'}}if(typeof(m)!="undefined"){return p+">"+m+"</"+q+">"}return p+" />"},remove:function(i,j){return this.run(i,function(l){var m,k=l.parentNode;if(!k){return null}if(j){while(m=l.firstChild){if(!e.isIE||m.nodeType!==3||m.nodeValue){k.insertBefore(m,l)}else{l.removeChild(m)}}}return k.removeChild(l)})},setStyle:function(l,i,j){var k=this;return k.run(l,function(o){var n,m;n=o.style;i=i.replace(/-(\D)/g,function(q,p){return p.toUpperCase()});if(k.pixelStyles.test(i)&&(e.is(j,"number")||/^[\-0-9\.]+$/.test(j))){j+="px"}switch(i){case"opacity":if(b){n.filter=j===""?"":"alpha(opacity="+(j*100)+")";if(!l.currentStyle||!l.currentStyle.hasLayout){n.display="inline-block"}}n[i]=n["-moz-opacity"]=n["-khtml-opacity"]=j||"";break;case"float":b?n.styleFloat=j:n.cssFloat=j;break;default:n[i]=j||""}if(k.settings.update_styles){k.setAttrib(o,"data-mce-style")}})},getStyle:function(l,i,k){l=this.get(l);if(!l){return}if(this.doc.defaultView&&k){i=i.replace(/[A-Z]/g,function(m){return"-"+m});try{return this.doc.defaultView.getComputedStyle(l,null).getPropertyValue(i)}catch(j){return null}}i=i.replace(/-(\D)/g,function(n,m){return m.toUpperCase()});if(i=="float"){i=b?"styleFloat":"cssFloat"}if(l.currentStyle&&k){return l.currentStyle[i]}return l.style?l.style[i]:undefined},setStyles:function(l,m){var j=this,k=j.settings,i;i=k.update_styles;k.update_styles=0;g(m,function(o,p){j.setStyle(l,p,o)});k.update_styles=i;if(k.update_styles){j.setAttrib(l,k.cssText)}},removeAllAttribs:function(i){return this.run(i,function(l){var k,j=l.attributes;for(k=j.length-1;k>=0;k--){l.removeAttributeNode(j.item(k))}})},setAttrib:function(k,l,i){var j=this;if(!k||!l){return}if(j.settings.strict){l=l.toLowerCase()}return this.run(k,function(p){var o=j.settings;var m=p.getAttribute(l);if(i!==null){switch(l){case"style":if(!d(i,"string")){g(i,function(q,r){j.setStyle(p,r,q)});return}if(o.keep_values){if(i&&!j._isRes(i)){p.setAttribute("data-mce-style",i,2)}else{p.removeAttribute("data-mce-style",2)}}p.style.cssText=i;break;case"class":p.className=i||"";break;case"src":case"href":if(o.keep_values){if(o.url_converter){i=o.url_converter.call(o.url_converter_scope||j,i,l,p)}j.setAttrib(p,"data-mce-"+l,i,2)}break;case"shape":p.setAttribute("data-mce-style",i);break}}if(d(i)&&i!==null&&i.length!==0){p.setAttribute(l,""+i,2)}else{p.removeAttribute(l,2)}if(tinyMCE.activeEditor&&m!=i){var n=tinyMCE.activeEditor;n.onSetAttrib.dispatch(n,p,l,i)}})},setAttribs:function(j,k){var i=this;return this.run(j,function(l){g(k,function(m,o){i.setAttrib(l,o,m)})})},getAttrib:function(m,o,k){var i,j=this,l;m=j.get(m);if(!m||m.nodeType!==1){return k===l?false:k}if(!d(k)){k=""}if(/^(src|href|style|coords|shape)$/.test(o)){i=m.getAttribute("data-mce-"+o);if(i){return i}}if(b&&j.props[o]){i=m[j.props[o]];i=i&&i.nodeValue?i.nodeValue:i}if(!i){i=m.getAttribute(o,2)}if(/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(o)){if(m[j.props[o]]===true&&i===""){return o}return i?o:""}if(m.nodeName==="FORM"&&m.getAttributeNode(o)){return m.getAttributeNode(o).nodeValue}if(o==="style"){i=i||m.style.cssText;if(i){i=j.serializeStyle(j.parseStyle(i),m.nodeName);if(j.settings.keep_values&&!j._isRes(i)){m.setAttribute("data-mce-style",i)}}}if(f&&o==="class"&&i){i=i.replace(/(apple|webkit)\-[a-z\-]+/gi,"")}if(b){switch(o){case"rowspan":case"colspan":if(i===1){i=""}break;case"size":if(i==="+0"||i===20||i===0){i=""}break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":if(i===0){i=""}break;case"hspace":if(i===-1){i=""}break;case"maxlength":case"tabindex":if(i===32768||i===2147483647||i==="32768"){i=""}break;case"multiple":case"compact":case"noshade":case"nowrap":if(i===65535){return o}return k;case"shape":i=i.toLowerCase();break;default:if(o.indexOf("on")===0&&i){i=e._replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/,"$1",""+i)}}}return(i!==l&&i!==null&&i!=="")?""+i:k},getPos:function(q,l){var j=this,i=0,p=0,m,o=j.doc,k;q=j.get(q);l=l||o.body;if(q){if(q.getBoundingClientRect){q=q.getBoundingClientRect();m=j.boxModel?o.documentElement:o.body;i=q.left+(o.documentElement.scrollLeft||o.body.scrollLeft)-m.clientTop;p=q.top+(o.documentElement.scrollTop||o.body.scrollTop)-m.clientLeft;return{x:i,y:p}}k=q;while(k&&k!=l&&k.nodeType){i+=k.offsetLeft||0;p+=k.offsetTop||0;k=k.offsetParent}k=q.parentNode;while(k&&k!=l&&k.nodeType){i-=k.scrollLeft||0;p-=k.scrollTop||0;k=k.parentNode}}return{x:i,y:p}},parseStyle:function(i){return this.styles.parse(i)},serializeStyle:function(j,i){return this.styles.serialize(j,i)},loadCSS:function(i){var k=this,l=k.doc,j;if(!i){i=""}j=k.select("head")[0];g(i.split(","),function(m){var n;if(k.files[m]){return}k.files[m]=true;n=k.create("link",{rel:"stylesheet",href:e._addVer(m)});if(b&&l.documentMode&&l.recalc){n.onload=function(){if(l.recalc){l.recalc()}n.onload=null}}j.appendChild(n)})},addClass:function(i,j){return this.run(i,function(k){var l;if(!j){return 0}if(this.hasClass(k,j)){return k.className}l=this.removeClass(k,j);return k.className=(l!=""?(l+" "):"")+j})},removeClass:function(k,l){var i=this,j;return i.run(k,function(n){var m;if(i.hasClass(n,l)){if(!j){j=new RegExp("(^|\\s+)"+l+"(\\s+|$)","g")}m=n.className.replace(j," ");m=e.trim(m!=" "?m:"");n.className=m;if(!m){n.removeAttribute("class");n.removeAttribute("className")}return m}return n.className})},hasClass:function(j,i){j=this.get(j);if(!j||!i){return false}return(" "+j.className+" ").indexOf(" "+i+" ")!==-1},show:function(i){return this.setStyle(i,"display","block")},hide:function(i){return this.setStyle(i,"display","none")},isHidden:function(i){i=this.get(i);return !i||i.style.display=="none"||this.getStyle(i,"display")=="none"},uniqueId:function(i){return(!i?"mce_":i)+(this.counter++)},setHTML:function(k,j){var i=this;return i.run(k,function(m){if(b){while(m.firstChild){m.removeChild(m.firstChild)}try{m.innerHTML="<br />"+j;m.removeChild(m.firstChild)}catch(l){m=i.create("div");m.innerHTML="<br />"+j;g(m.childNodes,function(o,n){if(n){m.appendChild(o)}})}}else{m.innerHTML=j}return j})},getOuterHTML:function(k){var j,i=this;k=i.get(k);if(!k){return null}if(k.nodeType===1&&i.hasOuterHTML){return k.outerHTML}j=(k.ownerDocument||i.doc).createElement("body");j.appendChild(k.cloneNode(true));return j.innerHTML},setOuterHTML:function(l,j,m){var i=this;function k(p,o,r){var s,q;q=r.createElement("body");q.innerHTML=o;s=q.lastChild;while(s){i.insertAfter(s.cloneNode(true),p);s=s.previousSibling}i.remove(p)}return this.run(l,function(o){o=i.get(o);if(o.nodeType==1){m=m||o.ownerDocument||i.doc;if(b){try{if(b&&o.nodeType==1){o.outerHTML=j}else{k(o,j,m)}}catch(n){k(o,j,m)}}else{k(o,j,m)}}})},decode:h.decode,encode:h.encodeAllRaw,insertAfter:function(i,j){j=this.get(j);return this.run(i,function(l){var k,m;k=j.parentNode;m=j.nextSibling;if(m){k.insertBefore(l,m)}else{k.appendChild(l)}return l})},replace:function(m,l,i){var j=this;if(d(l,"array")){m=m.cloneNode(true)}return j.run(l,function(k){if(i){g(e.grep(k.childNodes),function(n){m.appendChild(n)})}return k.parentNode.replaceChild(m,k)})},rename:function(l,i){var k=this,j;if(l.nodeName!=i.toUpperCase()){j=k.create(i);g(k.getAttribs(l),function(m){k.setAttrib(j,m.nodeName,k.getAttrib(l,m.nodeName))});k.replace(j,l,1)}return j||l},findCommonAncestor:function(k,i){var l=k,j;while(l){j=i;while(j&&l!=j){j=j.parentNode}if(l==j){break}l=l.parentNode}if(!l&&k.ownerDocument){return k.ownerDocument.documentElement}return l},toHex:function(i){var k=/^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(i);function j(l){l=parseInt(l).toString(16);return l.length>1?l:"0"+l}if(k){i="#"+j(k[1])+j(k[2])+j(k[3]);return i}return i},getClasses:function(){var n=this,j=[],m,o={},p=n.settings.class_filter,l;if(n.classes){return n.classes}function q(i){g(i.imports,function(s){q(s)});g(i.cssRules||i.rules,function(s){switch(s.type||1){case 1:if(s.selectorText){g(s.selectorText.split(","),function(r){r=r.replace(/^\s*|\s*$|^\s\./g,"");if(/\.mce/.test(r)||!/\.[\w\-]+$/.test(r)){return}l=r;r=e._replace(/.*\.([a-z0-9_\-]+).*/i,"$1",r);if(p&&!(r=p(r,l))){return}if(!o[r]){j.push({"class":r});o[r]=1}})}break;case 3:q(s.styleSheet);break}})}try{g(n.doc.styleSheets,q)}catch(k){}if(j.length>0){n.classes=j}return j},run:function(l,k,j){var i=this,m;if(i.doc&&typeof(l)==="string"){l=i.get(l)}if(!l){return false}j=j||this;if(!l.nodeType&&(l.length||l.length===0)){m=[];g(l,function(o,n){if(o){if(typeof(o)=="string"){o=i.doc.getElementById(o)}m.push(k.call(j,o,n))}});return m}return k.call(j,l)},getAttribs:function(j){var i;j=this.get(j);if(!j){return[]}if(b){i=[];if(j.nodeName=="OBJECT"){return j.attributes}if(j.nodeName==="OPTION"&&this.getAttrib(j,"selected")){i.push({specified:1,nodeName:"selected"})}j.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi,"").replace(/[\w:\-]+/gi,function(k){i.push({specified:1,nodeName:k})});return i}return j.attributes},isEmpty:function(m,k){var r=this,o,n,q,j,l,p=0;m=m.firstChild;if(m){j=new e.dom.TreeWalker(m,m.parentNode);k=k||r.schema?r.schema.getNonEmptyElements():null;do{q=m.nodeType;if(q===1){if(m.getAttribute("data-mce-bogus")){continue}l=m.nodeName.toLowerCase();if(k&&k[l]){if(l==="br"){p++;continue}return false}n=r.getAttribs(m);o=m.attributes.length;while(o--){l=m.attributes[o].nodeName;if(l==="name"||l==="data-mce-bookmark"){return false}}}if(q==8){return false}if((q===3&&!a.test(m.nodeValue))){return false}}while(m=j.next())}return p<=1},destroy:function(j){var i=this;i.win=i.doc=i.root=i.events=i.frag=null;if(!j){e.removeUnload(i.destroy)}},createRng:function(){var i=this.doc;return i.createRange?i.createRange():new e.dom.Range(this)},nodeIndex:function(m,n){var i=0,k,l,j;if(m){for(k=m.nodeType,m=m.previousSibling,l=m;m;m=m.previousSibling){j=m.nodeType;if(n&&j==3){if(j==k||!m.nodeValue.length){continue}}i++;k=j}}return i},split:function(m,l,p){var q=this,i=q.createRng(),n,k,o;function j(v){var t,s=v.childNodes,u=v.nodeType;function x(A){var z=A.previousSibling&&A.previousSibling.nodeName=="SPAN";var y=A.nextSibling&&A.nextSibling.nodeName=="SPAN";return z&&y}if(u==1&&v.getAttribute("data-mce-type")=="bookmark"){return}for(t=s.length-1;t>=0;t--){j(s[t])}if(u!=9){if(u==3&&v.nodeValue.length>0){var r=e.trim(v.nodeValue).length;if(!q.isBlock(v.parentNode)||r>0||r==0&&x(v)){return}}else{if(u==1){s=v.childNodes;if(s.length==1&&s[0]&&s[0].nodeType==1&&s[0].getAttribute("data-mce-type")=="bookmark"){v.parentNode.insertBefore(s[0],v)}if(s.length||/^(br|hr|input|img)$/i.test(v.nodeName)){return}}}q.remove(v)}return v}if(m&&l){i.setStart(m.parentNode,q.nodeIndex(m));i.setEnd(l.parentNode,q.nodeIndex(l));n=i.extractContents();i=q.createRng();i.setStart(l.parentNode,q.nodeIndex(l)+1);i.setEnd(m.parentNode,q.nodeIndex(m)+1);k=i.extractContents();o=m.parentNode;o.insertBefore(j(n),m);if(p){o.replaceChild(p,l)}else{o.insertBefore(l,m)}o.insertBefore(j(k),m);q.remove(m);return p||l}},bind:function(l,i,k,j){return this.events.add(l,i,k,j||this)},unbind:function(k,i,j){return this.events.remove(k,i,j)},fire:function(k,j,i){return this.events.fire(k,j,i)},_findSib:function(l,i,j){var k=this,m=i;if(l){if(d(m,"string")){m=function(n){return k.is(n,i)}}for(l=l[j];l;l=l[j]){if(m(l)){return l}}}return null},_isRes:function(i){return/^(top|left|bottom|right|width|height)/i.test(i)||/;\s*(top|left|bottom|right|width|height)/i.test(i)}});e.DOM=new e.dom.DOMUtils(document,{process_html:0})})(tinymce);(function(a){function b(c){var O=this,e=c.doc,T=0,F=1,j=2,E=true,S=false,V="startOffset",h="startContainer",Q="endContainer",A="endOffset",k=tinymce.extend,n=c.nodeIndex;k(O,{startContainer:e,startOffset:0,endContainer:e,endOffset:0,collapsed:E,commonAncestorContainer:e,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:q,setEnd:s,setStartBefore:g,setStartAfter:J,setEndBefore:K,setEndAfter:u,collapse:B,selectNode:y,selectNodeContents:G,compareBoundaryPoints:v,deleteContents:p,extractContents:I,cloneContents:d,insertNode:D,surroundContents:N,cloneRange:L});function x(){return e.createDocumentFragment()}function q(W,t){C(E,W,t)}function s(W,t){C(S,W,t)}function g(t){q(t.parentNode,n(t))}function J(t){q(t.parentNode,n(t)+1)}function K(t){s(t.parentNode,n(t))}function u(t){s(t.parentNode,n(t)+1)}function B(t){if(t){O[Q]=O[h];O[A]=O[V]}else{O[h]=O[Q];O[V]=O[A]}O.collapsed=E}function y(t){g(t);u(t)}function G(t){q(t,0);s(t,t.nodeType===1?t.childNodes.length:t.nodeValue.length)}function v(Z,t){var ac=O[h],X=O[V],ab=O[Q],W=O[A],aa=t.startContainer,ae=t.startOffset,Y=t.endContainer,ad=t.endOffset;if(Z===0){return H(ac,X,aa,ae)}if(Z===1){return H(ab,W,aa,ae)}if(Z===2){return H(ab,W,Y,ad)}if(Z===3){return H(ac,X,Y,ad)}}function p(){l(j)}function I(){return l(T)}function d(){return l(F)}function D(Z){var W=this[h],t=this[V],Y,X;if((W.nodeType===3||W.nodeType===4)&&W.nodeValue){if(!t){W.parentNode.insertBefore(Z,W)}else{if(t>=W.nodeValue.length){c.insertAfter(Z,W)}else{Y=W.splitText(t);W.parentNode.insertBefore(Z,Y)}}}else{if(W.childNodes.length>0){X=W.childNodes[t]}if(X){W.insertBefore(Z,X)}else{W.appendChild(Z)}}}function N(W){var t=O.extractContents();O.insertNode(W);W.appendChild(t);O.selectNode(W)}function L(){return k(new b(c),{startContainer:O[h],startOffset:O[V],endContainer:O[Q],endOffset:O[A],collapsed:O.collapsed,commonAncestorContainer:O.commonAncestorContainer})}function P(t,W){var X;if(t.nodeType==3){return t}if(W<0){return t}X=t.firstChild;while(X&&W>0){--W;X=X.nextSibling}if(X){return X}return t}function m(){return(O[h]==O[Q]&&O[V]==O[A])}function H(Y,aa,W,Z){var ab,X,t,ac,ae,ad;if(Y==W){if(aa==Z){return 0}if(aa<Z){return -1}return 1}ab=W;while(ab&&ab.parentNode!=Y){ab=ab.parentNode}if(ab){X=0;t=Y.firstChild;while(t!=ab&&X<aa){X++;t=t.nextSibling}if(aa<=X){return -1}return 1}ab=Y;while(ab&&ab.parentNode!=W){ab=ab.parentNode}if(ab){X=0;t=W.firstChild;while(t!=ab&&X<Z){X++;t=t.nextSibling}if(X<Z){return -1}return 1}ac=c.findCommonAncestor(Y,W);ae=Y;while(ae&&ae.parentNode!=ac){ae=ae.parentNode}if(!ae){ae=ac}ad=W;while(ad&&ad.parentNode!=ac){ad=ad.parentNode}if(!ad){ad=ac}if(ae==ad){return 0}t=ac.firstChild;while(t){if(t==ae){return -1}if(t==ad){return 1}t=t.nextSibling}}function C(W,Z,Y){var t,X;if(W){O[h]=Z;O[V]=Y}else{O[Q]=Z;O[A]=Y}t=O[Q];while(t.parentNode){t=t.parentNode}X=O[h];while(X.parentNode){X=X.parentNode}if(X==t){if(H(O[h],O[V],O[Q],O[A])>0){O.collapse(W)}}else{O.collapse(W)}O.collapsed=m();O.commonAncestorContainer=c.findCommonAncestor(O[h],O[Q])}function l(ac){var ab,Y=0,ae=0,W,aa,X,Z,t,ad;if(O[h]==O[Q]){return f(ac)}for(ab=O[Q],W=ab.parentNode;W;ab=W,W=W.parentNode){if(W==O[h]){return r(ab,ac)}++Y}for(ab=O[h],W=ab.parentNode;W;ab=W,W=W.parentNode){if(W==O[Q]){return U(ab,ac)}++ae}aa=ae-Y;X=O[h];while(aa>0){X=X.parentNode;aa--}Z=O[Q];while(aa<0){Z=Z.parentNode;aa++}for(t=X.parentNode,ad=Z.parentNode;t!=ad;t=t.parentNode,ad=ad.parentNode){X=t;Z=ad}return o(X,Z,ac)}function f(ab){var ad,ae,t,X,Y,ac,Z,W,aa;if(ab!=j){ad=x()}if(O[V]==O[A]){return ad}if(O[h].nodeType==3){ae=O[h].nodeValue;t=ae.substring(O[V],O[A]);if(ab!=F){X=O[h];W=O[V];aa=O[A]-O[V];if(W===0&&aa>=X.nodeValue.length-1){X.parentNode.removeChild(X)}else{X.deleteData(W,aa)}O.collapse(E)}if(ab==j){return}if(t.length>0){ad.appendChild(e.createTextNode(t))}return ad}X=P(O[h],O[V]);Y=O[A]-O[V];while(X&&Y>0){ac=X.nextSibling;Z=z(X,ab);if(ad){ad.appendChild(Z)}--Y;X=ac}if(ab!=F){O.collapse(E)}return ad}function r(ac,Z){var ab,aa,W,t,Y,X;if(Z!=j){ab=x()}aa=i(ac,Z);if(ab){ab.appendChild(aa)}W=n(ac);t=W-O[V];if(t<=0){if(Z!=F){O.setEndBefore(ac);O.collapse(S)}return ab}aa=ac.previousSibling;while(t>0){Y=aa.previousSibling;X=z(aa,Z);if(ab){ab.insertBefore(X,ab.firstChild)}--t;aa=Y}if(Z!=F){O.setEndBefore(ac);O.collapse(S)}return ab}function U(aa,Z){var ac,W,ab,t,Y,X;if(Z!=j){ac=x()}ab=R(aa,Z);if(ac){ac.appendChild(ab)}W=n(aa);++W;t=O[A]-W;ab=aa.nextSibling;while(ab&&t>0){Y=ab.nextSibling;X=z(ab,Z);if(ac){ac.appendChild(X)}--t;ab=Y}if(Z!=F){O.setStartAfter(aa);O.collapse(E)}return ac}function o(aa,t,ad){var X,af,Z,ab,ac,W,ae,Y;if(ad!=j){af=x()}X=R(aa,ad);if(af){af.appendChild(X)}Z=aa.parentNode;ab=n(aa);ac=n(t);++ab;W=ac-ab;ae=aa.nextSibling;while(W>0){Y=ae.nextSibling;X=z(ae,ad);if(af){af.appendChild(X)}ae=Y;--W}X=i(t,ad);if(af){af.appendChild(X)}if(ad!=F){O.setStartAfter(aa);O.collapse(E)}return af}function i(ab,ac){var X=P(O[Q],O[A]-1),ad,aa,Z,t,W,Y=X!=O[Q];if(X==ab){return M(X,Y,S,ac)}ad=X.parentNode;aa=M(ad,S,S,ac);while(ad){while(X){Z=X.previousSibling;t=M(X,Y,S,ac);if(ac!=j){aa.insertBefore(t,aa.firstChild)}Y=E;X=Z}if(ad==ab){return aa}X=ad.previousSibling;ad=ad.parentNode;W=M(ad,S,S,ac);if(ac!=j){W.appendChild(aa)}aa=W}}function R(ab,ac){var Y=P(O[h],O[V]),Z=Y!=O[h],ad,aa,X,t,W;if(Y==ab){return M(Y,Z,E,ac)}ad=Y.parentNode;aa=M(ad,S,E,ac);while(ad){while(Y){X=Y.nextSibling;t=M(Y,Z,E,ac);if(ac!=j){aa.appendChild(t)}Z=E;Y=X}if(ad==ab){return aa}Y=ad.nextSibling;ad=ad.parentNode;W=M(ad,S,E,ac);if(ac!=j){W.appendChild(aa)}aa=W}}function M(t,Z,ac,ad){var Y,X,aa,W,ab;if(Z){return z(t,ad)}if(t.nodeType==3){Y=t.nodeValue;if(ac){W=O[V];X=Y.substring(W);aa=Y.substring(0,W)}else{W=O[A];X=Y.substring(0,W);aa=Y.substring(W)}if(ad!=F){t.nodeValue=aa}if(ad==j){return}ab=c.clone(t,S);ab.nodeValue=X;return ab}if(ad==j){return}return c.clone(t,S)}function z(W,t){if(t!=j){return t==F?c.clone(W,E):W}W.parentNode.removeChild(W)}}a.Range=b})(tinymce.dom);(function(){function a(d){var b=this,h=d.dom,c=true,f=false;function e(i,j){var k,t=0,q,n,m,l,o,r,p=-1,s;k=i.duplicate();k.collapse(j);s=k.parentElement();if(s.ownerDocument!==d.dom.doc){return}while(s.contentEditable==="false"){s=s.parentNode}if(!s.hasChildNodes()){return{node:s,inside:1}}m=s.children;q=m.length-1;while(t<=q){r=Math.floor((t+q)/2);l=m[r];k.moveToElementText(l);p=k.compareEndPoints(j?"StartToStart":"EndToEnd",i);if(p>0){q=r-1}else{if(p<0){t=r+1}else{return{node:l}}}}if(p<0){if(!l){k.moveToElementText(s);k.collapse(true);l=s;n=true}else{k.collapse(false)}o=0;while(k.compareEndPoints(j?"StartToStart":"StartToEnd",i)!==0){if(k.move("character",1)==0||s!=k.parentElement()){break}o++}}else{k.collapse(true);o=0;while(k.compareEndPoints(j?"StartToStart":"StartToEnd",i)!==0){if(k.move("character",-1)==0||s!=k.parentElement()){break}o++}}return{node:l,position:p,offset:o,inside:n}}function g(){var i=d.getRng(),r=h.createRng(),l,k,p,q,m,j;l=i.item?i.item(0):i.parentElement();if(l.ownerDocument!=h.doc){return r}k=d.isCollapsed();if(i.item){r.setStart(l.parentNode,h.nodeIndex(l));r.setEnd(r.startContainer,r.startOffset+1);return r}function o(A){var u=e(i,A),s,y,z=0,x,v,t;s=u.node;y=u.offset;if(u.inside&&!s.hasChildNodes()){r[A?"setStart":"setEnd"](s,0);return}if(y===v){r[A?"setStartBefore":"setEndAfter"](s);return}if(u.position<0){x=u.inside?s.firstChild:s.nextSibling;if(!x){r[A?"setStartAfter":"setEndAfter"](s);return}if(!y){if(x.nodeType==3){r[A?"setStart":"setEnd"](x,0)}else{r[A?"setStartBefore":"setEndBefore"](x)}return}while(x){t=x.nodeValue;z+=t.length;if(z>=y){s=x;z-=y;z=t.length-z;break}x=x.nextSibling}}else{x=s.previousSibling;if(!x){return r[A?"setStartBefore":"setEndBefore"](s)}if(!y){if(s.nodeType==3){r[A?"setStart":"setEnd"](x,s.nodeValue.length)}else{r[A?"setStartAfter":"setEndAfter"](x)}return}while(x){z+=x.nodeValue.length;if(z>=y){s=x;z-=y;break}x=x.previousSibling}}r[A?"setStart":"setEnd"](s,z)}try{o(true);if(!k){o()}}catch(n){if(n.number==-2147024809){m=b.getBookmark(2);p=i.duplicate();p.collapse(true);l=p.parentElement();if(!k){p=i.duplicate();p.collapse(false);q=p.parentElement();q.innerHTML=q.innerHTML}l.innerHTML=l.innerHTML;b.moveToBookmark(m);i=d.getRng();o(true);if(!k){o()}}else{throw n}}return r}this.getBookmark=function(m){var j=d.getRng(),o,i,l={};function n(u){var u,t,p,s,r,q=[];t=u.parentNode;p=h.getRoot().parentNode;while(t!=p&&t.nodeType!==9){s=t.children;r=s.length;while(r--){if(u===s[r]){q.push(r);break}}u=t;t=t.parentNode}return q}function k(q){var p;p=e(j,q);if(p){return{position:p.position,offset:p.offset,indexes:n(p.node),inside:p.inside}}}if(m===2){if(!j.item){l.start=k(true);if(!d.isCollapsed()){l.end=k()}}else{l.start={ctrl:true,indexes:n(j.item(0))}}}return l};this.moveToBookmark=function(k){var j,i=h.doc.body;function m(o){var r,q,n,p;r=h.getRoot();for(q=o.length-1;q>=0;q--){p=r.children;n=o[q];if(n<=p.length-1){r=p[n]}}return r}function l(r){var n=k[r?"start":"end"],q,p,o;if(n){q=n.position>0;p=i.createTextRange();p.moveToElementText(m(n.indexes));offset=n.offset;if(offset!==o){p.collapse(n.inside||q);p.moveStart("character",q?-offset:offset)}else{p.collapse(r)}j.setEndPoint(r?"StartToStart":"EndToStart",p);if(r){j.collapse(true)}}}if(k.start){if(k.start.ctrl){j=i.createControlRange();j.addElement(m(k.start.indexes));j.select()}else{j=i.createTextRange();l(true);l();j.select()}}};this.addRange=function(i){var n,l,k,p,s,q,r=d.dom.doc,m=r.body;function j(z){var u,y,t,x,v;t=h.create("a");u=z?k:s;y=z?p:q;x=n.duplicate();if(u==r||u==r.documentElement){u=m;y=0}if(u.nodeType==3){u.parentNode.insertBefore(t,u);x.moveToElementText(t);x.moveStart("character",y);h.remove(t);n.setEndPoint(z?"StartToStart":"EndToEnd",x)}else{v=u.childNodes;if(v.length){if(y>=v.length){h.insertAfter(t,v[v.length-1])}else{u.insertBefore(t,v[y])}x.moveToElementText(t)}else{if(u.canHaveHTML){u.innerHTML="<span>\uFEFF</span>";t=u.firstChild;x.moveToElementText(t);x.collapse(f)}}n.setEndPoint(z?"StartToStart":"EndToEnd",x);h.remove(t)}}k=i.startContainer;p=i.startOffset;s=i.endContainer;q=i.endOffset;n=m.createTextRange();if(k==s&&k.nodeType==1){if(!k.hasChildNodes()){k.innerHTML="<span>\uFEFF</span><span>\uFEFF</span>";n.moveToElementText(k.lastChild);n.select();h.doc.selection.clear();k.innerHTML="";return}if(p==q-1){try{l=m.createControlRange();l.addElement(k.childNodes[p]);l.select();return}catch(o){}}}j(true);j();n.select()};this.getRangeAt=g}tinymce.dom.TridentSelection=a})();(function(){var p=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,j=0,d=Object.prototype.toString,o=false,i=true;[0,0].sort(function(){i=false;return 0});var b=function(v,e,z,A){z=z||[];e=e||document;var C=e;if(e.nodeType!==1&&e.nodeType!==9){return[]}if(!v||typeof v!=="string"){return z}var x=[],s,E,H,r,u=true,t=b.isXML(e),B=v,D,G,F,y;do{p.exec("");s=p.exec(B);if(s){B=s[3];x.push(s[1]);if(s[2]){r=s[3];break}}}while(s);if(x.length>1&&k.exec(v)){if(x.length===2&&f.relative[x[0]]){E=h(x[0]+x[1],e)}else{E=f.relative[x[0]]?[e]:b(x.shift(),e);while(x.length){v=x.shift();if(f.relative[v]){v+=x.shift()}E=h(v,E)}}}else{if(!A&&x.length>1&&e.nodeType===9&&!t&&f.match.ID.test(x[0])&&!f.match.ID.test(x[x.length-1])){D=b.find(x.shift(),e,t);e=D.expr?b.filter(D.expr,D.set)[0]:D.set[0]}if(e){D=A?{expr:x.pop(),set:a(A)}:b.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&e.parentNode?e.parentNode:e,t);E=D.expr?b.filter(D.expr,D.set):D.set;if(x.length>0){H=a(E)}else{u=false}while(x.length){G=x.pop();F=G;if(!f.relative[G]){G=""}else{F=x.pop()}if(F==null){F=e}f.relative[G](H,F,t)}}else{H=x=[]}}if(!H){H=E}if(!H){b.error(G||v)}if(d.call(H)==="[object Array]"){if(!u){z.push.apply(z,H)}else{if(e&&e.nodeType===1){for(y=0;H[y]!=null;y++){if(H[y]&&(H[y]===true||H[y].nodeType===1&&b.contains(e,H[y]))){z.push(E[y])}}}else{for(y=0;H[y]!=null;y++){if(H[y]&&H[y].nodeType===1){z.push(E[y])}}}}}else{a(H,z)}if(r){b(r,C,z,A);b.uniqueSort(z)}return z};b.uniqueSort=function(r){if(c){o=i;r.sort(c);if(o){for(var e=1;e<r.length;e++){if(r[e]===r[e-1]){r.splice(e--,1)}}}}return r};b.matches=function(e,r){return b(e,null,null,r)};b.find=function(y,e,z){var x;if(!y){return[]}for(var t=0,s=f.order.length;t<s;t++){var v=f.order[t],u;if((u=f.leftMatch[v].exec(y))){var r=u[1];u.splice(1,1);if(r.substr(r.length-1)!=="\\"){u[1]=(u[1]||"").replace(/\\/g,"");x=f.find[v](u,e,z);if(x!=null){y=y.replace(f.match[v],"");break}}}}if(!x){x=e.getElementsByTagName("*")}return{set:x,expr:y}};b.filter=function(C,B,F,u){var s=C,H=[],z=B,x,e,y=B&&B[0]&&b.isXML(B[0]);while(C&&B.length){for(var A in f.filter){if((x=f.leftMatch[A].exec(C))!=null&&x[2]){var r=f.filter[A],G,E,t=x[1];e=false;x.splice(1,1);if(t.substr(t.length-1)==="\\"){continue}if(z===H){H=[]}if(f.preFilter[A]){x=f.preFilter[A](x,z,F,H,u,y);if(!x){e=G=true}else{if(x===true){continue}}}if(x){for(var v=0;(E=z[v])!=null;v++){if(E){G=r(E,x,v,z);var D=u^!!G;if(F&&G!=null){if(D){e=true}else{z[v]=false}}else{if(D){H.push(E);e=true}}}}}if(G!==undefined){if(!F){z=H}C=C.replace(f.match[A],"");if(!e){return[]}break}}}if(C===s){if(e==null){b.error(C)}else{break}}s=C}return z};b.error=function(e){throw"Syntax error, unrecognized expression: "+e};var f=b.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(e){return e.getAttribute("href")}},relative:{"+":function(x,r){var t=typeof r==="string",v=t&&!/\W/.test(r),y=t&&!v;if(v){r=r.toLowerCase()}for(var s=0,e=x.length,u;s<e;s++){if((u=x[s])){while((u=u.previousSibling)&&u.nodeType!==1){}x[s]=y||u&&u.nodeName.toLowerCase()===r?u||false:u===r}}if(y){b.filter(r,x,true)}},">":function(x,r){var u=typeof r==="string",v,s=0,e=x.length;if(u&&!/\W/.test(r)){r=r.toLowerCase();for(;s<e;s++){v=x[s];if(v){var t=v.parentNode;x[s]=t.nodeName.toLowerCase()===r?t:false}}}else{for(;s<e;s++){v=x[s];if(v){x[s]=u?v.parentNode:v.parentNode===r}}if(u){b.filter(r,x,true)}}},"":function(t,r,v){var s=j++,e=q,u;if(typeof r==="string"&&!/\W/.test(r)){r=r.toLowerCase();u=r;e=n}e("parentNode",r,s,t,u,v)},"~":function(t,r,v){var s=j++,e=q,u;if(typeof r==="string"&&!/\W/.test(r)){r=r.toLowerCase();u=r;e=n}e("previousSibling",r,s,t,u,v)}},find:{ID:function(r,s,t){if(typeof s.getElementById!=="undefined"&&!t){var e=s.getElementById(r[1]);return e?[e]:[]}},NAME:function(s,v){if(typeof v.getElementsByName!=="undefined"){var r=[],u=v.getElementsByName(s[1]);for(var t=0,e=u.length;t<e;t++){if(u[t].getAttribute("name")===s[1]){r.push(u[t])}}return r.length===0?null:r}},TAG:function(e,r){return r.getElementsByTagName(e[1])}},preFilter:{CLASS:function(t,r,s,e,x,y){t=" "+t[1].replace(/\\/g,"")+" ";if(y){return t}for(var u=0,v;(v=r[u])!=null;u++){if(v){if(x^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(t)>=0)){if(!s){e.push(v)}}else{if(s){r[u]=false}}}}return false},ID:function(e){return e[1].replace(/\\/g,"")},TAG:function(r,e){return r[1].toLowerCase()},CHILD:function(e){if(e[1]==="nth"){var r=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(e[2]==="even"&&"2n"||e[2]==="odd"&&"2n+1"||!/\D/.test(e[2])&&"0n+"+e[2]||e[2]);e[2]=(r[1]+(r[2]||1))-0;e[3]=r[3]-0}e[0]=j++;return e},ATTR:function(u,r,s,e,v,x){var t=u[1].replace(/\\/g,"");if(!x&&f.attrMap[t]){u[1]=f.attrMap[t]}if(u[2]==="~="){u[4]=" "+u[4]+" "}return u},PSEUDO:function(u,r,s,e,v){if(u[1]==="not"){if((p.exec(u[3])||"").length>1||/^\w/.test(u[3])){u[3]=b(u[3],null,null,r)}else{var t=b.filter(u[3],r,s,true^v);if(!s){e.push.apply(e,t)}return false}}else{if(f.match.POS.test(u[0])||f.match.CHILD.test(u[0])){return true}}return u},POS:function(e){e.unshift(true);return e}},filters:{enabled:function(e){return e.disabled===false&&e.type!=="hidden"},disabled:function(e){return e.disabled===true},checked:function(e){return e.checked===true},selected:function(e){e.parentNode.selectedIndex;return e.selected===true},parent:function(e){return !!e.firstChild},empty:function(e){return !e.firstChild},has:function(s,r,e){return !!b(e[3],s).length},header:function(e){return(/h\d/i).test(e.nodeName)},text:function(e){return"text"===e.type},radio:function(e){return"radio"===e.type},checkbox:function(e){return"checkbox"===e.type},file:function(e){return"file"===e.type},password:function(e){return"password"===e.type},submit:function(e){return"submit"===e.type},image:function(e){return"image"===e.type},reset:function(e){return"reset"===e.type},button:function(e){return"button"===e.type||e.nodeName.toLowerCase()==="button"},input:function(e){return(/input|select|textarea|button/i).test(e.nodeName)}},setFilters:{first:function(r,e){return e===0},last:function(s,r,e,t){return r===t.length-1},even:function(r,e){return e%2===0},odd:function(r,e){return e%2===1},lt:function(s,r,e){return r<e[3]-0},gt:function(s,r,e){return r>e[3]-0},nth:function(s,r,e){return e[3]-0===r},eq:function(s,r,e){return e[3]-0===r}},filter:{PSEUDO:function(s,y,x,z){var e=y[1],r=f.filters[e];if(r){return r(s,x,y,z)}else{if(e==="contains"){return(s.textContent||s.innerText||b.getText([s])||"").indexOf(y[3])>=0}else{if(e==="not"){var t=y[3];for(var v=0,u=t.length;v<u;v++){if(t[v]===s){return false}}return true}else{b.error("Syntax error, unrecognized expression: "+e)}}}},CHILD:function(e,t){var x=t[1],r=e;switch(x){case"only":case"first":while((r=r.previousSibling)){if(r.nodeType===1){return false}}if(x==="first"){return true}r=e;case"last":while((r=r.nextSibling)){if(r.nodeType===1){return false}}return true;case"nth":var s=t[2],A=t[3];if(s===1&&A===0){return true}var v=t[0],z=e.parentNode;if(z&&(z.sizcache!==v||!e.nodeIndex)){var u=0;for(r=z.firstChild;r;r=r.nextSibling){if(r.nodeType===1){r.nodeIndex=++u}}z.sizcache=v}var y=e.nodeIndex-A;if(s===0){return y===0}else{return(y%s===0&&y/s>=0)}}},ID:function(r,e){return r.nodeType===1&&r.getAttribute("id")===e},TAG:function(r,e){return(e==="*"&&r.nodeType===1)||r.nodeName.toLowerCase()===e},CLASS:function(r,e){return(" "+(r.className||r.getAttribute("class"))+" ").indexOf(e)>-1},ATTR:function(v,t){var s=t[1],e=f.attrHandle[s]?f.attrHandle[s](v):v[s]!=null?v[s]:v.getAttribute(s),x=e+"",u=t[2],r=t[4];return e==null?u==="!=":u==="="?x===r:u==="*="?x.indexOf(r)>=0:u==="~="?(" "+x+" ").indexOf(r)>=0:!r?x&&e!==false:u==="!="?x!==r:u==="^="?x.indexOf(r)===0:u==="$="?x.substr(x.length-r.length)===r:u==="|="?x===r||x.substr(0,r.length+1)===r+"-":false},POS:function(u,r,s,v){var e=r[2],t=f.setFilters[e];if(t){return t(u,s,r,v)}}}};var k=f.match.POS,g=function(r,e){return"\\"+(e-0+1)};for(var m in f.match){f.match[m]=new RegExp(f.match[m].source+(/(?![^\[]*\])(?![^\(]*\))/.source));f.leftMatch[m]=new RegExp(/(^(?:.|\r|\n)*?)/.source+f.match[m].source.replace(/\\(\d+)/g,g))}var a=function(r,e){r=Array.prototype.slice.call(r,0);if(e){e.push.apply(e,r);return e}return r};try{Array.prototype.slice.call(document.documentElement.childNodes,0)[0].nodeType}catch(l){a=function(u,t){var r=t||[],s=0;if(d.call(u)==="[object Array]"){Array.prototype.push.apply(r,u)}else{if(typeof u.length==="number"){for(var e=u.length;s<e;s++){r.push(u[s])}}else{for(;u[s];s++){r.push(u[s])}}}return r}}var c;if(document.documentElement.compareDocumentPosition){c=function(r,e){if(!r.compareDocumentPosition||!e.compareDocumentPosition){if(r==e){o=true}return r.compareDocumentPosition?-1:1}var s=r.compareDocumentPosition(e)&4?-1:r===e?0:1;if(s===0){o=true}return s}}else{if("sourceIndex" in document.documentElement){c=function(r,e){if(!r.sourceIndex||!e.sourceIndex){if(r==e){o=true}return r.sourceIndex?-1:1}var s=r.sourceIndex-e.sourceIndex;if(s===0){o=true}return s}}else{if(document.createRange){c=function(t,r){if(!t.ownerDocument||!r.ownerDocument){if(t==r){o=true}return t.ownerDocument?-1:1}var s=t.ownerDocument.createRange(),e=r.ownerDocument.createRange();s.setStart(t,0);s.setEnd(t,0);e.setStart(r,0);e.setEnd(r,0);var u=s.compareBoundaryPoints(Range.START_TO_END,e);if(u===0){o=true}return u}}}}b.getText=function(e){var r="",t;for(var s=0;e[s];s++){t=e[s];if(t.nodeType===3||t.nodeType===4){r+=t.nodeValue}else{if(t.nodeType!==8){r+=b.getText(t.childNodes)}}}return r};(function(){var r=document.createElement("div"),s="script"+(new Date()).getTime();r.innerHTML="<a name='"+s+"'/>";var e=document.documentElement;e.insertBefore(r,e.firstChild);if(document.getElementById(s)){f.find.ID=function(u,v,x){if(typeof v.getElementById!=="undefined"&&!x){var t=v.getElementById(u[1]);return t?t.id===u[1]||typeof t.getAttributeNode!=="undefined"&&t.getAttributeNode("id").nodeValue===u[1]?[t]:undefined:[]}};f.filter.ID=function(v,t){var u=typeof v.getAttributeNode!=="undefined"&&v.getAttributeNode("id");return v.nodeType===1&&u&&u.nodeValue===t}}e.removeChild(r);e=r=null})();(function(){var e=document.createElement("div");e.appendChild(document.createComment(""));if(e.getElementsByTagName("*").length>0){f.find.TAG=function(r,v){var u=v.getElementsByTagName(r[1]);if(r[1]==="*"){var t=[];for(var s=0;u[s];s++){if(u[s].nodeType===1){t.push(u[s])}}u=t}return u}}e.innerHTML="<a href='#'></a>";if(e.firstChild&&typeof e.firstChild.getAttribute!=="undefined"&&e.firstChild.getAttribute("href")!=="#"){f.attrHandle.href=function(r){return r.getAttribute("href",2)}}e=null})();if(document.querySelectorAll){(function(){var e=b,s=document.createElement("div");s.innerHTML="<p class='TEST'></p>";if(s.querySelectorAll&&s.querySelectorAll(".TEST").length===0){return}b=function(x,v,t,u){v=v||document;if(!u&&v.nodeType===9&&!b.isXML(v)){try{return a(v.querySelectorAll(x),t)}catch(y){}}return e(x,v,t,u)};for(var r in e){b[r]=e[r]}s=null})()}(function(){var e=document.createElement("div");e.innerHTML="<div class='test e'></div><div class='test'></div>";if(!e.getElementsByClassName||e.getElementsByClassName("e").length===0){return}e.lastChild.className="e";if(e.getElementsByClassName("e").length===1){return}f.order.splice(1,0,"CLASS");f.find.CLASS=function(r,s,t){if(typeof s.getElementsByClassName!=="undefined"&&!t){return s.getElementsByClassName(r[1])}};e=null})();function n(r,x,v,A,y,z){for(var t=0,s=A.length;t<s;t++){var e=A[t];if(e){e=e[r];var u=false;while(e){if(e.sizcache===v){u=A[e.sizset];break}if(e.nodeType===1&&!z){e.sizcache=v;e.sizset=t}if(e.nodeName.toLowerCase()===x){u=e;break}e=e[r]}A[t]=u}}}function q(r,x,v,A,y,z){for(var t=0,s=A.length;t<s;t++){var e=A[t];if(e){e=e[r];var u=false;while(e){if(e.sizcache===v){u=A[e.sizset];break}if(e.nodeType===1){if(!z){e.sizcache=v;e.sizset=t}if(typeof x!=="string"){if(e===x){u=true;break}}else{if(b.filter(x,[e]).length>0){u=e;break}}}e=e[r]}A[t]=u}}}b.contains=document.compareDocumentPosition?function(r,e){return !!(r.compareDocumentPosition(e)&16)}:function(r,e){return r!==e&&(r.contains?r.contains(e):true)};b.isXML=function(e){var r=(e?e.ownerDocument||e:0).documentElement;return r?r.nodeName!=="HTML":false};var h=function(e,y){var t=[],u="",v,s=y.nodeType?[y]:y;while((v=f.match.PSEUDO.exec(e))){u+=v[0];e=e.replace(f.match.PSEUDO,"")}e=f.relative[e]?e+"*":e;for(var x=0,r=s.length;x<r;x++){b(e,s[x],t)}return b.filter(u,t)};window.tinymce.dom.Sizzle=b})();(function(a){a.dom.Element=function(f,d){var b=this,e,c;b.settings=d=d||{};b.id=f;b.dom=e=d.dom||a.DOM;if(!a.isIE){c=e.get(b.id)}a.each(("getPos,getRect,getParent,add,setStyle,getStyle,setStyles,setAttrib,setAttribs,getAttrib,addClass,removeClass,hasClass,getOuterHTML,setOuterHTML,remove,show,hide,isHidden,setHTML,get").split(/,/),function(g){b[g]=function(){var h=[f],j;for(j=0;j<arguments.length;j++){h.push(arguments[j])}h=e[g].apply(e,h);b.update(g);return h}});a.extend(b,{on:function(i,h,g){return a.dom.Event.add(b.id,i,h,g)},getXY:function(){return{x:parseInt(b.getStyle("left")),y:parseInt(b.getStyle("top"))}},getSize:function(){var g=e.get(b.id);return{w:parseInt(b.getStyle("width")||g.clientWidth),h:parseInt(b.getStyle("height")||g.clientHeight)}},moveTo:function(g,h){b.setStyles({left:g,top:h})},moveBy:function(g,i){var h=b.getXY();b.moveTo(h.x+g,h.y+i)},resizeTo:function(g,i){b.setStyles({width:g,height:i})},resizeBy:function(g,j){var i=b.getSize();b.resizeTo(i.w+g,i.h+j)},update:function(h){var g;if(a.isIE6&&d.blocker){h=h||"";if(h.indexOf("get")===0||h.indexOf("has")===0||h.indexOf("is")===0){return}if(h=="remove"){e.remove(b.blocker);return}if(!b.blocker){b.blocker=e.uniqueId();g=e.add(d.container||e.getRoot(),"iframe",{id:b.blocker,style:"position:absolute;",frameBorder:0,src:'javascript:""'});e.setStyle(g,"opacity",0)}else{g=e.get(b.blocker)}e.setStyles(g,{left:b.getStyle("left",1),top:b.getStyle("top",1),width:b.getStyle("width",1),height:b.getStyle("height",1),display:b.getStyle("display",1),zIndex:parseInt(b.getStyle("zIndex",1)||0)-1})}}})}})(tinymce);(function(c){function e(f){return f.replace(/[\n\r]+/g,"")}var b=c.is,a=c.isIE,d=c.each;c.create("tinymce.dom.Selection",{Selection:function(i,h,g){var f=this;f.dom=i;f.win=h;f.serializer=g;d(["onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent"],function(j){f[j]=new c.util.Dispatcher(f)});if(!f.win.getSelection){f.tridentSel=new c.dom.TridentSelection(f)}if(c.isIE&&i.boxModel){this._fixIESelection()}c.addUnload(f.destroy,f)},setCursorLocation:function(h,i){var f=this;var g=f.dom.createRng();g.setStart(h,i);g.setEnd(h,i);f.setRng(g);f.collapse(false)},getContent:function(g){var f=this,h=f.getRng(),l=f.dom.create("body"),j=f.getSel(),i,k,m;g=g||{};i=k="";g.get=true;g.format=g.format||"html";g.forced_root_block="";f.onBeforeGetContent.dispatch(f,g);if(g.format=="text"){return f.isCollapsed()?"":(h.text||(j.toString?j.toString():""))}if(h.cloneContents){m=h.cloneContents();if(m){l.appendChild(m)}}else{if(b(h.item)||b(h.htmlText)){l.innerHTML="<br>"+(h.item?h.item(0).outerHTML:h.htmlText);l.removeChild(l.firstChild)}else{l.innerHTML=h.toString()}}if(/^\s/.test(l.innerHTML)){i=" "}if(/\s+$/.test(l.innerHTML)){k=" "}g.getInner=true;g.content=f.isCollapsed()?"":i+f.serializer.serialize(l,g)+k;f.onGetContent.dispatch(f,g);return g.content},setContent:function(g,i){var n=this,f=n.getRng(),j,k=n.win.document,m,l;i=i||{format:"html"};i.set=true;g=i.content=g;if(!i.no_events){n.onBeforeSetContent.dispatch(n,i)}g=i.content;if(f.insertNode){g+='<span id="__caret">_</span>';if(f.startContainer==k&&f.endContainer==k){k.body.innerHTML=g}else{f.deleteContents();if(k.body.childNodes.length==0){k.body.innerHTML=g}else{if(f.createContextualFragment){f.insertNode(f.createContextualFragment(g))}else{m=k.createDocumentFragment();l=k.createElement("div");m.appendChild(l);l.outerHTML=g;f.insertNode(m)}}}j=n.dom.get("__caret");f=k.createRange();f.setStartBefore(j);f.setEndBefore(j);n.setRng(f);n.dom.remove("__caret");try{n.setRng(f)}catch(h){}}else{if(f.item){k.execCommand("Delete",false,null);f=n.getRng()}if(/^\s+/.test(g)){f.pasteHTML('<span id="__mce_tmp">_</span>'+g);n.dom.remove("__mce_tmp")}else{f.pasteHTML(g)}}if(!i.no_events){n.onSetContent.dispatch(n,i)}},getStart:function(){var g=this.getRng(),h,f,j,i;if(g.duplicate||g.item){if(g.item){return g.item(0)}j=g.duplicate();j.collapse(1);h=j.parentElement();f=i=g.parentElement();while(i=i.parentNode){if(i==h){h=f;break}}return h}else{h=g.startContainer;if(h.nodeType==1&&h.hasChildNodes()){h=h.childNodes[Math.min(h.childNodes.length-1,g.startOffset)]}if(h&&h.nodeType==3){return h.parentNode}return h}},getEnd:function(){var g=this,h=g.getRng(),i,f;if(h.duplicate||h.item){if(h.item){return h.item(0)}h=h.duplicate();h.collapse(0);i=h.parentElement();if(i&&i.nodeName=="BODY"){return i.lastChild||i}return i}else{i=h.endContainer;f=h.endOffset;if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[f>0?f-1:f]}if(i&&i.nodeType==3){return i.parentNode}return i}},getBookmark:function(r,s){var v=this,m=v.dom,g,j,i,n,h,o,p,l="\uFEFF",u;function f(x,y){var t=0;d(m.select(x),function(A,z){if(A==y){t=z}});return t}if(r==2){function k(){var x=v.getRng(true),t=m.getRoot(),y={};function z(C,H){var B=C[H?"startContainer":"endContainer"],G=C[H?"startOffset":"endOffset"],A=[],D,F,E=0;if(B.nodeType==3){if(s){for(D=B.previousSibling;D&&D.nodeType==3;D=D.previousSibling){G+=D.nodeValue.length}}A.push(G)}else{F=B.childNodes;if(G>=F.length&&F.length){E=1;G=Math.max(0,F.length-1)}A.push(v.dom.nodeIndex(F[G],s)+E)}for(;B&&B!=t;B=B.parentNode){A.push(v.dom.nodeIndex(B,s))}return A}y.start=z(x,true);if(!v.isCollapsed()){y.end=z(x)}return y}if(v.tridentSel){return v.tridentSel.getBookmark(r)}return k()}if(r){return{rng:v.getRng()}}g=v.getRng();i=m.uniqueId();n=tinyMCE.activeEditor.selection.isCollapsed();u="overflow:hidden;line-height:0px";if(g.duplicate||g.item){if(!g.item){j=g.duplicate();try{g.collapse();g.pasteHTML('<span data-mce-type="bookmark" id="'+i+'_start" style="'+u+'">'+l+"</span>");if(!n){j.collapse(false);g.moveToElementText(j.parentElement());if(g.compareEndPoints("StartToEnd",j)==0){j.move("character",-1)}j.pasteHTML('<span data-mce-type="bookmark" id="'+i+'_end" style="'+u+'">'+l+"</span>")}}catch(q){return null}}else{o=g.item(0);h=o.nodeName;return{name:h,index:f(h,o)}}}else{o=v.getNode();h=o.nodeName;if(h=="IMG"){return{name:h,index:f(h,o)}}if(g.startContainer.nodeType==9){return}j=g.cloneRange();if(!n){j.collapse(false);j.insertNode(m.create("span",{"data-mce-type":"bookmark",id:i+"_end",style:u},l))}g.collapse(true);g.insertNode(m.create("span",{"data-mce-type":"bookmark",id:i+"_start",style:u},l))}v.moveToBookmark({id:i,keep:1});return{id:i}},moveToBookmark:function(n){var r=this,l=r.dom,i,h,f,q,j,s,o,p;if(n){if(n.start){f=l.createRng();q=l.getRoot();function g(z){var t=n[z?"start":"end"],v,x,y,u;if(t){y=t[0];for(x=q,v=t.length-1;v>=1;v--){u=x.childNodes;if(t[v]>u.length-1){return}x=u[t[v]]}if(x.nodeType===3){y=Math.min(t[0],x.nodeValue.length)}if(x.nodeType===1){y=Math.min(t[0],x.childNodes.length)}if(z){f.setStart(x,y)}else{f.setEnd(x,y)}}return true}if(r.tridentSel){return r.tridentSel.moveToBookmark(n)}if(g(true)&&g()){r.setRng(f)}}else{if(n.id){function k(A){var u=l.get(n.id+"_"+A),z,t,x,y,v=n.keep;if(u){z=u.parentNode;if(A=="start"){if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}j=s=z;o=p=t}else{if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}s=z;p=t}if(!v){y=u.previousSibling;x=u.nextSibling;d(c.grep(u.childNodes),function(B){if(B.nodeType==3){B.nodeValue=B.nodeValue.replace(/\uFEFF/g,"")}});while(u=l.get(n.id+"_"+A)){l.remove(u,1)}if(y&&x&&y.nodeType==x.nodeType&&y.nodeType==3&&!c.isOpera){t=y.nodeValue.length;y.appendData(x.nodeValue);l.remove(x);if(A=="start"){j=s=y;o=p=t}else{s=y;p=t}}}}}function m(t){if(l.isBlock(t)&&!t.innerHTML){t.innerHTML=!a?'<br data-mce-bogus="1" />':" "}return t}k("start");k("end");if(j){f=l.createRng();f.setStart(m(j),o);f.setEnd(m(s),p);r.setRng(f)}}else{if(n.name){r.select(l.select(n.name)[n.index])}else{if(n.rng){r.setRng(n.rng)}}}}}},select:function(k,j){var i=this,l=i.dom,g=l.createRng(),f;if(k){f=l.nodeIndex(k);g.setStart(k.parentNode,f);g.setEnd(k.parentNode,f+1);if(j){function h(m,o){var n=new c.dom.TreeWalker(m,m);do{if(m.nodeType==3&&c.trim(m.nodeValue).length!=0){if(o){g.setStart(m,0)}else{g.setEnd(m,m.nodeValue.length)}return}if(m.nodeName=="BR"){if(o){g.setStartBefore(m)}else{g.setEndBefore(m)}return}}while(m=(o?n.next():n.prev()))}h(k,1);h(k)}i.setRng(g)}return k},isCollapsed:function(){var f=this,h=f.getRng(),g=f.getSel();if(!h||h.item){return false}if(h.compareEndPoints){return h.compareEndPoints("StartToEnd",h)===0}return !g||h.collapsed},collapse:function(f){var h=this,g=h.getRng(),i;if(g.item){i=g.item(0);g=h.win.document.body.createTextRange();g.moveToElementText(i)}g.collapse(!!f);h.setRng(g)},getSel:function(){var g=this,f=this.win;return f.getSelection?f.getSelection():f.document.selection},getRng:function(l){var g=this,h,i,k,j=g.win.document;if(l&&g.tridentSel){return g.tridentSel.getRangeAt(0)}try{if(h=g.getSel()){i=h.rangeCount>0?h.getRangeAt(0):(h.createRange?h.createRange():j.createRange())}}catch(f){}if(c.isIE&&i&&i.setStart&&j.selection.createRange().item){k=j.selection.createRange().item(0);i=j.createRange();i.setStartBefore(k);i.setEndAfter(k)}if(!i){i=j.createRange?j.createRange():j.body.createTextRange()}if(g.selectedRange&&g.explicitRange){if(i.compareBoundaryPoints(i.START_TO_START,g.selectedRange)===0&&i.compareBoundaryPoints(i.END_TO_END,g.selectedRange)===0){i=g.explicitRange}else{g.selectedRange=null;g.explicitRange=null}}return i},setRng:function(i){var h,g=this;if(!g.tridentSel){h=g.getSel();if(h){g.explicitRange=i;try{h.removeAllRanges()}catch(f){}h.addRange(i);g.selectedRange=h.rangeCount>0?h.getRangeAt(0):null}}else{if(i.cloneRange){try{g.tridentSel.addRange(i);return}catch(f){}}try{i.select()}catch(f){}}},setNode:function(g){var f=this;f.setContent(f.dom.getOuterHTML(g));return g},getNode:function(){var h=this,g=h.getRng(),i=h.getSel(),l,k=g.startContainer,f=g.endContainer;if(!g){return h.dom.getRoot()}if(g.setStart){l=g.commonAncestorContainer;if(!g.collapsed){if(g.startContainer==g.endContainer){if(g.endOffset-g.startOffset<2){if(g.startContainer.hasChildNodes()){l=g.startContainer.childNodes[g.startOffset]}}}if(k.nodeType===3&&f.nodeType===3){function j(p,m){var o=p;while(p&&p.nodeType===3&&p.length===0){p=m?p.nextSibling:p.previousSibling}return p||o}if(k.length===g.startOffset){k=j(k.nextSibling,true)}else{k=k.parentNode}if(g.endOffset===0){f=j(f.previousSibling,false)}else{f=f.parentNode}if(k&&k===f){return k}}}if(l&&l.nodeType==3){return l.parentNode}return l}return g.item?g.item(0):g.parentElement()},getSelectedBlocks:function(o,g){var m=this,j=m.dom,l,k,h,i=[];l=j.getParent(o||m.getStart(),j.isBlock);k=j.getParent(g||m.getEnd(),j.isBlock);if(l){i.push(l)}if(l&&k&&l!=k){h=l;var f=new c.dom.TreeWalker(l,j.getRoot());while((h=f.next())&&h!=k){if(j.isBlock(h)){i.push(h)}}}if(k&&l!=k){i.push(k)}return i},normalize:function(){var g=this,f,i;if(c.isIE){return}function h(p){var k,o,n,m=g.dom,j=m.getRoot(),l;k=f[(p?"start":"end")+"Container"];o=f[(p?"start":"end")+"Offset"];if(k.nodeType===9){k=k.body;o=0}if(k===j){if(k.hasChildNodes()){k=k.childNodes[Math.min(!p&&o>0?o-1:o,k.childNodes.length-1)];o=0;if(k.hasChildNodes()){l=k;n=new c.dom.TreeWalker(k,j);do{if(l.nodeType===3){o=p?0:l.nodeValue.length-1;k=l;i=true;break}if(/^(BR|IMG)$/.test(l.nodeName)){o=m.nodeIndex(l);k=l.parentNode;if(l.nodeName=="IMG"&&!p){o++}i=true;break}}while(l=(p?n.next():n.prev()))}}}if(i){f["set"+(p?"Start":"End")](k,o)}}f=g.getRng();h(true);if(!f.collapsed){h()}if(i){g.setRng(f)}},destroy:function(g){var f=this;f.win=null;if(!g){c.removeUnload(f.destroy)}},_fixIESelection:function(){var g=this.dom,m=g.doc,h=m.body,j,n,f;m.documentElement.unselectable=true;function i(o,r){var p=h.createTextRange();try{p.moveToPoint(o,r)}catch(q){p=null}return p}function l(p){var o;if(p.button){o=i(p.x,p.y);if(o){if(o.compareEndPoints("StartToStart",n)>0){o.setEndPoint("StartToStart",n)}else{o.setEndPoint("EndToEnd",n)}o.select()}}else{k()}}function k(){var o=m.selection.createRange();if(n&&!o.item&&o.compareEndPoints("StartToEnd",o)===0){n.select()}g.unbind(m,"mouseup",k);g.unbind(m,"mousemove",l);n=j=0}g.bind(m,["mousedown","contextmenu"],function(o){if(o.target.nodeName==="HTML"){if(j){k()}f=m.documentElement;if(f.scrollHeight>f.clientHeight){return}j=1;n=i(o.x,o.y);if(n){g.bind(m,"mouseup",k);g.bind(m,"mousemove",l);g.win.focus();n.select()}}})}})})(tinymce);(function(a){a.dom.Serializer=function(e,i,f){var h,b,d=a.isIE,g=a.each,c;if(!e.apply_source_formatting){e.indent=false}i=i||a.DOM;f=f||new a.html.Schema(e);e.entity_encoding=e.entity_encoding||"named";e.remove_trailing_brs="remove_trailing_brs" in e?e.remove_trailing_brs:true;h=new a.util.Dispatcher(self);b=new a.util.Dispatcher(self);c=new a.html.DomParser(e,f);c.addAttributeFilter("src,href,style",function(k,j){var o=k.length,l,q,n="data-mce-"+j,p=e.url_converter,r=e.url_converter_scope,m;while(o--){l=k[o];q=l.attributes.map[n];if(q!==m){l.attr(j,q.length>0?q:null);l.attr(n,null)}else{q=l.attributes.map[j];if(j==="style"){q=i.serializeStyle(i.parseStyle(q),l.name)}else{if(p){q=p.call(r,q,j,l.name)}}l.attr(j,q.length>0?q:null)}}});c.addAttributeFilter("class",function(j,k){var l=j.length,m,n;while(l--){m=j[l];n=m.attr("class").replace(/\s*mce(Item\w+|Selected)\s*/g,"");m.attr("class",n.length>0?n:null)}});c.addAttributeFilter("data-mce-type",function(j,l,k){var m=j.length,n;while(m--){n=j[m];if(n.attributes.map["data-mce-type"]==="bookmark"&&!k.cleanup){n.remove()}}});c.addAttributeFilter("data-mce-expando",function(j,l,k){var m=j.length;while(m--){j[m].attr(l,null)}});c.addNodeFilter("script,style",function(k,l){var m=k.length,n,o;function j(p){return p.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*((<!--)?(\s*\/\/)?\s*<!\[CDATA\[|(<!--\s*)?\/\*\s*<!\[CDATA\[\s*\*\/|(\/\/)?\s*<!--|\/\*\s*<!--\s*\*\/)\s*[\r\n]*/gi,"").replace(/\s*(\/\*\s*\]\]>\s*\*\/(-->)?|\s*\/\/\s*\]\]>(-->)?|\/\/\s*(-->)?|\]\]>|\/\*\s*-->\s*\*\/|\s*-->\s*)\s*$/g,"")}while(m--){n=k[m];o=n.firstChild?n.firstChild.value:"";if(l==="script"){n.attr("type",(n.attr("type")||"text/javascript").replace(/^mce\-/,""));if(o.length>0){n.firstChild.value="// <![CDATA[\n"+j(o)+"\n// ]]>"}}else{if(o.length>0){n.firstChild.value="<!--\n"+j(o)+"\n-->"}}}});c.addNodeFilter("#comment",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.value.indexOf("[CDATA[")===0){m.name="#cdata";m.type=4;m.value=m.value.replace(/^\[CDATA\[|\]\]$/g,"")}else{if(m.value.indexOf("mce:protected ")===0){m.name="#text";m.type=3;m.raw=true;m.value=unescape(m.value).substr(14)}}}});c.addNodeFilter("xml:namespace,input",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.type===7){m.remove()}else{if(m.type===1){if(k==="input"&&!("type" in m.attributes.map)){m.attr("type","text")}}}}});if(e.fix_list_elements){c.addNodeFilter("ul,ol",function(k,l){var m=k.length,n,j;while(m--){n=k[m];j=n.parent;if(j.name==="ul"||j.name==="ol"){if(n.prev&&n.prev.name==="li"){n.prev.append(n)}}}})}c.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style",function(j,k){var l=j.length;while(l--){j[l].attr(k,null)}});return{schema:f,addNodeFilter:c.addNodeFilter,addAttributeFilter:c.addAttributeFilter,onPreProcess:h,onPostProcess:b,serialize:function(o,m){var l,p,k,j,n;if(d&&i.select("script,style,select,map").length>0){n=o.innerHTML;o=o.cloneNode(false);i.setHTML(o,n)}else{o=o.cloneNode(true)}l=o.ownerDocument.implementation;if(l.createHTMLDocument){p=l.createHTMLDocument("");g(o.nodeName=="BODY"?o.childNodes:[o],function(q){p.body.appendChild(p.importNode(q,true))});if(o.nodeName!="BODY"){o=p.body.firstChild}else{o=p.body}k=i.doc;i.doc=p}m=m||{};m.format=m.format||"html";if(!m.no_events){m.node=o;h.dispatch(self,m)}j=new a.html.Serializer(e,f);m.content=j.serialize(c.parse(m.getInner?o.innerHTML:a.trim(i.getOuterHTML(o),m),m));if(!m.cleanup){m.content=m.content.replace(/\uFEFF|\u200B/g,"")}if(!m.no_events){b.dispatch(self,m)}if(k){i.doc=k}m.node=null;return m.content},addRules:function(j){f.addValidElements(j)},setRules:function(j){f.setValidElements(j)}}}})(tinymce);(function(a){a.dom.ScriptLoader=function(h){var c=0,k=1,i=2,l={},j=[],f={},d=[],g=0,e;function b(m,v){var x=this,q=a.DOM,s,o,r,n;function p(){q.remove(n);if(s){s.onreadystatechange=s.onload=s=null}v()}function u(){if(typeof(console)!=="undefined"&&console.log){console.log("Failed to load: "+m)}}n=q.uniqueId();if(a.isIE6){o=new a.util.URI(m);r=location;if(o.host==r.hostname&&o.port==r.port&&(o.protocol+":")==r.protocol&&o.protocol.toLowerCase()!="file"){a.util.XHR.send({url:a._addVer(o.getURI()),success:function(y){var t=q.create("script",{type:"text/javascript"});t.text=y;document.getElementsByTagName("head")[0].appendChild(t);q.remove(t);p()},error:u});return}}s=q.create("script",{id:n,type:"text/javascript",src:a._addVer(m)});if(!a.isIE){s.onload=p}s.onerror=u;if(!a.isOpera){s.onreadystatechange=function(){var t=s.readyState;if(t=="complete"||t=="loaded"){p()}}}(document.getElementsByTagName("head")[0]||document.body).appendChild(s)}this.isDone=function(m){return l[m]==i};this.markDone=function(m){l[m]=i};this.add=this.load=function(m,q,n){var o,p=l[m];if(p==e){j.push(m);l[m]=c}if(q){if(!f[m]){f[m]=[]}f[m].push({func:q,scope:n||this})}};this.loadQueue=function(n,m){this.loadScripts(j,n,m)};this.loadScripts=function(m,q,p){var o;function n(r){a.each(f[r],function(s){s.func.call(s.scope)});f[r]=e}d.push({func:q,scope:p||this});o=function(){var r=a.grep(m);m.length=0;a.each(r,function(s){if(l[s]==i){n(s);return}if(l[s]!=k){l[s]=k;g++;b(s,function(){l[s]=i;g--;n(s);o()})}});if(!g){a.each(d,function(s){s.func.call(s.scope)});d.length=0}};o()}};a.ScriptLoader=new a.dom.ScriptLoader()})(tinymce);tinymce.dom.TreeWalker=function(a,c){var b=a;function d(i,f,e,j){var h,g;if(i){if(!j&&i[f]){return i[f]}if(i!=c){h=i[e];if(h){return h}for(g=i.parentNode;g&&g!=c;g=g.parentNode){h=g[e];if(h){return h}}}}}this.current=function(){return b};this.next=function(e){return(b=d(b,"firstChild","nextSibling",e))};this.prev=function(e){return(b=d(b,"lastChild","previousSibling",e))}};(function(a){a.dom.RangeUtils=function(c){var b="\uFEFF";this.walk=function(d,s){var i=d.startContainer,l=d.startOffset,t=d.endContainer,m=d.endOffset,j,g,o,h,r,q,e;e=c.select("td.mceSelected,th.mceSelected");if(e.length>0){a.each(e,function(u){s([u])});return}function f(u){var v;v=u[0];if(v.nodeType===3&&v===i&&l>=v.nodeValue.length){u.splice(0,1)}v=u[u.length-1];if(m===0&&u.length>0&&v===t&&v.nodeType===3){u.splice(u.length-1,1)}return u}function p(x,v,u){var y=[];for(;x&&x!=u;x=x[v]){y.push(x)}return y}function n(v,u){do{if(v.parentNode==u){return v}v=v.parentNode}while(v)}function k(x,v,y){var u=y?"nextSibling":"previousSibling";for(h=x,r=h.parentNode;h&&h!=v;h=r){r=h.parentNode;q=p(h==x?h:h[u],u);if(q.length){if(!y){q.reverse()}s(f(q))}}}if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[l]}if(t.nodeType==1&&t.hasChildNodes()){t=t.childNodes[Math.min(m-1,t.childNodes.length-1)]}if(i==t){return s(f([i]))}j=c.findCommonAncestor(i,t);for(h=i;h;h=h.parentNode){if(h===t){return k(i,j,true)}if(h===j){break}}for(h=t;h;h=h.parentNode){if(h===i){return k(t,j)}if(h===j){break}}g=n(i,j)||i;o=n(t,j)||t;k(i,g,true);q=p(g==i?g:g.nextSibling,"nextSibling",o==t?o.nextSibling:o);if(q.length){s(f(q))}k(t,o)};this.split=function(e){var h=e.startContainer,d=e.startOffset,i=e.endContainer,g=e.endOffset;function f(j,k){return j.splitText(k)}if(h==i&&h.nodeType==3){if(d>0&&d<h.nodeValue.length){i=f(h,d);h=i.previousSibling;if(g>d){g=g-d;h=i=f(i,g).previousSibling;g=i.nodeValue.length;d=0}else{g=0}}}else{if(h.nodeType==3&&d>0&&d<h.nodeValue.length){h=f(h,d);d=0}if(i.nodeType==3&&g>0&&g<i.nodeValue.length){i=f(i,g).previousSibling;g=i.nodeValue.length}}return{startContainer:h,startOffset:d,endContainer:i,endOffset:g}}};a.dom.RangeUtils.compareRanges=function(c,b){if(c&&b){if(c.item||c.duplicate){if(c.item&&b.item&&c.item(0)===b.item(0)){return true}if(c.isEqual&&b.isEqual&&b.isEqual(c)){return true}}else{return c.startContainer==b.startContainer&&c.startOffset==b.startOffset}}return false}})(tinymce);(function(b){var a=b.dom.Event,c=b.each;b.create("tinymce.ui.KeyboardNavigation",{KeyboardNavigation:function(e,f){var p=this,m=e.root,l=e.items,n=e.enableUpDown,i=e.enableLeftRight||!e.enableUpDown,k=e.excludeFromTabOrder,j,h,o,d,g;f=f||b.DOM;j=function(q){g=q.target.id};h=function(q){f.setAttrib(q.target.id,"tabindex","-1")};d=function(q){var r=f.get(g);f.setAttrib(r,"tabindex","0");r.focus()};p.focus=function(){f.get(g).focus()};p.destroy=function(){c(l,function(q){f.unbind(f.get(q.id),"focus",j);f.unbind(f.get(q.id),"blur",h)});f.unbind(f.get(m),"focus",d);f.unbind(f.get(m),"keydown",o);l=f=m=p.focus=j=h=o=d=null;p.destroy=function(){}};p.moveFocus=function(u,r){var q=-1,t=p.controls,s;if(!g){return}c(l,function(x,v){if(x.id===g){q=v;return false}});q+=u;if(q<0){q=l.length-1}else{if(q>=l.length){q=0}}s=l[q];f.setAttrib(g,"tabindex","-1");f.setAttrib(s.id,"tabindex","0");f.get(s.id).focus();if(e.actOnFocus){e.onAction(s.id)}if(r){a.cancel(r)}};o=function(y){var u=37,t=39,x=38,z=40,q=27,s=14,r=13,v=32;switch(y.keyCode){case u:if(i){p.moveFocus(-1)}break;case t:if(i){p.moveFocus(1)}break;case x:if(n){p.moveFocus(-1)}break;case z:if(n){p.moveFocus(1)}break;case q:if(e.onCancel){e.onCancel();a.cancel(y)}break;case s:case r:case v:if(e.onAction){e.onAction(g);a.cancel(y)}break}};c(l,function(s,q){var r;if(!s.id){s.id=f.uniqueId("_mce_item_")}if(k){f.bind(s.id,"blur",h);r="-1"}else{r=(q===0?"0":"-1")}f.setAttrib(s.id,"tabindex",r);f.bind(f.get(s.id),"focus",j)});if(l[0]){g=l[0].id}f.setAttrib(m,"tabindex","-1");f.bind(f.get(m),"focus",d);f.bind(f.get(m),"keydown",o)}})})(tinymce);(function(c){var b=c.DOM,a=c.is;c.create("tinymce.ui.Control",{Control:function(f,e,d){this.id=f;this.settings=e=e||{};this.rendered=false;this.onRender=new c.util.Dispatcher(this);this.classPrefix="";this.scope=e.scope||this;this.disabled=0;this.active=0;this.editor=d},setAriaProperty:function(f,e){var d=b.get(this.id+"_aria")||b.get(this.id);if(d){b.setAttrib(d,"aria-"+f,!!e)}},focus:function(){b.get(this.id).focus()},setDisabled:function(d){if(d!=this.disabled){this.setAriaProperty("disabled",d);this.setState("Disabled",d);this.setState("Enabled",!d);this.disabled=d}},isDisabled:function(){return this.disabled},setActive:function(d){if(d!=this.active){this.setState("Active",d);this.active=d;this.setAriaProperty("pressed",d)}},isActive:function(){return this.active},setState:function(f,d){var e=b.get(this.id);f=this.classPrefix+f;if(d){b.addClass(e,f)}else{b.removeClass(e,f)}},isRendered:function(){return this.rendered},renderHTML:function(){},renderTo:function(d){b.setHTML(d,this.renderHTML())},postRender:function(){var e=this,d;if(a(e.disabled)){d=e.disabled;e.disabled=-1;e.setDisabled(d)}if(a(e.active)){d=e.active;e.active=-1;e.setActive(d)}},remove:function(){b.remove(this.id);this.destroy()},destroy:function(){c.dom.Event.clear(this.id)}})})(tinymce);tinymce.create("tinymce.ui.Container:tinymce.ui.Control",{Container:function(c,b,a){this.parent(c,b,a);this.controls=[];this.lookup={}},add:function(a){this.lookup[a.id]=a;this.controls.push(a);return a},get:function(a){return this.lookup[a]}});tinymce.create("tinymce.ui.Separator:tinymce.ui.Control",{Separator:function(b,a){this.parent(b,a);this.classPrefix="mceSeparator";this.setDisabled(true)},renderHTML:function(){return tinymce.DOM.createHTML("span",{"class":this.classPrefix,role:"separator","aria-orientation":"vertical",tabindex:"-1"})}});(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.MenuItem:tinymce.ui.Control",{MenuItem:function(g,f){this.parent(g,f);this.classPrefix="mceMenuItem"},setSelected:function(f){this.setState("Selected",f);this.setAriaProperty("checked",!!f);this.selected=f},isSelected:function(){return this.selected},postRender:function(){var f=this;f.parent();if(c(f.selected)){f.setSelected(f.selected)}}})})(tinymce);(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.Menu:tinymce.ui.MenuItem",{Menu:function(h,g){var f=this;f.parent(h,g);f.items={};f.collapsed=false;f.menuCount=0;f.onAddItem=new d.util.Dispatcher(this)},expand:function(g){var f=this;if(g){a(f,function(h){if(h.expand){h.expand()}},"items",f)}f.collapsed=false},collapse:function(g){var f=this;if(g){a(f,function(h){if(h.collapse){h.collapse()}},"items",f)}f.collapsed=true},isCollapsed:function(){return this.collapsed},add:function(f){if(!f.settings){f=new d.ui.MenuItem(f.id||b.uniqueId(),f)}this.onAddItem.dispatch(this,f);return this.items[f.id]=f},addSeparator:function(){return this.add({separator:true})},addMenu:function(f){if(!f.collapse){f=this.createMenu(f)}this.menuCount++;return this.add(f)},hasMenus:function(){return this.menuCount!==0},remove:function(f){delete this.items[f.id]},removeAll:function(){var f=this;a(f,function(g){if(g.removeAll){g.removeAll()}else{g.remove()}g.destroy()},"items",f);f.items={}},createMenu:function(g){var f=new d.ui.Menu(g.id||b.uniqueId(),g);f.onAddItem.add(this.onAddItem.dispatch,this.onAddItem);return f}})})(tinymce);(function(e){var d=e.is,c=e.DOM,f=e.each,a=e.dom.Event,b=e.dom.Element;e.create("tinymce.ui.DropMenu:tinymce.ui.Menu",{DropMenu:function(h,g){g=g||{};g.container=g.container||c.doc.body;g.offset_x=g.offset_x||0;g.offset_y=g.offset_y||0;g.vp_offset_x=g.vp_offset_x||0;g.vp_offset_y=g.vp_offset_y||0;if(d(g.icons)&&!g.icons){g["class"]+=" mceNoIcons"}this.parent(h,g);this.onShowMenu=new e.util.Dispatcher(this);this.onHideMenu=new e.util.Dispatcher(this);this.classPrefix="mceMenu"},createMenu:function(j){var h=this,i=h.settings,g;j.container=j.container||i.container;j.parent=h;j.constrain=j.constrain||i.constrain;j["class"]=j["class"]||i["class"];j.vp_offset_x=j.vp_offset_x||i.vp_offset_x;j.vp_offset_y=j.vp_offset_y||i.vp_offset_y;j.keyboard_focus=i.keyboard_focus;g=new e.ui.DropMenu(j.id||c.uniqueId(),j);g.onAddItem.add(h.onAddItem.dispatch,h.onAddItem);return g},focus:function(){var g=this;if(g.keyboardNav){g.keyboardNav.focus()}},update:function(){var i=this,j=i.settings,g=c.get("menu_"+i.id+"_tbl"),l=c.get("menu_"+i.id+"_co"),h,k;h=j.max_width?Math.min(g.clientWidth,j.max_width):g.clientWidth;k=j.max_height?Math.min(g.clientHeight,j.max_height):g.clientHeight;if(!c.boxModel){i.element.setStyles({width:h+2,height:k+2})}else{i.element.setStyles({width:h,height:k})}if(j.max_width){c.setStyle(l,"width",h)}if(j.max_height){c.setStyle(l,"height",k);if(g.clientHeight<j.max_height){c.setStyle(l,"overflow","hidden")}}},showMenu:function(p,n,r){var z=this,A=z.settings,o,g=c.getViewPort(),u,l,v,q,i=2,k,j,m=z.classPrefix;z.collapse(1);if(z.isMenuVisible){return}if(!z.rendered){o=c.add(z.settings.container,z.renderNode());f(z.items,function(h){h.postRender()});z.element=new b("menu_"+z.id,{blocker:1,container:A.container})}else{o=c.get("menu_"+z.id)}if(!e.isOpera){c.setStyles(o,{left:-65535,top:-65535})}c.show(o);z.update();p+=A.offset_x||0;n+=A.offset_y||0;g.w-=4;g.h-=4;if(A.constrain){u=o.clientWidth-i;l=o.clientHeight-i;v=g.x+g.w;q=g.y+g.h;if((p+A.vp_offset_x+u)>v){p=r?r-u:Math.max(0,(v-A.vp_offset_x)-u)}if((n+A.vp_offset_y+l)>q){n=Math.max(0,(q-A.vp_offset_y)-l)}}c.setStyles(o,{left:p,top:n});z.element.update();z.isMenuVisible=1;z.mouseClickFunc=a.add(o,"click",function(s){var h;s=s.target;if(s&&(s=c.getParent(s,"tr"))&&!c.hasClass(s,m+"ItemSub")){h=z.items[s.id];if(h.isDisabled()){return}k=z;while(k){if(k.hideMenu){k.hideMenu()}k=k.settings.parent}if(h.settings.onclick){h.settings.onclick(s)}return false}});if(z.hasMenus()){z.mouseOverFunc=a.add(o,"mouseover",function(x){var h,t,s;x=x.target;if(x&&(x=c.getParent(x,"tr"))){h=z.items[x.id];if(z.lastMenu){z.lastMenu.collapse(1)}if(h.isDisabled()){return}if(x&&c.hasClass(x,m+"ItemSub")){t=c.getRect(x);h.showMenu((t.x+t.w-i),t.y-i,t.x);z.lastMenu=h;c.addClass(c.get(h.id).firstChild,m+"ItemActive")}}})}a.add(o,"keydown",z._keyHandler,z);z.onShowMenu.dispatch(z);if(A.keyboard_focus){z._setupKeyboardNav()}},hideMenu:function(j){var g=this,i=c.get("menu_"+g.id),h;if(!g.isMenuVisible){return}if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(i,"mouseover",g.mouseOverFunc);a.remove(i,"click",g.mouseClickFunc);a.remove(i,"keydown",g._keyHandler);c.hide(i);g.isMenuVisible=0;if(!j){g.collapse(1)}if(g.element){g.element.hide()}if(h=c.get(g.id)){c.removeClass(h.firstChild,g.classPrefix+"ItemActive")}g.onHideMenu.dispatch(g)},add:function(i){var g=this,h;i=g.parent(i);if(g.isRendered&&(h=c.get("menu_"+g.id))){g._add(c.select("tbody",h)[0],i)}return i},collapse:function(g){this.parent(g);this.hideMenu(1)},remove:function(g){c.remove(g.id);this.destroy();return this.parent(g)},destroy:function(){var g=this,h=c.get("menu_"+g.id);if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(h,"mouseover",g.mouseOverFunc);a.remove(c.select("a",h),"focus",g.mouseOverFunc);a.remove(h,"click",g.mouseClickFunc);a.remove(h,"keydown",g._keyHandler);if(g.element){g.element.remove()}c.remove(h)},renderNode:function(){var i=this,j=i.settings,l,h,k,g;g=c.create("div",{role:"listbox",id:"menu_"+i.id,"class":j["class"],style:"position:absolute;left:0;top:0;z-index:200000;outline:0"});if(i.settings.parent){c.setAttrib(g,"aria-parent","menu_"+i.settings.parent.id)}k=c.add(g,"div",{role:"presentation",id:"menu_"+i.id+"_co","class":i.classPrefix+(j["class"]?" "+j["class"]:"")});i.element=new b("menu_"+i.id,{blocker:1,container:j.container});if(j.menu_line){c.add(k,"span",{"class":i.classPrefix+"Line"})}l=c.add(k,"table",{role:"presentation",id:"menu_"+i.id+"_tbl",border:0,cellPadding:0,cellSpacing:0});h=c.add(l,"tbody");f(i.items,function(m){i._add(h,m)});i.rendered=true;return g},_setupKeyboardNav:function(){var i,h,g=this;i=c.get("menu_"+g.id);h=c.select("a[role=option]","menu_"+g.id);h.splice(0,0,i);g.keyboardNav=new e.ui.KeyboardNavigation({root:"menu_"+g.id,items:h,onCancel:function(){g.hideMenu()},enableUpDown:true});i.focus()},_keyHandler:function(g){var h=this,i;switch(g.keyCode){case 37:if(h.settings.parent){h.hideMenu();h.settings.parent.focus();a.cancel(g)}break;case 39:if(h.mouseOverFunc){h.mouseOverFunc(g)}break}},_add:function(j,h){var i,q=h.settings,p,l,k,m=this.classPrefix,g;if(q.separator){l=c.add(j,"tr",{id:h.id,"class":m+"ItemSeparator"});c.add(l,"td",{"class":m+"ItemSeparator"});if(i=l.previousSibling){c.addClass(i,"mceLast")}return}i=l=c.add(j,"tr",{id:h.id,"class":m+"Item "+m+"ItemEnabled"});i=k=c.add(i,q.titleItem?"th":"td");i=p=c.add(i,"a",{id:h.id+"_aria",role:q.titleItem?"presentation":"option",href:"javascript:;",onclick:"return false;",onmousedown:"return false;"});if(q.parent){c.setAttrib(p,"aria-haspopup","true");c.setAttrib(p,"aria-owns","menu_"+h.id)}c.addClass(k,q["class"]);g=c.add(i,"span",{"class":"mceIcon"+(q.icon?" mce_"+q.icon:"")});if(q.icon_src){c.add(g,"img",{src:q.icon_src})}i=c.add(i,q.element||"span",{"class":"mceText",title:h.settings.title},h.settings.title);if(h.settings.style){if(typeof h.settings.style=="function"){h.settings.style=h.settings.style()}c.setAttrib(i,"style",h.settings.style)}if(j.childNodes.length==1){c.addClass(l,"mceFirst")}if((i=l.previousSibling)&&c.hasClass(i,m+"ItemSeparator")){c.addClass(l,"mceFirst")}if(h.collapse){c.addClass(l,m+"ItemSub")}if(i=l.previousSibling){c.removeClass(i,"mceLast")}c.addClass(l,"mceLast")}})})(tinymce);(function(b){var a=b.DOM;b.create("tinymce.ui.Button:tinymce.ui.Control",{Button:function(e,d,c){this.parent(e,d,c);this.classPrefix="mceButton"},renderHTML:function(){var f=this.classPrefix,e=this.settings,d,c;c=a.encode(e.label||"");d='<a role="button" id="'+this.id+'" href="javascript:;" class="'+f+" "+f+"Enabled "+e["class"]+(c?" "+f+"Labeled":"")+'" onmousedown="return false;" onclick="return false;" aria-labelledby="'+this.id+'_voice" title="'+a.encode(e.title)+'">';if(e.image&&!(this.editor&&this.editor.forcedHighContrastMode)){d+='<img class="mceIcon" src="'+e.image+'" alt="'+a.encode(e.title)+'" />'+c}else{d+='<span class="mceIcon '+e["class"]+'"></span>'+(c?'<span class="'+f+'Label">'+c+"</span>":"")}d+='<span class="mceVoiceLabel mceIconOnly" style="display: none;" id="'+this.id+'_voice">'+e.title+"</span>";d+="</a>";return d},postRender:function(){var d=this,e=d.settings,c;if(b.isIE&&d.editor){b.dom.Event.add(d.id,"mousedown",function(f){var g=d.editor.selection.getNode().nodeName;c=g==="IMG"?d.editor.selection.getBookmark():null})}b.dom.Event.add(d.id,"click",function(f){if(!d.isDisabled()){if(b.isIE&&d.editor&&c!==null){d.editor.selection.moveToBookmark(c)}return e.onclick.call(e.scope,f)}});b.dom.Event.add(d.id,"keyup",function(f){if(!d.isDisabled()&&f.keyCode==b.VK.SPACEBAR){return e.onclick.call(e.scope,f)}})}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.ListBox:tinymce.ui.Control",{ListBox:function(i,h,f){var g=this;g.parent(i,h,f);g.items=[];g.onChange=new a(g);g.onPostRender=new a(g);g.onAdd=new a(g);g.onRenderMenu=new d.util.Dispatcher(this);g.classPrefix="mceListBox";g.marked={}},select:function(h){var g=this,j,i;g.marked={};if(h==undefined){return g.selectByIndex(-1)}if(h&&typeof(h)=="function"){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){var h=this,i,j,g;h.marked={};if(f!=h.selectedIndex){i=c.get(h.id+"_text");g=c.get(h.id+"_voiceDesc");j=h.items[f];if(j){h.selectedValue=j.value;h.selectedIndex=f;c.setHTML(i,c.encode(j.title));c.setHTML(g,h.settings.title+" - "+j.title);c.removeClass(i,"mceTitle");c.setAttrib(h.id,"aria-valuenow",j.title)}else{c.setHTML(i,c.encode(h.settings.title));c.setHTML(g,c.encode(h.settings.title));c.addClass(i,"mceTitle");h.selectedValue=h.selectedIndex=null;c.setAttrib(h.id,"aria-valuenow",h.settings.title)}i=0}},mark:function(f){this.marked[f]=true},add:function(i,f,h){var g=this;h=h||{};h=d.extend(h,{title:i,value:f});g.items.push(h);g.onAdd.dispatch(g,h)},getLength:function(){return this.items.length},renderHTML:function(){var i="",f=this,g=f.settings,j=f.classPrefix;i='<span role="listbox" aria-haspopup="true" aria-labelledby="'+f.id+'_voiceDesc" aria-describedby="'+f.id+'_voiceDesc"><table role="presentation" tabindex="0" id="'+f.id+'" cellpadding="0" cellspacing="0" class="'+j+" "+j+"Enabled"+(g["class"]?(" "+g["class"]):"")+'"><tbody><tr>';i+="<td>"+c.createHTML("span",{id:f.id+"_voiceDesc","class":"voiceLabel",style:"display:none;"},f.settings.title);i+=c.createHTML("a",{id:f.id+"_text",tabindex:-1,href:"javascript:;","class":"mceText",onclick:"return false;",onmousedown:"return false;"},c.encode(f.settings.title))+"</td>";i+="<td>"+c.createHTML("a",{id:f.id+"_open",tabindex:-1,href:"javascript:;","class":"mceOpen",onclick:"return false;",onmousedown:"return false;"},'<span><span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span></span>')+"</td>";i+="</tr></tbody></table></span>";return i},showMenu:function(){var g=this,i,h=c.get(this.id),f;if(g.isDisabled()||g.items.length==0){return}if(g.menu&&g.menu.isMenuVisible){return g.hideMenu()}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}i=c.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.keyboard_focus=!d.isOpera;e(g.items,function(j){if(f.items[j.id]){f.items[j.id].setSelected(0)}});e(g.items,function(j){if(f.items[j.id]&&g.marked[j.value]){f.items[j.id].setSelected(1)}if(j.value===g.selectedValue){f.items[j.id].setSelected(1)}});f.showMenu(0,h.clientHeight);b.add(c.doc,"mousedown",g.hideMenu,g);c.addClass(g.id,g.classPrefix+"Selected")},hideMenu:function(g){var f=this;if(f.menu&&f.menu.isMenuVisible){c.removeClass(f.id,f.classPrefix+"Selected");if(g&&g.type=="mousedown"&&(g.target.id==f.id+"_text"||g.target.id==f.id+"_open")){return}if(!g||!c.getParent(g.target,".mceMenu")){c.removeClass(f.id,f.classPrefix+"Selected");b.remove(c.doc,"mousedown",f.hideMenu,f);f.menu.hideMenu()}}},renderMenu:function(){var g=this,f;f=g.settings.control_manager.createDropMenu(g.id+"_menu",{menu_line:1,"class":g.classPrefix+"Menu mceNoIcons",max_width:150,max_height:150});f.onHideMenu.add(function(){g.hideMenu();g.focus()});f.add({title:g.settings.title,"class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}});e(g.items,function(h){if(h.value===undefined){f.add({title:h.title,role:"option","class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}})}else{h.id=c.uniqueId();h.role="option";h.onclick=function(){if(g.settings.onselect(h.value)!==false){g.select(h.value)}};f.add(h)}});g.onRenderMenu.dispatch(g,f);g.menu=f},postRender:function(){var f=this,g=f.classPrefix;b.add(f.id,"click",f.showMenu,f);b.add(f.id,"keydown",function(h){if(h.keyCode==32){f.showMenu(h);b.cancel(h)}});b.add(f.id,"focus",function(){if(!f._focused){f.keyDownHandler=b.add(f.id,"keydown",function(h){if(h.keyCode==40){f.showMenu();b.cancel(h)}});f.keyPressHandler=b.add(f.id,"keypress",function(i){var h;if(i.keyCode==13){h=f.selectedValue;f.selectedValue=null;b.cancel(i);f.settings.onselect(h)}})}f._focused=1});b.add(f.id,"blur",function(){b.remove(f.id,"keydown",f.keyDownHandler);b.remove(f.id,"keypress",f.keyPressHandler);f._focused=0});if(d.isIE6||!c.boxModel){b.add(f.id,"mouseover",function(){if(!c.hasClass(f.id,g+"Disabled")){c.addClass(f.id,g+"Hover")}});b.add(f.id,"mouseout",function(){if(!c.hasClass(f.id,g+"Disabled")){c.removeClass(f.id,g+"Hover")}})}f.onPostRender.dispatch(f,c.get(f.id))},destroy:function(){this.parent();b.clear(this.id+"_text");b.clear(this.id+"_open")}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.NativeListBox:tinymce.ui.ListBox",{NativeListBox:function(g,f){this.parent(g,f);this.classPrefix="mceNativeListBox"},setDisabled:function(f){c.get(this.id).disabled=f;this.setAriaProperty("disabled",f)},isDisabled:function(){return c.get(this.id).disabled},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&typeof(h)=="function"){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){c.get(this.id).selectedIndex=f+1;this.selectedValue=this.items[f]?this.items[f].value:null},add:function(j,g,f){var i,h=this;f=f||{};f.value=g;if(h.isRendered()){c.add(c.get(this.id),"option",f,j)}i={title:j,value:g,attribs:f};h.items.push(i);h.onAdd.dispatch(h,i)},getLength:function(){return this.items.length},renderHTML:function(){var g,f=this;g=c.createHTML("option",{value:""},"-- "+f.settings.title+" --");e(f.items,function(h){g+=c.createHTML("option",{value:h.value},h.title)});g=c.createHTML("select",{id:f.id,"class":"mceNativeListBox","aria-labelledby":f.id+"_aria"},g);g+=c.createHTML("span",{id:f.id+"_aria",style:"display: none"},f.settings.title);return g},postRender:function(){var g=this,h,i=true;g.rendered=true;function f(k){var j=g.items[k.target.selectedIndex-1];if(j&&(j=j.value)){g.onChange.dispatch(g,j);if(g.settings.onselect){g.settings.onselect(j)}}}b.add(g.id,"change",f);b.add(g.id,"keydown",function(k){var j;b.remove(g.id,"change",h);i=false;j=b.add(g.id,"blur",function(){if(i){return}i=true;b.add(g.id,"change",f);b.remove(g.id,"blur",j)});if(d.isWebKit&&(k.keyCode==37||k.keyCode==39)){return b.prevent(k)}if(k.keyCode==13||k.keyCode==32){f(k);return b.cancel(k)}});g.onPostRender.dispatch(g,c.get(g.id))}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.MenuButton:tinymce.ui.Button",{MenuButton:function(g,f,e){this.parent(g,f,e);this.onRenderMenu=new c.util.Dispatcher(this);f.menu_container=f.menu_container||b.doc.body},showMenu:function(){var g=this,j,i,h=b.get(g.id),f;if(g.isDisabled()){return}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}if(g.isMenuVisible){return g.hideMenu()}j=b.getPos(g.settings.menu_container);i=b.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.vp_offset_x=i.x;f.settings.vp_offset_y=i.y;f.settings.keyboard_focus=g._focused;f.showMenu(0,h.clientHeight);a.add(b.doc,"mousedown",g.hideMenu,g);g.setState("Selected",1);g.isMenuVisible=1},renderMenu:function(){var f=this,e;e=f.settings.control_manager.createDropMenu(f.id+"_menu",{menu_line:1,"class":this.classPrefix+"Menu",icons:f.settings.icons});e.onHideMenu.add(function(){f.hideMenu();f.focus()});f.onRenderMenu.dispatch(f,e);f.menu=e},hideMenu:function(g){var f=this;if(g&&g.type=="mousedown"&&b.getParent(g.target,function(h){return h.id===f.id||h.id===f.id+"_open"})){return}if(!g||!b.getParent(g.target,".mceMenu")){f.setState("Selected",0);a.remove(b.doc,"mousedown",f.hideMenu,f);if(f.menu){f.menu.hideMenu()}}f.isMenuVisible=0},postRender:function(){var e=this,f=e.settings;a.add(e.id,"click",function(){if(!e.isDisabled()){if(f.onclick){f.onclick(e.value)}e.showMenu()}})}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.SplitButton:tinymce.ui.MenuButton",{SplitButton:function(g,f,e){this.parent(g,f,e);this.classPrefix="mceSplitButton"},renderHTML:function(){var i,f=this,g=f.settings,e;i="<tbody><tr>";if(g.image){e=b.createHTML("img ",{src:g.image,role:"presentation","class":"mceAction "+g["class"]})}else{e=b.createHTML("span",{"class":"mceAction "+g["class"]},"")}e+=b.createHTML("span",{"class":"mceVoiceLabel mceIconOnly",id:f.id+"_voice",style:"display:none;"},g.title);i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_action",tabindex:"-1",href:"javascript:;","class":"mceAction "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";e=b.createHTML("span",{"class":"mceOpen "+g["class"]},'<span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span>');i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_open",tabindex:"-1",href:"javascript:;","class":"mceOpen "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";i+="</tr></tbody>";i=b.createHTML("table",{role:"presentation","class":"mceSplitButton mceSplitButtonEnabled "+g["class"],cellpadding:"0",cellspacing:"0",title:g.title},i);return b.createHTML("div",{id:f.id,role:"button",tabindex:"0","aria-labelledby":f.id+"_voice","aria-haspopup":"true"},i)},postRender:function(){var e=this,g=e.settings,f;if(g.onclick){f=function(h){if(!e.isDisabled()){g.onclick(e.value);a.cancel(h)}};a.add(e.id+"_action","click",f);a.add(e.id,["click","keydown"],function(h){var k=32,m=14,i=13,j=38,l=40;if((h.keyCode===32||h.keyCode===13||h.keyCode===14)&&!h.altKey&&!h.ctrlKey&&!h.metaKey){f();a.cancel(h)}else{if(h.type==="click"||h.keyCode===l){e.showMenu();a.cancel(h)}}})}a.add(e.id+"_open","click",function(h){e.showMenu();a.cancel(h)});a.add([e.id,e.id+"_open"],"focus",function(){e._focused=1});a.add([e.id,e.id+"_open"],"blur",function(){e._focused=0});if(c.isIE6||!b.boxModel){a.add(e.id,"mouseover",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.addClass(e.id,"mceSplitButtonHover")}});a.add(e.id,"mouseout",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.removeClass(e.id,"mceSplitButtonHover")}})}},destroy:function(){this.parent();a.clear(this.id+"_action");a.clear(this.id+"_open");a.clear(this.id)}})})(tinymce);(function(d){var c=d.DOM,a=d.dom.Event,b=d.is,e=d.each;d.create("tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton",{ColorSplitButton:function(i,h,f){var g=this;g.parent(i,h,f);g.settings=h=d.extend({colors:"000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,008000,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF",grid_width:8,default_color:"#888888"},g.settings);g.onShowMenu=new d.util.Dispatcher(g);g.onHideMenu=new d.util.Dispatcher(g);g.value=h.default_color},showMenu:function(){var f=this,g,j,i,h;if(f.isDisabled()){return}if(!f.isMenuRendered){f.renderMenu();f.isMenuRendered=true}if(f.isMenuVisible){return f.hideMenu()}i=c.get(f.id);c.show(f.id+"_menu");c.addClass(i,"mceSplitButtonSelected");h=c.getPos(i);c.setStyles(f.id+"_menu",{left:h.x,top:h.y+i.clientHeight,zIndex:200000});i=0;a.add(c.doc,"mousedown",f.hideMenu,f);f.onShowMenu.dispatch(f);if(f._focused){f._keyHandler=a.add(f.id+"_menu","keydown",function(k){if(k.keyCode==27){f.hideMenu()}});c.select("a",f.id+"_menu")[0].focus()}f.isMenuVisible=1},hideMenu:function(g){var f=this;if(f.isMenuVisible){if(g&&g.type=="mousedown"&&c.getParent(g.target,function(h){return h.id===f.id+"_open"})){return}if(!g||!c.getParent(g.target,".mceSplitButtonMenu")){c.removeClass(f.id,"mceSplitButtonSelected");a.remove(c.doc,"mousedown",f.hideMenu,f);a.remove(f.id+"_menu","keydown",f._keyHandler);c.hide(f.id+"_menu")}f.isMenuVisible=0;f.onHideMenu.dispatch()}},renderMenu:function(){var p=this,h,k=0,q=p.settings,g,j,l,o,f;o=c.add(q.menu_container,"div",{role:"listbox",id:p.id+"_menu","class":q.menu_class+" "+q["class"],style:"position:absolute;left:0;top:-1000px;"});h=c.add(o,"div",{"class":q["class"]+" mceSplitButtonMenu"});c.add(h,"span",{"class":"mceMenuLine"});g=c.add(h,"table",{role:"presentation","class":"mceColorSplitMenu"});j=c.add(g,"tbody");k=0;e(b(q.colors,"array")?q.colors:q.colors.split(","),function(m){m=m.replace(/^#/,"");if(!k--){l=c.add(j,"tr");k=q.grid_width-1}g=c.add(l,"td");var i={href:"javascript:;",style:{backgroundColor:"#"+m},title:p.editor.getLang("colors."+m,m),"data-mce-color":"#"+m};if(!d.isIE){i.role="option"}g=c.add(g,"a",i);if(p.editor.forcedHighContrastMode){g=c.add(g,"canvas",{width:16,height:16,"aria-hidden":"true"});if(g.getContext&&(f=g.getContext("2d"))){f.fillStyle="#"+m;f.fillRect(0,0,16,16)}else{c.remove(g)}}});if(q.more_colors_func){g=c.add(j,"tr");g=c.add(g,"td",{colspan:q.grid_width,"class":"mceMoreColors"});g=c.add(g,"a",{role:"option",id:p.id+"_more",href:"javascript:;",onclick:"return false;","class":"mceMoreColors"},q.more_colors_title);a.add(g,"click",function(i){q.more_colors_func.call(q.more_colors_scope||this);return a.cancel(i)})}c.addClass(h,"mceColorSplitMenu");new d.ui.KeyboardNavigation({root:p.id+"_menu",items:c.select("a",p.id+"_menu"),onCancel:function(){p.hideMenu();p.focus()}});a.add(p.id+"_menu","mousedown",function(i){return a.cancel(i)});a.add(p.id+"_menu","click",function(i){var m;i=c.getParent(i.target,"a",j);if(i&&i.nodeName.toLowerCase()=="a"&&(m=i.getAttribute("data-mce-color"))){p.setColor(m)}return false});return o},setColor:function(f){this.displayColor(f);this.hideMenu();this.settings.onselect(f)},displayColor:function(g){var f=this;c.setStyle(f.id+"_preview","backgroundColor",g);f.value=g},postRender:function(){var f=this,g=f.id;f.parent();c.add(g+"_action","div",{id:g+"_preview","class":"mceColorPreview"});c.setStyle(f.id+"_preview","backgroundColor",f.value)},destroy:function(){this.parent();a.clear(this.id+"_menu");a.clear(this.id+"_more");c.remove(this.id+"_menu")}})})(tinymce);(function(b){var d=b.DOM,c=b.each,a=b.dom.Event;b.create("tinymce.ui.ToolbarGroup:tinymce.ui.Container",{renderHTML:function(){var f=this,i=[],e=f.controls,j=b.each,g=f.settings;i.push('<div id="'+f.id+'" role="group" aria-labelledby="'+f.id+'_voice">');i.push("<span role='application'>");i.push('<span id="'+f.id+'_voice" class="mceVoiceLabel" style="display:none;">'+d.encode(g.name)+"</span>");j(e,function(h){i.push(h.renderHTML())});i.push("</span>");i.push("</div>");return i.join("")},focus:function(){var e=this;d.get(e.id).focus()},postRender:function(){var f=this,e=[];c(f.controls,function(g){c(g.controls,function(h){if(h.id){e.push(h)}})});f.keyNav=new b.ui.KeyboardNavigation({root:f.id,items:e,onCancel:function(){if(b.isWebKit){d.get(f.editor.id+"_ifr").focus()}f.editor.focus()},excludeFromTabOrder:!f.settings.tab_focus_toolbar})},destroy:function(){var e=this;e.parent();e.keyNav.destroy();a.clear(e.id)}})})(tinymce);(function(a){var c=a.DOM,b=a.each;a.create("tinymce.ui.Toolbar:tinymce.ui.Container",{renderHTML:function(){var m=this,f="",j,k,n=m.settings,e,d,g,l;l=m.controls;for(e=0;e<l.length;e++){k=l[e];d=l[e-1];g=l[e+1];if(e===0){j="mceToolbarStart";if(k.Button){j+=" mceToolbarStartButton"}else{if(k.SplitButton){j+=" mceToolbarStartSplitButton"}else{if(k.ListBox){j+=" mceToolbarStartListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"))}if(d&&k.ListBox){if(d.Button||d.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarEnd"},c.createHTML("span",null,"<!-- IE -->"))}}if(c.stdMode){f+='<td style="position: relative">'+k.renderHTML()+"</td>"}else{f+="<td>"+k.renderHTML()+"</td>"}if(g&&k.ListBox){if(g.Button||g.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarStart"},c.createHTML("span",null,"<!-- IE -->"))}}}j="mceToolbarEnd";if(k.Button){j+=" mceToolbarEndButton"}else{if(k.SplitButton){j+=" mceToolbarEndSplitButton"}else{if(k.ListBox){j+=" mceToolbarEndListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"));return c.createHTML("table",{id:m.id,"class":"mceToolbar"+(n["class"]?" "+n["class"]:""),cellpadding:"0",cellspacing:"0",align:m.settings.align||"",role:"presentation",tabindex:"-1"},"<tbody><tr>"+f+"</tr></tbody>")}})})(tinymce);(function(b){var a=b.util.Dispatcher,c=b.each;b.create("tinymce.AddOnManager",{AddOnManager:function(){var d=this;d.items=[];d.urls={};d.lookup={};d.onAdd=new a(d)},get:function(d){if(this.lookup[d]){return this.lookup[d].instance}else{return undefined}},dependencies:function(e){var d;if(this.lookup[e]){d=this.lookup[e].dependencies}return d||[]},requireLangPack:function(e){var d=b.settings;if(d&&d.language&&d.language_load!==false){b.ScriptLoader.add(this.urls[e]+"/langs/"+d.language+".js")}},add:function(f,e,d){this.items.push(e);this.lookup[f]={instance:e,dependencies:d};this.onAdd.dispatch(this,f,e);return e},createUrl:function(d,e){if(typeof e==="object"){return e}else{return{prefix:d.prefix,resource:e,suffix:d.suffix}}},addComponents:function(f,d){var e=this.urls[f];b.each(d,function(g){b.ScriptLoader.add(e+"/"+g)})},load:function(j,f,d,h){var g=this,e=f;function i(){var k=g.dependencies(j);b.each(k,function(m){var l=g.createUrl(f,m);g.load(l.resource,l,undefined,undefined)});if(d){if(h){d.call(h)}else{d.call(b.ScriptLoader)}}}if(g.urls[j]){return}if(typeof f==="object"){e=f.prefix+f.resource+f.suffix}if(e.indexOf("/")!=0&&e.indexOf("://")==-1){e=b.baseURL+"/"+e}g.urls[j]=e.substring(0,e.lastIndexOf("/"));if(g.lookup[j]){i()}else{b.ScriptLoader.add(e,i,h)}}});b.PluginManager=new b.AddOnManager();b.ThemeManager=new b.AddOnManager()}(tinymce));(function(j){var g=j.each,d=j.extend,k=j.DOM,i=j.dom.Event,f=j.ThemeManager,b=j.PluginManager,e=j.explode,h=j.util.Dispatcher,a,c=0;j.documentBaseURL=window.location.href.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,"");if(!/[\/\\]$/.test(j.documentBaseURL)){j.documentBaseURL+="/"}j.baseURL=new j.util.URI(j.documentBaseURL).toAbsolute(j.baseURL);j.baseURI=new j.util.URI(j.baseURL);j.onBeforeUnload=new h(j);i.add(window,"beforeunload",function(l){j.onBeforeUnload.dispatch(j,l)});j.onAddEditor=new h(j);j.onRemoveEditor=new h(j);j.EditorManager=d(j,{editors:[],i18n:{},activeEditor:null,init:function(v){var u=this,o,n=j.ScriptLoader,r,l=[],q;function p(t){var s=t.id;if(!s){s=t.name;if(s&&!k.get(s)){s=t.name}else{s=k.uniqueId()}t.setAttribute("id",s)}return s}function m(y,z,t){var x=y[z];if(!x){return}if(j.is(x,"string")){t=x.replace(/\.\w+$/,"");t=t?j.resolve(t):0;x=j.resolve(x)}return x.apply(t||this,Array.prototype.slice.call(arguments,2))}v=d({theme:"simple",language:"en"},v);u.settings=v;i.bind(window,"ready",function(){var s,x;m(v,"onpageload");switch(v.mode){case"exact":s=v.elements||"";if(s.length>0){g(e(s),function(y){if(k.get(y)){q=new j.Editor(y,v);l.push(q);q.render(1)}else{g(document.forms,function(z){g(z.elements,function(A){if(A.name===y){y="mce_editor_"+c++;k.setAttrib(A,"id",y);q=new j.Editor(y,v);l.push(q);q.render(1)}})})}})}break;case"textareas":case"specific_textareas":function t(z,y){return y.constructor===RegExp?y.test(z.className):k.hasClass(z,y)}g(k.select("textarea"),function(y){if(v.editor_deselector&&t(y,v.editor_deselector)){return}if(!v.editor_selector||t(y,v.editor_selector)){q=new j.Editor(p(y),v);l.push(q);q.render(1)}});break;default:if(v.types){g(v.types,function(y){g(k.select(y.selector),function(A){var z=new j.Editor(p(A),j.extend({},v,y));l.push(z);z.render(1)})})}else{if(v.selector){g(k.select(v.selector),function(z){var y=new j.Editor(p(z),v);l.push(y);y.render(1)})}}}if(v.oninit){s=x=0;g(l,function(y){x++;if(!y.initialized){y.onInit.add(function(){s++;if(s==x){m(v,"oninit")}})}else{s++}if(s==x){m(v,"oninit")}})}})},get:function(l){if(l===a){return this.editors}return this.editors[l]},getInstanceById:function(l){return this.get(l)},add:function(m){var l=this,n=l.editors;n[m.id]=m;n.push(m);l._setActive(m);l.onAddEditor.dispatch(l,m);return m},remove:function(n){var m=this,l,o=m.editors;if(!o[n.id]){return null}delete o[n.id];for(l=0;l<o.length;l++){if(o[l]==n){o.splice(l,1);break}}if(m.activeEditor==n){m._setActive(o[0])}n.destroy();m.onRemoveEditor.dispatch(m,n);return n},execCommand:function(r,p,o){var q=this,n=q.get(o),l;switch(r){case"mceFocus":n.focus();return true;case"mceAddEditor":case"mceAddControl":if(!q.get(o)){new j.Editor(o,q.settings).render()}return true;case"mceAddFrameControl":l=o.window;l.tinyMCE=tinyMCE;l.tinymce=j;j.DOM.doc=l.document;j.DOM.win=l;n=new j.Editor(o.element_id,o);n.render();if(j.isIE){function m(){n.destroy();l.detachEvent("onunload",m);l=l.tinyMCE=l.tinymce=null}l.attachEvent("onunload",m)}o.page_window=null;return true;case"mceRemoveEditor":case"mceRemoveControl":if(n){n.remove()}return true;case"mceToggleEditor":if(!n){q.execCommand("mceAddControl",0,o);return true}if(n.isHidden()){n.show()}else{n.hide()}return true}if(q.activeEditor){return q.activeEditor.execCommand(r,p,o)}return false},execInstanceCommand:function(p,o,n,m){var l=this.get(p);if(l){return l.execCommand(o,n,m)}return false},triggerSave:function(){g(this.editors,function(l){l.save()})},addI18n:function(n,q){var l,m=this.i18n;if(!j.is(n,"string")){g(n,function(r,p){g(r,function(t,s){g(t,function(v,u){if(s==="common"){m[p+"."+u]=v}else{m[p+"."+s+"."+u]=v}})})})}else{g(q,function(r,p){m[n+"."+p]=r})}},_setActive:function(l){this.selectedInstance=this.activeEditor=l}})})(tinymce);(function(n){var o=n.DOM,k=n.dom.Event,f=n.extend,l=n.util.Dispatcher,i=n.each,a=n.isGecko,b=n.isIE,e=n.isWebKit,d=n.is,h=n.ThemeManager,c=n.PluginManager,p=n.inArray,m=n.grep,g=n.explode,j=n.VK;n.create("tinymce.Editor",{Editor:function(u,r){var q=this;q.id=q.editorId=u;q.execCommands={};q.queryStateCommands={};q.queryValueCommands={};q.isNotDirty=false;q.plugins={};i(["onPreInit","onBeforeRenderUI","onPostRender","onLoad","onInit","onRemove","onActivate","onDeactivate","onClick","onEvent","onMouseUp","onMouseDown","onDblClick","onKeyDown","onKeyUp","onKeyPress","onContextMenu","onSubmit","onReset","onPaste","onPreProcess","onPostProcess","onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent","onLoadContent","onSaveContent","onNodeChange","onChange","onBeforeExecCommand","onExecCommand","onUndo","onRedo","onVisualAid","onSetProgressState","onSetAttrib"],function(s){q[s]=new l(q)});q.settings=r=f({id:u,language:"en",docs_language:"en",theme:"simple",skin:"default",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:n.documentBaseURL,add_form_submit_trigger:1,submit_patch:1,add_unload_trigger:1,convert_urls:1,relative_urls:1,remove_script_host:1,table_inline_editing:0,object_resizing:1,cleanup:1,accessibility_focus:1,custom_shortcuts:1,custom_undo_redo_keyboard_shortcuts:1,custom_undo_redo_restore_selection:1,custom_undo_redo:1,doctype:n.isIE6?'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">':"<!DOCTYPE>",visual_table_class:"mceItemTable",visual:1,font_size_style_values:"xx-small,x-small,small,medium,large,x-large,xx-large",font_size_legacy_values:"xx-small,small,medium,large,x-large,xx-large,300%",apply_source_formatting:1,directionality:"ltr",forced_root_block:"p",hidden_input:1,padd_empty_editor:1,render_ui:1,init_theme:1,force_p_newlines:1,indentation:"30px",keep_styles:1,fix_table_elements:1,inline_styles:1,convert_fonts_to_spans:true,indent:"simple",indent_before:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside",validate:true,entity_encoding:"named",url_converter:q.convertURL,url_converter_scope:q,ie7_compat:true},r);q.documentBaseURI=new n.util.URI(r.document_base_url||n.documentBaseURL,{base_uri:tinyMCE.baseURI});q.baseURI=n.baseURI;q.contentCSS=[];q.execCallback("setup",q)},render:function(u){var v=this,x=v.settings,y=v.id,q=n.ScriptLoader;if(!k.domLoaded){k.add(window,"ready",function(){v.render()});return}tinyMCE.settings=x;if(!v.getElement()){return}if(n.isIDevice&&!n.isIOS5){return}if(!/TEXTAREA|INPUT/i.test(v.getElement().nodeName)&&x.hidden_input&&o.getParent(y,"form")){o.insertAfter(o.create("input",{type:"hidden",name:y}),y)}if(n.WindowManager){v.windowManager=new n.WindowManager(v)}if(x.encoding=="xml"){v.onGetContent.add(function(s,t){if(t.save){t.content=o.encode(t.content)}})}if(x.add_form_submit_trigger){v.onSubmit.addToTop(function(){if(v.initialized){v.save();v.isNotDirty=1}})}if(x.add_unload_trigger){v._beforeUnload=tinyMCE.onBeforeUnload.add(function(){if(v.initialized&&!v.destroyed&&!v.isHidden()){v.save({format:"raw",no_events:true})}})}n.addUnload(v.destroy,v);if(x.submit_patch){v.onBeforeRenderUI.add(function(){var s=v.getElement().form;if(!s){return}if(s._mceOldSubmit){return}if(!s.submit.nodeType&&!s.submit.length){v.formElement=s;s._mceOldSubmit=s.submit;s.submit=function(){n.triggerSave();v.isNotDirty=1;return v.formElement._mceOldSubmit(v.formElement)}}s=null})}function r(){if(x.language&&x.language_load!==false){q.add(n.baseURL+"/langs/"+x.language+".js")}if(x.theme&&x.theme.charAt(0)!="-"&&!h.urls[x.theme]){h.load(x.theme,"themes/"+x.theme+"/editor_template"+n.suffix+".js")}i(g(x.plugins),function(t){if(t&&!c.urls[t]){if(t.charAt(0)=="-"){t=t.substr(1,t.length);var s=c.dependencies(t);i(s,function(A){var z={prefix:"plugins/",resource:A,suffix:"/editor_plugin"+n.suffix+".js"};var A=c.createUrl(z,A);c.load(A.resource,A)})}else{if(t=="safari"){return}c.load(t,{prefix:"plugins/",resource:t,suffix:"/editor_plugin"+n.suffix+".js"})}}});q.loadQueue(function(){if(!v.removed){v.init()}})}r()},init:function(){var v,I=this,J=I.settings,F,B,E=I.getElement(),r,q,G,z,D,H,A,x=[];n.add(I);J.aria_label=J.aria_label||o.getAttrib(E,"aria-label",I.getLang("aria.rich_text_area"));if(J.theme){J.theme=J.theme.replace(/-/,"");r=h.get(J.theme);I.theme=new r();if(I.theme.init&&J.init_theme){I.theme.init(I,h.urls[J.theme]||n.documentBaseURL.replace(/\/$/,""))}}function C(K){var L=c.get(K),t=c.urls[K]||n.documentBaseURL.replace(/\/$/,""),s;if(L&&n.inArray(x,K)===-1){i(c.dependencies(K),function(u){C(u)});s=new L(I,t);I.plugins[K]=s;if(s.init){s.init(I,t);x.push(K)}}}i(g(J.plugins.replace(/\-/g,"")),C);if(J.popup_css!==false){if(J.popup_css){J.popup_css=I.documentBaseURI.toAbsolute(J.popup_css)}else{J.popup_css=I.baseURI.toAbsolute("themes/"+J.theme+"/skins/"+J.skin+"/dialog.css")}}if(J.popup_css_add){J.popup_css+=","+I.documentBaseURI.toAbsolute(J.popup_css_add)}I.controlManager=new n.ControlManager(I);if(J.custom_undo_redo){I.onBeforeExecCommand.add(function(t,K,u,L,s){if(K!="Undo"&&K!="Redo"&&K!="mceRepaint"&&(!s||!s.skip_undo)){I.undoManager.beforeChange()}});I.onExecCommand.add(function(t,K,u,L,s){if(K!="Undo"&&K!="Redo"&&K!="mceRepaint"&&(!s||!s.skip_undo)){I.undoManager.add()}})}I.onExecCommand.add(function(s,t){if(!/^(FontName|FontSize)$/.test(t)){I.nodeChanged()}});if(a){function y(s,t){if(!t||!t.initial){I.execCommand("mceRepaint")}}I.onUndo.add(y);I.onRedo.add(y);I.onSetContent.add(y)}I.onBeforeRenderUI.dispatch(I,I.controlManager);if(J.render_ui){F=J.width||E.style.width||E.offsetWidth;B=J.height||E.style.height||E.offsetHeight;I.orgDisplay=E.style.display;H=/^[0-9\.]+(|px)$/i;if(H.test(""+F)){F=Math.max(parseInt(F)+(r.deltaWidth||0),100)}if(H.test(""+B)){B=Math.max(parseInt(B)+(r.deltaHeight||0),100)}r=I.theme.renderUI({targetNode:E,width:F,height:B,deltaWidth:J.delta_width,deltaHeight:J.delta_height});I.editorContainer=r.editorContainer}if(document.domain&&location.hostname!=document.domain){n.relaxedDomain=document.domain}o.setStyles(r.sizeContainer||r.editorContainer,{width:F,height:B});if(J.content_css){n.each(g(J.content_css),function(s){I.contentCSS.push(I.documentBaseURI.toAbsolute(s))})}B=(r.iframeHeight||B)+(typeof(B)=="number"?(r.deltaHeight||0):"");if(B<100){B=100}I.iframeHTML=J.doctype+'<html><head xmlns="http://www.w3.org/1999/xhtml">';if(J.document_base_url!=n.documentBaseURL){I.iframeHTML+='<base href="'+I.documentBaseURI.getURI()+'" />'}if(J.ie7_compat){I.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=7" />'}else{I.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=edge" />'}I.iframeHTML+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';for(A=0;A<I.contentCSS.length;A++){I.iframeHTML+='<link type="text/css" rel="stylesheet" href="'+I.contentCSS[A]+'" />'}I.contentCSS=[];z=J.body_id||"tinymce";if(z.indexOf("=")!=-1){z=I.getParam("body_id","","hash");z=z[I.id]||z}D=J.body_class||"";if(D.indexOf("=")!=-1){D=I.getParam("body_class","","hash");D=D[I.id]||""}I.iframeHTML+='</head><body id="'+z+'" class="mceContentBody '+D+'" onload="window.parent.tinyMCE.get(\''+I.id+"').onLoad.dispatch();\"><br></body></html>";if(n.relaxedDomain&&(b||(n.isOpera&&parseFloat(opera.version())<11))){G='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinyMCE.get("'+I.id+'");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()'}v=o.add(r.iframeContainer,"iframe",{id:I.id+"_ifr",src:G||'javascript:""',frameBorder:"0",allowTransparency:"true",title:J.aria_label,style:{width:"100%",height:B,display:"block"}});I.contentAreaContainer=r.iframeContainer;o.get(r.editorContainer).style.display=I.orgDisplay;o.get(I.id).style.display="none";o.setAttrib(I.id,"aria-hidden",true);if(!n.relaxedDomain||!G){I.setupIframe()}E=v=r=null},setupIframe:function(){var r=this,x=r.settings,y=o.get(r.id),z=r.getDoc(),v,q;if(!b||!n.relaxedDomain){z.open();z.write(r.iframeHTML);z.close();if(n.relaxedDomain){z.domain=n.relaxedDomain}}q=r.getBody();q.disabled=true;if(!x.readonly){q.contentEditable=true}q.disabled=false;r.schema=new n.html.Schema(x);r.dom=new n.dom.DOMUtils(r.getDoc(),{keep_values:true,url_converter:r.convertURL,url_converter_scope:r,hex_colors:x.force_hex_style_colors,class_filter:x.class_filter,update_styles:1,fix_ie_paragraphs:1,schema:r.schema});r.parser=new n.html.DomParser(x,r.schema);if(!r.settings.allow_html_in_named_anchor){r.parser.addAttributeFilter("name",function(s,t){var B=s.length,D,A,C,E;while(B--){E=s[B];if(E.name==="a"&&E.firstChild){C=E.parent;D=E.lastChild;do{A=D.prev;C.insert(D,E);D=A}while(D)}}})}r.parser.addAttributeFilter("src,href,style",function(s,t){var A=s.length,C,E=r.dom,D,B;while(A--){C=s[A];D=C.attr(t);B="data-mce-"+t;if(!C.attributes.map[B]){if(t==="style"){C.attr(B,E.serializeStyle(E.parseStyle(D),C.name))}else{C.attr(B,r.convertURL(D,t,C.name))}}}});r.parser.addNodeFilter("script",function(s,t){var A=s.length,B;while(A--){B=s[A];B.attr("type","mce-"+(B.attr("type")||"text/javascript"))}});r.parser.addNodeFilter("#cdata",function(s,t){var A=s.length,B;while(A--){B=s[A];B.type=8;B.name="#comment";B.value="[CDATA["+B.value+"]]"}});r.parser.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(t,A){var B=t.length,C,s=r.schema.getNonEmptyElements();while(B--){C=t[B];if(C.isEmpty(s)){C.empty().append(new n.html.Node("br",1)).shortEnded=true}}});r.serializer=new n.dom.Serializer(x,r.dom,r.schema);r.selection=new n.dom.Selection(r.dom,r.getWin(),r.serializer);r.formatter=new n.Formatter(this);r.formatter.register({alignleft:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"left"},defaultBlock:"div"},{selector:"img,table",collapsed:false,styles:{"float":"left"}}],aligncenter:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"center"},defaultBlock:"div"},{selector:"img",collapsed:false,styles:{display:"block",marginLeft:"auto",marginRight:"auto"}},{selector:"table",collapsed:false,styles:{marginLeft:"auto",marginRight:"auto"}}],alignright:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"right"},defaultBlock:"div"},{selector:"img,table",collapsed:false,styles:{"float":"right"}}],alignfull:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"justify"},defaultBlock:"div"}],bold:[{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b",remove:"all"}],italic:[{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i",remove:"all"}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:true},{inline:"u",remove:"all"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:true},{inline:"strike",remove:"all"}],forecolor:{inline:"span",styles:{color:"%value"},wrap_links:false},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},wrap_links:false},fontname:{inline:"span",styles:{fontFamily:"%value"}},fontsize:{inline:"span",styles:{fontSize:"%value"}},fontsize_class:{inline:"span",attributes:{"class":"%value"}},blockquote:{block:"blockquote",wrapper:1,remove:"all"},subscript:{inline:"sub"},superscript:{inline:"sup"},link:{inline:"a",selector:"a",remove:"all",split:true,deep:true,onmatch:function(s){return true},onformat:function(A,s,t){i(t,function(C,B){r.dom.setAttrib(A,B,C)})}},removeformat:[{selector:"b,strong,em,i,font,u,strike",remove:"all",split:true,expand:false,block_expand:true,deep:true},{selector:"span",attributes:["style","class"],remove:"empty",split:true,expand:false,deep:true},{selector:"*",attributes:["style","class"],split:false,expand:false,deep:true}]});i("p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp".split(/\s/),function(s){r.formatter.register(s,{block:s,remove:"all"})});r.formatter.register(r.settings.formats);r.undoManager=new n.UndoManager(r);r.undoManager.onAdd.add(function(t,s){if(t.hasUndo()){return r.onChange.dispatch(r,s,t)}});r.undoManager.onUndo.add(function(t,s){return r.onUndo.dispatch(r,s,t)});r.undoManager.onRedo.add(function(t,s){return r.onRedo.dispatch(r,s,t)});r.forceBlocks=new n.ForceBlocks(r);r.enterKey=new n.EnterKey(r);r.editorCommands=new n.EditorCommands(r);r.serializer.onPreProcess.add(function(s,t){return r.onPreProcess.dispatch(r,t,s)});r.serializer.onPostProcess.add(function(s,t){return r.onPostProcess.dispatch(r,t,s)});r.onPreInit.dispatch(r);if(!x.gecko_spellcheck){r.getBody().spellcheck=0}if(!x.readonly){r._addEvents()}r.controlManager.onPostRender.dispatch(r,r.controlManager);r.onPostRender.dispatch(r);r.quirks=new n.util.Quirks(this);if(x.directionality){r.getBody().dir=x.directionality}if(x.nowrap){r.getBody().style.whiteSpace="nowrap"}if(x.handle_node_change_callback){r.onNodeChange.add(function(t,s,A){r.execCallback("handle_node_change_callback",r.id,A,-1,-1,true,r.selection.isCollapsed())})}if(x.save_callback){r.onSaveContent.add(function(s,A){var t=r.execCallback("save_callback",r.id,A.content,r.getBody());if(t){A.content=t}})}if(x.onchange_callback){r.onChange.add(function(t,s){r.execCallback("onchange_callback",r,s)})}if(x.protect){r.onBeforeSetContent.add(function(s,t){if(x.protect){i(x.protect,function(A){t.content=t.content.replace(A,function(B){return"<!--mce:protected "+escape(B)+"-->"})})}})}if(x.convert_newlines_to_brs){r.onBeforeSetContent.add(function(s,t){if(t.initial){t.content=t.content.replace(/\r?\n/g,"<br />")}})}if(x.preformatted){r.onPostProcess.add(function(s,t){t.content=t.content.replace(/^\s*<pre.*?>/,"");t.content=t.content.replace(/<\/pre>\s*$/,"");if(t.set){t.content='<pre class="mceItemHidden">'+t.content+"</pre>"}})}if(x.verify_css_classes){r.serializer.attribValueFilter=function(C,A){var B,t;if(C=="class"){if(!r.classesRE){t=r.dom.getClasses();if(t.length>0){B="";i(t,function(s){B+=(B?"|":"")+s["class"]});r.classesRE=new RegExp("("+B+")","gi")}}return !r.classesRE||/(\bmceItem\w+\b|\bmceTemp\w+\b)/g.test(A)||r.classesRE.test(A)?A:""}return A}}if(x.cleanup_callback){r.onBeforeSetContent.add(function(s,t){t.content=r.execCallback("cleanup_callback","insert_to_editor",t.content,t)});r.onPreProcess.add(function(s,t){if(t.set){r.execCallback("cleanup_callback","insert_to_editor_dom",t.node,t)}if(t.get){r.execCallback("cleanup_callback","get_from_editor_dom",t.node,t)}});r.onPostProcess.add(function(s,t){if(t.set){t.content=r.execCallback("cleanup_callback","insert_to_editor",t.content,t)}if(t.get){t.content=r.execCallback("cleanup_callback","get_from_editor",t.content,t)}})}if(x.save_callback){r.onGetContent.add(function(s,t){if(t.save){t.content=r.execCallback("save_callback",r.id,t.content,r.getBody())}})}if(x.handle_event_callback){r.onEvent.add(function(s,t,A){if(r.execCallback("handle_event_callback",t,s,A)===false){k.cancel(t)}})}r.onSetContent.add(function(){r.addVisual(r.getBody())});if(x.padd_empty_editor){r.onPostProcess.add(function(s,t){t.content=t.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/,"")})}if(a){function u(s,t){i(s.dom.select("a"),function(B){var A=B.parentNode;if(s.dom.isBlock(A)&&A.lastChild===B){s.dom.add(A,"br",{"data-mce-bogus":1})}})}r.onExecCommand.add(function(s,t){if(t==="CreateLink"){u(s)}});r.onSetContent.add(r.selection.onSetContent.add(u))}r.load({initial:true,format:"html"});r.startContent=r.getContent({format:"raw"});r.undoManager.add();r.initialized=true;r.onInit.dispatch(r);r.execCallback("setupcontent_callback",r.id,r.getBody(),r.getDoc());r.execCallback("init_instance_callback",r);r.focus(true);r.nodeChanged({initial:1});i(r.contentCSS,function(s){r.dom.loadCSS(s)});if(x.auto_focus){setTimeout(function(){var s=n.get(x.auto_focus);s.selection.select(s.getBody(),1);s.selection.collapse(1);s.getBody().focus();s.getWin().focus()},100)}y=null},focus:function(v){var z,r=this,u=r.selection,y=r.settings.content_editable,s,q,x=r.getDoc();if(!v){s=u.getRng();if(s.item){q=s.item(0)}r._refreshContentEditable();if(!y){r.getWin().focus()}if(n.isGecko){r.getBody().focus()}if(q&&q.ownerDocument==x){s=x.body.createControlRange();s.addElement(q);s.select()}}if(n.activeEditor!=r){if((z=n.activeEditor)!=null){z.onDeactivate.dispatch(z,r)}r.onActivate.dispatch(r,z)}n._setActive(r)},execCallback:function(v){var q=this,u=q.settings[v],r;if(!u){return}if(q.callbackLookup&&(r=q.callbackLookup[v])){u=r.func;r=r.scope}if(d(u,"string")){r=u.replace(/\.\w+$/,"");r=r?n.resolve(r):0;u=n.resolve(u);q.callbackLookup=q.callbackLookup||{};q.callbackLookup[v]={func:u,scope:r}}return u.apply(r||q,Array.prototype.slice.call(arguments,1))},translate:function(q){var t=this.settings.language||"en",r=n.i18n;if(!q){return""}return r[t+"."+q]||q.replace(/{\#([^}]+)\}/g,function(u,s){return r[t+"."+s]||"{#"+s+"}"})},getLang:function(r,q){return n.i18n[(this.settings.language||"en")+"."+r]||(d(q)?q:"{#"+r+"}")},getParam:function(x,s,q){var t=n.trim,r=d(this.settings[x])?this.settings[x]:s,u;if(q==="hash"){u={};if(d(r,"string")){i(r.indexOf("=")>0?r.split(/[;,](?![^=;,]*(?:[;,]|$))/):r.split(","),function(y){y=y.split("=");if(y.length>1){u[t(y[0])]=t(y[1])}else{u[t(y[0])]=t(y)}})}else{u=r}return u}return r},nodeChanged:function(u){var q=this,r=q.selection,v=r.getStart()||q.getBody();if(q.initialized){u=u||{};v=b&&v.ownerDocument!=q.getDoc()?q.getBody():v;u.parents=[];q.dom.getParent(v,function(s){if(s.nodeName=="BODY"){return true}u.parents.push(s)});q.onNodeChange.dispatch(q,u?u.controlManager||q.controlManager:q.controlManager,v,r.isCollapsed(),u)}},addButton:function(u,r){var q=this;q.buttons=q.buttons||{};q.buttons[u]=r},addCommand:function(q,s,r){this.execCommands[q]={func:s,scope:r||this}},addQueryStateHandler:function(q,s,r){this.queryStateCommands[q]={func:s,scope:r||this}},addQueryValueHandler:function(q,s,r){this.queryValueCommands[q]={func:s,scope:r||this}},addShortcut:function(s,v,q,u){var r=this,x;if(!r.settings.custom_shortcuts){return false}r.shortcuts=r.shortcuts||{};if(d(q,"string")){x=q;q=function(){r.execCommand(x,false,null)}}if(d(q,"object")){x=q;q=function(){r.execCommand(x[0],x[1],x[2])}}i(g(s),function(t){var y={func:q,scope:u||this,desc:v,alt:false,ctrl:false,shift:false};i(g(t,"+"),function(z){switch(z){case"alt":case"ctrl":case"shift":y[z]=true;break;default:y.charCode=z.charCodeAt(0);y.keyCode=z.toUpperCase().charCodeAt(0)}});r.shortcuts[(y.ctrl?"ctrl":"")+","+(y.alt?"alt":"")+","+(y.shift?"shift":"")+","+y.keyCode]=y});return true},execCommand:function(y,x,A,q){var u=this,v=0,z,r;if(!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(y)&&(!q||!q.skip_focus)){u.focus()}q=f({},q);u.onBeforeExecCommand.dispatch(u,y,x,A,q);if(q.terminate){return false}if(u.execCallback("execcommand_callback",u.id,u.selection.getNode(),y,x,A)){u.onExecCommand.dispatch(u,y,x,A,q);return true}if(z=u.execCommands[y]){r=z.func.call(z.scope,x,A);if(r!==true){u.onExecCommand.dispatch(u,y,x,A,q);return r}}i(u.plugins,function(s){if(s.execCommand&&s.execCommand(y,x,A)){u.onExecCommand.dispatch(u,y,x,A,q);v=1;return false}});if(v){return true}if(u.theme&&u.theme.execCommand&&u.theme.execCommand(y,x,A)){u.onExecCommand.dispatch(u,y,x,A,q);return true}if(u.editorCommands.execCommand(y,x,A)){u.onExecCommand.dispatch(u,y,x,A,q);return true}u.getDoc().execCommand(y,x,A);u.onExecCommand.dispatch(u,y,x,A,q)},queryCommandState:function(v){var r=this,x,u;if(r._isHidden()){return}if(x=r.queryStateCommands[v]){u=x.func.call(x.scope);if(u!==true){return u}}x=r.editorCommands.queryCommandState(v);if(x!==-1){return x}try{return this.getDoc().queryCommandState(v)}catch(q){}},queryCommandValue:function(x){var r=this,v,u;if(r._isHidden()){return}if(v=r.queryValueCommands[x]){u=v.func.call(v.scope);if(u!==true){return u}}v=r.editorCommands.queryCommandValue(x);if(d(v)){return v}try{return this.getDoc().queryCommandValue(x)}catch(q){}},show:function(){var q=this;o.show(q.getContainer());o.hide(q.id);q.load()},hide:function(){var q=this,r=q.getDoc();if(b&&r){r.execCommand("SelectAll")}q.save();o.hide(q.getContainer());o.setStyle(q.id,"display",q.orgDisplay)},isHidden:function(){return !o.isHidden(this.id)},setProgressState:function(q,r,s){this.onSetProgressState.dispatch(this,q,r,s);return q},load:function(u){var q=this,s=q.getElement(),r;if(s){u=u||{};u.load=true;r=q.setContent(d(s.value)?s.value:s.innerHTML,u);u.element=s;if(!u.no_events){q.onLoadContent.dispatch(q,u)}u.element=s=null;return r}},save:function(v){var q=this,u=q.getElement(),r,s;if(!u||!q.initialized){return}v=v||{};v.save=true;if(!v.no_events){q.undoManager.typing=false;q.undoManager.add()}v.element=u;r=v.content=q.getContent(v);if(!v.no_events){q.onSaveContent.dispatch(q,v)}r=v.content;if(!/TEXTAREA|INPUT/i.test(u.nodeName)){u.innerHTML=r;if(s=o.getParent(q.id,"form")){i(s.elements,function(t){if(t.name==q.id){t.value=r;return false}})}}else{u.value=r}v.element=u=null;return r},setContent:function(v,t){var s=this,r,q=s.getBody(),u;t=t||{};t.format=t.format||"html";t.set=true;t.content=v;if(!t.no_events){s.onBeforeSetContent.dispatch(s,t)}v=t.content;if(!n.isIE&&(v.length===0||/^\s+$/.test(v))){u=s.settings.forced_root_block;if(u){v="<"+u+'><br data-mce-bogus="1"></'+u+">"}else{v='<br data-mce-bogus="1">'}q.innerHTML=v;s.selection.select(q,true);s.selection.collapse(true);return}if(t.format!=="raw"){v=new n.html.Serializer({},s.schema).serialize(s.parser.parse(v))}t.content=n.trim(v);s.dom.setHTML(q,t.content);if(!t.no_events){s.onSetContent.dispatch(s,t)}s.selection.normalize();return t.content},getContent:function(r){var q=this,s;r=r||{};r.format=r.format||"html";r.get=true;if(!r.no_events){q.onBeforeGetContent.dispatch(q,r)}if(r.format=="raw"){s=q.getBody().innerHTML}else{s=q.serializer.serialize(q.getBody(),r)}r.content=n.trim(s);if(!r.no_events){q.onGetContent.dispatch(q,r)}return r.content},isDirty:function(){var q=this;return n.trim(q.startContent)!=n.trim(q.getContent({format:"raw",no_events:1}))&&!q.isNotDirty},getContainer:function(){var q=this;if(!q.container){q.container=o.get(q.editorContainer||q.id+"_parent")}return q.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return o.get(this.settings.content_element||this.id)},getWin:function(){var q=this,r;if(!q.contentWindow){r=o.get(q.id+"_ifr");if(r){q.contentWindow=r.contentWindow}}return q.contentWindow},getDoc:function(){var r=this,q;if(!r.contentDocument){q=r.getWin();if(q){r.contentDocument=q.document}}return r.contentDocument},getBody:function(){return this.bodyElement||this.getDoc().body},convertURL:function(q,y,x){var r=this,v=r.settings;if(v.urlconverter_callback){return r.execCallback("urlconverter_callback",q,x,true,y)}if(!v.convert_urls||(x&&x.nodeName=="LINK")||q.indexOf("file:")===0){return q}if(v.relative_urls){return r.documentBaseURI.toRelative(q)}q=r.documentBaseURI.toAbsolute(q,v.remove_script_host);return q},addVisual:function(u){var q=this,r=q.settings;u=u||q.getBody();if(!d(q.hasVisual)){q.hasVisual=r.visual}i(q.dom.select("table,a",u),function(t){var s;switch(t.nodeName){case"TABLE":s=q.dom.getAttrib(t,"border");if(!s||s=="0"){if(q.hasVisual){q.dom.addClass(t,r.visual_table_class)}else{q.dom.removeClass(t,r.visual_table_class)}}return;case"A":s=q.dom.getAttrib(t,"name");if(s){if(q.hasVisual){q.dom.addClass(t,"mceItemAnchor")}else{q.dom.removeClass(t,"mceItemAnchor")}}return}});q.onVisualAid.dispatch(q,u,q.hasVisual)},remove:function(){var q=this,r=q.getContainer();if(!q.removed){q.removed=1;q.hide();if(!q.settings.content_editable){k.clear(q.getWin());k.clear(q.getDoc())}k.clear(q.getBody());k.clear(q.formElement);k.unbind(r);q.execCallback("remove_instance_callback",q);q.onRemove.dispatch(q);q.onExecCommand.listeners=[];n.remove(q);o.remove(r)}},destroy:function(r){var q=this;if(q.destroyed){return}if(a){k.unbind(q.getDoc());k.unbind(q.getWin());k.unbind(q.getBody())}if(!r){n.removeUnload(q.destroy);tinyMCE.onBeforeUnload.remove(q._beforeUnload);if(q.theme&&q.theme.destroy){q.theme.destroy()}q.controlManager.destroy();q.selection.destroy();q.dom.destroy()}if(q.formElement){q.formElement.submit=q.formElement._mceOldSubmit;q.formElement._mceOldSubmit=null}q.contentAreaContainer=q.formElement=q.container=q.settings.content_element=q.bodyElement=q.contentDocument=q.contentWindow=null;if(q.selection){q.selection=q.selection.win=q.selection.dom=q.selection.dom.doc=null}q.destroyed=1},_addEvents:function(){var B=this,u,C=B.settings,r=B.dom,y={mouseup:"onMouseUp",mousedown:"onMouseDown",click:"onClick",keyup:"onKeyUp",keydown:"onKeyDown",keypress:"onKeyPress",submit:"onSubmit",reset:"onReset",contextmenu:"onContextMenu",dblclick:"onDblClick",paste:"onPaste"};function q(t,D){var s=t.type;if(B.removed){return}if(B.onEvent.dispatch(B,t,D)!==false){B[y[t.fakeType||t.type]].dispatch(B,t,D)}}i(y,function(t,s){switch(s){case"contextmenu":r.bind(B.getDoc(),s,q);break;case"paste":r.bind(B.getBody(),s,function(D){q(D)});break;case"submit":case"reset":r.bind(B.getElement().form||o.getParent(B.id,"form"),s,q);break;default:r.bind(C.content_editable?B.getBody():B.getDoc(),s,q)}});r.bind(C.content_editable?B.getBody():(a?B.getDoc():B.getWin()),"focus",function(s){B.focus(true)});if(n.isGecko){r.bind(B.getDoc(),"DOMNodeInserted",function(t){var s;t=t.target;if(t.nodeType===1&&t.nodeName==="IMG"&&(s=t.getAttribute("data-mce-src"))){t.src=B.documentBaseURI.toAbsolute(s)}})}if(a){function v(){var E=this,G=E.getDoc(),F=E.settings;if(a&&!F.readonly){E._refreshContentEditable();try{G.execCommand("styleWithCSS",0,false)}catch(D){if(!E._isHidden()){try{G.execCommand("useCSS",0,true)}catch(D){}}}if(!F.table_inline_editing){try{G.execCommand("enableInlineTableEditing",false,false)}catch(D){}}if(!F.object_resizing){try{G.execCommand("enableObjectResizing",false,false)}catch(D){}}}}B.onBeforeExecCommand.add(v);B.onMouseDown.add(v)}B.onMouseUp.add(B.nodeChanged);B.onKeyUp.add(function(s,t){var D=t.keyCode;if((D>=33&&D<=36)||(D>=37&&D<=40)||D==13||D==45||D==46||D==8||(n.isMac&&(D==91||D==93))||t.ctrlKey){B.nodeChanged()}});B.onKeyDown.add(function(t,D){if(D.keyCode!=j.BACKSPACE){return}var s=t.selection.getRng();if(!s.collapsed){return}var F=s.startContainer;var E=s.startOffset;while(F&&F.nodeType&&F.nodeType!=1&&F.parentNode){F=F.parentNode}if(F&&F.parentNode&&F.parentNode.tagName==="BLOCKQUOTE"&&F.parentNode.firstChild==F&&E==0){t.formatter.toggle("blockquote",null,F.parentNode);s.setStart(F,0);s.setEnd(F,0);t.selection.setRng(s);t.selection.collapse(false)}});B.onReset.add(function(){B.setContent(B.startContent,{format:"raw"})});if(C.custom_shortcuts){if(C.custom_undo_redo_keyboard_shortcuts){B.addShortcut("ctrl+z",B.getLang("undo_desc"),"Undo");B.addShortcut("ctrl+y",B.getLang("redo_desc"),"Redo")}B.addShortcut("ctrl+b",B.getLang("bold_desc"),"Bold");B.addShortcut("ctrl+i",B.getLang("italic_desc"),"Italic");B.addShortcut("ctrl+u",B.getLang("underline_desc"),"Underline");for(u=1;u<=6;u++){B.addShortcut("ctrl+"+u,"",["FormatBlock",false,"h"+u])}B.addShortcut("ctrl+7","",["FormatBlock",false,"p"]);B.addShortcut("ctrl+8","",["FormatBlock",false,"div"]);B.addShortcut("ctrl+9","",["FormatBlock",false,"address"]);function x(t){var s=null;if(!t.altKey&&!t.ctrlKey&&!t.metaKey){return s}i(B.shortcuts,function(D){if(n.isMac&&D.ctrl!=t.metaKey){return}else{if(!n.isMac&&D.ctrl!=t.ctrlKey){return}}if(D.alt!=t.altKey){return}if(D.shift!=t.shiftKey){return}if(t.keyCode==D.keyCode||(t.charCode&&t.charCode==D.charCode)){s=D;return false}});return s}B.onKeyUp.add(function(s,t){var D=x(t);if(D){return k.cancel(t)}});B.onKeyPress.add(function(s,t){var D=x(t);if(D){return k.cancel(t)}});B.onKeyDown.add(function(s,t){var D=x(t);if(D){D.func.call(D.scope);return k.cancel(t)}})}if(n.isIE){r.bind(B.getDoc(),"controlselect",function(D){var t=B.resizeInfo,s;D=D.target;if(D.nodeName!=="IMG"){return}if(t){r.unbind(t.node,t.ev,t.cb)}if(!r.hasClass(D,"mceItemNoResize")){ev="resizeend";s=r.bind(D,ev,function(F){var E;F=F.target;if(E=r.getStyle(F,"width")){r.setAttrib(F,"width",E.replace(/[^0-9%]+/g,""));r.setStyle(F,"width","")}if(E=r.getStyle(F,"height")){r.setAttrib(F,"height",E.replace(/[^0-9%]+/g,""));r.setStyle(F,"height","")}})}else{ev="resizestart";s=r.bind(D,"resizestart",k.cancel,k)}t=B.resizeInfo={node:D,ev:ev,cb:s}})}if(n.isOpera){B.onClick.add(function(s,t){k.prevent(t)})}if(C.custom_undo_redo){function A(){B.undoManager.typing=false;B.undoManager.add()}var z=n.isGecko?"blur":"focusout";r.bind(B.getDoc(),z,function(s){if(!B.removed&&B.undoManager.typing){A()}});B.dom.bind(B.dom.getRoot(),"dragend",function(s){A()});B.onKeyUp.add(function(s,D){var t=D.keyCode;if((t>=33&&t<=36)||(t>=37&&t<=40)||t==13||t==45||D.ctrlKey){A()}});B.onKeyDown.add(function(s,E){var D=E.keyCode,t;if(D==8){t=B.getDoc().selection;if(t&&t.createRange&&t.createRange().item){B.undoManager.beforeChange();s.dom.remove(t.createRange().item(0));A();return k.cancel(E)}}if((D>=33&&D<=36)||(D>=37&&D<=40)||D==13||D==45){if(n.isIE&&D==13){B.undoManager.beforeChange()}if(B.undoManager.typing){A()}return}if((D<16||D>20)&&D!=224&&D!=91&&!B.undoManager.typing){B.undoManager.beforeChange();B.undoManager.typing=true;B.undoManager.add()}});B.onMouseDown.add(function(){if(B.undoManager.typing){A()}})}},_refreshContentEditable:function(){var r=this,q,s;if(r._isHidden()){q=r.getBody();s=q.parentNode;s.removeChild(q);s.appendChild(q);q.focus()}},_isHidden:function(){var q;if(!a){return 0}q=this.selection.getSel();return(!q||!q.rangeCount||q.rangeCount==0)}})})(tinymce);(function(c){var d=c.each,e,a=true,b=false;c.EditorCommands=function(n){var m=n.dom,p=n.selection,j={state:{},exec:{},value:{}},k=n.settings,q=n.formatter,o;function r(z,y,x){var v;z=z.toLowerCase();if(v=j.exec[z]){v(z,y,x);return a}return b}function l(x){var v;x=x.toLowerCase();if(v=j.state[x]){return v(x)}return -1}function h(x){var v;x=x.toLowerCase();if(v=j.value[x]){return v(x)}return b}function u(v,x){x=x||"exec";d(v,function(z,y){d(y.toLowerCase().split(","),function(A){j[x][A]=z})})}c.extend(this,{execCommand:r,queryCommandState:l,queryCommandValue:h,addCommands:u});function f(y,x,v){if(x===e){x=b}if(v===e){v=null}return n.getDoc().execCommand(y,x,v)}function t(v){return q.match(v)}function s(v,x){q.toggle(v,x?{value:x}:e)}function i(v){o=p.getBookmark(v)}function g(){p.moveToBookmark(o)}u({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){n.undoManager.add()},"Cut,Copy,Paste":function(z){var y=n.getDoc(),v;try{f(z)}catch(x){v=a}if(v||!y.queryCommandSupported(z)){if(c.isGecko){n.windowManager.confirm(n.getLang("clipboard_msg"),function(A){if(A){open("http://www.mozilla.org/editor/midasdemo/securityprefs.html","_blank")}})}else{n.windowManager.alert(n.getLang("clipboard_no_support"))}}},unlink:function(v){if(p.isCollapsed()){p.select(p.getNode())}f(v);p.collapse(b)},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(v){var x=v.substring(7);d("left,center,right,full".split(","),function(y){if(x!=y){q.remove("align"+y)}});s("align"+x);r("mceRepaint")},"InsertUnorderedList,InsertOrderedList":function(y){var v,x;f(y);v=m.getParent(p.getNode(),"ol,ul");if(v){x=v.parentNode;if(/^(H[1-6]|P|ADDRESS|PRE)$/.test(x.nodeName)){i();m.split(x,v);g()}}},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(v){s(v)},"ForeColor,HiliteColor,FontName":function(y,x,v){s(y,v)},FontSize:function(z,y,x){var v,A;if(x>=1&&x<=7){A=c.explode(k.font_size_style_values);v=c.explode(k.font_size_classes);if(v){x=v[x-1]||x}else{x=A[x-1]||x}}s(z,x)},RemoveFormat:function(v){q.remove(v)},mceBlockQuote:function(v){s("blockquote")},FormatBlock:function(y,x,v){return s(v||"p")},mceCleanup:function(){var v=p.getBookmark();n.setContent(n.getContent({cleanup:a}),{cleanup:a});p.moveToBookmark(v)},mceRemoveNode:function(z,y,x){var v=x||p.getNode();if(v!=n.getBody()){i();n.dom.remove(v,a);g()}},mceSelectNodeDepth:function(z,y,x){var v=0;m.getParent(p.getNode(),function(A){if(A.nodeType==1&&v++==x){p.select(A);return b}},n.getBody())},mceSelectNode:function(y,x,v){p.select(v)},mceInsertContent:function(B,I,K){var y,J,E,z,F,G,D,C,L,x,A,M,v,H;y=n.parser;J=new c.html.Serializer({},n.schema);v='<span id="mce_marker" data-mce-type="bookmark">\uFEFF</span>';G={content:K,format:"html"};p.onBeforeSetContent.dispatch(p,G);K=G.content;if(K.indexOf("{$caret}")==-1){K+="{$caret}"}K=K.replace(/\{\$caret\}/,v);if(!p.isCollapsed()){n.getDoc().execCommand("Delete",false,null)}E=p.getNode();G={context:E.nodeName.toLowerCase()};F=y.parse(K,G);A=F.lastChild;if(A.attr("id")=="mce_marker"){D=A;for(A=A.prev;A;A=A.walk(true)){if(A.type==3||!m.isBlock(A.name)){A.parent.insert(D,A,A.name==="br");break}}}if(!G.invalid){K=J.serialize(F);A=E.firstChild;M=E.lastChild;if(!A||(A===M&&A.nodeName==="BR")){m.setHTML(E,K)}else{p.setContent(K)}}else{p.setContent(v);E=n.selection.getNode();z=n.getBody();if(E.nodeType==9){E=A=z}else{A=E}while(A!==z){E=A;A=A.parentNode}K=E==z?z.innerHTML:m.getOuterHTML(E);K=J.serialize(y.parse(K.replace(/<span (id="mce_marker"|id=mce_marker).+?<\/span>/i,function(){return J.serialize(F)})));if(E==z){m.setHTML(z,K)}else{m.setOuterHTML(E,K)}}D=m.get("mce_marker");C=m.getRect(D);L=m.getViewPort(n.getWin());if((C.y+C.h>L.y+L.h||C.y<L.y)||(C.x>L.x+L.w||C.x<L.x)){H=c.isIE?n.getDoc().documentElement:n.getBody();H.scrollLeft=C.x;H.scrollTop=C.y-L.h+25}x=m.createRng();A=D.previousSibling;if(A&&A.nodeType==3){x.setStart(A,A.nodeValue.length)}else{x.setStartBefore(D);x.setEndBefore(D)}m.remove(D);p.setRng(x);p.onSetContent.dispatch(p,G);n.addVisual()},mceInsertRawHTML:function(y,x,v){p.setContent("tiny_mce_marker");n.setContent(n.getContent().replace(/tiny_mce_marker/g,function(){return v}))},mceSetContent:function(y,x,v){n.setContent(v)},"Indent,Outdent":function(z){var x,v,y;x=k.indentation;v=/[a-z%]+$/i.exec(x);x=parseInt(x);if(!l("InsertUnorderedList")&&!l("InsertOrderedList")){if(!k.forced_root_block&&!m.getParent(p.getNode(),m.isBlock)){q.apply("div")}d(p.getSelectedBlocks(),function(A){if(z=="outdent"){y=Math.max(0,parseInt(A.style.paddingLeft||0)-x);m.setStyle(A,"paddingLeft",y?y+v:"")}else{m.setStyle(A,"paddingLeft",(parseInt(A.style.paddingLeft||0)+x)+v)}})}else{f(z)}},mceRepaint:function(){var x;if(c.isGecko){try{i(a);if(p.getSel()){p.getSel().selectAllChildren(n.getBody())}p.collapse(a);g()}catch(v){}}},mceToggleFormat:function(y,x,v){q.toggle(v)},InsertHorizontalRule:function(){n.execCommand("mceInsertContent",false,"<hr />")},mceToggleVisualAid:function(){n.hasVisual=!n.hasVisual;n.addVisual()},mceReplaceContent:function(y,x,v){n.execCommand("mceInsertContent",false,v.replace(/\{\$selection\}/g,p.getContent({format:"text"})))},mceInsertLink:function(z,y,x){var v;if(typeof(x)=="string"){x={href:x}}v=m.getParent(p.getNode(),"a");x.href=x.href.replace(" ","%20");if(!v||!x.href){q.remove("link")}if(x.href){q.apply("link",x,v)}},selectAll:function(){var x=m.getRoot(),v=m.createRng();v.setStart(x,0);v.setEnd(x,x.childNodes.length);n.selection.setRng(v)}});u({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(z){var x="align"+z.substring(7);var v=p.isCollapsed()?[p.getNode()]:p.getSelectedBlocks();var y=c.map(v,function(A){return !!q.matchNode(A,x)});return c.inArray(y,a)!==-1},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(v){return t(v)},mceBlockQuote:function(){return t("blockquote")},Outdent:function(){var v;if(k.inline_styles){if((v=m.getParent(p.getStart(),m.isBlock))&&parseInt(v.style.paddingLeft)>0){return a}if((v=m.getParent(p.getEnd(),m.isBlock))&&parseInt(v.style.paddingLeft)>0){return a}}return l("InsertUnorderedList")||l("InsertOrderedList")||(!k.inline_styles&&!!m.getParent(p.getNode(),"BLOCKQUOTE"))},"InsertUnorderedList,InsertOrderedList":function(v){return m.getParent(p.getNode(),v=="insertunorderedlist"?"UL":"OL")}},"state");u({"FontSize,FontName":function(y){var x=0,v;if(v=m.getParent(p.getNode(),"span")){if(y=="fontsize"){x=v.style.fontSize}else{x=v.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()}}return x}},"value");if(k.custom_undo_redo){u({Undo:function(){n.undoManager.undo()},Redo:function(){n.undoManager.redo()}})}}})(tinymce);(function(b){var a=b.util.Dispatcher;b.UndoManager=function(f){var d,e=0,h=[],c;function g(){return b.trim(f.getContent({format:"raw",no_events:1}).replace(/<span[^>]+data-mce-bogus[^>]+>[\u200B\uFEFF]+<\/span>/g,""))}return d={typing:false,onAdd:new a(d),onUndo:new a(d),onRedo:new a(d),beforeChange:function(){c=f.selection.getBookmark(2,true)},add:function(m){var j,k=f.settings,l;m=m||{};m.content=g();l=h[e];if(l&&l.content==m.content){return null}if(h[e]){h[e].beforeBookmark=c}if(k.custom_undo_redo_levels){if(h.length>k.custom_undo_redo_levels){for(j=0;j<h.length-1;j++){h[j]=h[j+1]}h.length--;e=h.length}}m.bookmark=f.selection.getBookmark(2,true);if(e<h.length-1){h.length=e+1}h.push(m);e=h.length-1;d.onAdd.dispatch(d,m);f.isNotDirty=0;return m},undo:function(){var k,j;if(d.typing){d.add();d.typing=false}if(e>0){k=h[--e];f.setContent(k.content,{format:"raw"});f.selection.moveToBookmark(k.beforeBookmark);d.onUndo.dispatch(d,k)}return k},redo:function(){var i;if(e<h.length-1){i=h[++e];f.setContent(i.content,{format:"raw"});f.selection.moveToBookmark(i.bookmark);d.onRedo.dispatch(d,i)}return i},clear:function(){h=[];e=0;d.typing=false},hasUndo:function(){return e>0||this.typing},hasRedo:function(){return e<h.length-1&&!this.typing}}}})(tinymce);tinymce.ForceBlocks=function(c){var b=c.settings,e=c.dom,a=c.selection,d=c.schema.getBlockElements();if(b.forced_root_block){function f(){var j=a.getStart(),h=c.getBody(),g,k,o,q,p,i,l,m=-16777215;if(!j||j.nodeType!==1||!b.forced_root_block){return}while(j!=h){if(d[j.nodeName]){return}j=j.parentNode}g=a.getRng();if(g.setStart){k=g.startContainer;o=g.startOffset;q=g.endContainer;p=g.endOffset}else{if(g.item){j=g.item(0);g=c.getDoc().body.createTextRange();g.moveToElementText(j)}tmpRng=g.duplicate();tmpRng.collapse(true);o=tmpRng.move("character",m)*-1;if(!tmpRng.collapsed){tmpRng=g.duplicate();tmpRng.collapse(false);p=(tmpRng.move("character",m)*-1)-o}}for(j=h.firstChild;j;j){if(j.nodeType===3||(j.nodeType==1&&!d[j.nodeName])){if(!i){i=e.create(b.forced_root_block);j.parentNode.insertBefore(i,j)}l=j;j=j.nextSibling;i.appendChild(l)}else{i=null;j=j.nextSibling}}if(g.setStart){g.setStart(k,o);g.setEnd(q,p);a.setRng(g)}else{try{g=c.getDoc().body.createTextRange();g.moveToElementText(h);g.collapse(true);g.moveStart("character",o);if(p>0){g.moveEnd("character",p)}g.select()}catch(n){}}c.nodeChanged()}c.onKeyUp.add(f);c.onClick.add(f)}};(function(c){var b=c.DOM,a=c.dom.Event,d=c.each,e=c.extend;c.create("tinymce.ControlManager",{ControlManager:function(f,j){var h=this,g;j=j||{};h.editor=f;h.controls={};h.onAdd=new c.util.Dispatcher(h);h.onPostRender=new c.util.Dispatcher(h);h.prefix=j.prefix||f.id+"_";h._cls={};h.onPostRender.add(function(){d(h.controls,function(i){i.postRender()})})},get:function(f){return this.controls[this.prefix+f]||this.controls[f]},setActive:function(h,f){var g=null;if(g=this.get(h)){g.setActive(f)}return g},setDisabled:function(h,f){var g=null;if(g=this.get(h)){g.setDisabled(f)}return g},add:function(g){var f=this;if(g){f.controls[g.id]=g;f.onAdd.dispatch(g,f)}return g},createControl:function(i){var h,g=this,f=g.editor;d(f.plugins,function(j){if(j.createControl){h=j.createControl(i,g);if(h){return false}}});switch(i){case"|":case"separator":return g.createSeparator()}if(!h&&f.buttons&&(h=f.buttons[i])){return g.createButton(i,h)}return g.add(h)},createDropMenu:function(f,n,h){var m=this,i=m.editor,j,g,k,l;n=e({"class":"mceDropDown",constrain:i.settings.constrain_menus},n);n["class"]=n["class"]+" "+i.getParam("skin")+"Skin";if(k=i.getParam("skin_variant")){n["class"]+=" "+i.getParam("skin")+"Skin"+k.substring(0,1).toUpperCase()+k.substring(1)}f=m.prefix+f;l=h||m._cls.dropmenu||c.ui.DropMenu;j=m.controls[f]=new l(f,n);j.onAddItem.add(function(r,q){var p=q.settings;p.title=i.getLang(p.title,p.title);if(!p.onclick){p.onclick=function(o){if(p.cmd){i.execCommand(p.cmd,p.ui||false,p.value)}}}});i.onRemove.add(function(){j.destroy()});if(c.isIE){j.onShowMenu.add(function(){i.focus();g=i.selection.getBookmark(1)});j.onHideMenu.add(function(){if(g){i.selection.moveToBookmark(g);g=0}})}return m.add(j)},createListBox:function(f,n,h){var l=this,j=l.editor,i,k,m;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,scope:n.scope,control_manager:l},n);f=l.prefix+f;function g(o){return o.settings.use_accessible_selects&&!c.isGecko}if(j.settings.use_native_selects||g(j)){k=new c.ui.NativeListBox(f,n)}else{m=h||l._cls.listbox||c.ui.ListBox;k=new m(f,n,j)}l.controls[f]=k;if(c.isWebKit){k.onPostRender.add(function(p,o){a.add(o,"mousedown",function(){j.bookmark=j.selection.getBookmark(1)});a.add(o,"focus",function(){j.selection.moveToBookmark(j.bookmark);j.bookmark=null})})}if(k.hideMenu){j.onMouseDown.add(k.hideMenu,k)}return l.add(k)},createButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.label=g.translate(i.label);i.scope=i.scope||g;if(!i.onclick&&!i.menu_button){i.onclick=function(){g.execCommand(i.cmd,i.ui||false,i.value)}}i=e({title:i.title,"class":"mce_"+m,unavailable_prefix:g.getLang("unavailable",""),scope:i.scope,control_manager:h},i);m=h.prefix+m;if(i.menu_button){f=l||h._cls.menubutton||c.ui.MenuButton;k=new f(m,i,g);g.onMouseDown.add(k.hideMenu,k)}else{f=h._cls.button||c.ui.Button;k=new f(m,i,g)}return h.add(k)},createMenuButton:function(h,f,g){f=f||{};f.menu_button=1;return this.createButton(h,f,g)},createSplitButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onclick){i.onclick=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;f=l||h._cls.splitbutton||c.ui.SplitButton;k=h.add(new f(m,i,g));g.onMouseDown.add(k.hideMenu,k);return k},createColorSplitButton:function(f,n,h){var l=this,j=l.editor,i,k,m,g;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onclick){n.onclick=function(o){if(c.isIE){g=j.selection.getBookmark(1)}j.execCommand(n.cmd,n.ui||false,o||n.value)}}if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,menu_class:j.getParam("skin")+"Skin",scope:n.scope,more_colors_title:j.getLang("more_colors")},n);f=l.prefix+f;m=h||l._cls.colorsplitbutton||c.ui.ColorSplitButton;k=new m(f,n,j);j.onMouseDown.add(k.hideMenu,k);j.onRemove.add(function(){k.destroy()});if(c.isIE){k.onShowMenu.add(function(){j.focus();g=j.selection.getBookmark(1)});k.onHideMenu.add(function(){if(g){j.selection.moveToBookmark(g);g=0}})}return l.add(k)},createToolbar:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||g._cls.toolbar||c.ui.Toolbar;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createToolbarGroup:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||this._cls.toolbarGroup||c.ui.ToolbarGroup;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createSeparator:function(g){var f=g||this._cls.separator||c.ui.Separator;return new f()},setControlType:function(g,f){return this._cls[g.toLowerCase()]=f},destroy:function(){d(this.controls,function(f){f.destroy()});this.controls=null}})})(tinymce);(function(d){var a=d.util.Dispatcher,e=d.each,c=d.isIE,b=d.isOpera;d.create("tinymce.WindowManager",{WindowManager:function(f){var g=this;g.editor=f;g.onOpen=new a(g);g.onClose=new a(g);g.params={};g.features={}},open:function(z,h){var v=this,k="",n,m,i=v.editor.settings.dialog_type=="modal",q,o,j,g=d.DOM.getViewPort(),r;z=z||{};h=h||{};o=b?g.w:screen.width;j=b?g.h:screen.height;z.name=z.name||"mc_"+new Date().getTime();z.width=parseInt(z.width||320);z.height=parseInt(z.height||240);z.resizable=true;z.left=z.left||parseInt(o/2)-(z.width/2);z.top=z.top||parseInt(j/2)-(z.height/2);h.inline=false;h.mce_width=z.width;h.mce_height=z.height;h.mce_auto_focus=z.auto_focus;if(i){if(c){z.center=true;z.help=false;z.dialogWidth=z.width+"px";z.dialogHeight=z.height+"px";z.scroll=z.scrollbars||false}}e(z,function(p,f){if(d.is(p,"boolean")){p=p?"yes":"no"}if(!/^(name|url)$/.test(f)){if(c&&i){k+=(k?";":"")+f+":"+p}else{k+=(k?",":"")+f+"="+p}}});v.features=z;v.params=h;v.onOpen.dispatch(v,z,h);r=z.url||z.file;r=d._addVer(r);try{if(c&&i){q=1;window.showModalDialog(r,window,k)}else{q=window.open(r,z.name,k)}}catch(l){}if(!q){alert(v.editor.getLang("popup_blocked"))}},close:function(f){f.close();this.onClose.dispatch(this)},createInstance:function(i,h,g,m,l,k){var j=d.resolve(i);return new j(h,g,m,l,k)},confirm:function(h,f,i,g){g=g||window;f.call(i||this,g.confirm(this._decode(this.editor.getLang(h,h))))},alert:function(h,f,j,g){var i=this;g=g||window;g.alert(i._decode(i.editor.getLang(h,h)));if(f){f.call(j||i)}},resizeBy:function(f,g,h){h.resizeBy(f,g)},_decode:function(f){return d.DOM.decode(f).replace(/\\n/g,"\n")}})}(tinymce));(function(a){a.Formatter=function(W){var N={},Q=a.each,c=W.dom,q=W.selection,t=a.dom.TreeWalker,L=new a.dom.RangeUtils(c),d=W.schema.isValidChild,G=c.isBlock,l=W.settings.forced_root_block,s=c.nodeIndex,F=a.isGecko?"\u200B":"\uFEFF",e=/^(src|href|style)$/,T=false,C=true,p;function x(Y){var X=Y.getAttribute("data-mce-contenteditable");if(X&&X!=="inherit"){return X}return Y.contentEditable!=="inherit"?Y.contentEditable:null}function A(X){return X instanceof Array}function m(Y,X){return c.getParents(Y,X,c.getRoot())}function b(X){return X.nodeType===1&&X.id==="_mce_caret"}function S(X){return X?N[X]:N}function k(X,Y){if(X){if(typeof(X)!=="string"){Q(X,function(aa,Z){k(Z,aa)})}else{Y=Y.length?Y:[Y];Q(Y,function(Z){if(Z.deep===p){Z.deep=!Z.selector}if(Z.split===p){Z.split=!Z.selector||Z.inline}if(Z.remove===p&&Z.selector&&!Z.inline){Z.remove="none"}if(Z.selector&&Z.inline){Z.mixed=true;Z.block_expand=true}if(typeof(Z.classes)==="string"){Z.classes=Z.classes.split(/\s+/)}});N[X]=Y}}}var i=function(Y){var X;W.dom.getParent(Y,function(Z){X=W.dom.getStyle(Z,"text-decoration");return X&&X!=="none"});return X};var J=function(X){var Y;if(X.nodeType===1&&X.parentNode&&X.parentNode.nodeType===1){Y=i(X.parentNode);if(W.dom.getStyle(X,"color")&&Y){W.dom.setStyle(X,"text-decoration",Y)}else{if(W.dom.getStyle(X,"textdecoration")===Y){W.dom.setStyle(X,"text-decoration",null)}}}};function U(aa,ah,ac){var ad=S(aa),ai=ad[0],ag,Y,af,ae=q.isCollapsed();function X(am,al){al=al||ai;if(am){if(al.onformat){al.onformat(am,al,ah,ac)}Q(al.styles,function(ao,an){c.setStyle(am,an,r(ao,ah))});Q(al.attributes,function(ao,an){c.setAttrib(am,an,r(ao,ah))});Q(al.classes,function(an){an=r(an,ah);if(!c.hasClass(am,an)){c.addClass(am,an)}})}}function ab(){function an(au,ar){var at=new t(ar);for(ac=at.current();ac;ac=at.prev()){if(ac.childNodes.length>1||ac==au){return ac}}}var am=W.selection.getRng();var aq=am.startContainer;var al=am.endContainer;if(aq!=al&&am.endOffset==0){var ap=an(aq,al);var ao=ap.nodeType==3?ap.length:ap.childNodes.length;am.setEnd(ap,ao)}return am}function Z(ao,au,ar,aq,am){var al=[],an=-1,at,aw=-1,ap=-1,av;Q(ao.childNodes,function(ay,ax){if(ay.nodeName==="UL"||ay.nodeName==="OL"){an=ax;at=ay;return false}});Q(ao.childNodes,function(ay,ax){if(ay.nodeName==="SPAN"&&c.getAttrib(ay,"data-mce-type")=="bookmark"){if(ay.id==au.id+"_start"){aw=ax}else{if(ay.id==au.id+"_end"){ap=ax}}}});if(an<=0||(aw<an&&ap>an)){Q(a.grep(ao.childNodes),am);return 0}else{av=c.clone(ar,T);Q(a.grep(ao.childNodes),function(ay,ax){if((aw<an&&ax<an)||(aw>an&&ax>an)){al.push(ay);ay.parentNode.removeChild(ay)}});if(aw<an){ao.insertBefore(av,at)}else{if(aw>an){ao.insertBefore(av,at.nextSibling)}}aq.push(av);Q(al,function(ax){av.appendChild(ax)});return av}}function aj(am,ao,ar){var al=[],aq,an,ap=true;aq=ai.inline||ai.block;an=c.create(aq);X(an);L.walk(am,function(at){var au;function av(aw){var aB,az,ax,ay,aA;aA=ap;aB=aw.nodeName.toLowerCase();az=aw.parentNode.nodeName.toLowerCase();if(aw.nodeType===1&&x(aw)){aA=ap;ap=x(aw)==="true";ay=true}if(g(aB,"br")){au=0;if(ai.block){c.remove(aw)}return}if(ai.wrapper&&y(aw,aa,ah)){au=0;return}if(ap&&!ay&&ai.block&&!ai.wrapper&&H(aB)){aw=c.rename(aw,aq);X(aw);al.push(aw);au=0;return}if(ai.selector){Q(ad,function(aC){if("collapsed" in aC&&aC.collapsed!==ae){return}if(c.is(aw,aC.selector)&&!b(aw)){X(aw,aC);ax=true}});if(!ai.inline||ax){au=0;return}}if(ap&&!ay&&d(aq,aB)&&d(az,aq)&&!(!ar&&aw.nodeType===3&&aw.nodeValue.length===1&&aw.nodeValue.charCodeAt(0)===65279)&&!b(aw)){if(!au){au=c.clone(an,T);aw.parentNode.insertBefore(au,aw);al.push(au)}au.appendChild(aw)}else{if(aB=="li"&&ao){au=Z(aw,ao,an,al,av)}else{au=0;Q(a.grep(aw.childNodes),av);if(ay){ap=aA}au=0}}}Q(at,av)});if(ai.wrap_links===false){Q(al,function(at){function au(ay){var ax,aw,av;if(ay.nodeName==="A"){aw=c.clone(an,T);al.push(aw);av=a.grep(ay.childNodes);for(ax=0;ax<av.length;ax++){aw.appendChild(av[ax])}ay.appendChild(aw)}Q(a.grep(ay.childNodes),au)}au(at)})}Q(al,function(av){var at;function aw(ay){var ax=0;Q(ay.childNodes,function(az){if(!f(az)&&!I(az)){ax++}});return ax}function au(ax){var az,ay;Q(ax.childNodes,function(aA){if(aA.nodeType==1&&!I(aA)&&!b(aA)){az=aA;return T}});if(az&&h(az,ai)){ay=c.clone(az,T);X(ay);c.replace(ay,ax,C);c.remove(az,1)}return ay||ax}at=aw(av);if((al.length>1||!G(av))&&at===0){c.remove(av,1);return}if(ai.inline||ai.wrapper){if(!ai.exact&&at===1){av=au(av)}Q(ad,function(ax){Q(c.select(ax.inline,av),function(az){var ay;if(ax.wrap_links===false){ay=az.parentNode;do{if(ay.nodeName==="A"){return}}while(ay=ay.parentNode)}V(ax,ah,az,ax.exact?az:null)})});if(y(av.parentNode,aa,ah)){c.remove(av,1);av=0;return C}if(ai.merge_with_parents){c.getParent(av.parentNode,function(ax){if(y(ax,aa,ah)){c.remove(av,1);av=0;return C}})}if(av&&ai.merge_siblings!==false){av=u(D(av),av);av=u(av,D(av,C))}}})}if(ai){if(ac){if(ac.nodeType){Y=c.createRng();Y.setStartBefore(ac);Y.setEndAfter(ac);aj(o(Y,ad),null,true)}else{aj(ac,null,true)}}else{if(!ae||!ai.inline||c.select("td.mceSelected,th.mceSelected").length){var ak=W.selection.getNode();if(!l&&ad[0].defaultBlock&&!c.getParent(ak,c.isBlock)){U(ad[0].defaultBlock)}W.selection.setRng(ab());ag=q.getBookmark();aj(o(q.getRng(C),ad),ag);if(ai.styles&&(ai.styles.color||ai.styles.textDecoration)){a.walk(ak,J,"childNodes");J(ak)}q.moveToBookmark(ag);O(q.getRng(C));W.nodeChanged()}else{R("apply",aa,ah)}}}}function B(Z,ai,ab){var ac=S(Z),ak=ac[0],ag,af,Y,ah=true;function aa(aq){var ap,ao,an,am,at,ar;if(aq.nodeType===1&&x(aq)){at=ah;ah=x(aq)==="true";ar=true}ap=a.grep(aq.childNodes);if(ah&&!ar){for(ao=0,an=ac.length;ao<an;ao++){if(V(ac[ao],ai,aq,aq)){break}}}if(ak.deep){if(ap.length){for(ao=0,an=ap.length;ao<an;ao++){aa(ap[ao])}if(ar){ah=at}}}}function ad(am){var an;Q(m(am.parentNode).reverse(),function(ao){var ap;if(!an&&ao.id!="_start"&&ao.id!="_end"){ap=y(ao,Z,ai);if(ap&&ap.split!==false){an=ao}}});return an}function X(ap,am,ar,av){var aw,au,at,ao,aq,an;if(ap){an=ap.parentNode;for(aw=am.parentNode;aw&&aw!=an;aw=aw.parentNode){au=c.clone(aw,T);for(aq=0;aq<ac.length;aq++){if(V(ac[aq],ai,au,au)){au=0;break}}if(au){if(at){au.appendChild(at)}if(!ao){ao=au}at=au}}if(av&&(!ak.mixed||!G(ap))){am=c.split(ap,am)}if(at){ar.parentNode.insertBefore(at,ar);ao.appendChild(ar)}}return am}function aj(am){return X(ad(am),am,am,true)}function ae(ao){var an=c.get(ao?"_start":"_end"),am=an[ao?"firstChild":"lastChild"];if(I(am)){am=am[ao?"firstChild":"lastChild"]}c.remove(an,true);return am}function al(am){var an,ao;am=o(am,ac,C);if(ak.split){an=K(am,C);ao=K(am);if(an!=ao){an=P(an,"span",{id:"_start","data-mce-type":"bookmark"});ao=P(ao,"span",{id:"_end","data-mce-type":"bookmark"});aj(an);aj(ao);an=ae(C);ao=ae()}else{an=ao=aj(an)}am.startContainer=an.parentNode;am.startOffset=s(an);am.endContainer=ao.parentNode;am.endOffset=s(ao)+1}L.walk(am,function(ap){Q(ap,function(aq){aa(aq);if(aq.nodeType===1&&W.dom.getStyle(aq,"text-decoration")==="underline"&&aq.parentNode&&i(aq.parentNode)==="underline"){V({deep:false,exact:true,inline:"span",styles:{textDecoration:"underline"}},null,aq)}})})}if(ab){if(ab.nodeType){Y=c.createRng();Y.setStartBefore(ab);Y.setEndAfter(ab);al(Y)}else{al(ab)}return}if(!q.isCollapsed()||!ak.inline||c.select("td.mceSelected,th.mceSelected").length){ag=q.getBookmark();al(q.getRng(C));q.moveToBookmark(ag);if(ak.inline&&j(Z,ai,q.getStart())){O(q.getRng(true))}W.nodeChanged()}else{R("remove",Z,ai)}}function E(Y,aa,Z){var X=S(Y);if(j(Y,aa,Z)&&(!("toggle" in X[0])||X[0]["toggle"])){B(Y,aa,Z)}else{U(Y,aa,Z)}}function y(Y,X,ad,ab){var Z=S(X),ae,ac,aa;function af(aj,al,am){var ai,ak,ag=al[am],ah;if(al.onmatch){return al.onmatch(aj,al,am)}if(ag){if(ag.length===p){for(ai in ag){if(ag.hasOwnProperty(ai)){if(am==="attributes"){ak=c.getAttrib(aj,ai)}else{ak=M(aj,ai)}if(ab&&!ak&&!al.exact){return}if((!ab||al.exact)&&!g(ak,r(ag[ai],ad))){return}}}}else{for(ah=0;ah<ag.length;ah++){if(am==="attributes"?c.getAttrib(aj,ag[ah]):M(aj,ag[ah])){return al}}}}return al}if(Z&&Y){for(ac=0;ac<Z.length;ac++){ae=Z[ac];if(h(Y,ae)&&af(Y,ae,"attributes")&&af(Y,ae,"styles")){if(aa=ae.classes){for(ac=0;ac<aa.length;ac++){if(!c.hasClass(Y,aa[ac])){return}}}return ae}}}}function j(Z,ab,aa){var Y;function X(ac){ac=c.getParent(ac,function(ad){return !!y(ad,Z,ab,true)});return y(ac,Z,ab)}if(aa){return X(aa)}aa=q.getNode();if(X(aa)){return C}Y=q.getStart();if(Y!=aa){if(X(Y)){return C}}return T}function v(ae,ad){var ab,ac=[],aa={},Z,Y,X;ab=q.getStart();c.getParent(ab,function(ah){var ag,af;for(ag=0;ag<ae.length;ag++){af=ae[ag];if(!aa[af]&&y(ah,af,ad)){aa[af]=true;ac.push(af)}}});return ac}function z(ab){var ad=S(ab),aa,Z,ac,Y,X;if(ad){aa=q.getStart();Z=m(aa);for(Y=ad.length-1;Y>=0;Y--){X=ad[Y].selector;if(!X){return C}for(ac=Z.length-1;ac>=0;ac--){if(c.is(Z[ac],X)){return C}}}}return T}a.extend(this,{get:S,register:k,apply:U,remove:B,toggle:E,match:j,matchAll:v,matchNode:y,canApply:z});function h(X,Y){if(g(X,Y.inline)){return C}if(g(X,Y.block)){return C}if(Y.selector){return c.is(X,Y.selector)}}function g(Y,X){Y=Y||"";X=X||"";Y=""+(Y.nodeName||Y);X=""+(X.nodeName||X);return Y.toLowerCase()==X.toLowerCase()}function M(Y,X){var Z=c.getStyle(Y,X);if(X=="color"||X=="backgroundColor"){Z=c.toHex(Z)}if(X=="fontWeight"&&Z==700){Z="bold"}return""+Z}function r(X,Y){if(typeof(X)!="string"){X=X(Y)}else{if(Y){X=X.replace(/%(\w+)/g,function(aa,Z){return Y[Z]||aa})}}return X}function f(X){return X&&X.nodeType===3&&/^([\t \r\n]+|)$/.test(X.nodeValue)}function P(Z,Y,X){var aa=c.create(Y,X);Z.parentNode.insertBefore(aa,Z);aa.appendChild(Z);return aa}function o(X,ai,aa){var al,aj,ad,Z=X.startContainer,ae=X.startOffset,an=X.endContainer,ag=X.endOffset,al,aj,ad,ah;function ak(au){var ao,ar,at,aq,ap;ao=ar=au?Z:an;ap=au?"previousSibling":"nextSibling";root=c.getRoot();if(ao.nodeType==3&&!f(ao)){if(au?ae>0:ag<ao.nodeValue.length){return ao}}for(;;){if(!ai[0].block_expand&&G(ar)){return ar}for(aq=ar[ap];aq;aq=aq[ap]){if(!I(aq)&&!f(aq)){return ar}}if(ar.parentNode==root){ao=ar;break}ar=ar.parentNode}return ao}function ac(ao,ap){if(ap===p){ap=ao.nodeType===3?ao.length:ao.childNodes.length}while(ao&&ao.hasChildNodes()){ao=ao.childNodes[ap];if(ao){ap=ao.nodeType===3?ao.length:ao.childNodes.length}}return{node:ao,offset:ap}}if(Z.nodeType==1&&Z.hasChildNodes()){aj=Z.childNodes.length-1;Z=Z.childNodes[ae>aj?aj:ae];if(Z.nodeType==3){ae=0}}if(an.nodeType==1&&an.hasChildNodes()){aj=an.childNodes.length-1;an=an.childNodes[ag>aj?aj:ag-1];if(an.nodeType==3){ag=an.nodeValue.length}}function am(ap){var ao=ap;while(ao){if(ao.nodeType===1&&x(ao)){return x(ao)==="false"?ao:ap}ao=ao.parentNode}return ap}Z=am(Z);an=am(an);if(I(Z.parentNode)||I(Z)){Z=I(Z)?Z:Z.parentNode;Z=Z.nextSibling||Z;if(Z.nodeType==3){ae=0}}if(I(an.parentNode)||I(an)){an=I(an)?an:an.parentNode;an=an.previousSibling||an;if(an.nodeType==3){ag=an.length}}if(ai[0].inline){if(X.collapsed){function af(ap,au,aw){var at,aq,av,ao;function ar(ay,aA){var aB,ax,az=ay.nodeValue;if(typeof(aA)=="undefined"){aA=aw?az.length:0}if(aw){aB=az.lastIndexOf(" ",aA);ax=az.lastIndexOf("\u00a0",aA);aB=aB>ax?aB:ax;if(aB!==-1&&!aa){aB++}}else{aB=az.indexOf(" ",aA);ax=az.indexOf("\u00a0",aA);aB=aB!==-1&&(ax===-1||aB<ax)?aB:ax}return aB}if(ap.nodeType===3){av=ar(ap,au);if(av!==-1){return{container:ap,offset:av}}ao=ap}at=new t(ap,c.getParent(ap,G)||W.getBody());while(aq=at[aw?"prev":"next"]()){if(aq.nodeType===3){ao=aq;av=ar(aq);if(av!==-1){return{container:aq,offset:av}}}else{if(G(aq)){break}}}if(ao){if(aw){au=0}else{au=ao.length}return{container:ao,offset:au}}}ah=af(Z,ae,true);if(ah){Z=ah.container;ae=ah.offset}ah=af(an,ag);if(ah){an=ah.container;ag=ah.offset}}ad=ac(an,ag);if(ad.node){while(ad.node&&ad.offset===0&&ad.node.previousSibling){ad=ac(ad.node.previousSibling)}if(ad.node&&ad.offset>0&&ad.node.nodeType===3&&ad.node.nodeValue.charAt(ad.offset-1)===" "){if(ad.offset>1){an=ad.node;an.splitText(ad.offset-1)}else{if(ad.node.previousSibling){}}}}}if(ai[0].inline||ai[0].block_expand){if(!ai[0].inline||(Z.nodeType!=3||ae===0)){Z=ak(true)}if(!ai[0].inline||(an.nodeType!=3||ag===an.nodeValue.length)){an=ak()}}if(ai[0].selector&&ai[0].expand!==T&&!ai[0].inline){function ab(ap,ao){var aq,ar,au,at;if(ap.nodeType==3&&ap.nodeValue.length==0&&ap[ao]){ap=ap[ao]}aq=m(ap);for(ar=0;ar<aq.length;ar++){for(au=0;au<ai.length;au++){at=ai[au];if("collapsed" in at&&at.collapsed!==X.collapsed){continue}if(c.is(aq[ar],at.selector)){return aq[ar]}}}return ap}Z=ab(Z,"previousSibling");an=ab(an,"nextSibling")}if(ai[0].block||ai[0].selector){function Y(ap,ao,ar){var aq;if(!ai[0].wrapper){aq=c.getParent(ap,ai[0].block)}if(!aq){aq=c.getParent(ap.nodeType==3?ap.parentNode:ap,G)}if(aq&&ai[0].wrapper){aq=m(aq,"ul,ol").reverse()[0]||aq}if(!aq){aq=ap;while(aq[ao]&&!G(aq[ao])){aq=aq[ao];if(g(aq,"br")){break}}}return aq||ap}Z=Y(Z,"previousSibling");an=Y(an,"nextSibling");if(ai[0].block){if(!G(Z)){Z=ak(true)}if(!G(an)){an=ak()}}}if(Z.nodeType==1){ae=s(Z);Z=Z.parentNode}if(an.nodeType==1){ag=s(an)+1;an=an.parentNode}return{startContainer:Z,startOffset:ae,endContainer:an,endOffset:ag}}function V(ad,ac,aa,X){var Z,Y,ab;if(!h(aa,ad)){return T}if(ad.remove!="all"){Q(ad.styles,function(af,ae){af=r(af,ac);if(typeof(ae)==="number"){ae=af;X=0}if(!X||g(M(X,ae),af)){c.setStyle(aa,ae,"")}ab=1});if(ab&&c.getAttrib(aa,"style")==""){aa.removeAttribute("style");aa.removeAttribute("data-mce-style")}Q(ad.attributes,function(ag,ae){var af;ag=r(ag,ac);if(typeof(ae)==="number"){ae=ag;X=0}if(!X||g(c.getAttrib(X,ae),ag)){if(ae=="class"){ag=c.getAttrib(aa,ae);if(ag){af="";Q(ag.split(/\s+/),function(ah){if(/mce\w+/.test(ah)){af+=(af?" ":"")+ah}});if(af){c.setAttrib(aa,ae,af);return}}}if(ae=="class"){aa.removeAttribute("className")}if(e.test(ae)){aa.removeAttribute("data-mce-"+ae)}aa.removeAttribute(ae)}});Q(ad.classes,function(ae){ae=r(ae,ac);if(!X||c.hasClass(X,ae)){c.removeClass(aa,ae)}});Y=c.getAttribs(aa);for(Z=0;Z<Y.length;Z++){if(Y[Z].nodeName.indexOf("_")!==0){return T}}}if(ad.remove!="none"){n(aa,ad);return C}}function n(Z,aa){var X=Z.parentNode,Y;if(aa.block){if(!l){function ab(ad,ac,ae){ad=D(ad,ac,ae);return !ad||(ad.nodeName=="BR"||G(ad))}if(G(Z)&&!G(X)){if(!ab(Z,T)&&!ab(Z.firstChild,C,1)){Z.insertBefore(c.create("br"),Z.firstChild)}if(!ab(Z,C)&&!ab(Z.lastChild,T,1)){Z.appendChild(c.create("br"))}}}else{if(X==c.getRoot()){if(!aa.list_block||!g(Z,aa.list_block)){Q(a.grep(Z.childNodes),function(ac){if(d(l,ac.nodeName.toLowerCase())){if(!Y){Y=P(ac,l)}else{Y.appendChild(ac)}}else{Y=0}})}}}}if(aa.selector&&aa.inline&&!g(aa.inline,Z)){return}c.remove(Z,1)}function D(Y,X,Z){if(Y){X=X?"nextSibling":"previousSibling";for(Y=Z?Y:Y[X];Y;Y=Y[X]){if(Y.nodeType==1||!f(Y)){return Y}}}}function I(X){return X&&X.nodeType==1&&X.getAttribute("data-mce-type")=="bookmark"}function u(ab,aa){var X,Z,Y;function ad(ag,af){if(ag.nodeName!=af.nodeName){return T}function ae(ai){var aj={};Q(c.getAttribs(ai),function(ak){var al=ak.nodeName.toLowerCase();if(al.indexOf("_")!==0&&al!=="style"){aj[al]=c.getAttrib(ai,al)}});return aj}function ah(al,ak){var aj,ai;for(ai in al){if(al.hasOwnProperty(ai)){aj=ak[ai];if(aj===p){return T}if(al[ai]!=aj){return T}delete ak[ai]}}for(ai in ak){if(ak.hasOwnProperty(ai)){return T}}return C}if(!ah(ae(ag),ae(af))){return T}if(!ah(c.parseStyle(c.getAttrib(ag,"style")),c.parseStyle(c.getAttrib(af,"style")))){return T}return C}if(ab&&aa){function ac(af,ae){for(Z=af;Z;Z=Z[ae]){if(Z.nodeType==3&&Z.nodeValue.length!==0){return af}if(Z.nodeType==1&&!I(Z)){return Z}}return af}ab=ac(ab,"previousSibling");aa=ac(aa,"nextSibling");if(ad(ab,aa)){for(Z=ab.nextSibling;Z&&Z!=aa;){Y=Z;Z=Z.nextSibling;ab.appendChild(Y)}c.remove(aa);Q(a.grep(aa.childNodes),function(ae){ab.appendChild(ae)});return ab}}return aa}function H(X){return/^(h[1-6]|p|div|pre|address|dl|dt|dd)$/.test(X)}function K(Y,ac){var X,ab,Z,aa;X=Y[ac?"startContainer":"endContainer"];ab=Y[ac?"startOffset":"endOffset"];if(X.nodeType==1){Z=X.childNodes.length-1;if(!ac&&ab){ab--}X=X.childNodes[ab>Z?Z:ab]}if(X.nodeType===3&&ac&&ab>=X.nodeValue.length){X=new t(X,W.getBody()).next()||X}if(X.nodeType===3&&!ac&&ab==0){X=new t(X,W.getBody()).prev()||X}return X}function R(ag,X,ae){var ah="_mce_caret",Y=W.settings.caret_debug;function Z(ak){var aj=c.create("span",{id:ah,"data-mce-bogus":true,style:Y?"color:red":""});if(ak){aj.appendChild(W.getDoc().createTextNode(F))}return aj}function af(ak,aj){while(ak){if((ak.nodeType===3&&ak.nodeValue!==F)||ak.childNodes.length>1){return false}if(aj&&ak.nodeType===1){aj.push(ak)}ak=ak.firstChild}return true}function ac(aj){while(aj){if(aj.id===ah){return aj}aj=aj.parentNode}}function ab(aj){var ak;if(aj){ak=new t(aj,aj);for(aj=ak.current();aj;aj=ak.next()){if(aj.nodeType===3){return aj}}}}function aa(al,ak){var am,aj;if(!al){al=ac(q.getStart());if(!al){while(al=c.get(ah)){aa(al,false)}}}else{aj=q.getRng(true);if(af(al)){if(ak!==false){aj.setStartBefore(al);aj.setEndBefore(al)}c.remove(al)}else{am=ab(al);if(am.nodeValue.charAt(0)===F){am=am.deleteData(0,1)}c.remove(al,1)}q.setRng(aj)}}function ad(){var al,aj,ap,ao,am,ak,an;al=q.getRng(true);ao=al.startOffset;ak=al.startContainer;an=ak.nodeValue;aj=ac(q.getStart());if(aj){ap=ab(aj)}if(an&&ao>0&&ao<an.length&&/\w/.test(an.charAt(ao))&&/\w/.test(an.charAt(ao-1))){am=q.getBookmark();al.collapse(true);al=o(al,S(X));al=L.split(al);U(X,ae,al);q.moveToBookmark(am)}else{if(!aj||ap.nodeValue!==F){aj=Z(true);ap=aj.firstChild;al.insertNode(aj);ao=1;U(X,ae,aj)}else{U(X,ae,aj)}q.setCursorLocation(ap,ao)}}function ai(){var aj=q.getRng(true),ak,am,ap,ao,al,at,ar=[],an,aq;ak=aj.startContainer;am=aj.startOffset;al=ak;if(ak.nodeType==3){if(am!=ak.nodeValue.length||ak.nodeValue===F){ao=true}al=al.parentNode}while(al){if(y(al,X,ae)){at=al;break}if(al.nextSibling){ao=true}ar.push(al);al=al.parentNode}if(!at){return}if(ao){ap=q.getBookmark();aj.collapse(true);aj=o(aj,S(X),true);aj=L.split(aj);B(X,ae,aj);q.moveToBookmark(ap)}else{aq=Z();al=aq;for(an=ar.length-1;an>=0;an--){al.appendChild(c.clone(ar[an],false));al=al.firstChild}al.appendChild(c.doc.createTextNode(F));al=al.firstChild;c.insertAfter(aq,at);q.setCursorLocation(al,1)}}if(!self._hasCaretEvents){W.onBeforeGetContent.addToTop(function(){var aj=[],ak;if(af(ac(q.getStart()),aj)){ak=aj.length;while(ak--){c.setAttrib(aj[ak],"data-mce-bogus","1")}}});a.each("onMouseUp onKeyUp".split(" "),function(aj){W[aj].addToTop(function(){aa()})});W.onKeyDown.addToTop(function(aj,al){var ak=al.keyCode;if(ak==8||ak==37||ak==39){aa(ac(q.getStart()))}});self._hasCaretEvents=true}if(ag=="apply"){ad()}else{ai()}}function O(Y){var X=Y.startContainer,ad=Y.startOffset,ac,ab,Z,aa;if(X.nodeType==3&&ad>=X.nodeValue.length){X=X.parentNode;ad=s(X)+1}if(X.nodeType==1){Z=X.childNodes;X=Z[Math.min(ad,Z.length-1)];ac=new t(X,c.getParent(X,c.isBlock));if(ad>Z.length-1){ac.next()}for(ab=ac.current();ab;ab=ac.next()){if(ab.nodeType==3&&!f(ab)){aa=c.create("a",null,F);ab.parentNode.insertBefore(aa,ab);Y.setStart(ab,0);q.setRng(Y);c.remove(aa);return}}}}}})(tinymce);tinymce.onAddEditor.add(function(e,a){var d,h,g,c=a.settings;if(c.inline_styles){h=e.explode(c.font_size_legacy_values);function b(j,i){e.each(i,function(l,k){if(l){g.setStyle(j,k,l)}});g.rename(j,"span")}d={font:function(j,i){b(i,{backgroundColor:i.style.backgroundColor,color:i.color,fontFamily:i.face,fontSize:h[parseInt(i.size)-1]})},u:function(j,i){b(i,{textDecoration:"underline"})},strike:function(j,i){b(i,{textDecoration:"line-through"})}};function f(i,j){g=i.dom;if(c.convert_fonts_to_spans){e.each(g.select("font,u,strike",j.node),function(k){d[k.nodeName.toLowerCase()](a.dom,k)})}}a.onPreProcess.add(f);a.onSetContent.add(f);a.onInit.add(function(){a.selection.onSetContent.add(f)})}});(function(b){var a=b.dom.TreeWalker;b.EnterKey=function(e){var h=e.dom,d=e.selection,c=e.settings,g=e.undoManager;function f(x){var t=d.getRng(true),A,v,s,n,m,i,k,r,C,u;function z(E){return E&&h.isBlock(E)&&!/^(TD|TH|CAPTION)$/.test(E.nodeName)&&!/^(fixed|absolute)/i.test(E.style.position)}function l(F){var J,H,E,K,I,G=F;E=h.createRng();if(F.hasChildNodes()){J=new a(F,F);while(H=J.current()){if(H.nodeType==3){E.setStart(H,0);E.setEnd(H,0);break}if(/^(BR|IMG)$/.test(H.nodeName)){E.setStartBefore(H);E.setEndBefore(H);break}G=H;H=J.next()}if(!H){E.setStart(G,0);E.setEnd(G,0)}}else{if(F.nodeName=="BR"){E.setStartAfter(F);E.setEndAfter(F)}else{E.setStart(F,0);E.setEnd(F,0)}}d.setRng(E);I=h.getViewPort(e.getWin());K=h.getPos(F).y;if(K<I.y||K+25>I.y+I.h){e.getWin().scrollTo(0,K<I.y?K:K-I.h+25)}}function p(F){var G=v,I,H,E;I=F?h.create(F):n.cloneNode(false);E=I;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(G.nodeName)){H=G.cloneNode(false);h.setAttrib(H,"id","");if(I.hasChildNodes()){H.appendChild(I.firstChild);I.appendChild(H)}else{E=H;I.appendChild(H)}}}while(G=G.parentNode);if(!b.isIE){E.innerHTML="<br>"}return I}function o(G){var F,E;if(v.nodeType==3&&(G?s>0:s<v.nodeValue.length)){return false}F=new a(v,n);while(E=(G?F.prev():F.next())){if(E.nodeType===1){if(E.getAttribute("data-mce-bogus")){continue}name=E.nodeName.toLowerCase();if(name==="IMG"){return false}}else{if(E.nodeType===3&&!/^[ \t\r\n]*$/.test(E.nodeValue)){return false}}}return true}function j(E,J){var K,I,F,H,G;I=h.getParent(E,h.isBlock);if(u&&!x.shiftKey&&(!I||!z(I))){I=I||h.getRoot();if(!I.hasChildNodes()){K=h.create(u);I.appendChild(K);t.setStart(K,0);t.setEnd(K,0);return K}H=E;while(H.parentNode!=I){H=H.parentNode}while(H&&!h.isBlock(H)){F=H;H=H.previousSibling}if(F){K=h.create(u);F.parentNode.insertBefore(K,F);H=F;while(H&&!h.isBlock(H)){G=H.nextSibling;K.appendChild(H);H=G}t.setStart(E,J);t.setEnd(E,J)}}return E}function B(){function E(G){var F=k[G?"firstChild":"lastChild"];while(F){if(F.nodeType==1){break}F=F[G?"nextSibling":"previousSibling"]}return F===n}m=u?p(u):h.create("BR");if(E(true)&&E()){h.replace(m,k)}else{if(E(true)){k.parentNode.insertBefore(m,k)}else{if(E()){h.insertAfter(m,k)}else{A=t.cloneRange();A.setStartAfter(n);A.setEndAfter(k);i=A.extractContents();h.insertAfter(i,k);h.insertAfter(m,k)}}}h.remove(n);l(m);g.add()}function y(){var F=new a(v,n),E;while(E=F.current()){if(E.nodeName=="BR"){return true}E=F.next()}}function D(){var G,F,E;if(v&&v.nodeType==3&&s>=v.nodeValue.length){if(!b.isIE&&!y()){G=h.create("br");t.insertNode(G);t.setStartAfter(G);t.setEndAfter(G);F=true}}G=h.create("br");t.insertNode(G);E=h.doc.documentMode;if(b.isIE&&r=="PRE"&&(!E||E<8)){G.parentNode.insertBefore(h.doc.createTextNode("\r"),G)}if(!F){t.setStartAfter(G);t.setEndAfter(G)}else{t.setStartBefore(G);t.setEndBefore(G)}d.setRng(t);g.add()}function q(E){do{if(E.nodeType===3){E.nodeValue=E.nodeValue.replace(/^[\r\n]+/,"")}E=E.firstChild}while(E)}if(!t.collapsed){e.execCommand("Delete");return}if(x.isDefaultPrevented()){return}v=t.startContainer;s=t.startOffset;u=c.forced_root_block;u=u?u.toUpperCase():"";if(v.nodeType==1&&v.hasChildNodes()){v=v.childNodes[Math.min(s,v.childNodes.length-1)]||v;s=0}g.beforeChange();v=j(v,s);n=h.getParent(v,h.isBlock);k=n?h.getParent(n.parentNode,h.isBlock):null;r=n?n.nodeName.toUpperCase():"";C=k?k.nodeName.toUpperCase():"";if(r=="LI"&&h.isEmpty(n)){if(/^(UL|OL|LI)$/.test(k.parentNode.nodeName)){return false}B();return}if(r=="PRE"&&c.br_in_pre!==false){if(!x.shiftKey){D();return}}else{if((!u&&!x.shiftKey&&r!="LI")||(u&&x.shiftKey)){D();return}}u=u||"P";if(o()){if(/^(H[1-6]|PRE)$/.test(r)&&C!="HGROUP"){m=p(u)}else{m=p()}if(c.end_container_on_empty_block&&z(k)&&h.isEmpty(n)){m=h.split(k,n)}else{h.insertAfter(m,n)}}else{if(o(true)){m=n.parentNode.insertBefore(p(),n)}else{A=t.cloneRange();A.setEndAfter(n);i=A.extractContents();q(i);m=i.firstChild;h.insertAfter(i,n)}}h.setAttrib(m,"id","");l(m);g.add()}e.onKeyDown.add(function(j,i){if(i.keyCode==13){if(f(i)!==false){i.preventDefault()}}})}})(tinymce);
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js b/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js
index 3ef3acb1f..4d9ffc03a 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js
+++ b/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js
@@ -2,4 +2,4 @@
 // Uncomment and change this document.domain value if you are loading the script cross subdomains
 // document.domain = 'moxiecode.com';
 
-var tinymce=null,tinyMCEPopup,tinyMCE;tinyMCEPopup={init:function(){var b=this,a,c;a=b.getWin();tinymce=a.tinymce;tinyMCE=a.tinyMCE;b.editor=tinymce.EditorManager.activeEditor;b.params=b.editor.windowManager.params;b.features=b.editor.windowManager.features;b.dom=b.editor.windowManager.createInstance("tinymce.dom.DOMUtils",document);if(b.features.popup_css!==false){b.dom.loadCSS(b.features.popup_css||b.editor.settings.popup_css)}b.listeners=[];b.onInit={add:function(e,d){b.listeners.push({func:e,scope:d})}};b.isWindow=!b.getWindowArg("mce_inline");b.id=b.getWindowArg("mce_window_id");b.editor.windowManager.onOpen.dispatch(b.editor.windowManager,window)},getWin:function(){return(!window.frameElement&&window.dialogArguments)||opener||parent||top},getWindowArg:function(c,b){var a=this.params[c];return tinymce.is(a)?a:b},getParam:function(b,a){return this.editor.getParam(b,a)},getLang:function(b,a){return this.editor.getLang(b,a)},execCommand:function(d,c,e,b){b=b||{};b.skip_focus=1;this.restoreSelection();return this.editor.execCommand(d,c,e,b)},resizeToInnerSize:function(){var a=this;setTimeout(function(){var b=a.dom.getViewPort(window);a.editor.windowManager.resizeBy(a.getWindowArg("mce_width")-b.w,a.getWindowArg("mce_height")-b.h,a.id||window)},0)},executeOnLoad:function(s){this.onInit.add(function(){eval(s)})},storeSelection:function(){this.editor.windowManager.bookmark=tinyMCEPopup.editor.selection.getBookmark(1)},restoreSelection:function(){var a=tinyMCEPopup;if(!a.isWindow&&tinymce.isIE){a.editor.selection.moveToBookmark(a.editor.windowManager.bookmark)}},requireLangPack:function(){var b=this,a=b.getWindowArg("plugin_url")||b.getWindowArg("theme_url");if(a&&b.editor.settings.language&&b.features.translate_i18n!==false){a+="/langs/"+b.editor.settings.language+"_dlg.js";if(!tinymce.ScriptLoader.isDone(a)){document.write('<script type="text/javascript" src="'+tinymce._addVer(a)+'"><\/script>');tinymce.ScriptLoader.markDone(a)}}},pickColor:function(b,a){this.execCommand("mceColorPicker",true,{color:document.getElementById(a).value,func:function(e){document.getElementById(a).value=e;try{document.getElementById(a).onchange()}catch(d){}}})},openBrowser:function(a,c,b){tinyMCEPopup.restoreSelection();this.editor.execCallback("file_browser_callback",a,document.getElementById(a).value,c,window)},confirm:function(b,a,c){this.editor.windowManager.confirm(b,a,c,window)},alert:function(b,a,c){this.editor.windowManager.alert(b,a,c,window)},close:function(){var a=this;function b(){a.editor.windowManager.close(window);tinymce=tinyMCE=a.editor=a.params=a.dom=a.dom.doc=null}if(tinymce.isOpera){a.getWin().setTimeout(b,0)}else{b()}},_restoreSelection:function(){var a=window.event.srcElement;if(a.nodeName=="INPUT"&&(a.type=="submit"||a.type=="button")){tinyMCEPopup.restoreSelection()}},_onDOMLoaded:function(){var b=tinyMCEPopup,d=document.title,e,c,a;if(b.domLoaded){return}b.domLoaded=1;if(b.features.translate_i18n!==false){c=document.body.innerHTML;if(tinymce.isIE){c=c.replace(/ (value|title|alt)=([^"][^\s>]+)/gi,' $1="$2"')}document.dir=b.editor.getParam("directionality","");if((a=b.editor.translate(c))&&a!=c){document.body.innerHTML=a}if((a=b.editor.translate(d))&&a!=d){document.title=d=a}}document.body.style.display="";if(tinymce.isIE){document.attachEvent("onmouseup",tinyMCEPopup._restoreSelection);b.dom.add(b.dom.select("head")[0],"base",{target:"_self"})}b.restoreSelection();b.resizeToInnerSize();if(!b.isWindow){b.editor.windowManager.setTitle(window,d)}else{window.focus()}if(!tinymce.isIE&&!b.isWindow){tinymce.dom.Event._add(document,"focus",function(){b.editor.windowManager.focus(b.id)})}tinymce.each(b.dom.select("select"),function(f){f.onkeydown=tinyMCEPopup._accessHandler});tinymce.each(b.listeners,function(f){f.func.call(f.scope,b.editor)});if(b.getWindowArg("mce_auto_focus",true)){window.focus();tinymce.each(document.forms,function(g){tinymce.each(g.elements,function(f){if(b.dom.hasClass(f,"mceFocus")&&!f.disabled){f.focus();return false}})})}document.onkeyup=tinyMCEPopup._closeWinKeyHandler},_accessHandler:function(a){a=a||window.event;if(a.keyCode==13||a.keyCode==32){a=a.target||a.srcElement;if(a.onchange){a.onchange()}return tinymce.dom.Event.cancel(a)}},_closeWinKeyHandler:function(a){a=a||window.event;if(a.keyCode==27){tinyMCEPopup.close()}},_wait:function(){if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);tinyMCEPopup._onDOMLoaded()}});if(document.documentElement.doScroll&&window==window.top){(function(){if(tinyMCEPopup.domLoaded){return}try{document.documentElement.doScroll("left")}catch(a){setTimeout(arguments.callee,0);return}tinyMCEPopup._onDOMLoaded()})()}document.attachEvent("onload",tinyMCEPopup._onDOMLoaded)}else{if(document.addEventListener){window.addEventListener("DOMContentLoaded",tinyMCEPopup._onDOMLoaded,false);window.addEventListener("load",tinyMCEPopup._onDOMLoaded,false)}}}};tinyMCEPopup.init();tinyMCEPopup._wait();
\ No newline at end of file
+var tinymce=null,tinyMCEPopup,tinyMCE;tinyMCEPopup={init:function(){var b=this,a,c;a=b.getWin();tinymce=a.tinymce;tinyMCE=a.tinyMCE;b.editor=tinymce.EditorManager.activeEditor;b.params=b.editor.windowManager.params;b.features=b.editor.windowManager.features;b.dom=b.editor.windowManager.createInstance("tinymce.dom.DOMUtils",document,{ownEvents:true,proxy:tinyMCEPopup._eventProxy});b.dom.bind(window,"ready",b._onDOMLoaded,b);if(b.features.popup_css!==false){b.dom.loadCSS(b.features.popup_css||b.editor.settings.popup_css)}b.listeners=[];b.onInit={add:function(e,d){b.listeners.push({func:e,scope:d})}};b.isWindow=!b.getWindowArg("mce_inline");b.id=b.getWindowArg("mce_window_id");b.editor.windowManager.onOpen.dispatch(b.editor.windowManager,window)},getWin:function(){return(!window.frameElement&&window.dialogArguments)||opener||parent||top},getWindowArg:function(c,b){var a=this.params[c];return tinymce.is(a)?a:b},getParam:function(b,a){return this.editor.getParam(b,a)},getLang:function(b,a){return this.editor.getLang(b,a)},execCommand:function(d,c,e,b){b=b||{};b.skip_focus=1;this.restoreSelection();return this.editor.execCommand(d,c,e,b)},resizeToInnerSize:function(){var a=this;setTimeout(function(){var b=a.dom.getViewPort(window);a.editor.windowManager.resizeBy(a.getWindowArg("mce_width")-b.w,a.getWindowArg("mce_height")-b.h,a.id||window)},10)},executeOnLoad:function(s){this.onInit.add(function(){eval(s)})},storeSelection:function(){this.editor.windowManager.bookmark=tinyMCEPopup.editor.selection.getBookmark(1)},restoreSelection:function(){var a=tinyMCEPopup;if(!a.isWindow&&tinymce.isIE){a.editor.selection.moveToBookmark(a.editor.windowManager.bookmark)}},requireLangPack:function(){var b=this,a=b.getWindowArg("plugin_url")||b.getWindowArg("theme_url");if(a&&b.editor.settings.language&&b.features.translate_i18n!==false&&b.editor.settings.language_load!==false){a+="/langs/"+b.editor.settings.language+"_dlg.js";if(!tinymce.ScriptLoader.isDone(a)){document.write('<script type="text/javascript" src="'+tinymce._addVer(a)+'"><\/script>');tinymce.ScriptLoader.markDone(a)}}},pickColor:function(b,a){this.execCommand("mceColorPicker",true,{color:document.getElementById(a).value,func:function(e){document.getElementById(a).value=e;try{document.getElementById(a).onchange()}catch(d){}}})},openBrowser:function(a,c,b){tinyMCEPopup.restoreSelection();this.editor.execCallback("file_browser_callback",a,document.getElementById(a).value,c,window)},confirm:function(b,a,c){this.editor.windowManager.confirm(b,a,c,window)},alert:function(b,a,c){this.editor.windowManager.alert(b,a,c,window)},close:function(){var a=this;function b(){a.editor.windowManager.close(window);tinymce=tinyMCE=a.editor=a.params=a.dom=a.dom.doc=null}if(tinymce.isOpera){a.getWin().setTimeout(b,0)}else{b()}},_restoreSelection:function(){var a=window.event.srcElement;if(a.nodeName=="INPUT"&&(a.type=="submit"||a.type=="button")){tinyMCEPopup.restoreSelection()}},_onDOMLoaded:function(){var b=tinyMCEPopup,d=document.title,e,c,a;if(b.features.translate_i18n!==false){c=document.body.innerHTML;if(tinymce.isIE){c=c.replace(/ (value|title|alt)=([^"][^\s>]+)/gi,' $1="$2"')}document.dir=b.editor.getParam("directionality","");if((a=b.editor.translate(c))&&a!=c){document.body.innerHTML=a}if((a=b.editor.translate(d))&&a!=d){document.title=d=a}}if(!b.editor.getParam("browser_preferred_colors",false)||!b.isWindow){b.dom.addClass(document.body,"forceColors")}document.body.style.display="";if(tinymce.isIE){document.attachEvent("onmouseup",tinyMCEPopup._restoreSelection);b.dom.add(b.dom.select("head")[0],"base",{target:"_self"})}b.restoreSelection();b.resizeToInnerSize();if(!b.isWindow){b.editor.windowManager.setTitle(window,d)}else{window.focus()}if(!tinymce.isIE&&!b.isWindow){b.dom.bind(document,"focus",function(){b.editor.windowManager.focus(b.id)})}tinymce.each(b.dom.select("select"),function(f){f.onkeydown=tinyMCEPopup._accessHandler});tinymce.each(b.listeners,function(f){f.func.call(f.scope,b.editor)});if(b.getWindowArg("mce_auto_focus",true)){window.focus();tinymce.each(document.forms,function(g){tinymce.each(g.elements,function(f){if(b.dom.hasClass(f,"mceFocus")&&!f.disabled){f.focus();return false}})})}document.onkeyup=tinyMCEPopup._closeWinKeyHandler},_accessHandler:function(a){a=a||window.event;if(a.keyCode==13||a.keyCode==32){a=a.target||a.srcElement;if(a.onchange){a.onchange()}return tinymce.dom.Event.cancel(a)}},_closeWinKeyHandler:function(a){a=a||window.event;if(a.keyCode==27){tinyMCEPopup.close()}},_eventProxy:function(a){return function(b){tinyMCEPopup.dom.events.callNativeHandler(a,b)}}};tinyMCEPopup.init();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js b/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js
index 9db8d18fe..42f01a58c 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js
+++ b/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js
@@ -1,13 +1,13 @@
 (function(win) {

 	var whiteSpaceRe = /^\s*|\s*$/g,

-		undefined;

+		undefined, isRegExpBroken = 'B'.replace(/A(.)|B/, '$1') === '$1';

 

 	var tinymce = {

 		majorVersion : '3',

 

-		minorVersion : '3.7',

+		minorVersion : '5b2',

 

-		releaseDate : '2010-06-10',

+		releaseDate : '2012-03-15',

 

 		_init : function() {

 			var t = this, d = document, na = navigator, ua = na.userAgent, i, nl, n, base, p, v;

@@ -20,6 +20,12 @@
 

 			t.isIE6 = t.isIE && /MSIE [56]/.test(ua);

 

+			t.isIE7 = t.isIE && /MSIE [7]/.test(ua);

+

+			t.isIE8 = t.isIE && /MSIE [8]/.test(ua);

+

+			t.isIE9 = t.isIE && /MSIE [9]/.test(ua);

+

 			t.isGecko = !t.isWebKit && /Gecko/.test(ua);

 

 			t.isMac = ua.indexOf('Mac') != -1;

@@ -27,6 +33,8 @@
 			t.isAir = /adobeair/i.test(ua);

 

 			t.isIDevice = /(iPad|iPhone)/.test(ua);

+			

+			t.isIOS5 = t.isIDevice && ua.match(/AppleWebKit\/(\d*)/)[1]>=534;

 

 			// TinyMCE .NET webcontrol might be setting the values for TinyMCE

 			if (win.tinyMCEPreInit) {

@@ -52,7 +60,7 @@
 			}

 

 			function getBase(n) {

-				if (n.src && /tiny_mce(|_gzip|_jquery|_prototype)(_dev|_src)?.js/.test(n.src)) {

+				if (n.src && /tiny_mce(|_gzip|_jquery|_prototype|_full)(_dev|_src)?.js/.test(n.src)) {

 					if (/_(src|dev)\.js/g.test(n.src))

 						t.suffix = '_src';

 

@@ -103,6 +111,24 @@
 			return typeof(o) == t;

 		},

 

+		makeMap : function(items, delim, map) {

+			var i;

+

+			items = items || [];

+			delim = delim || ',';

+

+			if (typeof(items) == "string")

+				items = items.split(delim);

+

+			map = map || {};

+

+			i = items.length;

+			while (i--)

+				map[items[i]] = {};

+

+			return map;

+		},

+

 		each : function(o, cb, s) {

 			var n, l;

 

@@ -185,7 +211,7 @@
 			return (s ? '' + s : '').replace(whiteSpaceRe, '');

 		},

 

-		create : function(s, p) {

+		create : function(s, p, root) {

 			var t = this, sp, ns, cn, scn, c, de = 0;

 

 			// Parse : <prefix> <class>:<super class>

@@ -193,7 +219,7 @@
 			cn = s[3].match(/(^|\.)(\w+)$/i)[2]; // Class name

 

 			// Create namespace for new class

-			ns = t.createNS(s[3].replace(/\.\w+$/, ''));

+			ns = t.createNS(s[3].replace(/\.\w+$/, ''), root);

 

 			// Class already exists

 			if (ns[cn])

@@ -428,6 +454,29 @@
 				return u + v;

 

 			return u.replace('#', v + '#');

+		},

+

+		// Fix function for IE 9 where regexps isn't working correctly

+		// Todo: remove me once MS fixes the bug

+		_replace : function(find, replace, str) {

+			// On IE9 we have to fake $x replacement

+			if (isRegExpBroken) {

+				return str.replace(find, function() {

+					var val = replace, args = arguments, i;

+

+					for (i = 0; i < args.length - 2; i++) {

+						if (args[i] === undefined) {

+							val = val.replace(new RegExp('\\$' + i, 'g'), '');

+						} else {

+							val = val.replace(new RegExp('\\$' + i, 'g'), args[i]);

+						}

+					}

+

+					return val;

+				});

+			}

+

+			return str.replace(find, replace);

 		}

 

 		};

@@ -437,7 +486,11 @@
 

 	// Expose tinymce namespace to the global namespace (window)

 	win.tinymce = win.tinyMCE = tinymce;

-})(window);

+

+	// Describe the different namespaces

+

+	})(window);

+

 

 

 tinymce.create('tinymce.util.Dispatcher', {

@@ -482,7 +535,7 @@ tinymce.create('tinymce.util.Dispatcher', {
 		// And this is also more efficient

 		for (i = 0; i<li.length; i++) {

 			c = li[i];

-			s = c.cb.apply(c.scope, a);

+			s = c.cb.apply(c.scope, a.length > 0 ? a : [c.scope]);

 

 			if (s === false)

 				break;

@@ -498,7 +551,7 @@ tinymce.create('tinymce.util.Dispatcher', {
 

 	tinymce.create('tinymce.util.URI', {

 		URI : function(u, s) {

-			var t = this, o, a, b;

+			var t = this, o, a, b, base_url;

 

 			// Trim whitespace

 			u = tinymce.trim(u);

@@ -506,8 +559,9 @@ tinymce.create('tinymce.util.Dispatcher', {
 			// Default settings

 			s = t.settings = s || {};

 

-			// Strange app protocol or local anchor

-			if (/^(mailto|tel|news|javascript|about|data):/i.test(u) || /^\s*#/.test(u)) {

+			// Strange app protocol that isn't http/https or local anchor

+			// For example: mailto,skype,tel etc.

+			if (/^([\w\-]+):([^\/]{2})/i.test(u) || /^\s*#/.test(u)) {

 				t.source = u;

 				return;

 			}

@@ -517,12 +571,14 @@ tinymce.create('tinymce.util.Dispatcher', {
 				u = (s.base_uri ? s.base_uri.protocol || 'http' : 'http') + '://mce_host' + u;

 

 			// Relative path http:// or protocol relative //path

-			if (!/^\w*:?\/\//.test(u))

-				u = (s.base_uri.protocol || 'http') + '://mce_host' + t.toAbsPath(s.base_uri.path, u);

+			if (!/^[\w-]*:?\/\//.test(u)) {

+				base_url = s.base_uri ? s.base_uri.path : new tinymce.util.URI(location.href).directory;

+				u = ((s.base_uri && s.base_uri.protocol) || 'http') + '://mce_host' + t.toAbsPath(base_url, u);

+			}

 

 			// Parse URL (Credits goes to Steave, http://blog.stevenlevithan.com/archives/parseuri)

 			u = u.replace(/@@/g, '(mce_at)'); // Zope 3 workaround, they use @@something

-			u = /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(u);

+			u = /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(u);

 			each(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"], function(v, i) {

 				var s = u[i];

 

@@ -805,9 +861,11 @@ tinymce.create('tinymce.util.Dispatcher', {
 	});

 })();

 

-tinymce.create('static tinymce.util.JSON', {

-	serialize : function(o) {

-		var i, v, s = tinymce.util.JSON.serialize, t;

+(function() {

+	function serialize(o, quote) {

+		var i, v, t;

+

+		quote = quote || '"';

 

 		if (o == null)

 			return 'null';

@@ -817,7 +875,11 @@ tinymce.create('static tinymce.util.JSON', {
 		if (t == 'string') {

 			v = '\bb\tt\nn\ff\rr\""\'\'\\\\';

 

-			return '"' + o.replace(/([\u0080-\uFFFF\x00-\x1f\"])/g, function(a, b) {

+			return quote + o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g, function(a, b) {

+				// Make sure single quotes never get encoded inside double quotes for JSON compatibility

+				if (quote === '"' && a === "'")

+					return a;

+

 				i = v.indexOf(b);

 

 				if (i + 1)

@@ -826,37 +888,44 @@ tinymce.create('static tinymce.util.JSON', {
 				a = b.charCodeAt().toString(16);

 

 				return '\\u' + '0000'.substring(a.length) + a;

-			}) + '"';

+			}) + quote;

 		}

 

 		if (t == 'object') {

 			if (o.hasOwnProperty && o instanceof Array) {

 					for (i=0, v = '['; i<o.length; i++)

-						v += (i > 0 ? ',' : '') + s(o[i]);

+						v += (i > 0 ? ',' : '') + serialize(o[i], quote);

 

 					return v + ']';

 				}

 

 				v = '{';

 

-				for (i in o)

-					v += typeof o[i] != 'function' ? (v.length > 1 ? ',"' : '"') + i + '":' + s(o[i]) : '';

+				for (i in o) {

+					if (o.hasOwnProperty(i)) {

+						v += typeof o[i] != 'function' ? (v.length > 1 ? ',' + quote : quote) + i + quote +':' + serialize(o[i], quote) : '';

+					}

+				}

 

 				return v + '}';

 		}

 

 		return '' + o;

-	},

+	};

 

-	parse : function(s) {

-		try {

-			return eval('(' + s + ')');

-		} catch (ex) {

-			// Ignore

+	tinymce.util.JSON = {

+		serialize: serialize,

+

+		parse: function(s) {

+			try {

+				return eval('(' + s + ')');

+			} catch (ex) {

+				// Ignore

+			}

 		}

-	}

 

-	});

+		};

+})();

 

 tinymce.create('static tinymce.util.XHR', {

 	send : function(o) {

@@ -948,7 +1017,8 @@ tinymce.create('static tinymce.util.XHR', {
 			};

 

 			o.error = function(ty, x) {

-				ecb.call(o.error_scope || o.scope, ty, x);

+				if (ecb)

+					ecb.call(o.error_scope || o.scope, ty, x);

 			};

 

 			o.data = JSON.serialize({

@@ -970,30 +1040,3354 @@ tinymce.create('static tinymce.util.XHR', {
 		}

 	});

 }());

+(function(tinymce){

+	tinymce.VK = {

+		BACKSPACE: 8,

+		DELETE: 46,

+		DOWN: 40,

+		ENTER: 13,

+		LEFT: 37,

+		RIGHT: 39,

+		SPACEBAR: 32,

+		TAB: 9,

+		UP: 38,

+

+		modifierPressed: function (e) {

+			return e.shiftKey || e.ctrlKey || e.altKey;

+		}

+	}

+})(tinymce);

+

+(function(tinymce) {

+	var VK = tinymce.VK, BACKSPACE = VK.BACKSPACE, DELETE = VK.DELETE;

+

+	function setEditorCommandState(editor, cmd, state) {

+		try {

+			editor.getDoc().execCommand(cmd, false, state);

+		} catch (ex) {

+			// Ignore

+		}

+	}

+

+	function cleanupStylesWhenDeleting(ed) {

+		var dom = ed.dom, selection = ed.selection;

+

+		ed.onKeyDown.add(function(ed, e) {

+			var rng, blockElm, node, clonedSpan, isDelete;

+

+			if (e.isDefaultPrevented()) {

+				return;

+			}

+

+			isDelete = e.keyCode == DELETE;

+			if ((isDelete || e.keyCode == BACKSPACE) && !VK.modifierPressed(e)) {

+				e.preventDefault();

+				rng = selection.getRng();

+

+				// Find root block

+				blockElm = dom.getParent(rng.startContainer, dom.isBlock);

+

+				// On delete clone the root span of the next block element

+				if (isDelete)

+					blockElm = dom.getNext(blockElm, dom.isBlock);

+

+				// Locate root span element and clone it since it would otherwise get merged by the "apple-style-span" on delete/backspace

+				if (blockElm) {

+					node = blockElm.firstChild;

+

+					// Ignore empty text nodes

+					while (node && node.nodeType == 3 && node.nodeValue.length == 0)

+						node = node.nextSibling;

+

+					if (node && node.nodeName === 'SPAN') {

+						clonedSpan = node.cloneNode(false);

+					}

+				}

+

+				// Do the backspace/delete action

+				ed.getDoc().execCommand(isDelete ? 'ForwardDelete' : 'Delete', false, null);

+

+				// Find all odd apple-style-spans

+				blockElm = dom.getParent(rng.startContainer, dom.isBlock);

+				tinymce.each(dom.select('span.Apple-style-span,font.Apple-style-span', blockElm), function(span) {

+					var bm = selection.getBookmark();

+

+					if (clonedSpan) {

+						dom.replace(clonedSpan.cloneNode(false), span, true);

+					} else {

+						dom.remove(span, true);

+					}

+

+					// Restore the selection

+					selection.moveToBookmark(bm);

+				});

+			}

+		});

+	};

+

+	function emptyEditorWhenDeleting(ed) {

+		function serializeRng(rng) {

+			var body = ed.dom.create("body");

+			var contents = rng.cloneContents();

+			body.appendChild(contents);

+			return ed.selection.serializer.serialize(body, {format: 'html'});

+		}

+

+		function allContentsSelected(rng) {

+			var selection = serializeRng(rng);

+

+			var allRng = ed.dom.createRng();

+			allRng.selectNode(ed.getBody());

+

+			var allSelection = serializeRng(allRng);

+			return selection === allSelection;

+		}

+

+		ed.onKeyDown.addToTop(function(ed, e) {

+			var keyCode = e.keyCode;

+			if (keyCode == DELETE || keyCode == BACKSPACE) {

+				var rng = ed.selection.getRng(true);

+				if (!rng.collapsed && allContentsSelected(rng)) {

+					ed.setContent('', {format : 'raw'});

+					ed.nodeChanged();

+					e.preventDefault();

+				}

+			}

+		});

+	};

+

+	function inputMethodFocus(ed) {

+		ed.dom.bind(ed.getDoc(), 'focusin', function() {

+			ed.selection.setRng(ed.selection.getRng());

+		});

+	};

+

+	function removeHrOnBackspace(ed) {

+		ed.onKeyDown.add(function(ed, e) {

+			if (e.keyCode === BACKSPACE) {

+				if (ed.selection.isCollapsed() && ed.selection.getRng(true).startOffset === 0) {

+					var node = ed.selection.getNode();

+					var previousSibling = node.previousSibling;

+					if (previousSibling && previousSibling.nodeName && previousSibling.nodeName.toLowerCase() === "hr") {

+						ed.dom.remove(previousSibling);

+						tinymce.dom.Event.cancel(e);

+					}

+				}

+			}

+		})

+	}

+

+	function focusBody(ed) {

+		// Fix for a focus bug in FF 3.x where the body element

+		// wouldn't get proper focus if the user clicked on the HTML element

+		if (!Range.prototype.getClientRects) { // Detect getClientRects got introduced in FF 4

+			ed.onMouseDown.add(function(ed, e) {

+				if (e.target.nodeName === "HTML") {

+					var body = ed.getBody();

+

+					// Blur the body it's focused but not correctly focused

+					body.blur();

+

+					// Refocus the body after a little while

+					setTimeout(function() {

+						body.focus();

+					}, 0);

+				}

+			});

+		}

+	};

+

+	function selectControlElements(ed) {

+		ed.onClick.add(function(ed, e) {

+			e = e.target;

+

+			// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250

+			// WebKit can't even do simple things like selecting an image

+			// Needs tobe the setBaseAndExtend or it will fail to select floated images

+			if (/^(IMG|HR)$/.test(e.nodeName))

+				ed.selection.getSel().setBaseAndExtent(e, 0, e, 1);

+

+			if (e.nodeName == 'A' && ed.dom.hasClass(e, 'mceItemAnchor'))

+				ed.selection.select(e);

+

+			ed.nodeChanged();

+		});

+	};

+

+	function removeStylesWhenDeletingAccrossBlockElements(ed) {

+		var selection = ed.selection, dom = ed.dom;

+

+		function getAttributeApplyFunction() {

+			var template = dom.getAttribs(selection.getStart().cloneNode(false));

+

+			return function() {

+				var target = selection.getStart();

+

+				if (target !== ed.getBody()) {

+					dom.setAttrib(target, "style", null);

+

+				tinymce.each(template, function(attr) {

+					target.setAttributeNode(attr.cloneNode(true));

+				});

+				}

+			};

+		}

+

+		function isSelectionAcrossElements() {

+			return !selection.isCollapsed() && selection.getStart() != selection.getEnd();

+		}

+

+		function blockEvent(ed, e) {

+			e.preventDefault();

+			return false;

+		}

+

+		ed.onKeyPress.add(function(ed, e) {

+			var applyAttributes;

+

+			if ((e.keyCode == 8 || e.keyCode == 46) && isSelectionAcrossElements()) {

+				applyAttributes = getAttributeApplyFunction();

+				ed.getDoc().execCommand('delete', false, null);

+				applyAttributes();

+				e.preventDefault();

+				return false;

+			}

+		});

+

+		dom.bind(ed.getDoc(), 'cut', function(e) {

+			var applyAttributes;

+

+			if (isSelectionAcrossElements()) {

+				applyAttributes = getAttributeApplyFunction();

+				ed.onKeyUp.addToTop(blockEvent);

+

+				setTimeout(function() {

+					applyAttributes();

+					ed.onKeyUp.remove(blockEvent);

+				}, 0);

+			}

+		});

+	}

+	

+	/*

+	function removeStylesOnPTagsInheritedFromHeadingTag(ed) {

+		ed.onKeyDown.add(function(ed, event) {

+			function checkInHeadingTag(ed) {

+				var currentNode = ed.selection.getNode();

+				var headingTags = 'h1,h2,h3,h4,h5,h6';

+				return ed.dom.is(currentNode, headingTags) || ed.dom.getParent(currentNode, headingTags) !== null;

+			}

+

+			if (event.keyCode === VK.ENTER && !VK.modifierPressed(event) && checkInHeadingTag(ed)) {

+				setTimeout(function() {

+					var currentNode = ed.selection.getNode();

+					if (ed.dom.is(currentNode, 'p')) {

+						ed.dom.setAttrib(currentNode, 'style', null);

+						// While tiny's content is correct after this method call, the content shown is not representative of it and needs to be 'repainted'

+						ed.execCommand('mceCleanup');

+					}

+				}, 0);

+			}

+		});

+	}

+	*/

+

+	function selectionChangeNodeChanged(ed) {

+		var lastRng, selectionTimer;

+

+		ed.dom.bind(ed.getDoc(), 'selectionchange', function() {

+			if (selectionTimer) {

+				clearTimeout(selectionTimer);

+				selectionTimer = 0;

+			}

+

+			selectionTimer = window.setTimeout(function() {

+				var rng = ed.selection.getRng();

+

+				// Compare the ranges to see if it was a real change or not

+				if (!lastRng || !tinymce.dom.RangeUtils.compareRanges(rng, lastRng)) {

+					ed.nodeChanged();

+					lastRng = rng;

+				}

+			}, 50);

+		});

+	}

+

+	function ensureBodyHasRoleApplication(ed) {

+		document.body.setAttribute("role", "application");

+	}

+	

+	function disableBackspaceIntoATable(ed) {

+		ed.onKeyDown.add(function(ed, e) {

+			if (e.keyCode === BACKSPACE) {

+				if (ed.selection.isCollapsed() && ed.selection.getRng(true).startOffset === 0) {

+					var previousSibling = ed.selection.getNode().previousSibling;

+					if (previousSibling && previousSibling.nodeName && previousSibling.nodeName.toLowerCase() === "table") {

+						return tinymce.dom.Event.cancel(e);

+					}

+				}

+			}

+		})

+	}

+

+	function addNewLinesBeforeBrInPre(editor) {

+		var documentMode = editor.getDoc().documentMode;

+

+		// IE8+ rendering mode does the right thing with BR in PRE

+		if (documentMode && documentMode > 7) {

+			return;

+		}

+

+		 // Enable display: none in area and add a specific class that hides all BR elements in PRE to

+		 // avoid the caret from getting stuck at the BR elements while pressing the right arrow key

+		setEditorCommandState(editor, 'RespectVisibilityInDesign', true);

+		editor.dom.addClass(editor.getBody(), 'mceHideBrInPre');

+

+		// Adds a \n before all BR elements in PRE to get them visual

+		editor.parser.addNodeFilter('pre', function(nodes, name) {

+			var i = nodes.length, brNodes, j, brElm, sibling;

+

+			while (i--) {

+				brNodes = nodes[i].getAll('br');

+				j = brNodes.length;

+				while (j--) {

+					brElm = brNodes[j];

+

+					// Add \n before BR in PRE elements on older IE:s so the new lines get rendered

+					sibling = brElm.prev;

+					if (sibling && sibling.type === 3 && sibling.value.charAt(sibling.value - 1) != '\n') {

+						sibling.value += '\n';

+					} else {

+						brElm.parent.insert(new tinymce.html.Node('#text', 3), brElm, true).value = '\n';

+					}

+				}

+			}

+		});

+

+		// Removes any \n before BR elements in PRE since other browsers and in contentEditable=false mode they will be visible

+		editor.serializer.addNodeFilter('pre', function(nodes, name) {

+			var i = nodes.length, brNodes, j, brElm, sibling;

+

+			while (i--) {

+				brNodes = nodes[i].getAll('br');

+				j = brNodes.length;

+				while (j--) {

+					brElm = brNodes[j];

+					sibling = brElm.prev;

+					if (sibling && sibling.type == 3) {

+						sibling.value = sibling.value.replace(/\r?\n$/, '');

+					}

+				}

+			}

+		});

+	}

+

+	tinymce.create('tinymce.util.Quirks', {

+		Quirks: function(ed) {

+			// All browsers

+			disableBackspaceIntoATable(ed);

+

+			// WebKit

+			if (tinymce.isWebKit) {

+				cleanupStylesWhenDeleting(ed);

+				emptyEditorWhenDeleting(ed);

+				inputMethodFocus(ed);

+				selectControlElements(ed);

+

+				// iOS

+				if (tinymce.isIDevice) {

+					selectionChangeNodeChanged(ed);

+				}

+			}

+

+			// IE

+			if (tinymce.isIE) {

+				removeHrOnBackspace(ed);

+				emptyEditorWhenDeleting(ed);

+				ensureBodyHasRoleApplication(ed);

+				//removeStylesOnPTagsInheritedFromHeadingTag(ed)

+				addNewLinesBeforeBrInPre(ed);

+			}

+

+			// Gecko

+			if (tinymce.isGecko) {

+				removeHrOnBackspace(ed);

+				focusBody(ed);

+				removeStylesWhenDeletingAccrossBlockElements(ed);

+			}

+		}

+	});

+})(tinymce);

+

+(function(tinymce) {

+	var namedEntities, baseEntities, reverseEntities,

+		attrsCharsRegExp = /[&<>\"\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,

+		textCharsRegExp = /[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,

+		rawCharsRegExp = /[<>&\"\']/g,

+		entityRegExp = /&(#x|#)?([\w]+);/g,

+		asciiMap = {

+				128 : "\u20AC", 130 : "\u201A", 131 : "\u0192", 132 : "\u201E", 133 : "\u2026", 134 : "\u2020",

+				135 : "\u2021", 136 : "\u02C6", 137 : "\u2030", 138 : "\u0160", 139 : "\u2039", 140 : "\u0152",

+				142 : "\u017D", 145 : "\u2018", 146 : "\u2019", 147 : "\u201C", 148 : "\u201D", 149 : "\u2022",

+				150 : "\u2013", 151 : "\u2014", 152 : "\u02DC", 153 : "\u2122", 154 : "\u0161", 155 : "\u203A",

+				156 : "\u0153", 158 : "\u017E", 159 : "\u0178"

+		};

+

+	// Raw entities

+	baseEntities = {

+		'\"' : '&quot;', // Needs to be escaped since the YUI compressor would otherwise break the code

+		"'" : '&#39;',

+		'<' : '&lt;',

+		'>' : '&gt;',

+		'&' : '&amp;'

+	};

+

+	// Reverse lookup table for raw entities

+	reverseEntities = {

+		'&lt;' : '<',

+		'&gt;' : '>',

+		'&amp;' : '&',

+		'&quot;' : '"',

+		'&apos;' : "'"

+	};

+

+	// Decodes text by using the browser

+	function nativeDecode(text) {

+		var elm;

+

+		elm = document.createElement("div");

+		elm.innerHTML = text;

+

+		return elm.textContent || elm.innerText || text;

+	};

+

+	// Build a two way lookup table for the entities

+	function buildEntitiesLookup(items, radix) {

+		var i, chr, entity, lookup = {};

+

+		if (items) {

+			items = items.split(',');

+			radix = radix || 10;

+

+			// Build entities lookup table

+			for (i = 0; i < items.length; i += 2) {

+				chr = String.fromCharCode(parseInt(items[i], radix));

+

+				// Only add non base entities

+				if (!baseEntities[chr]) {

+					entity = '&' + items[i + 1] + ';';

+					lookup[chr] = entity;

+					lookup[entity] = chr;

+				}

+			}

+

+			return lookup;

+		}

+	};

+

+	// Unpack entities lookup where the numbers are in radix 32 to reduce the size

+	namedEntities = buildEntitiesLookup(

+		'50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,' +

+		'5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,' +

+		'5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,' +

+		'5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,' +

+		'68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,' +

+		'6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,' +

+		'6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,' +

+		'75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,' +

+		'7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,' +

+		'7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,' +

+		'sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,' +

+		'st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,' +

+		't9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,' +

+		'tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,' +

+		'u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,' +

+		'81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,' +

+		'8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,' +

+		'8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,' +

+		'8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,' +

+		'8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,' +

+		'nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,' +

+		'rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,' +

+		'Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,' +

+		'80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,' +

+		'811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro'

+	, 32);

+

+	tinymce.html = tinymce.html || {};

+

+	tinymce.html.Entities = {

+		encodeRaw : function(text, attr) {

+			return text.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(chr) {

+				return baseEntities[chr] || chr;

+			});

+		},

+

+		encodeAllRaw : function(text) {

+			return ('' + text).replace(rawCharsRegExp, function(chr) {

+				return baseEntities[chr] || chr;

+			});

+		},

+

+		encodeNumeric : function(text, attr) {

+			return text.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(chr) {

+				// Multi byte sequence convert it to a single entity

+				if (chr.length > 1)

+					return '&#' + (((chr.charCodeAt(0) - 0xD800) * 0x400) + (chr.charCodeAt(1) - 0xDC00) + 0x10000) + ';';

+

+				return baseEntities[chr] || '&#' + chr.charCodeAt(0) + ';';

+			});

+		},

+

+		encodeNamed : function(text, attr, entities) {

+			entities = entities || namedEntities;

+

+			return text.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(chr) {

+				return baseEntities[chr] || entities[chr] || chr;

+			});

+		},

+

+		getEncodeFunc : function(name, entities) {

+			var Entities = tinymce.html.Entities;

+

+			entities = buildEntitiesLookup(entities) || namedEntities;

+

+			function encodeNamedAndNumeric(text, attr) {

+				return text.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(chr) {

+					return baseEntities[chr] || entities[chr] || '&#' + chr.charCodeAt(0) + ';' || chr;

+				});

+			};

+

+			function encodeCustomNamed(text, attr) {

+				return Entities.encodeNamed(text, attr, entities);

+			};

+

+			// Replace + with , to be compatible with previous TinyMCE versions

+			name = tinymce.makeMap(name.replace(/\+/g, ','));

+

+			// Named and numeric encoder

+			if (name.named && name.numeric)

+				return encodeNamedAndNumeric;

+

+			// Named encoder

+			if (name.named) {

+				// Custom names

+				if (entities)

+					return encodeCustomNamed;

+

+				return Entities.encodeNamed;

+			}

+

+			// Numeric

+			if (name.numeric)

+				return Entities.encodeNumeric;

+

+			// Raw encoder

+			return Entities.encodeRaw;

+		},

+

+		decode : function(text) {

+			return text.replace(entityRegExp, function(all, numeric, value) {

+				if (numeric) {

+					value = parseInt(value, numeric.length === 2 ? 16 : 10);

+

+					// Support upper UTF

+					if (value > 0xFFFF) {

+						value -= 0x10000;

+

+						return String.fromCharCode(0xD800 + (value >> 10), 0xDC00 + (value & 0x3FF));

+					} else

+						return asciiMap[value] || String.fromCharCode(value);

+				}

+

+				return reverseEntities[all] || namedEntities[all] || nativeDecode(all);

+			});

+		}

+	};

+})(tinymce);

+

+tinymce.html.Styles = function(settings, schema) {

+	var rgbRegExp = /rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,

+		urlOrStrRegExp = /(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,

+		styleRegExp = /\s*([^:]+):\s*([^;]+);?/g,

+		trimRightRegExp = /\s+$/,

+		urlColorRegExp = /rgb/,

+		undef, i, encodingLookup = {}, encodingItems;

+

+	settings = settings || {};

+

+	encodingItems = '\\" \\\' \\; \\: ; : \uFEFF'.split(' ');

+	for (i = 0; i < encodingItems.length; i++) {

+		encodingLookup[encodingItems[i]] = '\uFEFF' + i;

+		encodingLookup['\uFEFF' + i] = encodingItems[i];

+	}

+

+	function toHex(match, r, g, b) {

+		function hex(val) {

+			val = parseInt(val).toString(16);

+

+			return val.length > 1 ? val : '0' + val; // 0 -> 00

+		};

+

+		return '#' + hex(r) + hex(g) + hex(b);

+	};

+

+	return {

+		toHex : function(color) {

+			return color.replace(rgbRegExp, toHex);

+		},

+

+		parse : function(css) {

+			var styles = {}, matches, name, value, isEncoded, urlConverter = settings.url_converter, urlConverterScope = settings.url_converter_scope || this;

+

+			function compress(prefix, suffix) {

+				var top, right, bottom, left;

+

+				// Get values and check it it needs compressing

+				top = styles[prefix + '-top' + suffix];

+				if (!top)

+					return;

+

+				right = styles[prefix + '-right' + suffix];

+				if (top != right)

+					return;

+

+				bottom = styles[prefix + '-bottom' + suffix];

+				if (right != bottom)

+					return;

+

+				left = styles[prefix + '-left' + suffix];

+				if (bottom != left)

+					return;

+

+				// Compress

+				styles[prefix + suffix] = left;

+				delete styles[prefix + '-top' + suffix];

+				delete styles[prefix + '-right' + suffix];

+				delete styles[prefix + '-bottom' + suffix];

+				delete styles[prefix + '-left' + suffix];

+			};

+

+			function canCompress(key) {

+				var value = styles[key], i;

+

+				if (!value || value.indexOf(' ') < 0)

+					return;

+

+				value = value.split(' ');

+				i = value.length;

+				while (i--) {

+					if (value[i] !== value[0])

+						return false;

+				}

+

+				styles[key] = value[0];

+

+				return true;

+			};

+

+			function compress2(target, a, b, c) {

+				if (!canCompress(a))

+					return;

+

+				if (!canCompress(b))

+					return;

+

+				if (!canCompress(c))

+					return;

+

+				// Compress

+				styles[target] = styles[a] + ' ' + styles[b] + ' ' + styles[c];

+				delete styles[a];

+				delete styles[b];

+				delete styles[c];

+			};

+

+			// Encodes the specified string by replacing all \" \' ; : with _<num>

+			function encode(str) {

+				isEncoded = true;

+

+				return encodingLookup[str];

+			};

+

+			// Decodes the specified string by replacing all _<num> with it's original value \" \' etc

+			// It will also decode the \" \' if keep_slashes is set to fale or omitted

+			function decode(str, keep_slashes) {

+				if (isEncoded) {

+					str = str.replace(/\uFEFF[0-9]/g, function(str) {

+						return encodingLookup[str];

+					});

+				}

+

+				if (!keep_slashes)

+					str = str.replace(/\\([\'\";:])/g, "$1");

+

+				return str;

+			}

+

+			if (css) {

+				// Encode \" \' % and ; and : inside strings so they don't interfere with the style parsing

+				css = css.replace(/\\[\"\';:\uFEFF]/g, encode).replace(/\"[^\"]+\"|\'[^\']+\'/g, function(str) {

+					return str.replace(/[;:]/g, encode);

+				});

+

+				// Parse styles

+				while (matches = styleRegExp.exec(css)) {

+					name = matches[1].replace(trimRightRegExp, '').toLowerCase();

+					value = matches[2].replace(trimRightRegExp, '');

+

+					if (name && value.length > 0) {

+						// Opera will produce 700 instead of bold in their style values

+						if (name === 'font-weight' && value === '700')

+							value = 'bold';

+						else if (name === 'color' || name === 'background-color') // Lowercase colors like RED

+							value = value.toLowerCase();		

+

+						// Convert RGB colors to HEX

+						value = value.replace(rgbRegExp, toHex);

+

+						// Convert URLs and force them into url('value') format

+						value = value.replace(urlOrStrRegExp, function(match, url, url2, url3, str, str2) {

+							str = str || str2;

+

+							if (str) {

+								str = decode(str);

+

+								// Force strings into single quote format

+								return "'" + str.replace(/\'/g, "\\'") + "'";

+							}

+

+							url = decode(url || url2 || url3);

+

+							// Convert the URL to relative/absolute depending on config

+							if (urlConverter)

+								url = urlConverter.call(urlConverterScope, url, 'style');

+

+							// Output new URL format

+							return "url('" + url.replace(/\'/g, "\\'") + "')";

+						});

+

+						styles[name] = isEncoded ? decode(value, true) : value;

+					}

+

+					styleRegExp.lastIndex = matches.index + matches[0].length;

+				}

+

+				// Compress the styles to reduce it's size for example IE will expand styles

+				compress("border", "");

+				compress("border", "-width");

+				compress("border", "-color");

+				compress("border", "-style");

+				compress("padding", "");

+				compress("margin", "");

+				compress2('border', 'border-width', 'border-style', 'border-color');

+

+				// Remove pointless border, IE produces these

+				if (styles.border === 'medium none')

+					delete styles.border;

+			}

+

+			return styles;

+		},

+

+		serialize : function(styles, element_name) {

+			var css = '', name, value;

+

+			function serializeStyles(name) {

+				var styleList, i, l, value;

+

+				styleList = schema.styles[name];

+				if (styleList) {

+					for (i = 0, l = styleList.length; i < l; i++) {

+						name = styleList[i];

+						value = styles[name];

+

+						if (value !== undef && value.length > 0)

+							css += (css.length > 0 ? ' ' : '') + name + ': ' + value + ';';

+					}

+				}

+			};

+

+			// Serialize styles according to schema

+			if (element_name && schema && schema.styles) {

+				// Serialize global styles and element specific styles

+				serializeStyles('*');

+				serializeStyles(element_name);

+			} else {

+				// Output the styles in the order they are inside the object

+				for (name in styles) {

+					value = styles[name];

+

+					if (value !== undef && value.length > 0)

+						css += (css.length > 0 ? ' ' : '') + name + ': ' + value + ';';

+				}

+			}

+

+			return css;

+		}

+	};

+};

+

+(function(tinymce) {

+	var mapCache = {}, makeMap = tinymce.makeMap, each = tinymce.each;

+

+	function split(str, delim) {

+		return str.split(delim || ',');

+	};

+

+	function unpack(lookup, data) {

+		var key, elements = {};

+

+		function replace(value) {

+			return value.replace(/[A-Z]+/g, function(key) {

+				return replace(lookup[key]);

+			});

+		};

+

+		// Unpack lookup

+		for (key in lookup) {

+			if (lookup.hasOwnProperty(key))

+				lookup[key] = replace(lookup[key]);

+		}

+

+		// Unpack and parse data into object map

+		replace(data).replace(/#/g, '#text').replace(/(\w+)\[([^\]]+)\]\[([^\]]*)\]/g, function(str, name, attributes, children) {

+			attributes = split(attributes, '|');

+

+			elements[name] = {

+				attributes : makeMap(attributes),

+				attributesOrder : attributes,

+				children : makeMap(children, '|', {'#comment' : {}})

+			}

+		});

+

+		return elements;

+	};

+

+	function getHTML5() {

+		var html5 = mapCache.html5;

+

+		if (!html5) {

+			html5 = mapCache.html5 = unpack({

+					A : 'id|accesskey|class|dir|draggable|item|hidden|itemprop|role|spellcheck|style|subject|title',

+					B : '#|a|abbr|area|audio|b|bdo|br|button|canvas|cite|code|command|datalist|del|dfn|em|embed|i|iframe|img|input|ins|kbd|keygen|label|link|map|mark|meta|meter|noscript|object|output|progress|q|ruby|samp|script|select|small|span|strong|sub|sup|svg|textarea|time|var|video',

+					C : '#|a|abbr|area|address|article|aside|audio|b|bdo|blockquote|br|button|canvas|cite|code|command|datalist|del|details|dfn|dialog|div|dl|em|embed|fieldset|figure|footer|form|h1|h2|h3|h4|h5|h6|header|hgroup|hr|i|iframe|img|input|ins|kbd|keygen|label|link|map|mark|menu|meta|meter|nav|noscript|ol|object|output|p|pre|progress|q|ruby|samp|script|section|select|small|span|strong|style|sub|sup|svg|table|textarea|time|ul|var|video'

+				}, 'html[A|manifest][body|head]' +

+					'head[A][base|command|link|meta|noscript|script|style|title]' +

+					'title[A][#]' +

+					'base[A|href|target][]' +

+					'link[A|href|rel|media|type|sizes][]' +

+					'meta[A|http-equiv|name|content|charset][]' +

+					'style[A|type|media|scoped][#]' +

+					'script[A|charset|type|src|defer|async][#]' +

+					'noscript[A][C]' +

+					'body[A][C]' +

+					'section[A][C]' +

+					'nav[A][C]' +

+					'article[A][C]' +

+					'aside[A][C]' +

+					'h1[A][B]' +

+					'h2[A][B]' +

+					'h3[A][B]' +

+					'h4[A][B]' +

+					'h5[A][B]' +

+					'h6[A][B]' +

+					'hgroup[A][h1|h2|h3|h4|h5|h6]' +

+					'header[A][C]' +

+					'footer[A][C]' +

+					'address[A][C]' +

+					'p[A][B]' +

+					'br[A][]' +

+					'pre[A][B]' +

+					'dialog[A][dd|dt]' +

+					'blockquote[A|cite][C]' +

+					'ol[A|start|reversed][li]' +

+					'ul[A][li]' +

+					'li[A|value][C]' +

+					'dl[A][dd|dt]' +

+					'dt[A][B]' +

+					'dd[A][C]' +

+					'a[A|href|target|ping|rel|media|type][C]' +

+					'em[A][B]' +

+					'strong[A][B]' +

+					'small[A][B]' +

+					'cite[A][B]' +

+					'q[A|cite][B]' +

+					'dfn[A][B]' +

+					'abbr[A][B]' +

+					'code[A][B]' +

+					'var[A][B]' +

+					'samp[A][B]' +

+					'kbd[A][B]' +

+					'sub[A][B]' +

+					'sup[A][B]' +

+					'i[A][B]' +

+					'b[A][B]' +

+					'mark[A][B]' +

+					'progress[A|value|max][B]' +

+					'meter[A|value|min|max|low|high|optimum][B]' +

+					'time[A|datetime][B]' +

+					'ruby[A][B|rt|rp]' +

+					'rt[A][B]' +

+					'rp[A][B]' +

+					'bdo[A][B]' +

+					'span[A][B]' +

+					'ins[A|cite|datetime][B]' +

+					'del[A|cite|datetime][B]' +

+					'figure[A][C|legend]' +

+					'img[A|alt|src|height|width|usemap|ismap][]' +

+					'iframe[A|name|src|height|width|sandbox|seamless][]' +

+					'embed[A|src|height|width|type][]' +

+					'object[A|data|type|height|width|usemap|name|form|classid][param]' +

+					'param[A|name|value][]' +

+					'details[A|open][C|legend]' +

+					'command[A|type|label|icon|disabled|checked|radiogroup][]' +

+					'menu[A|type|label][C|li]' +

+					'legend[A][C|B]' +

+					'div[A][C]' +

+					'source[A|src|type|media][]' +

+					'audio[A|src|autobuffer|autoplay|loop|controls][source]' +

+					'video[A|src|autobuffer|autoplay|loop|controls|width|height|poster][source]' +

+					'hr[A][]' +

+					'form[A|accept-charset|action|autocomplete|enctype|method|name|novalidate|target][C]' +

+					'fieldset[A|disabled|form|name][C|legend]' +

+					'label[A|form|for][B]' +

+					'input[A|type|accept|alt|autocomplete|checked|disabled|form|formaction|formenctype|formmethod|formnovalidate|formtarget|height|list|max|maxlength|min|multiple|pattern|placeholder|readonly|required|size|src|step|width|files|value][]' +

+					'button[A|autofocus|disabled|form|formaction|formenctype|formmethod|formnovalidate|formtarget|name|value|type][B]' +

+					'select[A|autofocus|disabled|form|multiple|name|size][option|optgroup]' +

+					'datalist[A][B|option]' +

+					'optgroup[A|disabled|label][option]' +

+					'option[A|disabled|selected|label|value][]' +

+					'textarea[A|autofocus|disabled|form|maxlength|name|placeholder|readonly|required|rows|cols|wrap][]' +

+					'keygen[A|autofocus|challenge|disabled|form|keytype|name][]' +

+					'output[A|for|form|name][B]' +

+					'canvas[A|width|height][]' +

+					'map[A|name][B|C]' +

+					'area[A|shape|coords|href|alt|target|media|rel|ping|type][]' +

+					'mathml[A][]' +

+					'svg[A][]' +

+					'table[A|summary][caption|colgroup|thead|tfoot|tbody|tr]' +

+					'caption[A][C]' +

+					'colgroup[A|span][col]' +

+					'col[A|span][]' +

+					'thead[A][tr]' +

+					'tfoot[A][tr]' +

+					'tbody[A][tr]' +

+					'tr[A][th|td]' +

+					'th[A|headers|rowspan|colspan|scope][B]' +

+					'td[A|headers|rowspan|colspan][C]'

+			);

+		}

+

+		return html5;

+	};

+

+	function getHTML4() {

+		var html4 = mapCache.html4;

+

+		if (!html4) {

+			// This is the XHTML 1.0 transitional elements with it's attributes and children packed to reduce it's size

+			html4 = mapCache.html4 = unpack({

+				Z : 'H|K|N|O|P',

+				Y : 'X|form|R|Q',

+				ZG : 'E|span|width|align|char|charoff|valign',

+				X : 'p|T|div|U|W|isindex|fieldset|table',

+				ZF : 'E|align|char|charoff|valign',

+				W : 'pre|hr|blockquote|address|center|noframes',

+				ZE : 'abbr|axis|headers|scope|rowspan|colspan|align|char|charoff|valign|nowrap|bgcolor|width|height',

+				ZD : '[E][S]',

+				U : 'ul|ol|dl|menu|dir',

+				ZC : 'p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q',

+				T : 'h1|h2|h3|h4|h5|h6',

+				ZB : 'X|S|Q',

+				S : 'R|P',

+				ZA : 'a|G|J|M|O|P',

+				R : 'a|H|K|N|O',

+				Q : 'noscript|P',

+				P : 'ins|del|script',

+				O : 'input|select|textarea|label|button',

+				N : 'M|L',

+				M : 'em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym',

+				L : 'sub|sup',

+				K : 'J|I',

+				J : 'tt|i|b|u|s|strike',

+				I : 'big|small|font|basefont',

+				H : 'G|F',

+				G : 'br|span|bdo',

+				F : 'object|applet|img|map|iframe',

+				E : 'A|B|C',

+				D : 'accesskey|tabindex|onfocus|onblur',

+				C : 'onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup',

+				B : 'lang|xml:lang|dir',

+				A : 'id|class|style|title'

+			}, 'script[id|charset|type|language|src|defer|xml:space][]' + 

+				'style[B|id|type|media|title|xml:space][]' + 

+				'object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]' + 

+				'param[id|name|value|valuetype|type][]' + 

+				'p[E|align][#|S]' + 

+				'a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]' + 

+				'br[A|clear][]' + 

+				'span[E][#|S]' + 

+				'bdo[A|C|B][#|S]' + 

+				'applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]' + 

+				'h1[E|align][#|S]' + 

+				'img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]' + 

+				'map[B|C|A|name][X|form|Q|area]' + 

+				'h2[E|align][#|S]' + 

+				'iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]' + 

+				'h3[E|align][#|S]' + 

+				'tt[E][#|S]' + 

+				'i[E][#|S]' + 

+				'b[E][#|S]' + 

+				'u[E][#|S]' + 

+				's[E][#|S]' + 

+				'strike[E][#|S]' + 

+				'big[E][#|S]' + 

+				'small[E][#|S]' + 

+				'font[A|B|size|color|face][#|S]' + 

+				'basefont[id|size|color|face][]' + 

+				'em[E][#|S]' + 

+				'strong[E][#|S]' + 

+				'dfn[E][#|S]' + 

+				'code[E][#|S]' + 

+				'q[E|cite][#|S]' + 

+				'samp[E][#|S]' + 

+				'kbd[E][#|S]' + 

+				'var[E][#|S]' + 

+				'cite[E][#|S]' + 

+				'abbr[E][#|S]' + 

+				'acronym[E][#|S]' + 

+				'sub[E][#|S]' + 

+				'sup[E][#|S]' + 

+				'input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]' + 

+				'select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]' + 

+				'optgroup[E|disabled|label][option]' + 

+				'option[E|selected|disabled|label|value][]' + 

+				'textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]' + 

+				'label[E|for|accesskey|onfocus|onblur][#|S]' + 

+				'button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]' + 

+				'h4[E|align][#|S]' + 

+				'ins[E|cite|datetime][#|Y]' + 

+				'h5[E|align][#|S]' + 

+				'del[E|cite|datetime][#|Y]' + 

+				'h6[E|align][#|S]' + 

+				'div[E|align][#|Y]' + 

+				'ul[E|type|compact][li]' + 

+				'li[E|type|value][#|Y]' + 

+				'ol[E|type|compact|start][li]' + 

+				'dl[E|compact][dt|dd]' + 

+				'dt[E][#|S]' + 

+				'dd[E][#|Y]' + 

+				'menu[E|compact][li]' + 

+				'dir[E|compact][li]' + 

+				'pre[E|width|xml:space][#|ZA]' + 

+				'hr[E|align|noshade|size|width][]' + 

+				'blockquote[E|cite][#|Y]' + 

+				'address[E][#|S|p]' + 

+				'center[E][#|Y]' + 

+				'noframes[E][#|Y]' + 

+				'isindex[A|B|prompt][]' + 

+				'fieldset[E][#|legend|Y]' + 

+				'legend[E|accesskey|align][#|S]' + 

+				'table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]' + 

+				'caption[E|align][#|S]' + 

+				'col[ZG][]' + 

+				'colgroup[ZG][col]' + 

+				'thead[ZF][tr]' + 

+				'tr[ZF|bgcolor][th|td]' + 

+				'th[E|ZE][#|Y]' + 

+				'form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]' + 

+				'noscript[E][#|Y]' + 

+				'td[E|ZE][#|Y]' + 

+				'tfoot[ZF][tr]' + 

+				'tbody[ZF][tr]' + 

+				'area[E|D|shape|coords|href|nohref|alt|target][]' + 

+				'base[id|href|target][]' + 

+				'body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]'

+			);

+		}

+

+		return html4;

+	};

+

+	tinymce.html.Schema = function(settings) {

+		var self = this, elements = {}, children = {}, patternElements = [], validStyles, schemaItems;

+		var whiteSpaceElementsMap, selfClosingElementsMap, shortEndedElementsMap, boolAttrMap, blockElementsMap, nonEmptyElementsMap, customElementsMap = {};

+

+		// Creates an lookup table map object for the specified option or the default value

+		function createLookupTable(option, default_value, extend) {

+			var value = settings[option];

+

+			if (!value) {

+				// Get cached default map or make it if needed

+				value = mapCache[option];

+

+				if (!value) {

+					value = makeMap(default_value, ' ', makeMap(default_value.toUpperCase(), ' '));

+					value = tinymce.extend(value, extend);

+

+					mapCache[option] = value;

+				}

+			} else {

+				// Create custom map

+				value = makeMap(value, ',', makeMap(value.toUpperCase(), ' '));

+			}

+

+			return value;

+		};

+

+		settings = settings || {};

+		schemaItems = settings.schema == "html5" ? getHTML5() : getHTML4();

+

+		// Allow all elements and attributes if verify_html is set to false

+		if (settings.verify_html === false)

+			settings.valid_elements = '*[*]';

+

+		// Build styles list

+		if (settings.valid_styles) {

+			validStyles = {};

+

+			// Convert styles into a rule list

+			each(settings.valid_styles, function(value, key) {

+				validStyles[key] = tinymce.explode(value);

+			});

+		}

+

+		// Setup map objects

+		whiteSpaceElementsMap = createLookupTable('whitespace_elements', 'pre script style textarea');

+		selfClosingElementsMap = createLookupTable('self_closing_elements', 'colgroup dd dt li options p td tfoot th thead tr');

+		shortEndedElementsMap = createLookupTable('short_ended_elements', 'area base basefont br col frame hr img input isindex link meta param embed source');

+		boolAttrMap = createLookupTable('boolean_attributes', 'checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls');

+		nonEmptyElementsMap = createLookupTable('non_empty_elements', 'td th iframe video audio object', shortEndedElementsMap);

+		blockElementsMap = createLookupTable('block_elements', 'h1 h2 h3 h4 h5 h6 hr p div address pre form table tbody thead tfoot ' + 

+						'th tr td li ol ul caption blockquote center dl dt dd dir fieldset ' + 

+						'noscript menu isindex samp header footer article section hgroup aside nav');

+

+		// Converts a wildcard expression string to a regexp for example *a will become /.*a/.

+		function patternToRegExp(str) {

+			return new RegExp('^' + str.replace(/([?+*])/g, '.$1') + '$');

+		};

+

+		// Parses the specified valid_elements string and adds to the current rules

+		// This function is a bit hard to read since it's heavily optimized for speed

+		function addValidElements(valid_elements) {

+			var ei, el, ai, al, yl, matches, element, attr, attrData, elementName, attrName, attrType, attributes, attributesOrder,

+				prefix, outputName, globalAttributes, globalAttributesOrder, transElement, key, childKey, value,

+				elementRuleRegExp = /^([#+-])?([^\[\/]+)(?:\/([^\[]+))?(?:\[([^\]]+)\])?$/,

+				attrRuleRegExp = /^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,

+				hasPatternsRegExp = /[*?+]/;

+

+			if (valid_elements) {

+				// Split valid elements into an array with rules

+				valid_elements = split(valid_elements);

+

+				if (elements['@']) {

+					globalAttributes = elements['@'].attributes;

+					globalAttributesOrder = elements['@'].attributesOrder;

+				}

+

+				// Loop all rules

+				for (ei = 0, el = valid_elements.length; ei < el; ei++) {

+					// Parse element rule

+					matches = elementRuleRegExp.exec(valid_elements[ei]);

+					if (matches) {

+						// Setup local names for matches

+						prefix = matches[1];

+						elementName = matches[2];

+						outputName = matches[3];

+						attrData = matches[4];

+

+						// Create new attributes and attributesOrder

+						attributes = {};

+						attributesOrder = [];

+

+						// Create the new element

+						element = {

+							attributes : attributes,

+							attributesOrder : attributesOrder

+						};

+

+						// Padd empty elements prefix

+						if (prefix === '#')

+							element.paddEmpty = true;

+

+						// Remove empty elements prefix

+						if (prefix === '-')

+							element.removeEmpty = true;

+

+						// Copy attributes from global rule into current rule

+						if (globalAttributes) {

+							for (key in globalAttributes)

+								attributes[key] = globalAttributes[key];

+

+							attributesOrder.push.apply(attributesOrder, globalAttributesOrder);

+						}

+

+						// Attributes defined

+						if (attrData) {

+							attrData = split(attrData, '|');

+							for (ai = 0, al = attrData.length; ai < al; ai++) {

+								matches = attrRuleRegExp.exec(attrData[ai]);

+								if (matches) {

+									attr = {};

+									attrType = matches[1];

+									attrName = matches[2].replace(/::/g, ':');

+									prefix = matches[3];

+									value = matches[4];

+

+									// Required

+									if (attrType === '!') {

+										element.attributesRequired = element.attributesRequired || [];

+										element.attributesRequired.push(attrName);

+										attr.required = true;

+									}

+

+									// Denied from global

+									if (attrType === '-') {

+										delete attributes[attrName];

+										attributesOrder.splice(tinymce.inArray(attributesOrder, attrName), 1);

+										continue;

+									}

+

+									// Default value

+									if (prefix) {

+										// Default value

+										if (prefix === '=') {

+											element.attributesDefault = element.attributesDefault || [];

+											element.attributesDefault.push({name: attrName, value: value});

+											attr.defaultValue = value;

+										}

+

+										// Forced value

+										if (prefix === ':') {

+											element.attributesForced = element.attributesForced || [];

+											element.attributesForced.push({name: attrName, value: value});

+											attr.forcedValue = value;

+										}

+

+										// Required values

+										if (prefix === '<')

+											attr.validValues = makeMap(value, '?');

+									}

+

+									// Check for attribute patterns

+									if (hasPatternsRegExp.test(attrName)) {

+										element.attributePatterns = element.attributePatterns || [];

+										attr.pattern = patternToRegExp(attrName);

+										element.attributePatterns.push(attr);

+									} else {

+										// Add attribute to order list if it doesn't already exist

+										if (!attributes[attrName])

+											attributesOrder.push(attrName);

+

+										attributes[attrName] = attr;

+									}

+								}

+							}

+						}

+

+						// Global rule, store away these for later usage

+						if (!globalAttributes && elementName == '@') {

+							globalAttributes = attributes;

+							globalAttributesOrder = attributesOrder;

+						}

+

+						// Handle substitute elements such as b/strong

+						if (outputName) {

+							element.outputName = elementName;

+							elements[outputName] = element;

+						}

+

+						// Add pattern or exact element

+						if (hasPatternsRegExp.test(elementName)) {

+							element.pattern = patternToRegExp(elementName);

+							patternElements.push(element);

+						} else

+							elements[elementName] = element;

+					}

+				}

+			}

+		};

+

+		function setValidElements(valid_elements) {

+			elements = {};

+			patternElements = [];

+

+			addValidElements(valid_elements);

+

+			each(schemaItems, function(element, name) {

+				children[name] = element.children;

+			});

+		};

+

+		// Adds custom non HTML elements to the schema

+		function addCustomElements(custom_elements) {

+			var customElementRegExp = /^(~)?(.+)$/;

+

+			if (custom_elements) {

+				each(split(custom_elements), function(rule) {

+					var matches = customElementRegExp.exec(rule),

+						inline = matches[1] === '~',

+						cloneName = inline ? 'span' : 'div',

+						name = matches[2];

+

+					children[name] = children[cloneName];

+					customElementsMap[name] = cloneName;

+

+					// If it's not marked as inline then add it to valid block elements

+					if (!inline)

+						blockElementsMap[name] = {};

+

+					// Add custom elements at span/div positions

+					each(children, function(element, child) {

+						if (element[cloneName])

+							element[name] = element[cloneName];

+					});

+				});

+			}

+		};

+

+		// Adds valid children to the schema object

+		function addValidChildren(valid_children) {

+			var childRuleRegExp = /^([+\-]?)(\w+)\[([^\]]+)\]$/;

+

+			if (valid_children) {

+				each(split(valid_children), function(rule) {

+					var matches = childRuleRegExp.exec(rule), parent, prefix;

+

+					if (matches) {

+						prefix = matches[1];

+

+						// Add/remove items from default

+						if (prefix)

+							parent = children[matches[2]];

+						else

+							parent = children[matches[2]] = {'#comment' : {}};

+

+						parent = children[matches[2]];

+

+						each(split(matches[3], '|'), function(child) {

+							if (prefix === '-')

+								delete parent[child];

+							else

+								parent[child] = {};

+						});

+					}

+				});

+			}

+		};

+

+		function getElementRule(name) {

+			var element = elements[name], i;

+

+			// Exact match found

+			if (element)

+				return element;

+

+			// No exact match then try the patterns

+			i = patternElements.length;

+			while (i--) {

+				element = patternElements[i];

+

+				if (element.pattern.test(name))

+					return element;

+			}

+		};

+

+		if (!settings.valid_elements) {

+			// No valid elements defined then clone the elements from the schema spec

+			each(schemaItems, function(element, name) {

+				elements[name] = {

+					attributes : element.attributes,

+					attributesOrder : element.attributesOrder

+				};

+

+				children[name] = element.children;

+			});

+

+			// Switch these on HTML4

+			if (settings.schema != "html5") {

+				each(split('strong/b,em/i'), function(item) {

+					item = split(item, '/');

+					elements[item[1]].outputName = item[0];

+				});

+			}

+

+			// Add default alt attribute for images

+			elements.img.attributesDefault = [{name: 'alt', value: ''}];

+

+			// Remove these if they are empty by default

+			each(split('ol,ul,sub,sup,blockquote,span,font,a,table,tbody,tr,strong,em,b,i'), function(name) {

+				if (elements[name]) {

+					elements[name].removeEmpty = true;

+				}

+			});

+

+			// Padd these by default

+			each(split('p,h1,h2,h3,h4,h5,h6,th,td,pre,div,address,caption'), function(name) {

+				elements[name].paddEmpty = true;

+			});

+		} else

+			setValidElements(settings.valid_elements);

+

+		addCustomElements(settings.custom_elements);

+		addValidChildren(settings.valid_children);

+		addValidElements(settings.extended_valid_elements);

+

+		// Todo: Remove this when we fix list handling to be valid

+		addValidChildren('+ol[ul|ol],+ul[ul|ol]');

+

+		// Delete invalid elements

+		if (settings.invalid_elements) {

+			tinymce.each(tinymce.explode(settings.invalid_elements), function(item) {

+				if (elements[item])

+					delete elements[item];

+			});

+		}

+

+		// If the user didn't allow span only allow internal spans

+		if (!getElementRule('span'))

+			addValidElements('span[!data-mce-type|*]');

+

+		self.children = children;

+

+		self.styles = validStyles;

+

+		self.getBoolAttrs = function() {

+			return boolAttrMap;

+		};

+

+		self.getBlockElements = function() {

+			return blockElementsMap;

+		};

+

+		self.getShortEndedElements = function() {

+			return shortEndedElementsMap;

+		};

+

+		self.getSelfClosingElements = function() {

+			return selfClosingElementsMap;

+		};

+

+		self.getNonEmptyElements = function() {

+			return nonEmptyElementsMap;

+		};

+

+		self.getWhiteSpaceElements = function() {

+			return whiteSpaceElementsMap;

+		};

+

+		self.isValidChild = function(name, child) {

+			var parent = children[name];

+

+			return !!(parent && parent[child]);

+		};

+

+		self.getElementRule = getElementRule;

+

+		self.getCustomElements = function() {

+			return customElementsMap;

+		};

+

+		self.addValidElements = addValidElements;

+

+		self.setValidElements = setValidElements;

+

+		self.addCustomElements = addCustomElements;

+

+		self.addValidChildren = addValidChildren;

+	};

+})(tinymce);

+

+(function(tinymce) {

+	tinymce.html.SaxParser = function(settings, schema) {

+		var self = this, noop = function() {};

+

+		settings = settings || {};

+		self.schema = schema = schema || new tinymce.html.Schema();

+

+		if (settings.fix_self_closing !== false)

+			settings.fix_self_closing = true;

+

+		// Add handler functions from settings and setup default handlers

+		tinymce.each('comment cdata text start end pi doctype'.split(' '), function(name) {

+			if (name)

+				self[name] = settings[name] || noop;

+		});

+

+		self.parse = function(html) {

+			var self = this, matches, index = 0, value, endRegExp, stack = [], attrList, i, text, name, isInternalElement, removeInternalElements,

+				shortEndedElements, fillAttrsMap, isShortEnded, validate, elementRule, isValidElement, attr, attribsValue, invalidPrefixRegExp,

+				validAttributesMap, validAttributePatterns, attributesRequired, attributesDefault, attributesForced, selfClosing,

+				tokenRegExp, attrRegExp, specialElements, attrValue, idCount = 0, decode = tinymce.html.Entities.decode, fixSelfClosing, isIE;

+

+			function processEndTag(name) {

+				var pos, i;

+

+				// Find position of parent of the same type

+				pos = stack.length;

+				while (pos--) {

+					if (stack[pos].name === name)

+						break;						

+				}

+

+				// Found parent

+				if (pos >= 0) {

+					// Close all the open elements

+					for (i = stack.length - 1; i >= pos; i--) {

+						name = stack[i];

+

+						if (name.valid)

+							self.end(name.name);

+					}

+

+					// Remove the open elements from the stack

+					stack.length = pos;

+				}

+			};

+

+			// Precompile RegExps and map objects

+			tokenRegExp = new RegExp('<(?:' +

+				'(?:!--([\\w\\W]*?)-->)|' + // Comment

+				'(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|' + // CDATA

+				'(?:!DOCTYPE([\\w\\W]*?)>)|' + // DOCTYPE

+				'(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|' + // PI

+				'(?:\\/([^>]+)>)|' + // End element

+				'(?:([A-Za-z0-9\-\:]+)((?:\\s+[^"\'>]+(?:(?:"[^"]*")|(?:\'[^\']*\')|[^>]*))*|\\/|\\s+)>)' + // Start element

+			')', 'g');

+

+			attrRegExp = /([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:\\.|[^\"])*)\")|(?:\'((?:\\.|[^\'])*)\')|([^>\s]+)))?/g;

+			specialElements = {

+				'script' : /<\/script[^>]*>/gi,

+				'style' : /<\/style[^>]*>/gi,

+				'noscript' : /<\/noscript[^>]*>/gi

+			};

+

+			// Setup lookup tables for empty elements and boolean attributes

+			shortEndedElements = schema.getShortEndedElements();

+			selfClosing = schema.getSelfClosingElements();

+			fillAttrsMap = schema.getBoolAttrs();

+			validate = settings.validate;

+			removeInternalElements = settings.remove_internals;

+			fixSelfClosing = settings.fix_self_closing;

+			isIE = tinymce.isIE;

+			invalidPrefixRegExp = /^:/;

+

+			while (matches = tokenRegExp.exec(html)) {

+				// Text

+				if (index < matches.index)

+					self.text(decode(html.substr(index, matches.index - index)));

+

+				if (value = matches[6]) { // End element

+					value = value.toLowerCase();

+

+					// IE will add a ":" in front of elements it doesn't understand like custom elements or HTML5 elements

+					if (isIE && invalidPrefixRegExp.test(value))

+						value = value.substr(1);

+

+					processEndTag(value);

+				} else if (value = matches[7]) { // Start element

+					value = value.toLowerCase();

+

+					// IE will add a ":" in front of elements it doesn't understand like custom elements or HTML5 elements

+					if (isIE && invalidPrefixRegExp.test(value))

+						value = value.substr(1);

+

+					isShortEnded = value in shortEndedElements;

+

+					// Is self closing tag for example an <li> after an open <li>

+					if (fixSelfClosing && selfClosing[value] && stack.length > 0 && stack[stack.length - 1].name === value)

+						processEndTag(value);

+

+					// Validate element

+					if (!validate || (elementRule = schema.getElementRule(value))) {

+						isValidElement = true;

+

+						// Grab attributes map and patters when validation is enabled

+						if (validate) {

+							validAttributesMap = elementRule.attributes;

+							validAttributePatterns = elementRule.attributePatterns;

+						}

+

+						// Parse attributes

+						if (attribsValue = matches[8]) {

+							isInternalElement = attribsValue.indexOf('data-mce-type') !== -1; // Check if the element is an internal element

+

+							// If the element has internal attributes then remove it if we are told to do so

+							if (isInternalElement && removeInternalElements)

+								isValidElement = false;

+

+							attrList = [];

+							attrList.map = {};

+

+							attribsValue.replace(attrRegExp, function(match, name, value, val2, val3) {

+								var attrRule, i;

+

+								name = name.toLowerCase();

+								value = name in fillAttrsMap ? name : decode(value || val2 || val3 || ''); // Handle boolean attribute than value attribute

+

+								// Validate name and value

+								if (validate && !isInternalElement && name.indexOf('data-') !== 0) {

+									attrRule = validAttributesMap[name];

+

+									// Find rule by pattern matching

+									if (!attrRule && validAttributePatterns) {

+										i = validAttributePatterns.length;

+										while (i--) {

+											attrRule = validAttributePatterns[i];

+											if (attrRule.pattern.test(name))

+												break;

+										}

+

+										// No rule matched

+										if (i === -1)

+											attrRule = null;

+									}

+

+									// No attribute rule found

+									if (!attrRule)

+										return;

+

+									// Validate value

+									if (attrRule.validValues && !(value in attrRule.validValues))

+										return;

+								}

+

+								// Add attribute to list and map

+								attrList.map[name] = value;

+								attrList.push({

+									name: name,

+									value: value

+								});

+							});

+						} else {

+							attrList = [];

+							attrList.map = {};

+						}

+

+						// Process attributes if validation is enabled

+						if (validate && !isInternalElement) {

+							attributesRequired = elementRule.attributesRequired;

+							attributesDefault = elementRule.attributesDefault;

+							attributesForced = elementRule.attributesForced;

+

+							// Handle forced attributes

+							if (attributesForced) {

+								i = attributesForced.length;

+								while (i--) {

+									attr = attributesForced[i];

+									name = attr.name;

+									attrValue = attr.value;

+

+									if (attrValue === '{$uid}')

+										attrValue = 'mce_' + idCount++;

+

+									attrList.map[name] = attrValue;

+									attrList.push({name: name, value: attrValue});

+								}

+							}

+

+							// Handle default attributes

+							if (attributesDefault) {

+								i = attributesDefault.length;

+								while (i--) {

+									attr = attributesDefault[i];

+									name = attr.name;

+

+									if (!(name in attrList.map)) {

+										attrValue = attr.value;

+

+										if (attrValue === '{$uid}')

+											attrValue = 'mce_' + idCount++;

+

+										attrList.map[name] = attrValue;

+										attrList.push({name: name, value: attrValue});

+									}

+								}

+							}

+

+							// Handle required attributes

+							if (attributesRequired) {

+								i = attributesRequired.length;

+								while (i--) {

+									if (attributesRequired[i] in attrList.map)

+										break;

+								}

+

+								// None of the required attributes where found

+								if (i === -1)

+									isValidElement = false;

+							}

+

+							// Invalidate element if it's marked as bogus

+							if (attrList.map['data-mce-bogus'])

+								isValidElement = false;

+						}

+

+						if (isValidElement)

+							self.start(value, attrList, isShortEnded);

+					} else

+						isValidElement = false;

+

+					// Treat script, noscript and style a bit different since they may include code that looks like elements

+					if (endRegExp = specialElements[value]) {

+						endRegExp.lastIndex = index = matches.index + matches[0].length;

+

+						if (matches = endRegExp.exec(html)) {

+							if (isValidElement)

+								text = html.substr(index, matches.index - index);

+

+							index = matches.index + matches[0].length;

+						} else {

+							text = html.substr(index);

+							index = html.length;

+						}

+

+						if (isValidElement && text.length > 0)

+							self.text(text, true);

+

+						if (isValidElement)

+							self.end(value);

+

+						tokenRegExp.lastIndex = index;

+						continue;

+					}

+

+					// Push value on to stack

+					if (!isShortEnded) {

+						if (!attribsValue || attribsValue.indexOf('/') != attribsValue.length - 1)

+							stack.push({name: value, valid: isValidElement});

+						else if (isValidElement)

+							self.end(value);

+					}

+				} else if (value = matches[1]) { // Comment

+					self.comment(value);

+				} else if (value = matches[2]) { // CDATA

+					self.cdata(value);

+				} else if (value = matches[3]) { // DOCTYPE

+					self.doctype(value);

+				} else if (value = matches[4]) { // PI

+					self.pi(value, matches[5]);

+				}

+

+				index = matches.index + matches[0].length;

+			}

+

+			// Text

+			if (index < html.length)

+				self.text(decode(html.substr(index)));

+

+			// Close any open elements

+			for (i = stack.length - 1; i >= 0; i--) {

+				value = stack[i];

+

+				if (value.valid)

+					self.end(value.name);

+			}

+		};

+	}

+})(tinymce);

+

+(function(tinymce) {

+	var whiteSpaceRegExp = /^[ \t\r\n]*$/, typeLookup = {

+		'#text' : 3,

+		'#comment' : 8,

+		'#cdata' : 4,

+		'#pi' : 7,

+		'#doctype' : 10,

+		'#document-fragment' : 11

+	};

+

+	// Walks the tree left/right

+	function walk(node, root_node, prev) {

+		var sibling, parent, startName = prev ? 'lastChild' : 'firstChild', siblingName = prev ? 'prev' : 'next';

+

+		// Walk into nodes if it has a start

+		if (node[startName])

+			return node[startName];

+

+		// Return the sibling if it has one

+		if (node !== root_node) {

+			sibling = node[siblingName];

+

+			if (sibling)

+				return sibling;

+

+			// Walk up the parents to look for siblings

+			for (parent = node.parent; parent && parent !== root_node; parent = parent.parent) {

+				sibling = parent[siblingName];

+

+				if (sibling)

+					return sibling;

+			}

+		}

+	};

+

+	function Node(name, type) {

+		this.name = name;

+		this.type = type;

+

+		if (type === 1) {

+			this.attributes = [];

+			this.attributes.map = {};

+		}

+	}

+

+	tinymce.extend(Node.prototype, {

+		replace : function(node) {

+			var self = this;

+

+			if (node.parent)

+				node.remove();

+

+			self.insert(node, self);

+			self.remove();

+

+			return self;

+		},

+

+		attr : function(name, value) {

+			var self = this, attrs, i, undef;

+

+			if (typeof name !== "string") {

+				for (i in name)

+					self.attr(i, name[i]);

+

+				return self;

+			}

+

+			if (attrs = self.attributes) {

+				if (value !== undef) {

+					// Remove attribute

+					if (value === null) {

+						if (name in attrs.map) {

+							delete attrs.map[name];

+

+							i = attrs.length;

+							while (i--) {

+								if (attrs[i].name === name) {

+									attrs = attrs.splice(i, 1);

+									return self;

+								}

+							}

+						}

+

+						return self;

+					}

+

+					// Set attribute

+					if (name in attrs.map) {

+						// Set attribute

+						i = attrs.length;

+						while (i--) {

+							if (attrs[i].name === name) {

+								attrs[i].value = value;

+								break;

+							}

+						}

+					} else

+						attrs.push({name: name, value: value});

+

+					attrs.map[name] = value;

+

+					return self;

+				} else {

+					return attrs.map[name];

+				}

+			}

+		},

+

+		clone : function() {

+			var self = this, clone = new Node(self.name, self.type), i, l, selfAttrs, selfAttr, cloneAttrs;

+

+			// Clone element attributes

+			if (selfAttrs = self.attributes) {

+				cloneAttrs = [];

+				cloneAttrs.map = {};

+

+				for (i = 0, l = selfAttrs.length; i < l; i++) {

+					selfAttr = selfAttrs[i];

+

+					// Clone everything except id

+					if (selfAttr.name !== 'id') {

+						cloneAttrs[cloneAttrs.length] = {name: selfAttr.name, value: selfAttr.value};

+						cloneAttrs.map[selfAttr.name] = selfAttr.value;

+					}

+				}

+

+				clone.attributes = cloneAttrs;

+			}

+

+			clone.value = self.value;

+			clone.shortEnded = self.shortEnded;

+

+			return clone;

+		},

+

+		wrap : function(wrapper) {

+			var self = this;

+

+			self.parent.insert(wrapper, self);

+			wrapper.append(self);

+

+			return self;

+		},

+

+		unwrap : function() {

+			var self = this, node, next;

+

+			for (node = self.firstChild; node; ) {

+				next = node.next;

+				self.insert(node, self, true);

+				node = next;

+			}

+

+			self.remove();

+		},

+

+		remove : function() {

+			var self = this, parent = self.parent, next = self.next, prev = self.prev;

+

+			if (parent) {

+				if (parent.firstChild === self) {

+					parent.firstChild = next;

+

+					if (next)

+						next.prev = null;

+				} else {

+					prev.next = next;

+				}

+

+				if (parent.lastChild === self) {

+					parent.lastChild = prev;

+

+					if (prev)

+						prev.next = null;

+				} else {

+					next.prev = prev;

+				}

+

+				self.parent = self.next = self.prev = null;

+			}

+

+			return self;

+		},

+

+		append : function(node) {

+			var self = this, last;

+

+			if (node.parent)

+				node.remove();

+

+			last = self.lastChild;

+			if (last) {

+				last.next = node;

+				node.prev = last;

+				self.lastChild = node;

+			} else

+				self.lastChild = self.firstChild = node;

+

+			node.parent = self;

+

+			return node;

+		},

+

+		insert : function(node, ref_node, before) {

+			var parent;

+

+			if (node.parent)

+				node.remove();

+

+			parent = ref_node.parent || this;

+

+			if (before) {

+				if (ref_node === parent.firstChild)

+					parent.firstChild = node;

+				else

+					ref_node.prev.next = node;

+

+				node.prev = ref_node.prev;

+				node.next = ref_node;

+				ref_node.prev = node;

+			} else {

+				if (ref_node === parent.lastChild)

+					parent.lastChild = node;

+				else

+					ref_node.next.prev = node;

+

+				node.next = ref_node.next;

+				node.prev = ref_node;

+				ref_node.next = node;

+			}

+

+			node.parent = parent;

+

+			return node;

+		},

+

+		getAll : function(name) {

+			var self = this, node, collection = [];

+

+			for (node = self.firstChild; node; node = walk(node, self)) {

+				if (node.name === name)

+					collection.push(node);

+			}

+

+			return collection;

+		},

+

+		empty : function() {

+			var self = this, nodes, i, node;

+

+			// Remove all children

+			if (self.firstChild) {

+				nodes = [];

+

+				// Collect the children

+				for (node = self.firstChild; node; node = walk(node, self))

+					nodes.push(node);

+

+				// Remove the children

+				i = nodes.length;

+				while (i--) {

+					node = nodes[i];

+					node.parent = node.firstChild = node.lastChild = node.next = node.prev = null;

+				}

+			}

+

+			self.firstChild = self.lastChild = null;

+

+			return self;

+		},

+

+		isEmpty : function(elements) {

+			var self = this, node = self.firstChild, i, name;

+

+			if (node) {

+				do {

+					if (node.type === 1) {

+						// Ignore bogus elements

+						if (node.attributes.map['data-mce-bogus'])

+							continue;

+

+						// Keep empty elements like <img />

+						if (elements[node.name])

+							return false;

+

+						// Keep elements with data attributes or name attribute like <a name="1"></a>

+						i = node.attributes.length;

+						while (i--) {

+							name = node.attributes[i].name;

+							if (name === "name" || name.indexOf('data-') === 0)

+								return false;

+						}

+					}

+

+					// Keep comments

+					if (node.type === 8)

+						return false;

+					

+					// Keep non whitespace text nodes

+					if ((node.type === 3 && !whiteSpaceRegExp.test(node.value)))

+						return false;

+				} while (node = walk(node, self));

+			}

+

+			return true;

+		},

+

+		walk : function(prev) {

+			return walk(this, null, prev);

+		}

+	});

+

+	tinymce.extend(Node, {

+		create : function(name, attrs) {

+			var node, attrName;

+

+			// Create node

+			node = new Node(name, typeLookup[name] || 1);

+

+			// Add attributes if needed

+			if (attrs) {

+				for (attrName in attrs)

+					node.attr(attrName, attrs[attrName]);

+			}

+

+			return node;

+		}

+	});

+

+	tinymce.html.Node = Node;

+})(tinymce);

+

+(function(tinymce) {

+	var Node = tinymce.html.Node;

+

+	tinymce.html.DomParser = function(settings, schema) {

+		var self = this, nodeFilters = {}, attributeFilters = [], matchedNodes = {}, matchedAttributes = {};

+

+		settings = settings || {};

+		settings.validate = "validate" in settings ? settings.validate : true;

+		settings.root_name = settings.root_name || 'body';

+		self.schema = schema = schema || new tinymce.html.Schema();

+

+		function fixInvalidChildren(nodes) {

+			var ni, node, parent, parents, newParent, currentNode, tempNode, childNode, i,

+				childClone, nonEmptyElements, nonSplitableElements, sibling, nextNode;

+

+			nonSplitableElements = tinymce.makeMap('tr,td,th,tbody,thead,tfoot,table');

+			nonEmptyElements = schema.getNonEmptyElements();

+

+			for (ni = 0; ni < nodes.length; ni++) {

+				node = nodes[ni];

+

+				// Already removed

+				if (!node.parent)

+					continue;

+

+				// Get list of all parent nodes until we find a valid parent to stick the child into

+				parents = [node];

+				for (parent = node.parent; parent && !schema.isValidChild(parent.name, node.name) && !nonSplitableElements[parent.name]; parent = parent.parent)

+					parents.push(parent);

+

+				// Found a suitable parent

+				if (parent && parents.length > 1) {

+					// Reverse the array since it makes looping easier

+					parents.reverse();

+

+					// Clone the related parent and insert that after the moved node

+					newParent = currentNode = self.filterNode(parents[0].clone());

+

+					// Start cloning and moving children on the left side of the target node

+					for (i = 0; i < parents.length - 1; i++) {

+						if (schema.isValidChild(currentNode.name, parents[i].name)) {

+							tempNode = self.filterNode(parents[i].clone());

+							currentNode.append(tempNode);

+						} else

+							tempNode = currentNode;

+

+						for (childNode = parents[i].firstChild; childNode && childNode != parents[i + 1]; ) {

+							nextNode = childNode.next;

+							tempNode.append(childNode);

+							childNode = nextNode;

+						}

+

+						currentNode = tempNode;

+					}

+

+					if (!newParent.isEmpty(nonEmptyElements)) {

+						parent.insert(newParent, parents[0], true);

+						parent.insert(node, newParent);

+					} else {

+						parent.insert(node, parents[0], true);

+					}

+

+					// Check if the element is empty by looking through it's contents and special treatment for <p><br /></p>

+					parent = parents[0];

+					if (parent.isEmpty(nonEmptyElements) || parent.firstChild === parent.lastChild && parent.firstChild.name === 'br') {

+						parent.empty().remove();

+					}

+				} else if (node.parent) {

+					// If it's an LI try to find a UL/OL for it or wrap it

+					if (node.name === 'li') {

+						sibling = node.prev;

+						if (sibling && (sibling.name === 'ul' || sibling.name === 'ul')) {

+							sibling.append(node);

+							continue;

+						}

+

+						sibling = node.next;

+						if (sibling && (sibling.name === 'ul' || sibling.name === 'ul')) {

+							sibling.insert(node, sibling.firstChild, true);

+							continue;

+						}

+

+						node.wrap(self.filterNode(new Node('ul', 1)));

+						continue;

+					}

+

+					// Try wrapping the element in a DIV

+					if (schema.isValidChild(node.parent.name, 'div') && schema.isValidChild('div', node.name)) {

+						node.wrap(self.filterNode(new Node('div', 1)));

+					} else {

+						// We failed wrapping it, then remove or unwrap it

+						if (node.name === 'style' || node.name === 'script')

+							node.empty().remove();

+						else

+							node.unwrap();

+					}

+				}

+			}

+		};

+

+		self.filterNode = function(node) {

+			var i, name, list;

+

+			// Run element filters

+			if (name in nodeFilters) {

+				list = matchedNodes[name];

+

+				if (list)

+					list.push(node);

+				else

+					matchedNodes[name] = [node];

+			}

+

+			// Run attribute filters

+			i = attributeFilters.length;

+			while (i--) {

+				name = attributeFilters[i].name;

+

+				if (name in node.attributes.map) {

+					list = matchedAttributes[name];

+

+					if (list)

+						list.push(node);

+					else

+						matchedAttributes[name] = [node];

+				}

+			}

+

+			return node;

+		};

+

+		self.addNodeFilter = function(name, callback) {

+			tinymce.each(tinymce.explode(name), function(name) {

+				var list = nodeFilters[name];

+

+				if (!list)

+					nodeFilters[name] = list = [];

+

+				list.push(callback);

+			});

+		};

+

+		self.addAttributeFilter = function(name, callback) {

+			tinymce.each(tinymce.explode(name), function(name) {

+				var i;

+

+				for (i = 0; i < attributeFilters.length; i++) {

+					if (attributeFilters[i].name === name) {

+						attributeFilters[i].callbacks.push(callback);

+						return;

+					}

+				}

+

+				attributeFilters.push({name: name, callbacks: [callback]});

+			});

+		};

+

+		self.parse = function(html, args) {

+			var parser, rootNode, node, nodes, i, l, fi, fl, list, name, validate,

+				blockElements, startWhiteSpaceRegExp, invalidChildren = [], isInWhiteSpacePreservedElement,

+				endWhiteSpaceRegExp, allWhiteSpaceRegExp, whiteSpaceElements, children, nonEmptyElements, rootBlockName;

+

+			args = args || {};

+			matchedNodes = {};

+			matchedAttributes = {};

+			blockElements = tinymce.extend(tinymce.makeMap('script,style,head,html,body,title,meta,param'), schema.getBlockElements());

+			nonEmptyElements = schema.getNonEmptyElements();

+			children = schema.children;

+			validate = settings.validate;

+			rootBlockName = "forced_root_block" in args ? args.forced_root_block : settings.forced_root_block;

+

+			whiteSpaceElements = schema.getWhiteSpaceElements();

+			startWhiteSpaceRegExp = /^[ \t\r\n]+/;

+			endWhiteSpaceRegExp = /[ \t\r\n]+$/;

+			allWhiteSpaceRegExp = /[ \t\r\n]+/g;

+

+			function addRootBlocks() {

+				var node = rootNode.firstChild, next, rootBlockNode;

+

+				while (node) {

+					next = node.next;

+

+					if (node.type == 3 || (node.type == 1 && node.name !== 'p' && !blockElements[node.name] && !node.attr('data-mce-type'))) {

+						if (!rootBlockNode) {

+							// Create a new root block element

+							rootBlockNode = createNode(rootBlockName, 1);

+							rootNode.insert(rootBlockNode, node);

+							rootBlockNode.append(node);

+						} else

+							rootBlockNode.append(node);

+					} else {

+						rootBlockNode = null;

+					}

+

+					node = next;

+				};

+			};

+

+			function createNode(name, type) {

+				var node = new Node(name, type), list;

+

+				if (name in nodeFilters) {

+					list = matchedNodes[name];

+

+					if (list)

+						list.push(node);

+					else

+						matchedNodes[name] = [node];

+				}

+

+				return node;

+			};

+

+			function removeWhitespaceBefore(node) {

+				var textNode, textVal, sibling;

+

+				for (textNode = node.prev; textNode && textNode.type === 3; ) {

+					textVal = textNode.value.replace(endWhiteSpaceRegExp, '');

+

+					if (textVal.length > 0) {

+						textNode.value = textVal;

+						textNode = textNode.prev;

+					} else {

+						sibling = textNode.prev;

+						textNode.remove();

+						textNode = sibling;

+					}

+				}

+			};

+

+			parser = new tinymce.html.SaxParser({

+				validate : validate,

+				fix_self_closing : !validate, // Let the DOM parser handle <li> in <li> or <p> in <p> for better results

+

+				cdata: function(text) {

+					node.append(createNode('#cdata', 4)).value = text;

+				},

+

+				text: function(text, raw) {

+					var textNode;

+

+					// Trim all redundant whitespace on non white space elements

+					if (!isInWhiteSpacePreservedElement) {

+						text = text.replace(allWhiteSpaceRegExp, ' ');

+

+						if (node.lastChild && blockElements[node.lastChild.name])

+							text = text.replace(startWhiteSpaceRegExp, '');

+					}

+

+					// Do we need to create the node

+					if (text.length !== 0) {

+						textNode = createNode('#text', 3);

+						textNode.raw = !!raw;

+						node.append(textNode).value = text;

+					}

+				},

+

+				comment: function(text) {

+					node.append(createNode('#comment', 8)).value = text;

+				},

+

+				pi: function(name, text) {

+					node.append(createNode(name, 7)).value = text;

+					removeWhitespaceBefore(node);

+				},

+

+				doctype: function(text) {

+					var newNode;

+		

+					newNode = node.append(createNode('#doctype', 10));

+					newNode.value = text;

+					removeWhitespaceBefore(node);

+				},

+

+				start: function(name, attrs, empty) {

+					var newNode, attrFiltersLen, elementRule, textNode, attrName, text, sibling, parent;

+

+					elementRule = validate ? schema.getElementRule(name) : {};

+					if (elementRule) {

+						newNode = createNode(elementRule.outputName || name, 1);

+						newNode.attributes = attrs;

+						newNode.shortEnded = empty;

+

+						node.append(newNode);

+

+						// Check if node is valid child of the parent node is the child is

+						// unknown we don't collect it since it's probably a custom element

+						parent = children[node.name];

+						if (parent && children[newNode.name] && !parent[newNode.name])

+							invalidChildren.push(newNode);

+

+						attrFiltersLen = attributeFilters.length;

+						while (attrFiltersLen--) {

+							attrName = attributeFilters[attrFiltersLen].name;

+

+							if (attrName in attrs.map) {

+								list = matchedAttributes[attrName];

+

+								if (list)

+									list.push(newNode);

+								else

+									matchedAttributes[attrName] = [newNode];

+							}

+						}

+

+						// Trim whitespace before block

+						if (blockElements[name])

+							removeWhitespaceBefore(newNode);

+

+						// Change current node if the element wasn't empty i.e not <br /> or <img />

+						if (!empty)

+							node = newNode;

+

+						// Check if we are inside a whitespace preserved element

+						if (!isInWhiteSpacePreservedElement && whiteSpaceElements[name]) {

+							isInWhiteSpacePreservedElement = true;

+						}

+					}

+				},

+

+				end: function(name) {

+					var textNode, elementRule, text, sibling, tempNode;

+

+					elementRule = validate ? schema.getElementRule(name) : {};

+					if (elementRule) {

+						if (blockElements[name]) {

+							if (!isInWhiteSpacePreservedElement) {

+								// Trim whitespace at beginning of block

+								for (textNode = node.firstChild; textNode && textNode.type === 3; ) {

+									text = textNode.value.replace(startWhiteSpaceRegExp, '');

+

+									if (text.length > 0) {

+										textNode.value = text;

+										textNode = textNode.next;

+									} else {

+										sibling = textNode.next;

+										textNode.remove();

+										textNode = sibling;

+									}

+								}

+

+								// Trim whitespace at end of block

+								for (textNode = node.lastChild; textNode && textNode.type === 3; ) {

+									text = textNode.value.replace(endWhiteSpaceRegExp, '');

+

+									if (text.length > 0) {

+										textNode.value = text;

+										textNode = textNode.prev;

+									} else {

+										sibling = textNode.prev;

+										textNode.remove();

+										textNode = sibling;

+									}

+								}

+							}

+

+							// Trim start white space

+							textNode = node.prev;

+							if (textNode && textNode.type === 3) {

+								text = textNode.value.replace(startWhiteSpaceRegExp, '');

+

+								if (text.length > 0)

+									textNode.value = text;

+								else

+									textNode.remove();

+							}

+						}

+

+						// Check if we exited a whitespace preserved element

+						if (isInWhiteSpacePreservedElement && whiteSpaceElements[name]) {

+							isInWhiteSpacePreservedElement = false;

+						}

+

+						// Handle empty nodes

+						if (elementRule.removeEmpty || elementRule.paddEmpty) {

+							if (node.isEmpty(nonEmptyElements)) {

+								if (elementRule.paddEmpty)

+									node.empty().append(new Node('#text', '3')).value = '\u00a0';

+								else {

+									// Leave nodes that have a name like <a name="name">

+									if (!node.attributes.map.name) {

+										tempNode = node.parent;

+										node.empty().remove();

+										node = tempNode;

+										return;

+									}

+								}

+							}

+						}

+

+						node = node.parent;

+					}

+				}

+			}, schema);

+

+			rootNode = node = new Node(args.context || settings.root_name, 11);

+

+			parser.parse(html);

+

+			// Fix invalid children or report invalid children in a contextual parsing

+			if (validate && invalidChildren.length) {

+				if (!args.context)

+					fixInvalidChildren(invalidChildren);

+				else

+					args.invalid = true;

+			}

+

+			// Wrap nodes in the root into block elements if the root is body

+			if (rootBlockName && rootNode.name == 'body')

+				addRootBlocks();

+

+			// Run filters only when the contents is valid

+			if (!args.invalid) {

+				// Run node filters

+				for (name in matchedNodes) {

+					list = nodeFilters[name];

+					nodes = matchedNodes[name];

+

+					// Remove already removed children

+					fi = nodes.length;

+					while (fi--) {

+						if (!nodes[fi].parent)

+							nodes.splice(fi, 1);

+					}

+

+					for (i = 0, l = list.length; i < l; i++)

+						list[i](nodes, name, args);

+				}

+

+				// Run attribute filters

+				for (i = 0, l = attributeFilters.length; i < l; i++) {

+					list = attributeFilters[i];

+

+					if (list.name in matchedAttributes) {

+						nodes = matchedAttributes[list.name];

+

+						// Remove already removed children

+						fi = nodes.length;

+						while (fi--) {

+							if (!nodes[fi].parent)

+								nodes.splice(fi, 1);

+						}

+

+						for (fi = 0, fl = list.callbacks.length; fi < fl; fi++)

+							list.callbacks[fi](nodes, list.name, args);

+					}

+				}

+			}

+

+			return rootNode;

+		};

+

+		// Remove <br> at end of block elements Gecko and WebKit injects BR elements to

+		// make it possible to place the caret inside empty blocks. This logic tries to remove

+		// these elements and keep br elements that where intended to be there intact

+		if (settings.remove_trailing_brs) {

+			self.addNodeFilter('br', function(nodes, name) {

+				var i, l = nodes.length, node, blockElements = schema.getBlockElements(),

+					nonEmptyElements = schema.getNonEmptyElements(), parent, prev, prevName;

+

+				// Remove brs from body element as well

+				blockElements.body = 1;

+

+				// Must loop forwards since it will otherwise remove all brs in <p>a<br><br><br></p>

+				for (i = 0; i < l; i++) {

+					node = nodes[i];

+					parent = node.parent;

+

+					if (blockElements[node.parent.name] && node === parent.lastChild) {

+						// Loop all nodes to the right of the current node and check for other BR elements

+						// excluding bookmarks since they are invisible

+						prev = node.prev;

+						while (prev) {

+							prevName = prev.name;

+

+							// Ignore bookmarks

+							if (prevName !== "span" || prev.attr('data-mce-type') !== 'bookmark') {

+								// Found a non BR element

+								if (prevName !== "br")

+									break;

+	

+								// Found another br it's a <br><br> structure then don't remove anything

+								if (prevName === 'br') {

+									node = null;

+									break;

+								}

+							}

+

+							prev = prev.prev;

+						}

+

+						if (node) {

+							node.remove();

+

+							// Is the parent to be considered empty after we removed the BR

+							if (parent.isEmpty(nonEmptyElements)) {

+								elementRule = schema.getElementRule(parent.name);

+

+								// Remove or padd the element depending on schema rule

+								if (elementRule) {

+									if (elementRule.removeEmpty)

+										parent.remove();

+									else if (elementRule.paddEmpty)

+										parent.empty().append(new tinymce.html.Node('#text', 3)).value = '\u00a0';

+								}

+							}

+						}

+					}

+				}

+			});

+		}

+	}

+})(tinymce);

+

+tinymce.html.Writer = function(settings) {

+	var html = [], indent, indentBefore, indentAfter, encode, htmlOutput;

+

+	settings = settings || {};

+	indent = settings.indent;

+	indentBefore = tinymce.makeMap(settings.indent_before || '');

+	indentAfter = tinymce.makeMap(settings.indent_after || '');

+	encode = tinymce.html.Entities.getEncodeFunc(settings.entity_encoding || 'raw', settings.entities);

+	htmlOutput = settings.element_format == "html";

+

+	return {

+		start: function(name, attrs, empty) {

+			var i, l, attr, value;

+

+			if (indent && indentBefore[name] && html.length > 0) {

+				value = html[html.length - 1];

+

+				if (value.length > 0 && value !== '\n')

+					html.push('\n');

+			}

+

+			html.push('<', name);

+

+			if (attrs) {

+				for (i = 0, l = attrs.length; i < l; i++) {

+					attr = attrs[i];

+					html.push(' ', attr.name, '="', encode(attr.value, true), '"');

+				}

+			}

+

+			if (!empty || htmlOutput)

+				html[html.length] = '>';

+			else

+				html[html.length] = ' />';

+

+			if (empty && indent && indentAfter[name] && html.length > 0) {

+				value = html[html.length - 1];

+

+				if (value.length > 0 && value !== '\n')

+					html.push('\n');

+			}

+		},

+

+		end: function(name) {

+			var value;

+

+			/*if (indent && indentBefore[name] && html.length > 0) {

+				value = html[html.length - 1];

+

+				if (value.length > 0 && value !== '\n')

+					html.push('\n');

+			}*/

+

+			html.push('</', name, '>');

+

+			if (indent && indentAfter[name] && html.length > 0) {

+				value = html[html.length - 1];

+

+				if (value.length > 0 && value !== '\n')

+					html.push('\n');

+			}

+		},

+

+		text: function(text, raw) {

+			if (text.length > 0)

+				html[html.length] = raw ? text : encode(text);

+		},

+

+		cdata: function(text) {

+			html.push('<![CDATA[', text, ']]>');

+		},

+

+		comment: function(text) {

+			html.push('<!--', text, '-->');

+		},

+

+		pi: function(name, text) {

+			if (text)

+				html.push('<?', name, ' ', text, '?>');

+			else

+				html.push('<?', name, '?>');

+

+			if (indent)

+				html.push('\n');

+		},

+

+		doctype: function(text) {

+			html.push('<!DOCTYPE', text, '>', indent ? '\n' : '');

+		},

+

+		reset: function() {

+			html.length = 0;

+		},

+

+		getContent: function() {

+			return html.join('').replace(/\n$/, '');

+		}

+	};

+};

+

+(function(tinymce) {

+	tinymce.html.Serializer = function(settings, schema) {

+		var self = this, writer = new tinymce.html.Writer(settings);

+

+		settings = settings || {};

+		settings.validate = "validate" in settings ? settings.validate : true;

+

+		self.schema = schema = schema || new tinymce.html.Schema();

+		self.writer = writer;

+

+		self.serialize = function(node) {

+			var handlers, validate;

+

+			validate = settings.validate;

+

+			handlers = {

+				// #text

+				3: function(node, raw) {

+					writer.text(node.value, node.raw);

+				},

+

+				// #comment

+				8: function(node) {

+					writer.comment(node.value);

+				},

+

+				// Processing instruction

+				7: function(node) {

+					writer.pi(node.name, node.value);

+				},

+

+				// Doctype

+				10: function(node) {

+					writer.doctype(node.value);

+				},

+

+				// CDATA

+				4: function(node) {

+					writer.cdata(node.value);

+				},

+

+ 				// Document fragment

+				11: function(node) {

+					if ((node = node.firstChild)) {

+						do {

+							walk(node);

+						} while (node = node.next);

+					}

+				}

+			};

+

+			writer.reset();

+

+			function walk(node) {

+				var handler = handlers[node.type], name, isEmpty, attrs, attrName, attrValue, sortedAttrs, i, l, elementRule;

+

+				if (!handler) {

+					name = node.name;

+					isEmpty = node.shortEnded;

+					attrs = node.attributes;

+

+					// Sort attributes

+					if (validate && attrs && attrs.length > 1) {

+						sortedAttrs = [];

+						sortedAttrs.map = {};

+

+						elementRule = schema.getElementRule(node.name);

+						for (i = 0, l = elementRule.attributesOrder.length; i < l; i++) {

+							attrName = elementRule.attributesOrder[i];

+

+							if (attrName in attrs.map) {

+								attrValue = attrs.map[attrName];

+								sortedAttrs.map[attrName] = attrValue;

+								sortedAttrs.push({name: attrName, value: attrValue});

+							}

+						}

+

+						for (i = 0, l = attrs.length; i < l; i++) {

+							attrName = attrs[i].name;

+

+							if (!(attrName in sortedAttrs.map)) {

+								attrValue = attrs.map[attrName];

+								sortedAttrs.map[attrName] = attrValue;

+								sortedAttrs.push({name: attrName, value: attrValue});

+							}

+						}

+

+						attrs = sortedAttrs;

+					}

+

+					writer.start(node.name, attrs, isEmpty);

+

+					if (!isEmpty) {

+						if ((node = node.firstChild)) {

+							do {

+								walk(node);

+							} while (node = node.next);

+						}

+

+						writer.end(name);

+					}

+				} else

+					handler(node);

+			}

+

+			// Serialize element and treat all non elements as fragments

+			if (node.type == 1 && !settings.inner)

+				walk(node);

+			else

+				handlers[11](node);

+

+			return writer.getContent();

+		};

+	}

+})(tinymce);

+

+// JSLint defined globals

+/*global tinymce:false, window:false */

+

+tinymce.dom = {};

+

+(function(namespace, expando) {

+	var w3cEventModel = !!document.addEventListener;

+

+	function addEvent(target, name, callback, capture) {

+		if (target.addEventListener) {

+			target.addEventListener(name, callback, capture || false);

+		} else if (target.attachEvent) {

+			target.attachEvent('on' + name, callback);

+		}

+	}

+

+	function removeEvent(target, name, callback, capture) {

+		if (target.removeEventListener) {

+			target.removeEventListener(name, callback, capture || false);

+		} else if (target.detachEvent) {

+			target.detachEvent('on' + name, callback);

+		}

+	}

+

+	function fix(original_event, data) {

+		var name, event = data || {};

+

+		// Dummy function that gets replaced on the delegation state functions

+		function returnFalse() {

+			return false;

+		}

+

+		// Dummy function that gets replaced on the delegation state functions

+		function returnTrue() {

+			return true;

+		}

+

+		// Copy all properties from the original event

+		for (name in original_event) {

+			// layerX/layerY is deprecated in Chrome and produces a warning

+			if (name !== "layerX" && name !== "layerY") {

+				event[name] = original_event[name];

+			}

+		}

+

+		// Normalize target IE uses srcElement

+		if (!event.target) {

+			event.target = event.srcElement || document;

+		}

+

+		// Add preventDefault method

+		event.preventDefault = function() {

+			event.isDefaultPrevented = returnTrue;

+

+			// Execute preventDefault on the original event object

+			if (original_event) {

+				if (original_event.preventDefault) {

+					original_event.preventDefault();

+				} else {

+					original_event.returnValue = false; // IE

+				}

+			}

+		};

+

+		// Add stopPropagation

+		event.stopPropagation = function() {

+			event.isPropagationStopped = returnTrue;

+

+			// Execute stopPropagation on the original event object

+			if (original_event) {

+				if (original_event.stopPropagation) {

+					original_event.stopPropagation();

+				} else {

+					original_event.cancelBubble = true; // IE

+				}

+			 }

+		};

+

+		// Add stopImmediatePropagation

+		event.stopImmediatePropagation = function() {

+			event.isImmediatePropagationStopped = returnTrue;

+			event.stopPropagation();

+		};

+

+		// Add event delegation states

+		if (!event.isDefaultPrevented) {

+			event.isDefaultPrevented = returnFalse;

+			event.isPropagationStopped = returnFalse;

+			event.isImmediatePropagationStopped = returnFalse;

+		}

+

+		return event;

+	}

+

+	function bindOnReady(win, callback, event_utils) {

+		var doc = win.document, event = {type: 'ready'};

+

+		// Gets called when the DOM is ready

+		function readyHandler() {

+			if (!event_utils.domLoaded) {

+				event_utils.domLoaded = true;

+				callback(event);

+			}

+		}

+

+		// Use W3C method

+		if (w3cEventModel) {

+			addEvent(win, 'DOMContentLoaded', readyHandler);

+		} else {

+			// Use IE method

+			addEvent(doc, "readystatechange", function() {

+				if (doc.readyState === "complete") {

+					removeEvent(doc, "readystatechange", arguments.callee);

+					readyHandler();

+				}

+			});

+

+			// Wait until we can scroll, when we can the DOM is initialized

+			if (doc.documentElement.doScroll && win === win.top) {

+				(function() {

+					try {

+						// If IE is used, use the trick by Diego Perini licensed under MIT by request to the author.

+						// http://javascript.nwbox.com/IEContentLoaded/

+						doc.documentElement.doScroll("left");

+					} catch (ex) {

+						setTimeout(arguments.callee, 0);

+						return;

+					}

+

+					readyHandler();

+				})();

+			}

+		}

+

+		// Fallback if any of the above methods should fail for some odd reason

+		addEvent(win, 'load', readyHandler);

+	}

+

+	function EventUtils(proxy) {

+		var self = this, events = {}, count, isFocusBlurBound, hasFocusIn, hasMouseEnterLeave, mouseEnterLeave;

+

+		hasMouseEnterLeave = "onmouseenter" in document.documentElement;

+		hasFocusIn = "onfocusin" in document.documentElement;

+		mouseEnterLeave = {mouseenter: 'mouseover', mouseleave: 'mouseout'};

+		count = 1;

+

+		// State if the DOMContentLoaded was executed or not

+		self.domLoaded = false;

+		self.events = events;

+

+		function executeHandlers(evt, id) {

+			var callbackList, i, l, callback;

+

+			callbackList = events[id][evt.type];

+			if (callbackList) {

+				for (i = 0, l = callbackList.length; i < l; i++) {

+					callback = callbackList[i];

+					

+					// Check if callback exists might be removed if a unbind is called inside the callback

+					if (callback && callback.func.call(callback.scope, evt) === false) {

+						evt.preventDefault();

+					}

+

+					// Should we stop propagation to immediate listeners

+					if (evt.isImmediatePropagationStopped()) {

+						return;

+					}

+				}

+			}

+		}

+

+		self.bind = function(target, names, callback, scope) {

+			var id, callbackList, i, name, fakeName, nativeHandler, capture, win = window;

+

+			// Native event handler function patches the event and executes the callbacks for the expando

+			function defaultNativeHandler(evt) {

+				executeHandlers(fix(evt || win.event), id);

+			}

+

+			// Don't bind to text nodes or comments

+			if (!target || target.nodeType === 3 || target.nodeType === 8) {

+				return;

+			}

+

+			// Create or get events id for the target

+			if (!target[expando]) {

+				id = count++;

+				target[expando] = id;

+				events[id] = {};

+			} else {

+				id = target[expando];

+

+				if (!events[id]) {

+					events[id] = {};

+				}

+			}

+

+			// Setup the specified scope or use the target as a default

+			scope = scope || target;

+

+			// Split names and bind each event, enables you to bind multiple events with one call

+			names = names.split(' ');

+			i = names.length;

+			while (i--) {

+				name = names[i];

+				nativeHandler = defaultNativeHandler;

+				fakeName = capture = false;

+

+				// Use ready instead of DOMContentLoaded

+				if (name === "DOMContentLoaded") {

+					name = "ready";

+				}

+

+				// DOM is already ready

+				if ((self.domLoaded || target.readyState == 'complete') && name === "ready") {

+					self.domLoaded = true;

+					callback.call(scope, fix({type: name}));

+					continue;

+				}

+

+				// Handle mouseenter/mouseleaver

+				if (!hasMouseEnterLeave) {

+					fakeName = mouseEnterLeave[name];

+

+					if (fakeName) {

+						nativeHandler = function(evt) {

+							var current, related;

+

+							current = evt.currentTarget;

+							related = evt.relatedTarget;

+

+							// Check if related is inside the current target if it's not then the event should be ignored since it's a mouseover/mouseout inside the element

+							if (related && current.contains) {

+								// Use contains for performance

+								related = current.contains(related);

+							} else {

+								while (related && related !== current) {

+									related = related.parentNode;

+								}

+							}

+

+							// Fire fake event

+							if (!related) {

+								evt = fix(evt || win.event);

+								evt.type = evt.type === 'mouseout' ? 'mouseleave' : 'mouseenter';

+								evt.target = current;

+								executeHandlers(evt, id);

+							}

+						};

+					}

+				}

+

+				// Fake bubbeling of focusin/focusout

+				if (!hasFocusIn && (name === "focusin" || name === "focusout")) {

+					capture = true;

+					fakeName = name === "focusin" ? "focus" : "blur";

+					nativeHandler = function(evt) {

+						evt = fix(evt || win.event);

+						evt.type = evt.type === 'focus' ? 'focusin' : 'focusout';

+						executeHandlers(evt, id);

+					};

+				}

+

+				// Setup callback list and bind native event

+				callbackList = events[id][name];

+				if (!callbackList) {

+					events[id][name] = callbackList = [{func: callback, scope: scope}];

+					callbackList.fakeName = fakeName;

+					callbackList.capture = capture;

+

+					// Add the nativeHandler to the callback list so that we can later unbind it

+					callbackList.nativeHandler = nativeHandler;

+					if (!w3cEventModel) {

+						callbackList.proxyHandler = proxy(id);

+					}

+

+					// Check if the target has native events support

+					if (name === "ready") {

+						bindOnReady(target, nativeHandler, self);

+					} else {

+						addEvent(target, fakeName || name, w3cEventModel ? nativeHandler : callbackList.proxyHandler, capture);

+					}

+				} else {

+					// If it already has an native handler then just push the callback

+					callbackList.push({func: callback, scope: scope});

+				}

+			}

+

+			target = callbackList = 0; // Clean memory for IE

+

+			return callback;

+		};

+

+		self.unbind = function(target, names, callback) {

+			var id, callbackList, i, ci, name, eventMap;

+

+			// Don't bind to text nodes or comments

+			if (!target || target.nodeType === 3 || target.nodeType === 8) {

+				return self;

+			}

+

+			// Unbind event or events if the target has the expando

+			id = target[expando];

+			if (id) {

+				eventMap = events[id];

+

+				// Specific callback

+				if (names) {

+					names = names.split(' ');

+					i = names.length;

+					while (i--) {

+						name = names[i];

+						callbackList = eventMap[name];

+

+						// Unbind the event if it exists in the map

+						if (callbackList) {

+							// Remove specified callback

+							if (callback) {

+								ci = callbackList.length;

+								while (ci--) {

+									if (callbackList[ci].func === callback) {

+										callbackList.splice(ci, 1);

+									}

+								}

+							}

+

+							// Remove all callbacks if there isn't a specified callback or there is no callbacks left

+							if (!callback || callbackList.length === 0) {

+								delete eventMap[name];

+								removeEvent(target, callbackList.fakeName || name, w3cEventModel ? callbackList.nativeHandler : callbackList.proxyHandler, callbackList.capture);

+							}

+						}

+					}

+				} else {

+					// All events for a specific element

+					for (name in eventMap) {

+						callbackList = eventMap[name];

+						removeEvent(target, callbackList.fakeName || name, w3cEventModel ? callbackList.nativeHandler : callbackList.proxyHandler, callbackList.capture);

+					}

+

+					eventMap = {};

+				}

+

+				// Check if object is empty, if it isn't then we won't remove the expando map

+				for (name in eventMap) {

+					return self;

+				}

+

+				// Delete event object

+				delete events[id];

+

+				// Remove expando from target

+				try {

+					// IE will fail here since it can't delete properties from window

+					delete target[expando];

+				} catch (ex) {

+					// IE will set it to null

+					target[expando] = null;

+				}

+			}

+

+			return self;

+		};

+

+		self.fire = function(target, name, args) {

+			var id, event;

+

+			// Don't bind to text nodes or comments

+			if (!target || target.nodeType === 3 || target.nodeType === 8) {

+				return self;

+			}

+

+			// Build event object by patching the args

+			event = fix(null, args);

+			event.type = name;

+

+			do {

+				// Found an expando that means there is listeners to execute

+				id = target[expando];

+				if (id) {

+					executeHandlers(event, id);

+				}

+

+				// Walk up the DOM

+				target = target.parentNode || target.ownerDocument || target.defaultView || target.parentWindow;

+			} while (target && !event.isPropagationStopped());

+

+			return self;

+		};

+

+		self.clean = function(target) {

+			var i, children, unbind = self.unbind;

+	

+			// Don't bind to text nodes or comments

+			if (!target || target.nodeType === 3 || target.nodeType === 8) {

+				return self;

+			}

+

+			// Unbind any element on the specificed target

+			if (target[expando]) {

+				unbind(target);

+			}

+

+			// Target doesn't have getElementsByTagName it's probably a window object then use it's document to find the children

+			if (!target.getElementsByTagName) {

+				target = target.document;

+			}

+

+			// Remove events from each child element

+			if (target && target.getElementsByTagName) {

+				unbind(target);

+

+				children = target.getElementsByTagName('*');

+				i = children.length;

+				while (i--) {

+					target = children[i];

+

+					if (target[expando]) {

+						unbind(target);

+					}

+				}

+			}

+

+			return self;

+		};

+

+		self.callNativeHandler = function(id, evt) {

+			if (events) {

+				events[id][evt.type].nativeHandler(evt);

+			}

+		};

+

+		self.destory = function() {

+			events = {};

+		};

+

+		// Legacy function calls

+

+		self.add = function(target, events, func, scope) {

+			// Old API supported direct ID assignment

+			if (typeof(target) === "string") {

+				target = document.getElementById(target);

+			}

+

+			// Old API supported multiple targets

+			if (target && target instanceof Array) {

+				var i = target;

+

+				while (i--) {

+					self.add(target[i], events, func, scope);

+				}

+

+				return;

+			}

+

+			// Old API called ready init

+			if (events === "init") {

+				events = "ready";

+			}

+

+			return self.bind(target, events instanceof Array ? events.join(' ') : events, func, scope);

+		};

+

+		self.remove = function(target, events, func) {

+			// Old API supported direct ID assignment

+			if (typeof(target) === "string") {

+				target = document.getElementById(target);

+			}

+

+			// Old API supported multiple targets

+			if (target instanceof Array) {

+				var i = target;

+

+				while (i--) {

+					self.remove(target[i], events, func, scope);

+				}

+

+				return self;

+			}

+

+			return self.unbind(target, events instanceof Array ? events.join(' ') : events, func);

+		};

+

+		self.clear = function(target) {

+			// Old API supported direct ID assignment

+			if (typeof(target) === "string") {

+				target = document.getElementById(target);

+			}

+

+			return self.clean(target);

+		};

+

+		self.cancel = function(e) {

+			if (e) {

+				self.prevent(e);

+				self.stop(e);

+			}

+

+			return false;

+		};

+

+		self.prevent = function(e) {

+			e.preventDefault();

+

+			return false;

+		};

+

+		self.stop = function(e) {

+			e.stopPropagation();

+

+			return false;

+		};

+	}

+

+	namespace.EventUtils = EventUtils;

+

+	namespace.Event = new EventUtils(function(id) {

+		return function(evt) {

+			tinymce.dom.Event.callNativeHandler(id, evt);

+		};

+	});

+

+	// Bind ready event when tinymce script is loaded

+	namespace.Event.bind(window, 'ready', function() {});

+

+	namespace = 0;

+})(tinymce.dom, 'data-mce-expando'); // Namespace and expando

+

 (function(tinymce) {

 	// Shorten names

 	var each = tinymce.each,

 		is = tinymce.is,

 		isWebKit = tinymce.isWebKit,

 		isIE = tinymce.isIE,

-		blockRe = /^(H[1-6R]|P|DIV|ADDRESS|PRE|FORM|T(ABLE|BODY|HEAD|FOOT|H|R|D)|LI|OL|UL|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|NOSCRIPT|MENU|ISINDEX|SAMP)$/,

-		boolAttrs = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'),

-		mceAttribs = makeMap('src,href,style,coords,shape'),

-		encodedChars = {'&' : '&amp;', '"' : '&quot;', '<' : '&lt;', '>' : '&gt;'},

-		encodeCharsRe = /[<>&\"]/g,

+		Entities = tinymce.html.Entities,

 		simpleSelectorRe = /^([a-z0-9],?)+$/i,

-		tagRegExp = /<(\w+)((?:\s+\w+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)(\s*\/?)>/g,

-		attrRegExp = /(\w+)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g;

-

-	function makeMap(str) {

-		var map = {}, i;

-

-		str = str.split(',');

-		for (i = str.length; i >= 0; i--)

-			map[str[i]] = 1;

-

-		return map;

-	};

+		whiteSpaceRegExp = /^[ \t\r\n]*$/;

 

 	tinymce.create('tinymce.dom.DOMUtils', {

 		doc : null,

@@ -1016,21 +4410,27 @@ tinymce.create('static tinymce.util.XHR', {
 		},

 

 		DOMUtils : function(d, s) {

-			var t = this, globalStyle;

+			var t = this, globalStyle, name, blockElementsMap;

 

 			t.doc = d;

 			t.win = window;

 			t.files = {};

 			t.cssFlicker = false;

 			t.counter = 0;

-			t.boxModel = !tinymce.isIE || d.compatMode == "CSS1Compat"; 

-			t.stdMode = d.documentMode === 8;

+			t.stdMode = !tinymce.isIE || d.documentMode >= 8;

+			t.boxModel = !tinymce.isIE || d.compatMode == "CSS1Compat" || t.stdMode;

+			t.hasOuterHTML = "outerHTML" in d.createElement("a");

 

 			t.settings = s = tinymce.extend({

 				keep_values : false,

-				hex_colors : 1,

-				process_html : 1

+				hex_colors : 1

 			}, s);

+			

+			t.schema = s.schema;

+			t.styles = new tinymce.html.Styles({

+				url_converter : s.url_converter,

+				url_converter_scope : s.url_converter_scope

+			}, s.schema);

 

 			// Fix IE6SP2 flicker and check it failed for pre SP2

 			if (tinymce.isIE6) {

@@ -1041,17 +4441,78 @@ tinymce.create('static tinymce.util.XHR', {
 				}

 			}

 

-			// Build styles list

-			if (s.valid_styles) {

-				t._styles = {};

+			t.fixDoc(d);

+			t.events = s.ownEvents ? new tinymce.dom.EventUtils(s.proxy) : tinymce.dom.Event;

+			tinymce.addUnload(t.destroy, t);

+			blockElementsMap = s.schema ? s.schema.getBlockElements() : {};

+

+			t.isBlock = function(node) {

+				// This function is called in module pattern style since it might be executed with the wrong this scope

+				var type = node.nodeType;

+

+				// If it's a node then check the type and use the nodeName

+				if (type)

+					return !!(type === 1 && blockElementsMap[node.nodeName]);

+

+				return !!blockElementsMap[node];

+			};

+		},

 

-				// Convert styles into a rule list

-				each(s.valid_styles, function(value, key) {

-					t._styles[key] = tinymce.explode(value);

+		fixDoc: function(doc) {

+			var settings = this.settings, name;

+

+			if (isIE && settings.schema) {

+				// Add missing HTML 4/5 elements to IE

+				('abbr article aside audio canvas ' +

+				'details figcaption figure footer ' +

+				'header hgroup mark menu meter nav ' +

+				'output progress section summary ' +

+				'time video').replace(/\w+/g, function(name) {

+					doc.createElement(name);

 				});

+

+				// Create all custom elements

+				for (name in settings.schema.getCustomElements()) {

+					doc.createElement(name);

+				}

 			}

+		},

 

-			tinymce.addUnload(t.destroy, t);

+		clone: function(node, deep) {

+			var self = this, clone, doc;

+

+			// TODO: Add feature detection here in the future

+			if (!isIE || node.nodeType !== 1 || deep) {

+				return node.cloneNode(deep);

+			}

+

+			doc = self.doc;

+

+			// Make a HTML5 safe shallow copy

+			if (!deep) {

+				clone = doc.createElement(node.nodeName);

+

+				// Copy attribs

+				each(self.getAttribs(node), function(attr) {

+					self.setAttrib(clone, attr.nodeName, self.getAttrib(node, attr.nodeName));

+				});

+

+				return clone;

+			}

+/*

+			// Setup HTML5 patched document fragment

+			if (!self.frag) {

+				self.frag = doc.createDocumentFragment();

+				self.fixDoc(self.frag);

+			}

+

+			// Make a deep copy by adding it to the document fragment then removing it this removed the :section

+			clone = doc.createElement('div');

+			self.frag.appendChild(clone);

+			clone.innerHTML = node.outerHTML;

+			self.frag.removeChild(clone);

+*/

+			return clone.firstChild;

 		},

 

 		getRoot : function() {

@@ -1246,7 +4707,8 @@ tinymce.create('static tinymce.util.XHR', {
 					o += ' ' + k + '="' + t.encode(a[k]) + '"';

 			}

 

-			if (tinymce.is(h))

+			// A call to tinymce.is doesn't work for some odd reason on IE9 possible bug inside their JS runtime

+			if (typeof(h) != "undefined")

 				return o + '>' + h + '</' + n + '>';

 

 			return o + ' />';

@@ -1254,9 +4716,7 @@ tinymce.create('static tinymce.util.XHR', {
 

 		remove : function(node, keep_children) {

 			return this.run(node, function(node) {

-				var parent, child;

-

-				parent = node.parentNode;

+				var child, parent = node.parentNode;

 

 				if (!parent)

 					return null;

@@ -1316,7 +4776,7 @@ tinymce.create('static tinymce.util.XHR', {
 

 				// Force update of the style data

 				if (t.settings.update_styles)

-					t.setAttrib(e, '_mce_style');

+					t.setAttrib(e, 'data-mce-style');

 			});

 		},

 

@@ -1324,7 +4784,7 @@ tinymce.create('static tinymce.util.XHR', {
 			n = this.get(n);

 

 			if (!n)

-				return false;

+				return;

 

 			// Gecko

 			if (this.doc.defaultView && c) {

@@ -1353,7 +4813,7 @@ tinymce.create('static tinymce.util.XHR', {
 			if (n.currentStyle && c)

 				return n.currentStyle[na];

 

-			return n.style[na];

+			return n.style ? n.style[na] : undefined;

 		},

 

 		setStyles : function(e, o) {

@@ -1372,6 +4832,15 @@ tinymce.create('static tinymce.util.XHR', {
 				t.setAttrib(e, s.cssText);

 		},

 

+		removeAllAttribs: function(e) {

+			return this.run(e, function(e) {

+				var i, attrs = e.attributes;

+				for (i = attrs.length - 1; i >= 0; i--) {

+					e.removeAttributeNode(attrs.item(i));

+				}

+			});

+		},

+

 		setAttrib : function(e, n, v) {

 			var t = this;

 

@@ -1385,52 +4854,59 @@ tinymce.create('static tinymce.util.XHR', {
 

 			return this.run(e, function(e) {

 				var s = t.settings;

+				var originalValue = e.getAttribute(n);

+				if (v !== null) {

+					switch (n) {

+						case "style":

+							if (!is(v, 'string')) {

+								each(v, function(v, n) {

+									t.setStyle(e, n, v);

+								});

 

-				switch (n) {

-					case "style":

-						if (!is(v, 'string')) {

-							each(v, function(v, n) {

-								t.setStyle(e, n, v);

-							});

+								return;

+							}

 

-							return;

-						}

+							// No mce_style for elements with these since they might get resized by the user

+							if (s.keep_values) {

+								if (v && !t._isRes(v))

+									e.setAttribute('data-mce-style', v, 2);

+								else

+									e.removeAttribute('data-mce-style', 2);

+							}

 

-						// No mce_style for elements with these since they might get resized by the user

-						if (s.keep_values) {

-							if (v && !t._isRes(v))

-								e.setAttribute('_mce_style', v, 2);

-							else

-								e.removeAttribute('_mce_style', 2);

-						}

+							e.style.cssText = v;

+							break;

 

-						e.style.cssText = v;

-						break;

+						case "class":

+							e.className = v || ''; // Fix IE null bug

+							break;

 

-					case "class":

-						e.className = v || ''; // Fix IE null bug

-						break;

+						case "src":

+						case "href":

+							if (s.keep_values) {

+								if (s.url_converter)

+									v = s.url_converter.call(s.url_converter_scope || t, v, n, e);

 

-					case "src":

-					case "href":

-						if (s.keep_values) {

-							if (s.url_converter)

-								v = s.url_converter.call(s.url_converter_scope || t, v, n, e);

+								t.setAttrib(e, 'data-mce-' + n, v, 2);

+							}

 

-							t.setAttrib(e, '_mce_' + n, v, 2);

-						}

+							break;

 

-						break;

-					

-					case "shape":

-						e.setAttribute('_mce_style', v);

-						break;

+						case "shape":

+							e.setAttribute('data-mce-style', v);

+							break;

+					}

 				}

-

 				if (is(v) && v !== null && v.length !== 0)

 					e.setAttribute(n, '' + v, 2);

 				else

 					e.removeAttribute(n, 2);

+

+				// fire onChangeAttrib event for attributes that have changed

+				if (tinyMCE.activeEditor && originalValue != v) {

+					var ed = tinyMCE.activeEditor;

+					ed.onSetAttrib.dispatch(ed, e, n, v);

+				}

 			});

 		},

 

@@ -1445,19 +4921,19 @@ tinymce.create('static tinymce.util.XHR', {
 		},

 

 		getAttrib : function(e, n, dv) {

-			var v, t = this;

+			var v, t = this, undef;

 

 			e = t.get(e);

 

 			if (!e || e.nodeType !== 1)

-				return false;

+				return dv === undef ? false : dv;

 

 			if (!is(dv))

 				dv = '';

 

 			// Try the mce variant for these

 			if (/^(src|href|style|coords|shape)$/.test(n)) {

-				v = e.getAttribute("_mce_" + n);

+				v = e.getAttribute("data-mce-" + n);

 

 				if (v)

 					return v;

@@ -1490,7 +4966,7 @@ tinymce.create('static tinymce.util.XHR', {
 					v = t.serializeStyle(t.parseStyle(v), e.nodeName);

 

 					if (t.settings.keep_values && !t._isRes(v))

-						e.setAttribute('_mce_style', v);

+						e.setAttribute('data-mce-style', v);

 				}

 			}

 

@@ -1558,11 +5034,11 @@ tinymce.create('static tinymce.util.XHR', {
 					default:

 						// IE has odd anonymous function for event attributes

 						if (n.indexOf('on') === 0 && v)

-							v = ('' + v).replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/, '$1');

+							v = tinymce._replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/, '$1', '' + v);

 				}

 			}

 

-			return (v !== undefined && v !== null && v !== '') ? '' + v : dv;

+			return (v !== undef && v !== null && v !== '') ? '' + v : dv;

 		},

 

 		getPos : function(n, ro) {

@@ -1572,15 +5048,17 @@ tinymce.create('static tinymce.util.XHR', {
 			ro = ro || d.body;

 

 			if (n) {

-				// Use getBoundingClientRect on IE, Opera has it but it's not perfect

-				if (isIE && !t.stdMode) {

+				// Use getBoundingClientRect if it exists since it's faster than looping offset nodes

+				if (n.getBoundingClientRect) {

 					n = n.getBoundingClientRect();

 					e = t.boxModel ? d.documentElement : d.body;

-					x = t.getStyle(t.select('html')[0], 'borderWidth'); // Remove border

-					x = (x == 'medium' || t.boxModel && !t.isIE6) && 2 || x;

-					n.top += t.win.self != t.win.top ? 2 : 0; // IE adds some strange extra cord if used in a frameset

 

-					return {x : n.left + e.scrollLeft - x, y : n.top + e.scrollTop - x};

+					// Add scroll offsets from documentElement or body since IE with the wrong box model will use d.body and so do WebKit

+					// Also remove the body/documentelement clientTop/clientLeft on IE 6, 7 since they offset the position

+					x = n.left + (d.documentElement.scrollLeft || d.body.scrollLeft) - e.clientTop;

+					y = n.top + (d.documentElement.scrollTop || d.body.scrollTop) - e.clientLeft;

+

+					return {x : x, y : y};

 				}

 

 				r = n;

@@ -1602,144 +5080,11 @@ tinymce.create('static tinymce.util.XHR', {
 		},

 

 		parseStyle : function(st) {

-			var t = this, s = t.settings, o = {};

-

-			if (!st)

-				return o;

-

-			function compress(p, s, ot) {

-				var t, r, b, l;

-

-				// Get values and check it it needs compressing

-				t = o[p + '-top' + s];

-				if (!t)

-					return;

-

-				r = o[p + '-right' + s];

-				if (t != r)

-					return;

-

-				b = o[p + '-bottom' + s];

-				if (r != b)

-					return;

-

-				l = o[p + '-left' + s];

-				if (b != l)

-					return;

-

-				// Compress

-				o[ot] = l;

-				delete o[p + '-top' + s];

-				delete o[p + '-right' + s];

-				delete o[p + '-bottom' + s];

-				delete o[p + '-left' + s];

-			};

-

-			function compress2(ta, a, b, c) {

-				var t;

-

-				t = o[a];

-				if (!t)

-					return;

-

-				t = o[b];

-				if (!t)

-					return;

-

-				t = o[c];

-				if (!t)

-					return;

-

-				// Compress

-				o[ta] = o[a] + ' ' + o[b] + ' ' + o[c];

-				delete o[a];

-				delete o[b];

-				delete o[c];

-			};

-

-			st = st.replace(/&(#?[a-z0-9]+);/g, '&$1_MCE_SEMI_'); // Protect entities

-

-			each(st.split(';'), function(v) {

-				var sv, ur = [];

-

-				if (v) {

-					v = v.replace(/_MCE_SEMI_/g, ';'); // Restore entities

-					v = v.replace(/url\([^\)]+\)/g, function(v) {ur.push(v);return 'url(' + ur.length + ')';});

-					v = v.split(':');

-					sv = tinymce.trim(v[1]);

-					sv = sv.replace(/url\(([^\)]+)\)/g, function(a, b) {return ur[parseInt(b) - 1];});

-

-					sv = sv.replace(/rgb\([^\)]+\)/g, function(v) {

-						return t.toHex(v);

-					});

-

-					if (s.url_converter) {

-						sv = sv.replace(/url\([\'\"]?([^\)\'\"]+)[\'\"]?\)/g, function(x, c) {

-							return 'url(' + s.url_converter.call(s.url_converter_scope || t, t.decode(c), 'style', null) + ')';

-						});

-					}

-

-					o[tinymce.trim(v[0]).toLowerCase()] = sv;

-				}

-			});

-

-			compress("border", "", "border");

-			compress("border", "-width", "border-width");

-			compress("border", "-color", "border-color");

-			compress("border", "-style", "border-style");

-			compress("padding", "", "padding");

-			compress("margin", "", "margin");

-			compress2('border', 'border-width', 'border-style', 'border-color');

-

-			if (isIE) {

-				// Remove pointless border

-				if (o.border == 'medium none')

-					o.border = '';

-			}

-

-			return o;

+			return this.styles.parse(st);

 		},

 

 		serializeStyle : function(o, name) {

-			var t = this, s = '';

-

-			function add(v, k) {

-				if (k && v) {

-					// Remove browser specific styles like -moz- or -webkit-

-					if (k.indexOf('-') === 0)

-						return;

-

-					switch (k) {

-						case 'font-weight':

-							// Opera will output bold as 700

-							if (v == 700)

-								v = 'bold';

-

-							break;

-

-						case 'color':

-						case 'background-color':

-							v = v.toLowerCase();

-							break;

-					}

-

-					s += (s ? ' ' : '') + k + ': ' + v + ';';

-				}

-			};

-

-			// Validate style output

-			if (name && t._styles) {

-				each(t._styles['*'], function(name) {

-					add(o[name], name);

-				});

-

-				each(t._styles[name.toLowerCase()], function(name) {

-					add(o[name], name);

-				});

-			} else

-				each(o, add);

-

-			return s;

+			return this.styles.serialize(o, name);

 		},

 

 		loadCSS : function(u) {

@@ -1762,9 +5107,11 @@ tinymce.create('static tinymce.util.XHR', {
 				// IE 8 has a bug where dynamically loading stylesheets would produce a 1 item remaining bug

 				// This fix seems to resolve that issue by realcing the document ones a stylesheet finishes loading

 				// It's ugly but it seems to work fine.

-				if (isIE && d.documentMode) {

+				if (isIE && d.documentMode && d.recalc) {

 					link.onload = function() {

-						d.recalc();

+						if (d.recalc)

+							d.recalc();

+

 						link.onload = null;

 					};

 				}

@@ -1844,256 +5191,57 @@ tinymce.create('static tinymce.util.XHR', {
 			return (!p ? 'mce_' : p) + (this.counter++);

 		},

 

-		setHTML : function(e, h) {

-			var t = this;

-

-			return this.run(e, function(e) {

-				var x, i, nl, n, p, x;

-

-				h = t.processHTML(h);

+		setHTML : function(element, html) {

+			var self = this;

 

+			return self.run(element, function(element) {

 				if (isIE) {

-					function set() {

-						// Remove all child nodes

-						while (e.firstChild)

-							e.firstChild.removeNode();

-

-						try {

-							// IE will remove comments from the beginning

-							// unless you padd the contents with something

-							e.innerHTML = '<br />' + h;

-							e.removeChild(e.firstChild);

-						} catch (ex) {

-							// IE sometimes produces an unknown runtime error on innerHTML if it's an block element within a block element for example a div inside a p

-							// This seems to fix this problem

-

-							// Create new div with HTML contents and a BR infront to keep comments

-							x = t.create('div');

-							x.innerHTML = '<br />' + h;

-

-							// Add all children from div to target

-							each (x.childNodes, function(n, i) {

-								// Skip br element

-								if (i)

-									e.appendChild(n);

-							});

-						}

-					};

-

-					// IE has a serious bug when it comes to paragraphs it can produce an invalid

-					// DOM tree if contents like this <p><ul><li>Item 1</li></ul></p> is inserted

-					// It seems to be that IE doesn't like a root block element placed inside another root block element

-					if (t.settings.fix_ie_paragraphs)

-						h = h.replace(/<p><\/p>|<p([^>]+)><\/p>|<p[^\/+]\/>/gi, '<p$1 _mce_keep="true">&nbsp;</p>');

-

-					set();

-

-					if (t.settings.fix_ie_paragraphs) {

-						// Check for odd paragraphs this is a sign of a broken DOM

-						nl = e.getElementsByTagName("p");

-						for (i = nl.length - 1, x = 0; i >= 0; i--) {

-							n = nl[i];

-

-							if (!n.hasChildNodes()) {

-								if (!n._mce_keep) {

-									x = 1; // Is broken

-									break;

-								}

-

-								n.removeAttribute('_mce_keep');

-							}

-						}

-					}

-

-					// Time to fix the madness IE left us

-					if (x) {

-						// So if we replace the p elements with divs and mark them and then replace them back to paragraphs

-						// after we use innerHTML we can fix the DOM tree

-						h = h.replace(/<p ([^>]+)>|<p>/ig, '<div $1 _mce_tmp="1">');

-						h = h.replace(/<\/p>/gi, '</div>');

-

-						// Set the new HTML with DIVs

-						set();

-

-						// Replace all DIV elements with the _mce_tmp attibute back to paragraphs

-						// This is needed since IE has a annoying bug see above for details

-						// This is a slow process but it has to be done. :(

-						if (t.settings.fix_ie_paragraphs) {

-							nl = e.getElementsByTagName("DIV");

-							for (i = nl.length - 1; i >= 0; i--) {

-								n = nl[i];

-

-								// Is it a temp div

-								if (n._mce_tmp) {

-									// Create new paragraph

-									p = t.doc.createElement('p');

-

-									// Copy all attributes

-									n.cloneNode(false).outerHTML.replace(/([a-z0-9\-_]+)=/gi, function(a, b) {

-										var v;

-

-										if (b !== '_mce_tmp') {

-											v = n.getAttribute(b);

-

-											if (!v && b === 'class')

-												v = n.className;

-

-											p.setAttribute(b, v);

-										}

-									});

+					// Remove all child nodes, IE keeps empty text nodes in DOM

+					while (element.firstChild)

+						element.removeChild(element.firstChild);

 

-									// Append all children to new paragraph

-									for (x = 0; x<n.childNodes.length; x++)

-										p.appendChild(n.childNodes[x].cloneNode(true));

-

-									// Replace div with new paragraph

-									n.swapNode(p);

-								}

-							}

-						}

+					try {

+						// IE will remove comments from the beginning

+						// unless you padd the contents with something

+						element.innerHTML = '<br />' + html;

+						element.removeChild(element.firstChild);

+					} catch (ex) {

+						// IE sometimes produces an unknown runtime error on innerHTML if it's an block element within a block element for example a div inside a p

+						// This seems to fix this problem

+

+						// Create new div with HTML contents and a BR infront to keep comments

+						element = self.create('div');

+						element.innerHTML = '<br />' + html;

+

+						// Add all children from div to target

+						each (element.childNodes, function(node, i) {

+							// Skip br element

+							if (i)

+								element.appendChild(node);

+						});

 					}

 				} else

-					e.innerHTML = h;

+					element.innerHTML = html;

 

-				return h;

+				return html;

 			});

 		},

 

-		processHTML : function(h) {

-			var t = this, s = t.settings, codeBlocks = [];

-

-			if (!s.process_html)

-				return h;

-

-			if (isIE) {

-				h = h.replace(/&apos;/g, '&#39;'); // IE can't handle apos

-				h = h.replace(/\s+(disabled|checked|readonly|selected)\s*=\s*[\"\']?(false|0)[\"\']?/gi, ''); // IE doesn't handle default values correct

-			}

-

-			// Fix some issues

-			h = h.replace(/<a( )([^>]+)\/>|<a\/>/gi, '<a$1$2></a>'); // Force open

+		getOuterHTML : function(elm) {

+			var doc, self = this;

 

-			// Store away src and href in _mce_src and mce_href since browsers mess them up

-			if (s.keep_values) {

-				// Wrap scripts and styles in comments for serialization purposes

-				if (/<script|noscript|style/i.test(h)) {

-					function trim(s) {

-						// Remove prefix and suffix code for element

-						s = s.replace(/(<!--\[CDATA\[|\]\]-->)/g, '\n');

-						s = s.replace(/^[\r\n]*|[\r\n]*$/g, '');

-						s = s.replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g, '');

-						s = s.replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g, '');

+			elm = self.get(elm);

 

-						return s;

-					};

-

-					// Wrap the script contents in CDATA and keep them from executing

-					h = h.replace(/<script([^>]+|)>([\s\S]*?)<\/script>/gi, function(v, attribs, text) {

-						// Force type attribute

-						if (!attribs)

-							attribs = ' type="text/javascript"';

-

-						// Convert the src attribute of the scripts

-						attribs = attribs.replace(/src=\"([^\"]+)\"?/i, function(a, url) {

-							if (s.url_converter)

-								url = t.encode(s.url_converter.call(s.url_converter_scope || t, t.decode(url), 'src', 'script'));

-

-							return '_mce_src="' + url + '"';

-						});

-

-						// Wrap text contents

-						if (tinymce.trim(text)) {

-							codeBlocks.push(trim(text));

-							text = '<!--\nMCE_SCRIPT:' + (codeBlocks.length - 1) + '\n// -->';

-						}

-

-						return '<mce:script' + attribs + '>' + text + '</mce:script>';

-					});

-

-					// Wrap style elements

-					h = h.replace(/<style([^>]+|)>([\s\S]*?)<\/style>/gi, function(v, attribs, text) {

-						// Wrap text contents

-						if (text) {

-							codeBlocks.push(trim(text));

-							text = '<!--\nMCE_SCRIPT:' + (codeBlocks.length - 1) + '\n-->';

-						}

-

-						return '<mce:style' + attribs + '>' + text + '</mce:style><style ' + attribs + ' _mce_bogus="1">' + text + '</style>';

-					});

-

-					// Wrap noscript elements

-					h = h.replace(/<noscript([^>]+|)>([\s\S]*?)<\/noscript>/g, function(v, attribs, text) {

-						return '<mce:noscript' + attribs + '><!--' + t.encode(text).replace(/--/g, '&#45;&#45;') + '--></mce:noscript>';

-					});

-				}

-

-				h = h.replace(/<!\[CDATA\[([\s\S]+)\]\]>/g, '<!--[CDATA[$1]]-->');

-

-				// This function processes the attributes in the HTML string to force boolean

-				// attributes to the attr="attr" format and convert style, src and href to _mce_ versions

-				function processTags(html) {

-					return html.replace(tagRegExp, function(match, elm_name, attrs, end) {

-						return '<' + elm_name + attrs.replace(attrRegExp, function(match, name, value, val2, val3) {

-							var mceValue;

-

-							name = name.toLowerCase();

-							value = value || val2 || val3 || "";

-

-							// Treat boolean attributes

-							if (boolAttrs[name]) {

-								// false or 0 is treated as a missing attribute

-								if (value === 'false' || value === '0')

-									return;

-

-								return name + '="' + name + '"';

-							}

-

-							// Is attribute one that needs special treatment

-							if (mceAttribs[name] && attrs.indexOf('_mce_' + name) == -1) {

-								mceValue = t.decode(value);

-

-								// Convert URLs to relative/absolute ones

-								if (s.url_converter && (name == "src" || name == "href"))

-									mceValue = s.url_converter.call(s.url_converter_scope || t, mceValue, name, elm_name);

-

-								// Process styles lowercases them and compresses them

-								if (name == 'style')

-									mceValue = t.serializeStyle(t.parseStyle(mceValue), name);

-

-								return name + '="' + value + '"' + ' _mce_' + name + '="' + t.encode(mceValue) + '"';

-							}

-

-							return match;

-						}) + end + '>';

-					});

-				};

-

-				h = processTags(h);

-

-				// Restore script blocks

-				h = h.replace(/MCE_SCRIPT:([0-9]+)/g, function(val, idx) {

-					return codeBlocks[idx];

-				});

-			}

-

-			return h;

-		},

-

-		getOuterHTML : function(e) {

-			var d;

-

-			e = this.get(e);

-

-			if (!e)

+			if (!elm)

 				return null;

 

-			if (e.outerHTML !== undefined)

-				return e.outerHTML;

+			if (elm.nodeType === 1 && self.hasOuterHTML)

+				return elm.outerHTML;

 

-			d = (e.ownerDocument || this.doc).createElement("body");

-			d.appendChild(e.cloneNode(true));

+			doc = (elm.ownerDocument || self.doc).createElement("body");

+			doc.appendChild(elm.cloneNode(true));

 

-			return d.innerHTML;

+			return doc.innerHTML;

 		},

 

 		setOuterHTML : function(e, h, d) {

@@ -2138,34 +5286,9 @@ tinymce.create('static tinymce.util.XHR', {
 			});

 		},

 

-		decode : function(s) {

-			var e, n, v;

-

-			// Look for entities to decode

-			if (/&[\w#]+;/.test(s)) {

-				// Decode the entities using a div element not super efficient but less code

-				e = this.doc.createElement("div");

-				e.innerHTML = s;

-				n = e.firstChild;

-				v = '';

+		decode : Entities.decode,

 

-				if (n) {

-					do {

-						v += n.nodeValue;

-					} while (n = n.nextSibling);

-				}

-

-				return v || s;

-			}

-

-			return s;

-		},

-

-		encode : function(str) {

-			return ('' + str).replace(encodeCharsRe, function(chr) {

-				return encodedChars[chr];

-			});

-		},

+		encode : Entities.encodeAllRaw,

 

 		insertAfter : function(node, reference_node) {

 			reference_node = this.get(reference_node);

@@ -2185,15 +5308,6 @@ tinymce.create('static tinymce.util.XHR', {
 			});

 		},

 

-		isBlock : function(n) {

-			if (n.nodeType && n.nodeType !== 1)

-				return false;

-

-			n = n.nodeName || n;

-

-			return blockRe.test(n);

-		},

-

 		replace : function(n, o, k) {

 			var t = this;

 

@@ -2296,7 +5410,7 @@ tinymce.create('static tinymce.util.XHR', {
 

 									// Remove everything but class name

 									ov = v;

-									v = v.replace(/.*\.([a-z0-9_\-]+).*/i, '$1');

+									v = tinymce._replace(/.*\.([a-z0-9_\-]+).*/i, '$1', v);

 

 									// Filter classes

 									if (f && !(v = f(v, ov)))

@@ -2388,13 +5502,61 @@ tinymce.create('static tinymce.util.XHR', {
 			return n.attributes;

 		},

 

+		isEmpty : function(node, elements) {

+			var self = this, i, attributes, type, walker, name, brCount = 0;

+

+			node = node.firstChild;

+			if (node) {

+				walker = new tinymce.dom.TreeWalker(node, node.parentNode);

+				elements = elements || self.schema ? self.schema.getNonEmptyElements() : null;

+

+				do {

+					type = node.nodeType;

+

+					if (type === 1) {

+						// Ignore bogus elements

+						if (node.getAttribute('data-mce-bogus'))

+							continue;

+

+						// Keep empty elements like <img />

+						name = node.nodeName.toLowerCase();

+						if (elements && elements[name]) {

+							// Ignore single BR elements in blocks like <p><br /></p> or <p><span><br /></span></p>

+							if (name === 'br') {

+								brCount++;

+								continue;

+							}

+

+							return false;

+						}

+

+						// Keep elements with data-bookmark attributes or name attribute like <a name="1"></a>

+						attributes = self.getAttribs(node);

+						i = node.attributes.length;

+						while (i--) {

+							name = node.attributes[i].nodeName;

+							if (name === "name" || name === 'data-mce-bookmark')

+								return false;

+						}

+					}

+

+					// Keep comment nodes

+					if (type == 8)

+						return false;

+

+					// Keep non whitespace text nodes

+					if ((type === 3 && !whiteSpaceRegExp.test(node.nodeValue)))

+						return false;

+				} while (node = walker.next());

+			}

+

+			return brCount <= 1;

+		},

+

 		destroy : function(s) {

 			var t = this;

 

-			if (t.events)

-				t.events.destroy();

-

-			t.win = t.doc = t.root = t.events = null;

+			t.win = t.doc = t.root = t.events = t.frag = null;

 

 			// Manual destroy then remove unload handler

 			if (!s)

@@ -2419,7 +5581,6 @@ tinymce.create('static tinymce.util.XHR', {
 						if (nodeType == lastNodeType || !node.nodeValue.length)

 							continue;

 					}

-

 					idx++;

 					lastNodeType = nodeType;

 				}

@@ -2440,23 +5601,33 @@ tinymce.create('static tinymce.util.XHR', {
 			// this function will then trim of empty edges and produce:

 			//   <p>text 1</p><b>CHOP</b><p>text 2</p>

 			function trim(node) {

-				var i, children = node.childNodes;

+				var i, children = node.childNodes, type = node.nodeType;

+

+				function surroundedBySpans(node) {

+					var previousIsSpan = node.previousSibling && node.previousSibling.nodeName == 'SPAN';

+					var nextIsSpan = node.nextSibling && node.nextSibling.nodeName == 'SPAN';

+					return previousIsSpan && nextIsSpan;

+				}

 

-				if (node.nodeType == 1 && node.getAttribute('_mce_type') == 'bookmark')

+				if (type == 1 && node.getAttribute('data-mce-type') == 'bookmark')

 					return;

 

 				for (i = children.length - 1; i >= 0; i--)

 					trim(children[i]);

 

-				if (node.nodeType != 9) {

+				if (type != 9) {

 					// Keep non whitespace text nodes

-					if (node.nodeType == 3 && node.nodeValue.length > 0)

-						return;

-

-					if (node.nodeType == 1) {

+					if (type == 3 && node.nodeValue.length > 0) {

+						// If parent element isn't a block or there isn't any useful contents for example "<p>   </p>"

+						// Also keep text nodes with only spaces if surrounded by spans.

+						// eg. "<p><span>a</span> <span>b</span></p>" should keep space between a and b

+						var trimmedLength = tinymce.trim(node.nodeValue).length;

+						if (!t.isBlock(node.parentNode) || trimmedLength > 0 || trimmedLength == 0 && surroundedBySpans(node))

+							return;

+					} else if (type == 1) {

 						// If the only child is a bookmark then move it up

 						children = node.childNodes;

-						if (children.length == 1 && children[0] && children[0].nodeType == 1 && children[0].getAttribute('_mce_type') == 'bookmark')

+						if (children.length == 1 && children[0] && children[0].nodeType == 1 && children[0].getAttribute('data-mce-type') == 'bookmark')

 							node.parentNode.insertBefore(children[0], node);

 

 						// Keep non empty elements or img, hr etc

@@ -2488,9 +5659,9 @@ tinymce.create('static tinymce.util.XHR', {
 

 				// Insert middle chunk

 				if (re)

-					pa.replaceChild(re, e);

-				else

-					pa.insertBefore(e, pe);

+				pa.replaceChild(re, e);

+			else

+				pa.insertBefore(e, pe);

 

 				// Insert after chunk

 				pa.insertBefore(trim(aft), pe);

@@ -2501,21 +5672,15 @@ tinymce.create('static tinymce.util.XHR', {
 		},

 

 		bind : function(target, name, func, scope) {

-			var t = this;

-

-			if (!t.events)

-				t.events = new tinymce.dom.EventUtils();

-

-			return t.events.add(target, name, func, scope || this);

+			return this.events.add(target, name, func, scope || this);

 		},

 

 		unbind : function(target, name, func) {

-			var t = this;

-

-			if (!t.events)

-				t.events = new tinymce.dom.EventUtils();

+			return this.events.remove(target, name, func);

+		},

 

-			return t.events.remove(target, name, func);

+		fire : function(target, name, evt) {

+			return this.events.fire(target, name, evt);

 		},

 

 

@@ -2630,6 +5795,10 @@ tinymce.create('static tinymce.util.XHR', {
 			cloneRange : cloneRange

 		});

 

+		function createDocumentFragment() {

+			return doc.createDocumentFragment();

+		};

+

 		function setStart(n, o) {

 			_setEndPoint(TRUE, n, o);

 		};

@@ -2677,23 +5846,24 @@ tinymce.create('static tinymce.util.XHR', {
 		};

 

 		function compareBoundaryPoints(h, r) {

-			var sc = t[START_CONTAINER], so = t[START_OFFSET], ec = t[END_CONTAINER], eo = t[END_OFFSET];

+			var sc = t[START_CONTAINER], so = t[START_OFFSET], ec = t[END_CONTAINER], eo = t[END_OFFSET],

+			rsc = r.startContainer, rso = r.startOffset, rec = r.endContainer, reo = r.endOffset;

 

 			// Check START_TO_START

 			if (h === 0)

-				return _compareBoundaryPoints(sc, so, sc, so);

-

+				return _compareBoundaryPoints(sc, so, rsc, rso);

+	

 			// Check START_TO_END

 			if (h === 1)

-				return _compareBoundaryPoints(sc, so, ec, eo);

-

+				return _compareBoundaryPoints(ec, eo, rsc, rso);

+	

 			// Check END_TO_END

 			if (h === 2)

-				return _compareBoundaryPoints(ec, eo, ec, eo);

-

+				return _compareBoundaryPoints(ec, eo, rec, reo);

+	

 			// Check END_TO_START

-			if (h === 3)

-				return _compareBoundaryPoints(ec, eo, sc, so);

+			if (h === 3) 

+				return _compareBoundaryPoints(sc, so, rec, reo);

 		};

 

 		function deleteContents() {

@@ -2785,7 +5955,7 @@ tinymce.create('static tinymce.util.XHR', {
 

 		function _compareBoundaryPoints(containerA, offsetA, containerB, offsetB) {

 			var c, offsetC, n, cmnRoot, childA, childB;

-

+			

 			// In the first case the boundary-points have the same container. A is before B

 			// if its offset is less than the offset of B, A is equal to B if its offset is

 			// equal to the offset of B, and A is after B if its offset is greater than the

@@ -2961,10 +6131,10 @@ tinymce.create('static tinymce.util.XHR', {
 		};

 

 		 function _traverseSameContainer(how) {

-			var frag, s, sub, n, cnt, sibling, xferNode;

+			var frag, s, sub, n, cnt, sibling, xferNode, start, len;

 

 			if (how != DELETE)

-				frag = doc.createDocumentFragment();

+				frag = createDocumentFragment();

 

 			// If selection is empty, just return the fragment

 			if (t[START_OFFSET] == t[END_OFFSET])

@@ -2978,7 +6148,15 @@ tinymce.create('static tinymce.util.XHR', {
 

 				// set the original text node to its new value

 				if (how != CLONE) {

-					t[START_CONTAINER].deleteData(t[START_OFFSET], t[END_OFFSET] - t[START_OFFSET]);

+					n = t[START_CONTAINER];

+					start = t[START_OFFSET];

+					len = t[END_OFFSET] - t[START_OFFSET];

+

+					if (start === 0 && len >= n.nodeValue.length - 1) {

+						n.parentNode.removeChild(n);

+					} else {

+						n.deleteData(start, len);

+					}

 

 					// Nothing is partially selected, so collapse to start point

 					t.collapse(TRUE);

@@ -2987,7 +6165,10 @@ tinymce.create('static tinymce.util.XHR', {
 				if (how == DELETE)

 					return;

 

-				frag.appendChild(doc.createTextNode(sub));

+				if (sub.length > 0) {

+					frag.appendChild(doc.createTextNode(sub));

+				}

+

 				return frag;

 			}

 

@@ -2995,7 +6176,7 @@ tinymce.create('static tinymce.util.XHR', {
 			n = _getSelectedNode(t[START_CONTAINER], t[START_OFFSET]);

 			cnt = t[END_OFFSET] - t[START_OFFSET];

 

-			while (cnt > 0) {

+			while (n && cnt > 0) {

 				sibling = n.nextSibling;

 				xferNode = _traverseFullySelected(n, how);

 

@@ -3017,7 +6198,7 @@ tinymce.create('static tinymce.util.XHR', {
 			var frag, n, endIdx, cnt, sibling, xferNode;

 

 			if (how != DELETE)

-				frag = doc.createDocumentFragment();

+				frag = createDocumentFragment();

 

 			n = _traverseRightBoundary(endAncestor, how);

 

@@ -3064,18 +6245,18 @@ tinymce.create('static tinymce.util.XHR', {
 			var frag, startIdx, n, cnt, sibling, xferNode;

 

 			if (how != DELETE)

-				frag = doc.createDocumentFragment();

+				frag = createDocumentFragment();

 

 			n = _traverseLeftBoundary(startAncestor, how);

 			if (frag)

 				frag.appendChild(n);

 

 			startIdx = nodeIndex(startAncestor);

-			++startIdx;  // Because we already traversed it....

+			++startIdx; // Because we already traversed it

 

 			cnt = t[END_OFFSET] - startIdx;

 			n = startAncestor.nextSibling;

-			while (cnt > 0) {

+			while (n && cnt > 0) {

 				sibling = n.nextSibling;

 				xferNode = _traverseFullySelected(n, how);

 

@@ -3098,7 +6279,7 @@ tinymce.create('static tinymce.util.XHR', {
 			var n, frag, commonParent, startOffset, endOffset, cnt, sibling, nextSibling;

 

 			if (how != DELETE)

-				frag = doc.createDocumentFragment();

+				frag = createDocumentFragment();

 

 			n = _traverseLeftBoundary(startAncestor, how);

 			if (frag)

@@ -3233,7 +6414,7 @@ tinymce.create('static tinymce.util.XHR', {
 				if (how == DELETE)

 					return;

 

-				newNode = n.cloneNode(FALSE);

+				newNode = dom.clone(n, FALSE);

 				newNode.nodeValue = newNodeValue;

 

 				return newNode;

@@ -3242,12 +6423,12 @@ tinymce.create('static tinymce.util.XHR', {
 			if (how == DELETE)

 				return;

 

-			return n.cloneNode(FALSE);

+			return dom.clone(n, FALSE);

 		};

 

 		function _traverseFullySelected(n, how) {

 			if (how != DELETE)

-				return how == CLONE ? n.cloneNode(TRUE) : n;

+				return how == CLONE ? dom.clone(n, TRUE) : n;

 

 			n.parentNode.removeChild(n);

 		};

@@ -3258,366 +6439,444 @@ tinymce.create('static tinymce.util.XHR', {
 

 (function() {

 	function Selection(selection) {

-		var t = this, invisibleChar = '\uFEFF', range, lastIERng, dom = selection.dom, TRUE = true, FALSE = false;

+		var self = this, dom = selection.dom, TRUE = true, FALSE = false;

+

+		function getPosition(rng, start) {

+			var checkRng, startIndex = 0, endIndex, inside,

+				children, child, offset, index, position = -1, parent;

+

+			// Setup test range, collapse it and get the parent

+			checkRng = rng.duplicate();

+			checkRng.collapse(start);

+			parent = checkRng.parentElement();

+

+			// Check if the selection is within the right document

+			if (parent.ownerDocument !== selection.dom.doc)

+				return;

+

+			// IE will report non editable elements as it's parent so look for an editable one

+			while (parent.contentEditable === "false") {

+				parent = parent.parentNode;

+			}

+

+			// If parent doesn't have any children then return that we are inside the element

+			if (!parent.hasChildNodes()) {

+				return {node : parent, inside : 1};

+			}

+

+			// Setup node list and endIndex

+			children = parent.children;

+			endIndex = children.length - 1;

+

+			// Perform a binary search for the position

+			while (startIndex <= endIndex) {

+				index = Math.floor((startIndex + endIndex) / 2);

+

+				// Move selection to node and compare the ranges

+				child = children[index];

+				checkRng.moveToElementText(child);

+				position = checkRng.compareEndPoints(start ? 'StartToStart' : 'EndToEnd', rng);

+

+				// Before/after or an exact match

+				if (position > 0) {

+					endIndex = index - 1;

+				} else if (position < 0) {

+					startIndex = index + 1;

+				} else {

+					return {node : child};

+				}

+			}

+

+			// Check if child position is before or we didn't find a position

+			if (position < 0) {

+				// No element child was found use the parent element and the offset inside that

+				if (!child) {

+					checkRng.moveToElementText(parent);

+					checkRng.collapse(true);

+					child = parent;

+					inside = true;

+				} else

+					checkRng.collapse(false);

+

+				// Walk character by character in text node until we hit the selected range endpoint, hit the end of document or parent isn't the right one

+				// We need to walk char by char since rng.text or rng.htmlText will trim line endings

+				offset = 0;

+				while (checkRng.compareEndPoints(start ? 'StartToStart' : 'StartToEnd', rng) !== 0) {

+					if (checkRng.move('character', 1) == 0 || parent != checkRng.parentElement()) {

+						break;

+					}

+

+					offset++;

+				}

+			} else {

+				// Child position is after the selection endpoint

+				checkRng.collapse(true);

+

+				// Walk character by character in text node until we hit the selected range endpoint, hit the end of document or parent isn't the right one

+				offset = 0;

+				while (checkRng.compareEndPoints(start ? 'StartToStart' : 'StartToEnd', rng) !== 0) {

+					if (checkRng.move('character', -1) == 0 || parent != checkRng.parentElement()) {

+						break;

+					}

+

+					offset++;

+				}

+			}

+

+			return {node : child, position : position, offset : offset, inside : inside};

+		};

 

 		// Returns a W3C DOM compatible range object by using the IE Range API

 		function getRange() {

-			var ieRange = selection.getRng(), domRange = dom.createRng(), element, collapsed;

+			var ieRange = selection.getRng(), domRange = dom.createRng(), element, collapsed, tmpRange, element2, bookmark, fail;

 

 			// If selection is outside the current document just return an empty range

 			element = ieRange.item ? ieRange.item(0) : ieRange.parentElement();

 			if (element.ownerDocument != dom.doc)

 				return domRange;

 

-			// Handle control selection or text selection of a image

-			if (ieRange.item || !element.hasChildNodes()) {

+			collapsed = selection.isCollapsed();

+

+			// Handle control selection

+			if (ieRange.item) {

 				domRange.setStart(element.parentNode, dom.nodeIndex(element));

 				domRange.setEnd(domRange.startContainer, domRange.startOffset + 1);

 

 				return domRange;

 			}

 

-			collapsed = selection.isCollapsed();

-

 			function findEndPoint(start) {

-				var marker, container, offset, nodes, startIndex = 0, endIndex, index, parent, checkRng, position;

+				var endPoint = getPosition(ieRange, start), container, offset, textNodeOffset = 0, sibling, undef, nodeValue;

 

-				// Setup temp range and collapse it

-				checkRng = ieRange.duplicate();

-				checkRng.collapse(start);

+				container = endPoint.node;

+				offset = endPoint.offset;

 

-				// Create marker and insert it at the end of the endpoints parent

-				marker = dom.create('a');

-				parent = checkRng.parentElement();

-

-				// If parent doesn't have any children then set the container to that parent and the index to 0

-				if (!parent.hasChildNodes()) {

-					domRange[start ? 'setStart' : 'setEnd'](parent, 0);

+				if (endPoint.inside && !container.hasChildNodes()) {

+					domRange[start ? 'setStart' : 'setEnd'](container, 0);

 					return;

 				}

 

-				parent.appendChild(marker);

-				checkRng.moveToElementText(marker);

-				position = ieRange.compareEndPoints(start ? 'StartToStart' : 'EndToEnd', checkRng);

-				if (position > 0) {

-					// The position is after the end of the parent element.

-					// This is the case where IE puts the caret to the left edge of a table.

-					domRange[start ? 'setStartAfter' : 'setEndAfter'](parent);

-					dom.remove(marker);

+				if (offset === undef) {

+					domRange[start ? 'setStartBefore' : 'setEndAfter'](container);

 					return;

 				}

 

-				// Setup node list and endIndex

-				nodes = tinymce.grep(parent.childNodes);

-				endIndex = nodes.length - 1;

-				// Perform a binary search for the position

-				while (startIndex <= endIndex) {

-					index = Math.floor((startIndex + endIndex) / 2);

-

-					// Insert marker and check it's position relative to the selection

-					parent.insertBefore(marker, nodes[index]);

-					checkRng.moveToElementText(marker);

-					position = ieRange.compareEndPoints(start ? 'StartToStart' : 'EndToEnd', checkRng);

-					if (position > 0) {

-						// Marker is to the right

-						startIndex = index + 1;

-					} else if (position < 0) {

-						// Marker is to the left

-						endIndex = index - 1;

-					} else {

-						// Maker is where we are

-						found = true;

-						break;

+				if (endPoint.position < 0) {

+					sibling = endPoint.inside ? container.firstChild : container.nextSibling;

+

+					if (!sibling) {

+						domRange[start ? 'setStartAfter' : 'setEndAfter'](container);

+						return;

 					}

-				}

 

-				// Setup container

-				container = position > 0 || index == 0 ? marker.nextSibling : marker.previousSibling;

+					if (!offset) {

+						if (sibling.nodeType == 3)

+							domRange[start ? 'setStart' : 'setEnd'](sibling, 0);

+						else

+							domRange[start ? 'setStartBefore' : 'setEndBefore'](sibling);

 

-				// Handle element selection

-				if (container.nodeType == 1) {

-					dom.remove(marker);

+						return;

+					}

 

-					// Find offset and container

-					offset = dom.nodeIndex(container);

-					container = container.parentNode;

+					// Find the text node and offset

+					while (sibling) {

+						nodeValue = sibling.nodeValue;

+						textNodeOffset += nodeValue.length;

 

-					// Move the offset if we are setting the end or the position is after an element

-					if (!start || index > 0)

-						offset++;

+						// We are at or passed the position we where looking for

+						if (textNodeOffset >= offset) {

+							container = sibling;

+							textNodeOffset -= offset;

+							textNodeOffset = nodeValue.length - textNodeOffset;

+							break;

+						}

+

+						sibling = sibling.nextSibling;

+					}

 				} else {

-					// Calculate offset within text node

-					if (position > 0 || index == 0) {

-						checkRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', ieRange);

-						offset = checkRng.text.length;

-					} else {

-						checkRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', ieRange);

-						offset = container.nodeValue.length - checkRng.text.length;

+					// Find the text node and offset

+					sibling = container.previousSibling;

+

+					if (!sibling)

+						return domRange[start ? 'setStartBefore' : 'setEndBefore'](container);

+

+					// If there isn't any text to loop then use the first position

+					if (!offset) {

+						if (container.nodeType == 3)

+							domRange[start ? 'setStart' : 'setEnd'](sibling, container.nodeValue.length);

+						else

+							domRange[start ? 'setStartAfter' : 'setEndAfter'](sibling);

+

+						return;

 					}

 

-					dom.remove(marker);

+					while (sibling) {

+						textNodeOffset += sibling.nodeValue.length;

+

+						// We are at or passed the position we where looking for

+						if (textNodeOffset >= offset) {

+							container = sibling;

+							textNodeOffset -= offset;

+							break;

+						}

+

+						sibling = sibling.previousSibling;

+					}

 				}

 

-				domRange[start ? 'setStart' : 'setEnd'](container, offset);

+				domRange[start ? 'setStart' : 'setEnd'](container, textNodeOffset);

 			};

 

-			// Find start point

-			findEndPoint(true);

+			try {

+				// Find start point

+				findEndPoint(true);

 

-			// Find end point if needed

-			if (!collapsed)

-				findEndPoint();

+				// Find end point if needed

+				if (!collapsed)

+					findEndPoint();

+			} catch (ex) {

+				// IE has a nasty bug where text nodes might throw "invalid argument" when you

+				// access the nodeValue or other properties of text nodes. This seems to happend when

+				// text nodes are split into two nodes by a delete/backspace call. So lets detect it and try to fix it.

+				if (ex.number == -2147024809) {

+					// Get the current selection

+					bookmark = self.getBookmark(2);

+

+					// Get start element

+					tmpRange = ieRange.duplicate();

+					tmpRange.collapse(true);

+					element = tmpRange.parentElement();

+

+					// Get end element

+					if (!collapsed) {

+						tmpRange = ieRange.duplicate();

+						tmpRange.collapse(false);

+						element2 = tmpRange.parentElement();

+						element2.innerHTML = element2.innerHTML;

+					}

 

-			return domRange;

-		};

+					// Remove the broken elements

+					element.innerHTML = element.innerHTML;

 

-		this.addRange = function(rng) {

-			var ieRng, ieRng2, doc = selection.dom.doc, body = doc.body, startPos, endPos, sc, so, ec, eo, marker, lastIndex, skipStart, skipEnd;

+					// Restore the selection

+					self.moveToBookmark(bookmark);

 

-			this.destroy();

+					// Since the range has moved we need to re-get it

+					ieRange = selection.getRng();

 

-			// Setup some shorter versions

-			sc = rng.startContainer;

-			so = rng.startOffset;

-			ec = rng.endContainer;

-			eo = rng.endOffset;

-			ieRng = body.createTextRange();

+					// Find start point

+					findEndPoint(true);

 

-			// If document selection move caret to first node in document

-			if (sc == doc || ec == doc) {

-				ieRng = body.createTextRange();

-				ieRng.collapse();

-				ieRng.select();

-				return;

+					// Find end point if needed

+					if (!collapsed)

+						findEndPoint();

+				} else

+					throw ex; // Throw other errors

 			}

 

-			// If child index resolve it

-			if (sc.nodeType == 1 && sc.hasChildNodes()) {

-				lastIndex = sc.childNodes.length - 1;

+			return domRange;

+		};

 

-				// Index is higher that the child count then we need to jump over the start container

-				if (so > lastIndex) {

-					skipStart = 1;

-					sc = sc.childNodes[lastIndex];

-				} else

-					sc = sc.childNodes[so];

+		this.getBookmark = function(type) {

+			var rng = selection.getRng(), start, end, bookmark = {};

 

-				// Child was text node then move offset to start of it

-				if (sc.nodeType == 3)

-					so = 0;

-			}

+			function getIndexes(node) {

+				var node, parent, root, children, i, indexes = [];

 

-			// If child index resolve it

-			if (ec.nodeType == 1 && ec.hasChildNodes()) {

-				lastIndex = ec.childNodes.length - 1;

+				parent = node.parentNode;

+				root = dom.getRoot().parentNode;

 

-				if (eo == 0) {

-					skipEnd = 1;

-					ec = ec.childNodes[0];

-				} else {

-					ec = ec.childNodes[Math.min(lastIndex, eo - 1)];

+				while (parent != root && parent.nodeType !== 9) {

+					children = parent.children;

 

-					// Child was text node then move offset to end of text node

-					if (ec.nodeType == 3)

-						eo = ec.nodeValue.length;

-				}

-			}

+					i = children.length;

+					while (i--) {

+						if (node === children[i]) {

+							indexes.push(i);

+							break;

+						}

+					}

 

-			// Single element selection

-			if (sc == ec && sc.nodeType == 1) {

-				// Make control selection for some elements

-				if (/^(IMG|TABLE)$/.test(sc.nodeName) && so != eo) {

-					ieRng = body.createControlRange();

-					ieRng.addElement(sc);

-				} else {

-					ieRng = body.createTextRange();

+					node = parent;

+					parent = parent.parentNode;

+				}

 

-					// Padd empty elements with invisible character

-					if (!sc.hasChildNodes() && sc.canHaveHTML)

-						sc.innerHTML = invisibleChar;

+				return indexes;

+			};

 

-					// Select element contents

-					ieRng.moveToElementText(sc);

+			function getBookmarkEndPoint(start) {

+				var position;

 

-					// If it's only containing a padding remove it so the caret remains

-					if (sc.innerHTML == invisibleChar) {

-						ieRng.collapse(TRUE);

-						sc.removeChild(sc.firstChild);

-					}

+				position = getPosition(rng, start);

+				if (position) {

+					return {

+						position : position.position,

+						offset : position.offset,

+						indexes : getIndexes(position.node),

+						inside : position.inside

+					};

 				}

+			};

 

-				if (so == eo)

-					ieRng.collapse(eo <= rng.endContainer.childNodes.length - 1);

+			// Non ubstructive bookmark

+			if (type === 2) {

+				// Handle text selection

+				if (!rng.item) {

+					bookmark.start = getBookmarkEndPoint(true);

 

-				ieRng.select();

-				ieRng.scrollIntoView();

-				return;

+					if (!selection.isCollapsed())

+						bookmark.end = getBookmarkEndPoint();

+				} else

+					bookmark.start = {ctrl : true, indexes : getIndexes(rng.item(0))};

 			}

 

-			// Create range and marker

-			ieRng = body.createTextRange();

-			marker = doc.createElement('span');

-			marker.innerHTML = ' ';

-

-			// Set start of range to startContainer/startOffset

-			if (sc.nodeType == 3) {

-				// Insert marker after/before startContainer

-				if (skipStart)

-					dom.insertAfter(marker, sc);

-				else

-					sc.parentNode.insertBefore(marker, sc);

+			return bookmark;

+		};

 

-				// Select marker the caret to offset position

-				ieRng.moveToElementText(marker);

-				marker.parentNode.removeChild(marker);

+		this.moveToBookmark = function(bookmark) {

+			var rng, body = dom.doc.body;

 

-				// Move if we need to, moving it 0 characters actually moves it!

-				if (so > 0)

-					ieRng.move('character', so);

-			} else {

-				ieRng.moveToElementText(sc);

+			function resolveIndexes(indexes) {

+				var node, i, idx, children;

 

-				if (skipStart)

-					ieRng.collapse(FALSE);

-			}

+				node = dom.getRoot();

+				for (i = indexes.length - 1; i >= 0; i--) {

+					children = node.children;

+					idx = indexes[i];

 

-			// If same text container then we can do a more simple move

-			if (sc == ec && sc.nodeType == 3) {

-				try {

-					ieRng.moveEnd('character', eo - so);

-					ieRng.select();

-					ieRng.scrollIntoView();

-				} catch (ex) {

-					// Some times a Runtime error of the 800a025e type gets thrown

-					// especially when the caret is placed before a table.

-					// This is a somewhat strange location for the caret.

-					// TODO: Find a better solution for this would possible require a rewrite of the setRng method

+					if (idx <= children.length - 1) {

+						node = children[idx];

+					}

 				}

 

-				return;

-			}

+				return node;

+			};

+			

+			function setBookmarkEndPoint(start) {

+				var endPoint = bookmark[start ? 'start' : 'end'], moveLeft, moveRng, undef;

 

-			// Set end of range to endContainer/endOffset

-			ieRng2 = body.createTextRange();

-			if (ec.nodeType == 3) {

-				// Insert marker after/before startContainer

-				ec.parentNode.insertBefore(marker, ec);

+				if (endPoint) {

+					moveLeft = endPoint.position > 0;

 

-				// Move selection to end marker and move caret to end offset

-				ieRng2.moveToElementText(marker);

-				marker.parentNode.removeChild(marker);

-				ieRng2.move('character', eo);

-				ieRng.setEndPoint('EndToStart', ieRng2);

-			} else {

-				ieRng2.moveToElementText(ec);

-				ieRng2.collapse(!!skipEnd);

-				ieRng.setEndPoint('EndToEnd', ieRng2);

-			}

+					moveRng = body.createTextRange();

+					moveRng.moveToElementText(resolveIndexes(endPoint.indexes));

 

-			ieRng.select();

-			ieRng.scrollIntoView();

-		};

+					offset = endPoint.offset;

+					if (offset !== undef) {

+						moveRng.collapse(endPoint.inside || moveLeft);

+						moveRng.moveStart('character', moveLeft ? -offset : offset);

+					} else

+						moveRng.collapse(start);

 

-		this.getRangeAt = function() {

-			// Setup new range if the cache is empty

-			if (!range || !tinymce.dom.RangeUtils.compareRanges(lastIERng, selection.getRng())) {

-				range = getRange();

+					rng.setEndPoint(start ? 'StartToStart' : 'EndToStart', moveRng);

 

-				// Store away text range for next call

-				lastIERng = selection.getRng();

-			}

+					if (start)

+						rng.collapse(true);

+				}

+			};

 

-			// IE will say that the range is equal then produce an invalid argument exception

-			// if you perform specific operations in a keyup event. For example Ctrl+Del.

-			// This hack will invalidate the range cache if the exception occurs

-			try {

-				range.startContainer.nextSibling;

-			} catch (ex) {

-				range = getRange();

-				lastIERng = null;

+			if (bookmark.start) {

+				if (bookmark.start.ctrl) {

+					rng = body.createControlRange();

+					rng.addElement(resolveIndexes(bookmark.start.indexes));

+					rng.select();

+				} else {

+					rng = body.createTextRange();

+					setBookmarkEndPoint(true);

+					setBookmarkEndPoint();

+					rng.select();

+				}

 			}

-

-			// Return cached range

-			return range;

 		};

 

-		this.destroy = function() {

-			// Destroy cached range and last IE range to avoid memory leaks

-			lastIERng = range = null;

-		};

+		this.addRange = function(rng) {

+			var ieRng, ctrlRng, startContainer, startOffset, endContainer, endOffset, doc = selection.dom.doc, body = doc.body;

 

-		// IE has an issue where you can't select/move the caret by clicking outside the body if the document is in standards mode

-		if (selection.dom.boxModel) {

-			(function() {

-				var doc = dom.doc, body = doc.body, started, startRng;

+			function setEndPoint(start) {

+				var container, offset, marker, tmpRng, nodes;

 

-				// Make HTML element unselectable since we are going to handle selection by hand

-				doc.documentElement.unselectable = TRUE;

+				marker = dom.create('a');

+				container = start ? startContainer : endContainer;

+				offset = start ? startOffset : endOffset;

+				tmpRng = ieRng.duplicate();

 

-				// Return range from point or null if it failed

-				function rngFromPoint(x, y) {

-					var rng = body.createTextRange();

+				if (container == doc || container == doc.documentElement) {

+					container = body;

+					offset = 0;

+				}

 

-					try {

-						rng.moveToPoint(x, y);

-					} catch (ex) {

-						// IE sometimes throws and exception, so lets just ignore it

-						rng = null;

-					}

+				if (container.nodeType == 3) {

+					container.parentNode.insertBefore(marker, container);

+					tmpRng.moveToElementText(marker);

+					tmpRng.moveStart('character', offset);

+					dom.remove(marker);

+					ieRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', tmpRng);

+				} else {

+					nodes = container.childNodes;

 

-					return rng;

-				};

+					if (nodes.length) {

+						if (offset >= nodes.length) {

+							dom.insertAfter(marker, nodes[nodes.length - 1]);

+						} else {

+							container.insertBefore(marker, nodes[offset]);

+						}

 

-				// Fires while the selection is changing

-				function selectionChange(e) {

-					var pointRng;

+						tmpRng.moveToElementText(marker);

+					} else if (container.canHaveHTML) {

+						// Empty node selection for example <div>|</div>

+						// Setting innerHTML with a span marker then remove that marker seems to keep empty block elements open

+						container.innerHTML = '<span>\uFEFF</span>';

+						marker = container.firstChild;

+						tmpRng.moveToElementText(marker);

+						tmpRng.collapse(FALSE); // Collapse false works better than true for some odd reason

+					}

 

-					// Check if the button is down or not

-					if (e.button) {

-						// Create range from mouse position

-						pointRng = rngFromPoint(e.x, e.y);

+					ieRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', tmpRng);

+					dom.remove(marker);

+				}

+			}

 

-						if (pointRng) {

-							// Check if pointRange is before/after selection then change the endPoint

-							if (pointRng.compareEndPoints('StartToStart', startRng) > 0)

-								pointRng.setEndPoint('StartToStart', startRng);

-							else

-								pointRng.setEndPoint('EndToEnd', startRng);

+			// Setup some shorter versions

+			startContainer = rng.startContainer;

+			startOffset = rng.startOffset;

+			endContainer = rng.endContainer;

+			endOffset = rng.endOffset;

+			ieRng = body.createTextRange();

 

-							pointRng.select();

-						}

-					} else

-						endSelection();

+			// If single element selection then try making a control selection out of it

+			if (startContainer == endContainer && startContainer.nodeType == 1) {

+				// Trick to place the caret inside an empty block element like <p></p>

+				if (!startContainer.hasChildNodes()) {

+					startContainer.innerHTML = '<span>\uFEFF</span><span>\uFEFF</span>';

+					ieRng.moveToElementText(startContainer.lastChild);

+					ieRng.select();

+					dom.doc.selection.clear();

+					startContainer.innerHTML = '';

+					return;

 				}

 

-				// Removes listeners

-				function endSelection() {

-					dom.unbind(doc, 'mouseup', endSelection);

-					dom.unbind(doc, 'mousemove', selectionChange);

-					started = 0;

-				};

-

-				// Detect when user selects outside BODY

-				dom.bind(doc, 'mousedown', function(e) {

-					if (e.target.nodeName === 'HTML') {

-						if (started)

-							endSelection();

+				if (startOffset == endOffset - 1) {

+					try {

+						ctrlRng = body.createControlRange();

+						ctrlRng.addElement(startContainer.childNodes[startOffset]);

+						ctrlRng.select();

+						return;

+					} catch (ex) {

+						// Ignore

+					}

+				}

+			}

 

-						started = 1;

+			// Set start/end point of selection

+			setEndPoint(true);

+			setEndPoint();

 

-						// Setup start position

-						startRng = rngFromPoint(e.x, e.y);

-						if (startRng) {

-							// Listen for selection change events

-							dom.bind(doc, 'mouseup', endSelection);

-							dom.bind(doc, 'mousemove', selectionChange);

+			// Select the new range and scroll it into view

+			ieRng.select();

+		};

 

-							startRng.select();

-						}

-					}

-				});

-			})();

-		}

+		// Expose range method

+		this.getRangeAt = getRange;

 	};

 

 	// Expose the selection object

@@ -4696,290 +7955,6 @@ window.tinymce.dom.Sizzle = Sizzle;
 

 

 (function(tinymce) {

-	// Shorten names

-	var each = tinymce.each, DOM = tinymce.DOM, isIE = tinymce.isIE, isWebKit = tinymce.isWebKit, Event;

-

-	tinymce.create('tinymce.dom.EventUtils', {

-		EventUtils : function() {

-			this.inits = [];

-			this.events = [];

-		},

-

-		add : function(o, n, f, s) {

-			var cb, t = this, el = t.events, r;

-

-			if (n instanceof Array) {

-				r = [];

-

-				each(n, function(n) {

-					r.push(t.add(o, n, f, s));

-				});

-

-				return r;

-			}

-

-			// Handle array

-			if (o && o.hasOwnProperty && o instanceof Array) {

-				r = [];

-

-				each(o, function(o) {

-					o = DOM.get(o);

-					r.push(t.add(o, n, f, s));

-				});

-

-				return r;

-			}

-

-			o = DOM.get(o);

-

-			if (!o)

-				return;

-

-			// Setup event callback

-			cb = function(e) {

-				// Is all events disabled

-				if (t.disabled)

-					return;

-

-				e = e || window.event;

-

-				// Patch in target, preventDefault and stopPropagation in IE it's W3C valid

-				if (e && isIE) {

-					if (!e.target)

-						e.target = e.srcElement;

-

-					// Patch in preventDefault, stopPropagation methods for W3C compatibility

-					tinymce.extend(e, t._stoppers);

-				}

-

-				if (!s)

-					return f(e);

-

-				return f.call(s, e);

-			};

-

-			if (n == 'unload') {

-				tinymce.unloads.unshift({func : cb});

-				return cb;

-			}

-

-			if (n == 'init') {

-				if (t.domLoaded)

-					cb();

-				else

-					t.inits.push(cb);

-

-				return cb;

-			}

-

-			// Store away listener reference

-			el.push({

-				obj : o,

-				name : n,

-				func : f,

-				cfunc : cb,

-				scope : s

-			});

-

-			t._add(o, n, cb);

-

-			return f;

-		},

-

-		remove : function(o, n, f) {

-			var t = this, a = t.events, s = false, r;

-

-			// Handle array

-			if (o && o.hasOwnProperty && o instanceof Array) {

-				r = [];

-

-				each(o, function(o) {

-					o = DOM.get(o);

-					r.push(t.remove(o, n, f));

-				});

-

-				return r;

-			}

-

-			o = DOM.get(o);

-

-			each(a, function(e, i) {

-				if (e.obj == o && e.name == n && (!f || (e.func == f || e.cfunc == f))) {

-					a.splice(i, 1);

-					t._remove(o, n, e.cfunc);

-					s = true;

-					return false;

-				}

-			});

-

-			return s;

-		},

-

-		clear : function(o) {

-			var t = this, a = t.events, i, e;

-

-			if (o) {

-				o = DOM.get(o);

-

-				for (i = a.length - 1; i >= 0; i--) {

-					e = a[i];

-

-					if (e.obj === o) {

-						t._remove(e.obj, e.name, e.cfunc);

-						e.obj = e.cfunc = null;

-						a.splice(i, 1);

-					}

-				}

-			}

-		},

-

-		cancel : function(e) {

-			if (!e)

-				return false;

-

-			this.stop(e);

-

-			return this.prevent(e);

-		},

-

-		stop : function(e) {

-			if (e.stopPropagation)

-				e.stopPropagation();

-			else

-				e.cancelBubble = true;

-

-			return false;

-		},

-

-		prevent : function(e) {

-			if (e.preventDefault)

-				e.preventDefault();

-			else

-				e.returnValue = false;

-

-			return false;

-		},

-

-		destroy : function() {

-			var t = this;

-

-			each(t.events, function(e, i) {

-				t._remove(e.obj, e.name, e.cfunc);

-				e.obj = e.cfunc = null;

-			});

-

-			t.events = [];

-			t = null;

-		},

-

-		_add : function(o, n, f) {

-			if (o.attachEvent)

-				o.attachEvent('on' + n, f);

-			else if (o.addEventListener)

-				o.addEventListener(n, f, false);

-			else

-				o['on' + n] = f;

-		},

-

-		_remove : function(o, n, f) {

-			if (o) {

-				try {

-					if (o.detachEvent)

-						o.detachEvent('on' + n, f);

-					else if (o.removeEventListener)

-						o.removeEventListener(n, f, false);

-					else

-						o['on' + n] = null;

-				} catch (ex) {

-					// Might fail with permission denined on IE so we just ignore that

-				}

-			}

-		},

-

-		_pageInit : function(win) {

-			var t = this;

-

-			// Keep it from running more than once

-			if (t.domLoaded)

-				return;

-

-			t.domLoaded = true;

-

-			each(t.inits, function(c) {

-				c();

-			});

-

-			t.inits = [];

-		},

-

-		_wait : function(win) {

-			var t = this, doc = win.document;

-

-			// No need since the document is already loaded

-			if (win.tinyMCE_GZ && tinyMCE_GZ.loaded) {

-				t.domLoaded = 1;

-				return;

-			}

-

-			// Use IE method

-			if (doc.attachEvent) {

-				doc.attachEvent("onreadystatechange", function() {

-					if (doc.readyState === "complete") {

-						doc.detachEvent("onreadystatechange", arguments.callee);

-						t._pageInit(win);

-					}

-				});

-

-				if (doc.documentElement.doScroll && win == win.top) {

-					(function() {

-						if (t.domLoaded)

-							return;

-

-						try {

-							// If IE is used, use the trick by Diego Perini

-							// http://javascript.nwbox.com/IEContentLoaded/

-							doc.documentElement.doScroll("left");

-						} catch (ex) {

-							setTimeout(arguments.callee, 0);

-							return;

-						}

-

-						t._pageInit(win);

-					})();

-				}

-			} else if (doc.addEventListener) {

-				t._add(win, 'DOMContentLoaded', function() {

-					t._pageInit(win);

-				});

-			}

-

-			t._add(win, 'load', function() {

-				t._pageInit(win);

-			});

-		},

-

-		_stoppers : {

-			preventDefault :  function() {

-				this.returnValue = false;

-			},

-

-			stopPropagation : function() {

-				this.cancelBubble = true;

-			}

-		}

-	});

-

-	Event = tinymce.dom.Event = new tinymce.dom.EventUtils();

-

-	// Dispatch DOM content loaded event for IE and Safari

-	Event._wait(window);

-

-	tinymce.addUnload(function() {

-		Event.destroy();

-	});

-})(tinymce);

-

-(function(tinymce) {

 	tinymce.dom.Element = function(id, settings) {

 		var t = this, dom, el;

 

@@ -5107,8 +8082,11 @@ window.tinymce.dom.Sizzle = Sizzle;
 			// Add events

 			each([

 				'onBeforeSetContent',

+

 				'onBeforeGetContent',

+

 				'onSetContent',

+

 				'onGetContent'

 			], function(e) {

 				t[e] = new tinymce.util.Dispatcher(t);

@@ -5118,10 +8096,20 @@ window.tinymce.dom.Sizzle = Sizzle;
 			if (!t.win.getSelection)

 				t.tridentSel = new tinymce.dom.TridentSelection(t);

 

+			if (tinymce.isIE && dom.boxModel)

+				this._fixIESelection();

+

 			// Prevent leaks

 			tinymce.addUnload(t.destroy, t);

 		},

 

+		setCursorLocation: function(node, offset) {

+			var t = this; var r = t.dom.createRng();

+			r.setStart(node, offset);

+			r.setEnd(node, offset);

+			t.setRng(r);

+			t.collapse(false);

+		},

 		getContent : function(s) {

 			var t = this, r = t.getRng(), e = t.dom.create("body"), se = t.getSel(), wb, wa, n;

 

@@ -5129,6 +8117,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 			wb = wa = '';

 			s.get = true;

 			s.format = s.format || 'html';

+			s.forced_root_block = '';

 			t.onBeforeGetContent.dispatch(t, s);

 

 			if (s.format == 'text')

@@ -5139,9 +8128,13 @@ window.tinymce.dom.Sizzle = Sizzle;
 

 				if (n)

 					e.appendChild(n);

-			} else if (is(r.item) || is(r.htmlText))

-				e.innerHTML = r.item ? r.item(0).outerHTML : r.htmlText;

-			else

+			} else if (is(r.item) || is(r.htmlText)) {

+				// IE will produce invalid markup if elements are present that

+				// it doesn't understand like custom elements or HTML5 elements.

+				// Adding a BR in front of the contents and then remoiving it seems to fix it though.

+				e.innerHTML = '<br>' + (r.item ? r.item(0).outerHTML : r.htmlText);

+				e.removeChild(e.firstChild);

+			} else

 				e.innerHTML = r.toString();

 

 			// Keep whitespace before and after

@@ -5159,57 +8152,84 @@ window.tinymce.dom.Sizzle = Sizzle;
 			return s.content;

 		},

 

-		setContent : function(h, s) {

-			var t = this, r = t.getRng(), c, d = t.win.document;

+		setContent : function(content, args) {

+			var self = this, rng = self.getRng(), caretNode, doc = self.win.document, frag, temp;

 

-			s = s || {format : 'html'};

-			s.set = true;

-			h = s.content = t.dom.processHTML(h);

+			args = args || {format : 'html'};

+			args.set = true;

+			content = args.content = content;

 

 			// Dispatch before set content event

-			t.onBeforeSetContent.dispatch(t, s);

-			h = s.content;

+			if (!args.no_events)

+				self.onBeforeSetContent.dispatch(self, args);

+

+			content = args.content;

 

-			if (r.insertNode) {

+			if (rng.insertNode) {

 				// Make caret marker since insertNode places the caret in the beginning of text after insert

-				h += '<span id="__caret">_</span>';

+				content += '<span id="__caret">_</span>';

 

 				// Delete and insert new node

-				

-				if (r.startContainer == d && r.endContainer ==  d) {

+				if (rng.startContainer == doc && rng.endContainer == doc) {

 					// WebKit will fail if the body is empty since the range is then invalid and it can't insert contents

-					d.body.innerHTML = h;

+					doc.body.innerHTML = content;

 				} else {

-					r.deleteContents();

-					if (d.body.childNodes.length == 0) {

-						d.body.innerHTML = h;

+					rng.deleteContents();

+

+					if (doc.body.childNodes.length == 0) {

+						doc.body.innerHTML = content;

 					} else {

-						r.insertNode(r.createContextualFragment(h));

+						// createContextualFragment doesn't exists in IE 9 DOMRanges

+						if (rng.createContextualFragment) {

+							rng.insertNode(rng.createContextualFragment(content));

+						} else {

+							// Fake createContextualFragment call in IE 9

+							frag = doc.createDocumentFragment();

+							temp = doc.createElement('div');

+

+							frag.appendChild(temp);

+							temp.outerHTML = content;

+

+							rng.insertNode(frag);

+						}

 					}

 				}

 

 				// Move to caret marker

-				c = t.dom.get('__caret');

+				caretNode = self.dom.get('__caret');

+

 				// Make sure we wrap it compleatly, Opera fails with a simple select call

-				r = d.createRange();

-				r.setStartBefore(c);

-				r.setEndBefore(c);

-				t.setRng(r);

+				rng = doc.createRange();

+				rng.setStartBefore(caretNode);

+				rng.setEndBefore(caretNode);

+				self.setRng(rng);

 

 				// Remove the caret position

-				t.dom.remove('__caret');

+				self.dom.remove('__caret');

+

+				try {

+					self.setRng(rng);

+				} catch (ex) {

+					// Might fail on Opera for some odd reason

+				}

 			} else {

-				if (r.item) {

+				if (rng.item) {

 					// Delete content and get caret text selection

-					d.execCommand('Delete', false, null);

-					r = t.getRng();

+					doc.execCommand('Delete', false, null);

+					rng = self.getRng();

 				}

 

-				r.pasteHTML(h);

+				// Explorer removes spaces from the beginning of pasted contents

+				if (/^\s+/.test(content)) {

+					rng.pasteHTML('<span id="__mce_tmp">_</span>' + content);

+					self.dom.remove('__mce_tmp');

+				} else

+					rng.pasteHTML(content);

 			}

 

 			// Dispatch set content event

-			t.onSetContent.dispatch(t, s);

+			if (!args.no_events)

+				self.onSetContent.dispatch(self, args);

 		},

 

 		getStart : function() {

@@ -5235,10 +8255,6 @@ window.tinymce.dom.Sizzle = Sizzle;
 					}

 				}

 

-				// If start element is body element try to move to the first child if it exists

-				if (startElement && startElement.nodeName == 'BODY')

-					return startElement.firstChild || startElement;

-

 				return startElement;

 			} else {

 				startElement = rng.startContainer;

@@ -5336,6 +8352,9 @@ window.tinymce.dom.Sizzle = Sizzle;
 					return bookmark;

 				};

 

+				if (t.tridentSel)

+					return t.tridentSel.getBookmark(type);

+

 				return getLocation();

 			}

 

@@ -5354,14 +8373,25 @@ window.tinymce.dom.Sizzle = Sizzle;
 				if (!rng.item) {

 					rng2 = rng.duplicate();

 

-					// Insert start marker

-					rng.collapse();

-					rng.pasteHTML('<span _mce_type="bookmark" id="' + id + '_start" style="' + styles + '">' + chr + '</span>');

+					try {

+						// Insert start marker

+						rng.collapse();

+						rng.pasteHTML('<span data-mce-type="bookmark" id="' + id + '_start" style="' + styles + '">' + chr + '</span>');

 

-					// Insert end marker

-					if (!collapsed) {

-						rng2.collapse(false);

-						rng2.pasteHTML('<span _mce_type="bookmark" id="' + id + '_end" style="' + styles + '">' + chr + '</span>');

+						// Insert end marker

+						if (!collapsed) {

+							rng2.collapse(false);

+

+							// Detect the empty space after block elements in IE and move the end back one character <p></p>] becomes <p>]</p>

+							rng.moveToElementText(rng2.parentElement());

+							if (rng.compareEndPoints('StartToEnd', rng2) == 0)

+								rng2.move('character', -1);

+

+							rng2.pasteHTML('<span data-mce-type="bookmark" id="' + id + '_end" style="' + styles + '">' + chr + '</span>');

+						}

+					} catch (ex) {

+						// IE might throw unspecified error so lets ignore it

+						return null;

 					}

 				} else {

 					// Control selection

@@ -5376,17 +8406,22 @@ window.tinymce.dom.Sizzle = Sizzle;
 				if (name == 'IMG')

 					return {name : name, index : findIndex(name, element)};

 

+				// Can't insert a node into the root of document WebKit defaults to document

+				if (rng.startContainer.nodeType == 9) {

+					return;

+				}

+

 				// W3C method

 				rng2 = rng.cloneRange();

 

 				// Insert end marker

 				if (!collapsed) {

 					rng2.collapse(false);

-					rng2.insertNode(dom.create('span', {_mce_type : "bookmark", id : id + '_end', style : styles}, chr));

+					rng2.insertNode(dom.create('span', {'data-mce-type' : "bookmark", id : id + '_end', style : styles}, chr));

 				}

 

 				rng.collapse(true);

-				rng.insertNode(dom.create('span', {_mce_type : "bookmark", id : id + '_start', style : styles}, chr));

+				rng.insertNode(dom.create('span', {'data-mce-type' : "bookmark", id : id + '_start', style : styles}, chr));

 			}

 

 			t.moveToBookmark({id : id, keep : 1});

@@ -5397,10 +8432,6 @@ window.tinymce.dom.Sizzle = Sizzle;
 		moveToBookmark : function(bookmark) {

 			var t = this, dom = t.dom, marker1, marker2, rng, root, startContainer, endContainer, startOffset, endOffset;

 

-			// Clear selection cache

-			if (t.tridentSel)

-				t.tridentSel.destroy();

-

 			if (bookmark) {

 				if (bookmark.start) {

 					rng = dom.createRng();

@@ -5410,26 +8441,42 @@ window.tinymce.dom.Sizzle = Sizzle;
 						var point = bookmark[start ? 'start' : 'end'], i, node, offset, children;

 

 						if (point) {

+							offset = point[0];

+

 							// Find container node

 							for (node = root, i = point.length - 1; i >= 1; i--) {

 								children = node.childNodes;

 

-								if (children.length)

-									node = children[point[i]];

+								if (point[i] > children.length - 1)

+									return;

+

+								node = children[point[i]];

 							}

 

+							// Move text offset to best suitable location

+							if (node.nodeType === 3)

+								offset = Math.min(point[0], node.nodeValue.length);

+

+							// Move element offset to best suitable location

+							if (node.nodeType === 1)

+								offset = Math.min(point[0], node.childNodes.length);

+

 							// Set offset within container node

 							if (start)

-								rng.setStart(node, point[0]);

+								rng.setStart(node, offset);

 							else

-								rng.setEnd(node, point[0]);

+								rng.setEnd(node, offset);

 						}

+

+						return true;

 					};

 

-					setEndPoint(true);

-					setEndPoint();

+					if (t.tridentSel)

+						return t.tridentSel.moveToBookmark(bookmark);

 

-					t.setRng(rng);

+					if (setEndPoint(true) && setEndPoint()) {

+						t.setRng(rng);

+					}

 				} else if (bookmark.id) {

 					function restoreEndPoint(suffix) {

 						var marker = dom.get(bookmark.id + '_' + suffix), node, idx, next, prev, keep = bookmark.keep;

@@ -5474,8 +8521,9 @@ window.tinymce.dom.Sizzle = Sizzle;
 								while (marker = dom.get(bookmark.id + '_' + suffix))

 									dom.remove(marker, 1);

 

-								// If siblings are text nodes then merge them

-								if (prev && next && prev.nodeType == next.nodeType && prev.nodeType == 3) {

+								// If siblings are text nodes then merge them unless it's Opera since it some how removes the node

+								// and we are sniffing since adding a lot of detection code for a browser with 3% of the market isn't worth the effort. Sorry, Opera but it's just a fact

+								if (prev && next && prev.nodeType == next.nodeType && prev.nodeType == 3 && !tinymce.isOpera) {

 									idx = prev.nodeValue.length;

 									prev.appendData(next.nodeValue);

 									dom.remove(next);

@@ -5493,10 +8541,9 @@ window.tinymce.dom.Sizzle = Sizzle;
 					};

 

 					function addBogus(node) {

-						// Adds a bogus BR element for empty block elements

-						// on non IE browsers just to have a place to put the caret

-						if (!isIE && dom.isBlock(node) && !node.innerHTML)

-							node.innerHTML = '<br _mce_bogus="1" />';

+						// Adds a bogus BR element for empty block elements or just a space on IE since it renders BR elements incorrectly

+						if (dom.isBlock(node) && !node.innerHTML)

+							node.innerHTML = !isIE ? '<br data-mce-bogus="1" />' : ' ';

 

 						return node;

 					};

@@ -5505,10 +8552,12 @@ window.tinymce.dom.Sizzle = Sizzle;
 					restoreEndPoint('start');

 					restoreEndPoint('end');

 

-					rng = dom.createRng();

-					rng.setStart(addBogus(startContainer), startOffset);

-					rng.setEnd(addBogus(endContainer), endOffset);

-					t.setRng(rng);

+					if (startContainer) {

+						rng = dom.createRng();

+						rng.setStart(addBogus(startContainer), startOffset);

+						rng.setEnd(addBogus(endContainer), endOffset);

+						t.setRng(rng);

+					}

 				} else if (bookmark.name) {

 					t.select(dom.select(bookmark.name)[bookmark.index]);

 				} else if (bookmark.rng)

@@ -5519,44 +8568,46 @@ window.tinymce.dom.Sizzle = Sizzle;
 		select : function(node, content) {

 			var t = this, dom = t.dom, rng = dom.createRng(), idx;

 

-			idx = dom.nodeIndex(node);

-			rng.setStart(node.parentNode, idx);

-			rng.setEnd(node.parentNode, idx + 1);

-

-			// Find first/last text node or BR element

-			if (content) {

-				function setPoint(node, start) {

-					var walker = new tinymce.dom.TreeWalker(node, node);

+			if (node) {

+				idx = dom.nodeIndex(node);

+				rng.setStart(node.parentNode, idx);

+				rng.setEnd(node.parentNode, idx + 1);

+

+				// Find first/last text node or BR element

+				if (content) {

+					function setPoint(node, start) {

+						var walker = new tinymce.dom.TreeWalker(node, node);

+

+						do {

+							// Text node

+							if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {

+								if (start)

+									rng.setStart(node, 0);

+								else

+									rng.setEnd(node, node.nodeValue.length);

 

-					do {

-						// Text node

-						if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {

-							if (start)

-								rng.setStart(node, 0);

-							else

-								rng.setEnd(node, node.nodeValue.length);

+								return;

+							}

 

-							return;

-						}

+							// BR element

+							if (node.nodeName == 'BR') {

+								if (start)

+									rng.setStartBefore(node);

+								else

+									rng.setEndBefore(node);

 

-						// BR element

-						if (node.nodeName == 'BR') {

-							if (start)

-								rng.setStartBefore(node);

-							else

-								rng.setEndBefore(node);

+								return;

+							}

+						} while (node = (start ? walker.next() : walker.prev()));

+					};

 

-							return;

-						}

-					} while (node = (start ? walker.next() : walker.prev()));

-				};

+					setPoint(node, 1);

+					setPoint(node);

+				}

 

-				setPoint(node, 1);

-				setPoint(node);

+				t.setRng(rng);

 			}

 

-			t.setRng(rng);

-

 			return node;

 		},

 

@@ -5572,18 +8623,18 @@ window.tinymce.dom.Sizzle = Sizzle;
 			return !s || r.collapsed;

 		},

 

-		collapse : function(b) {

-			var t = this, r = t.getRng(), n;

+		collapse : function(to_start) {

+			var self = this, rng = self.getRng(), node;

 

 			// Control range on IE

-			if (r.item) {

-				n = r.item(0);

-				r = this.win.document.body.createTextRange();

-				r.moveToElementText(n);

+			if (rng.item) {

+				node = rng.item(0);

+				rng = self.win.document.body.createTextRange();

+				rng.moveToElementText(node);

 			}

 

-			r.collapse(!!b);

-			t.setRng(r);

+			rng.collapse(!!to_start);

+			self.setRng(rng);

 		},

 

 		getSel : function() {

@@ -5593,7 +8644,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 		},

 

 		getRng : function(w3c) {

-			var t = this, s, r;

+			var t = this, s, r, elm, doc = t.win.document;

 

 			// Found tridentSel object then we need to use that one

 			if (w3c && t.tridentSel)

@@ -5601,16 +8652,24 @@ window.tinymce.dom.Sizzle = Sizzle;
 

 			try {

 				if (s = t.getSel())

-					r = s.rangeCount > 0 ? s.getRangeAt(0) : (s.createRange ? s.createRange() : t.win.document.createRange());

+					r = s.rangeCount > 0 ? s.getRangeAt(0) : (s.createRange ? s.createRange() : doc.createRange());

 			} catch (ex) {

 				// IE throws unspecified error here if TinyMCE is placed in a frame/iframe

 			}

 

+			// We have W3C ranges and it's IE then fake control selection since IE9 doesn't handle that correctly yet

+			if (tinymce.isIE && r && r.setStart && doc.selection.createRange().item) {

+				elm = doc.selection.createRange().item(0);

+				r = doc.createRange();

+				r.setStartBefore(elm);

+				r.setEndAfter(elm);

+			}

+

 			// No range found then create an empty one

 			// This can occur when the editor is placed in a hidden container element on Gecko

 			// Or on IE when there was an exception

 			if (!r)

-				r = t.win.document.createRange ? t.win.document.createRange() : t.win.document.body.createTextRange();

+				r = doc.createRange ? doc.createRange() : doc.body.createTextRange();

 

 			if (t.selectedRange && t.explicitRange) {

 				if (r.compareBoundaryPoints(r.START_TO_START, t.selectedRange) === 0 && r.compareBoundaryPoints(r.END_TO_END, t.selectedRange) === 0) {

@@ -5622,26 +8681,38 @@ window.tinymce.dom.Sizzle = Sizzle;
 					t.explicitRange = null;

 				}

 			}

+

 			return r;

 		},

 

 		setRng : function(r) {

 			var s, t = this;

-			

+

 			if (!t.tridentSel) {

 				s = t.getSel();

 

 				if (s) {

 					t.explicitRange = r;

-					s.removeAllRanges();

+

+					try {

+						s.removeAllRanges();

+					} catch (ex) {

+						// IE9 might throw errors here don't know why

+					}

+

 					s.addRange(r);

-					t.selectedRange = s.getRangeAt(0);

+					// adding range isn't always successful so we need to check range count otherwise an exception can occur

+					t.selectedRange = s.rangeCount > 0 ? s.getRangeAt(0) : null;

 				}

 			} else {

 				// Is W3C Range

 				if (r.cloneRange) {

-					t.tridentSel.addRange(r);

-					return;

+					try {

+						t.tridentSel.addRange(r);

+						return;

+					} catch (ex) {

+						//IE9 throws an error here if called before selection is placed in the editor

+					}

 				}

 

 				// Is IE specific range

@@ -5662,27 +8733,52 @@ window.tinymce.dom.Sizzle = Sizzle;
 		},

 

 		getNode : function() {

-			var t = this, rng = t.getRng(), sel = t.getSel(), elm;

+			var t = this, rng = t.getRng(), sel = t.getSel(), elm, start = rng.startContainer, end = rng.endContainer;

 

-			if (rng.setStart) {

-				// Range maybe lost after the editor is made visible again

-				if (!rng)

-					return t.dom.getRoot();

+			// Range maybe lost after the editor is made visible again

+			if (!rng)

+				return t.dom.getRoot();

 

+			if (rng.setStart) {

 				elm = rng.commonAncestorContainer;

 

 				// Handle selection a image or other control like element such as anchors

 				if (!rng.collapsed) {

 					if (rng.startContainer == rng.endContainer) {

-						if (rng.startOffset - rng.endOffset < 2) {

+						if (rng.endOffset - rng.startOffset < 2) {

 							if (rng.startContainer.hasChildNodes())

 								elm = rng.startContainer.childNodes[rng.startOffset];

 						}

 					}

 

 					// If the anchor node is a element instead of a text node then return this element

-					if (tinymce.isWebKit && sel.anchorNode && sel.anchorNode.nodeType == 1) 

-						return sel.anchorNode.childNodes[sel.anchorOffset]; 

+					//if (tinymce.isWebKit && sel.anchorNode && sel.anchorNode.nodeType == 1)

+					//	return sel.anchorNode.childNodes[sel.anchorOffset];

+

+					// Handle cases where the selection is immediately wrapped around a node and return that node instead of it's parent.

+					// This happens when you double click an underlined word in FireFox.

+					if (start.nodeType === 3 && end.nodeType === 3) {

+						function skipEmptyTextNodes(n, forwards) {

+							var orig = n;

+							while (n && n.nodeType === 3 && n.length === 0) {

+								n = forwards ? n.nextSibling : n.previousSibling;

+							}

+							return n || orig;

+						}

+						if (start.length === rng.startOffset) {

+							start = skipEmptyTextNodes(start.nextSibling, true);

+						} else {

+							start = start.parentNode;

+						}

+						if (rng.endOffset === 0) {

+							end = skipEmptyTextNodes(end.previousSibling, false);

+						} else {

+							end = end.parentNode;

+						}

+

+						if (start && start === end)

+							return start;

+					}

 				}

 

 				if (elm && elm.nodeType == 3)

@@ -5706,7 +8802,8 @@ window.tinymce.dom.Sizzle = Sizzle;
 			if (sb && eb && sb != eb) {

 				n = sb;

 

-				while ((n = n.nextSibling) && n != eb) {

+				var walker = new tinymce.dom.TreeWalker(sb, dom.getRoot());

+				while ((n = walker.next()) && n != eb) {

 					if (dom.isBlock(n))

 						bl.push(n);

 				}

@@ -5718,1114 +8815,444 @@ window.tinymce.dom.Sizzle = Sizzle;
 			return bl;

 		},

 

-		destroy : function(s) {

-			var t = this;

+		normalize : function() {

+			var self = this, rng, normalized;

 

-			t.win = null;

-

-			if (t.tridentSel)

-				t.tridentSel.destroy();

-

-			// Manual destroy then remove unload handler

-			if (!s)

-				tinymce.removeUnload(t.destroy);

-		}

-	});

-})(tinymce);

+			// TODO:

+			// Retain selection direction.

+			// Lean left/right on Gecko for inline elements.

+			// Run this on mouse up/key up when the user manually moves the selection

 

-(function(tinymce) {

-	tinymce.create('tinymce.dom.XMLWriter', {

-		node : null,

-

-		XMLWriter : function(s) {

-			// Get XML document

-			function getXML() {

-				var i = document.implementation;

-

-				if (!i || !i.createDocument) {

-					// Try IE objects

-					try {return new ActiveXObject('MSXML2.DOMDocument');} catch (ex) {}

-					try {return new ActiveXObject('Microsoft.XmlDom');} catch (ex) {}

-				} else

-					return i.createDocument('', '', null);

-			};

-

-			this.doc = getXML();

-			

-			// Since Opera and WebKit doesn't escape > into &gt; we need to do it our self to normalize the output for all browsers

-			this.valid = tinymce.isOpera || tinymce.isWebKit;

-

-			this.reset();

-		},

-

-		reset : function() {

-			var t = this, d = t.doc;

-

-			if (d.firstChild)

-				d.removeChild(d.firstChild);

-

-			t.node = d.appendChild(d.createElement("html"));

-		},

-

-		writeStartElement : function(n) {

-			var t = this;

-

-			t.node = t.node.appendChild(t.doc.createElement(n));

-		},

-

-		writeAttribute : function(n, v) {

-			if (this.valid)

-				v = v.replace(/>/g, '%MCGT%');

-

-			this.node.setAttribute(n, v);

-		},

-

-		writeEndElement : function() {

-			this.node = this.node.parentNode;

-		},

-

-		writeFullEndElement : function() {

-			var t = this, n = t.node;

-

-			n.appendChild(t.doc.createTextNode(""));

-			t.node = n.parentNode;

-		},

-

-		writeText : function(v) {

-			if (this.valid)

-				v = v.replace(/>/g, '%MCGT%');

-

-			this.node.appendChild(this.doc.createTextNode(v));

-		},

-

-		writeCDATA : function(v) {

-			this.node.appendChild(this.doc.createCDATASection(v));

-		},

-

-		writeComment : function(v) {

-			// Fix for bug #2035694

+			// Normalize only on non IE browsers for now

 			if (tinymce.isIE)

-				v = v.replace(/^\-|\-$/g, ' ');

-

-			this.node.appendChild(this.doc.createComment(v.replace(/\-\-/g, ' ')));

-		},

-

-		getContent : function() {

-			var h;

-

-			h = this.doc.xml || new XMLSerializer().serializeToString(this.doc);

-			h = h.replace(/<\?[^?]+\?>|<html>|<\/html>|<html\/>|<!DOCTYPE[^>]+>/g, '');

-			h = h.replace(/ ?\/>/g, ' />');

-

-			if (this.valid)

-				h = h.replace(/\%MCGT%/g, '&gt;');

-

-			return h;

-		}

-	});

-})(tinymce);

-

-(function(tinymce) {

-	tinymce.create('tinymce.dom.StringWriter', {

-		str : null,

-		tags : null,

-		count : 0,

-		settings : null,

-		indent : null,

-

-		StringWriter : function(s) {

-			this.settings = tinymce.extend({

-				indent_char : ' ',

-				indentation : 0

-			}, s);

-

-			this.reset();

-		},

-

-		reset : function() {

-			this.indent = '';

-			this.str = "";

-			this.tags = [];

-			this.count = 0;

-		},

-

-		writeStartElement : function(n) {

-			this._writeAttributesEnd();

-			this.writeRaw('<' + n);

-			this.tags.push(n);

-			this.inAttr = true;

-			this.count++;

-			this.elementCount = this.count;

-		},

-

-		writeAttribute : function(n, v) {

-			var t = this;

-

-			t.writeRaw(" " + t.encode(n) + '="' + t.encode(v) + '"');

-		},

-

-		writeEndElement : function() {

-			var n;

-

-			if (this.tags.length > 0) {

-				n = this.tags.pop();

-

-				if (this._writeAttributesEnd(1))

-					this.writeRaw('</' + n + '>');

-

-				if (this.settings.indentation > 0)

-					this.writeRaw('\n');

-			}

-		},

-

-		writeFullEndElement : function() {

-			if (this.tags.length > 0) {

-				this._writeAttributesEnd();

-				this.writeRaw('</' + this.tags.pop() + '>');

-

-				if (this.settings.indentation > 0)

-					this.writeRaw('\n');

-			}

-		},

-

-		writeText : function(v) {

-			this._writeAttributesEnd();

-			this.writeRaw(this.encode(v));

-			this.count++;

-		},

-

-		writeCDATA : function(v) {

-			this._writeAttributesEnd();

-			this.writeRaw('<![CDATA[' + v + ']]>');

-			this.count++;

-		},

-

-		writeComment : function(v) {

-			this._writeAttributesEnd();

-			this.writeRaw('<!-- ' + v + '-->');

-			this.count++;

-		},

-

-		writeRaw : function(v) {

-			this.str += v;

-		},

-

-		encode : function(s) {

-			return s.replace(/[<>&"]/g, function(v) {

-				switch (v) {

-					case '<':

-						return '&lt;';

-

-					case '>':

-						return '&gt;';

-

-					case '&':

-						return '&amp;';

-

-					case '"':

-						return '&quot;';

-				}

-

-				return v;

-			});

-		},

-

-		getContent : function() {

-			return this.str;

-		},

-

-		_writeAttributesEnd : function(s) {

-			if (!this.inAttr)

 				return;

 

-			this.inAttr = false;

-

-			if (s && this.elementCount == this.count) {

-				this.writeRaw(' />');

-				return false;

-			}

-

-			this.writeRaw('>');

-

-			return true;

-		}

-	});

-})(tinymce);

-

-(function(tinymce) {

-	// Shorten names

-	var extend = tinymce.extend, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher, isIE = tinymce.isIE, isGecko = tinymce.isGecko;

-

-	function wildcardToRE(s) {

-		return s.replace(/([?+*])/g, '.$1');

-	};

-

-	tinymce.create('tinymce.dom.Serializer', {

-		Serializer : function(s) {

-			var t = this;

-

-			t.key = 0;

-			t.onPreProcess = new Dispatcher(t);

-			t.onPostProcess = new Dispatcher(t);

-

-			try {

-				t.writer = new tinymce.dom.XMLWriter();

-			} catch (ex) {

-				// IE might throw exception if ActiveX is disabled so we then switch to the slightly slower StringWriter

-				t.writer = new tinymce.dom.StringWriter();

-			}

-

-			// Default settings

-			t.settings = s = extend({

-				dom : tinymce.DOM,

-				valid_nodes : 0,

-				node_filter : 0,

-				attr_filter : 0,

-				invalid_attrs : /^(_mce_|_moz_|sizset|sizcache)/,

-				closed : /^(br|hr|input|meta|img|link|param|area)$/,

-				entity_encoding : 'named',

-				entities : '160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,913,Alpha,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro',

-				valid_elements : '*[*]',

-				extended_valid_elements : 0,

-				invalid_elements : 0,

-				fix_table_elements : 1,

-				fix_list_elements : true,

-				fix_content_duplication : true,

-				convert_fonts_to_spans : false,

-				font_size_classes : 0,

-				apply_source_formatting : 0,

-				indent_mode : 'simple',

-				indent_char : '\t',

-				indent_levels : 1,

-				remove_linebreaks : 1,

-				remove_redundant_brs : 1,

-				element_format : 'xhtml'

-			}, s);

-

-			t.dom = s.dom;

-			t.schema = s.schema;

-

-			// Use raw entities if no entities are defined

-			if (s.entity_encoding == 'named' && !s.entities)

-				s.entity_encoding = 'raw';

-

-			if (s.remove_redundant_brs) {

-				t.onPostProcess.add(function(se, o) {

-					// Remove single BR at end of block elements since they get rendered

-					o.content = o.content.replace(/(<br \/>\s*)+<\/(p|h[1-6]|div|li)>/gi, function(a, b, c) {

-						// Check if it's a single element

-						if (/^<br \/>\s*<\//.test(a))

-							return '</' + c + '>';

-

-						return a;

-					});

-				});

-			}

-

-			// Remove XHTML element endings i.e. produce crap :) XHTML is better

-			if (s.element_format == 'html') {

-				t.onPostProcess.add(function(se, o) {

-					o.content = o.content.replace(/<([^>]+) \/>/g, '<$1>');

-				});

-			}

-

-			if (s.fix_list_elements) {

-				t.onPreProcess.add(function(se, o) {

-					var nl, x, a = ['ol', 'ul'], i, n, p, r = /^(OL|UL)$/, np;

+			function normalizeEndPoint(start) {

+				var container, offset, walker, dom = self.dom, body = dom.getRoot(), node;

 

-					function prevNode(e, n) {

-						var a = n.split(','), i;

+				container = rng[(start ? 'start' : 'end') + 'Container'];

+				offset = rng[(start ? 'start' : 'end') + 'Offset'];

 

-						while ((e = e.previousSibling) != null) {

-							for (i=0; i<a.length; i++) {

-								if (e.nodeName == a[i])

-									return e;

-							}

-						}

-

-						return null;

-					};

-

-					for (x=0; x<a.length; x++) {

-						nl = t.dom.select(a[x], o.node);

+				// If the container is a document move it to the body element

+				if (container.nodeType === 9) {

+					container = container.body;

+					offset = 0;

+				}

 

-						for (i=0; i<nl.length; i++) {

-							n = nl[i];

-							p = n.parentNode;

+				// If the container is body try move it into the closest text node or position

+				// TODO: Add more logic here to handle element selection cases

+				if (container === body) {

+					// Resolve the index

+					if (container.hasChildNodes()) {

+						container = container.childNodes[Math.min(!start && offset > 0 ? offset - 1 : offset, container.childNodes.length - 1)];

+						offset = 0;

+

+						// Don't walk into elements that doesn't have any child nodes like a IMG

+						if (container.hasChildNodes()) {

+							// Walk the DOM to find a text node to place the caret at or a BR

+							node = container;

+							walker = new tinymce.dom.TreeWalker(container, body);

+							do {

+								// Found a text node use that position

+								if (node.nodeType === 3) {

+									offset = start ? 0 : node.nodeValue.length - 1;

+									container = node;

+									normalized = true;

+									break;

+								}

 

-							if (r.test(p.nodeName)) {

-								np = prevNode(n, 'LI');

+								// Found a BR/IMG element that we can place the caret before

+								if (/^(BR|IMG)$/.test(node.nodeName)) {

+									offset = dom.nodeIndex(node);

+									container = node.parentNode;

 

-								if (!np) {

-									np = t.dom.create('li');

-									np.innerHTML = '&nbsp;';

-									np.appendChild(n);

-									p.insertBefore(np, p.firstChild);

-								} else

-									np.appendChild(n);

-							}

-						}

-					}

-				});

-			}

-

-			if (s.fix_table_elements) {

-				t.onPreProcess.add(function(se, o) {

-					// Since Opera will crash if you attach the node to a dynamic document we need to brrowser sniff a specific build

-					// so Opera users with an older version will have to live with less compaible output not much we can do here

-					if (!tinymce.isOpera || opera.buildNumber() >= 1767) {

-						each(t.dom.select('p table', o.node).reverse(), function(n) {

-							var parent = t.dom.getParent(n.parentNode, 'table,p');

+									// Put caret after image when moving the end point

+									if (node.nodeName ==  "IMG" && !start) {

+										offset++;

+									}

 

-							if (parent.nodeName != 'TABLE') {

-								try {

-									t.dom.split(parent, n);

-								} catch (ex) {

-									// IE can sometimes fire an unknown runtime error so we just ignore it

+									normalized = true;

+									break;

 								}

-							}

-						});

+							} while (node = (start ? walker.next() : walker.prev()));

+						}

 					}

-				});

-			}

-		},

-

-		setEntities : function(s) {

-			var t = this, a, i, l = {}, v;

+				}

 

-			// No need to setup more than once

-			if (t.entityLookup)

-				return;

+				// Set endpoint if it was normalized

+				if (normalized)

+					rng['set' + (start ? 'Start' : 'End')](container, offset);

+			};

 

-			// Build regex and lookup array

-			a = s.split(',');

-			for (i = 0; i < a.length; i += 2) {

-				v = a[i];

+			rng = self.getRng();

 

-				// Don't add default &amp; &quot; etc.

-				if (v == 34 || v == 38 || v == 60 || v == 62)

-					continue;

+			// Normalize the end points

+			normalizeEndPoint(true);

 

-				l[String.fromCharCode(a[i])] = a[i + 1];

+			if (!rng.collapsed)

+				normalizeEndPoint();

 

-				v = parseInt(a[i]).toString(16);

+			// Set the selection if it was normalized

+			if (normalized) {

+				//console.log(self.dom.dumpRng(rng));

+				self.setRng(rng);

 			}

-

-			t.entityLookup = l;

 		},

 

-		setRules : function(s) {

+		destroy : function(s) {

 			var t = this;

 

-			t._setup();

-			t.rules = {};

-			t.wildRules = [];

-			t.validElements = {};

-

-			return t.addRules(s);

-		},

-

-		addRules : function(s) {

-			var t = this, dr;

+			t.win = null;

 

+			// Manual destroy then remove unload handler

 			if (!s)

-				return;

-

-			t._setup();

-

-			each(s.split(','), function(s) {

-				var p = s.split(/\[|\]/), tn = p[0].split('/'), ra, at, wat, va = [];

-

-				// Extend with default rules

-				if (dr)

-					at = tinymce.extend([], dr.attribs);

-

-				// Parse attributes

-				if (p.length > 1) {

-					each(p[1].split('|'), function(s) {

-						var ar = {}, i;

-

-						at = at || [];

-

-						// Parse attribute rule

-						s = s.replace(/::/g, '~');

-						s = /^([!\-])?([\w*.?~_\-]+|)([=:<])?(.+)?$/.exec(s);

-						s[2] = s[2].replace(/~/g, ':');

-

-						// Add required attributes

-						if (s[1] == '!') {

-							ra = ra || [];

-							ra.push(s[2]);

-						}

-

-						// Remove inherited attributes

-						if (s[1] == '-') {

-							for (i = 0; i <at.length; i++) {

-								if (at[i].name == s[2]) {

-									at.splice(i, 1);

-									return;

-								}

-							}

-						}

-

-						switch (s[3]) {

-							// Add default attrib values

-							case '=':

-								ar.defaultVal = s[4] || '';

-								break;

+				tinymce.removeUnload(t.destroy);

+		},

 

-							// Add forced attrib values

-							case ':':

-								ar.forcedVal = s[4];

-								break;

+		// IE has an issue where you can't select/move the caret by clicking outside the body if the document is in standards mode

+		_fixIESelection : function() {

+			var dom = this.dom, doc = dom.doc, body = doc.body, started, startRng, htmlElm;

 

-							// Add validation values

-							case '<':

-								ar.validVals = s[4].split('?');

-								break;

-						}

+			// Make HTML element unselectable since we are going to handle selection by hand

+			doc.documentElement.unselectable = true;

 

-						if (/[*.?]/.test(s[2])) {

-							wat = wat || [];

-							ar.nameRE = new RegExp('^' + wildcardToRE(s[2]) + '$');

-							wat.push(ar);

-						} else {

-							ar.name = s[2];

-							at.push(ar);

-						}

+			// Return range from point or null if it failed

+			function rngFromPoint(x, y) {

+				var rng = body.createTextRange();

 

-						va.push(s[2]);

-					});

+				try {

+					rng.moveToPoint(x, y);

+				} catch (ex) {

+					// IE sometimes throws and exception, so lets just ignore it

+					rng = null;

 				}

 

-				// Handle element names

-				each(tn, function(s, i) {

-					var pr = s.charAt(0), x = 1, ru = {};

-

-					// Extend with default rule data

-					if (dr) {

-						if (dr.noEmpty)

-							ru.noEmpty = dr.noEmpty;

-

-						if (dr.fullEnd)

-							ru.fullEnd = dr.fullEnd;

-

-						if (dr.padd)

-							ru.padd = dr.padd;

-					}

+				return rng;

+			};

 

-					// Handle prefixes

-					switch (pr) {

-						case '-':

-							ru.noEmpty = true;

-							break;

+			// Fires while the selection is changing

+			function selectionChange(e) {

+				var pointRng;

 

-						case '+':

-							ru.fullEnd = true;

-							break;

+				// Check if the button is down or not

+				if (e.button) {

+					// Create range from mouse position

+					pointRng = rngFromPoint(e.x, e.y);

 

-						case '#':

-							ru.padd = true;

-							break;

+					if (pointRng) {

+						// Check if pointRange is before/after selection then change the endPoint

+						if (pointRng.compareEndPoints('StartToStart', startRng) > 0)

+							pointRng.setEndPoint('StartToStart', startRng);

+						else

+							pointRng.setEndPoint('EndToEnd', startRng);

 

-						default:

-							x = 0;

+						pointRng.select();

 					}

+				} else

+					endSelection();

+			}

 

-					tn[i] = s = s.substring(x);

-					t.validElements[s] = 1;

+			// Removes listeners

+			function endSelection() {

+				var rng = doc.selection.createRange();

 

-					// Add element name or element regex

-					if (/[*.?]/.test(tn[0])) {

-						ru.nameRE = new RegExp('^' + wildcardToRE(tn[0]) + '$');

-						t.wildRules = t.wildRules || {};

-						t.wildRules.push(ru);

-					} else {

-						ru.name = tn[0];

+				// If the range is collapsed then use the last start range

+				if (startRng && !rng.item && rng.compareEndPoints('StartToEnd', rng) === 0)

+					startRng.select();

 

-						// Store away default rule

-						if (tn[0] == '@')

-							dr = ru;

-

-						t.rules[s] = ru;

-					}

+				dom.unbind(doc, 'mouseup', endSelection);

+				dom.unbind(doc, 'mousemove', selectionChange);

+				startRng = started = 0;

+			};

 

-					ru.attribs = at;

+			// Detect when user selects outside BODY

+			dom.bind(doc, ['mousedown', 'contextmenu'], function(e) {

+				if (e.target.nodeName === 'HTML') {

+					if (started)

+						endSelection();

 

-					if (ra)

-						ru.requiredAttribs = ra;

+					// Detect vertical scrollbar, since IE will fire a mousedown on the scrollbar and have target set as HTML

+					htmlElm = doc.documentElement;

+					if (htmlElm.scrollHeight > htmlElm.clientHeight)

+						return;

 

-					if (wat) {

-						// Build valid attributes regexp

-						s = '';

-						each(va, function(v) {

-							if (s)

-								s += '|';

+					started = 1;

+					// Setup start position

+					startRng = rngFromPoint(e.x, e.y);

+					if (startRng) {

+						// Listen for selection change events

+						dom.bind(doc, 'mouseup', endSelection);

+						dom.bind(doc, 'mousemove', selectionChange);

 

-							s += '(' + wildcardToRE(v) + ')';

-						});

-						ru.validAttribsRE = new RegExp('^' + s.toLowerCase() + '$');

-						ru.wildAttribs = wat;

+						dom.win.focus();

+						startRng.select();

 					}

-				});

-			});

-

-			// Build valid elements regexp

-			s = '';

-			each(t.validElements, function(v, k) {

-				if (s)

-					s += '|';

-

-				if (k != '@')

-					s += k;

+				}

 			});

-			t.validElementsRE = new RegExp('^(' + wildcardToRE(s.toLowerCase()) + ')$');

+		}

+	});

+})(tinymce);

 

-			//console.debug(t.validElementsRE.toString());

-			//console.dir(t.rules);

-			//console.dir(t.wildRules);

-		},

+(function(tinymce) {

+	tinymce.dom.Serializer = function(settings, dom, schema) {

+		var onPreProcess, onPostProcess, isIE = tinymce.isIE, each = tinymce.each, htmlParser;

 

-		findRule : function(n) {

-			var t = this, rl = t.rules, i, r;

+		// Support the old apply_source_formatting option

+		if (!settings.apply_source_formatting)

+			settings.indent = false;

 

-			t._setup();

+		// Default DOM and Schema if they are undefined

+		dom = dom || tinymce.DOM;

+		schema = schema || new tinymce.html.Schema(settings);

+		settings.entity_encoding = settings.entity_encoding || 'named';

+		settings.remove_trailing_brs = "remove_trailing_brs" in settings ? settings.remove_trailing_brs : true;

 

-			// Exact match

-			r = rl[n];

-			if (r)

-				return r;

+		onPreProcess = new tinymce.util.Dispatcher(self);

 

-			// Try wildcards

-			rl = t.wildRules;

-			for (i = 0; i < rl.length; i++) {

-				if (rl[i].nameRE.test(n))

-					return rl[i];

-			}

+		onPostProcess = new tinymce.util.Dispatcher(self);

 

-			return null;

-		},

+		htmlParser = new tinymce.html.DomParser(settings, schema);

 

-		findAttribRule : function(ru, n) {

-			var i, wa = ru.wildAttribs;

+		// Convert move data-mce-src, data-mce-href and data-mce-style into nodes or process them if needed

+		htmlParser.addAttributeFilter('src,href,style', function(nodes, name) {

+			var i = nodes.length, node, value, internalName = 'data-mce-' + name, urlConverter = settings.url_converter, urlConverterScope = settings.url_converter_scope, undef;

 

-			for (i = 0; i < wa.length; i++) {

-				if (wa[i].nameRE.test(n))

-					return wa[i];

-			}

+			while (i--) {

+				node = nodes[i];

 

-			return null;

-		},

-

-		serialize : function(n, o) {

-			var h, t = this, doc, oldDoc, impl, selected;

-

-			t._setup();

-			o = o || {};

-			o.format = o.format || 'html';

-			t.processObj = o;

+				value = node.attributes.map[internalName];

+				if (value !== undef) {

+					// Set external name to internal value and remove internal

+					node.attr(name, value.length > 0 ? value : null);

+					node.attr(internalName, null);

+				} else {

+					// No internal attribute found then convert the value we have in the DOM

+					value = node.attributes.map[name];

 

-			// IE looses the selected attribute on option elements so we need to store it

-			// See: http://support.microsoft.com/kb/829907

-			if (isIE) {

-				selected = [];

-				each(n.getElementsByTagName('option'), function(n) {

-					var v = t.dom.getAttrib(n, 'selected');

+					if (name === "style")

+						value = dom.serializeStyle(dom.parseStyle(value), node.name);

+					else if (urlConverter)

+						value = urlConverter.call(urlConverterScope, value, name, node.name);

 

-					selected.push(v ? v : null);

-				});

+					node.attr(name, value.length > 0 ? value : null);

+				}

 			}

+		});

 

-			n = n.cloneNode(true);

+		// Remove internal classes mceItem<..>

+		htmlParser.addAttributeFilter('class', function(nodes, name) {

+			var i = nodes.length, node, value;

 

-			// IE looses the selected attribute on option elements so we need to restore it

-			if (isIE) {

-				each(n.getElementsByTagName('option'), function(n, i) {

-					t.dom.setAttrib(n, 'selected', selected[i]);

-				});

+			while (i--) {

+				node = nodes[i];

+				value = node.attr('class').replace(/\s*mce(Item\w+|Selected)\s*/g, '');

+				node.attr('class', value.length > 0 ? value : null);

 			}

+		});

 

-			// Nodes needs to be attached to something in WebKit/Opera

-			// Older builds of Opera crashes if you attach the node to an document created dynamically

-			// and since we can't feature detect a crash we need to sniff the acutal build number

-			// This fix will make DOM ranges and make Sizzle happy!

-			impl = n.ownerDocument.implementation;

-			if (impl.createHTMLDocument && (tinymce.isOpera && opera.buildNumber() >= 1767)) {

-				// Create an empty HTML document

-				doc = impl.createHTMLDocument("");

+		// Remove bookmark elements

+		htmlParser.addAttributeFilter('data-mce-type', function(nodes, name, args) {

+			var i = nodes.length, node;

 

-				// Add the element or it's children if it's a body element to the new document

-				each(n.nodeName == 'BODY' ? n.childNodes : [n], function(node) {

-					doc.body.appendChild(doc.importNode(node, true));

-				});

+			while (i--) {

+				node = nodes[i];

 

-				// Grab first child or body element for serialization

-				if (n.nodeName != 'BODY')

-					n = doc.body.firstChild;

-				else

-					n = doc.body;

-

-				// set the new document in DOMUtils so createElement etc works

-				oldDoc = t.dom.doc;

-				t.dom.doc = doc;

+				if (node.attributes.map['data-mce-type'] === 'bookmark' && !args.cleanup)

+					node.remove();

 			}

+		});

 

-			t.key = '' + (parseInt(t.key) + 1);

+		// Remove expando attributes

+		htmlParser.addAttributeFilter('data-mce-expando', function(nodes, name, args) {

+			var i = nodes.length;

 

-			// Pre process

-			if (!o.no_events) {

-				o.node = n;

-				t.onPreProcess.dispatch(t, o);

+			while (i--) {

+				nodes[i].attr(name, null);

 			}

+		});

 

-			// Serialize HTML DOM into a string

-			t.writer.reset();

-			t._info = o;

-			t._serializeNode(n, o.getInner);

-

-			// Post process

-			o.content = t.writer.getContent();

-

-			// Restore the old document if it was changed

-			if (oldDoc)

-				t.dom.doc = oldDoc;

-

-			if (!o.no_events)

-				t.onPostProcess.dispatch(t, o);

-

-			t._postProcess(o);

-			o.node = null;

-

-			return tinymce.trim(o.content);

-		},

-

-		// Internal functions

-

-		_postProcess : function(o) {

-			var t = this, s = t.settings, h = o.content, sc = [], p;

-

-			if (o.format == 'html') {

-				// Protect some elements

-				p = t._protect({

-					content : h,

-					patterns : [

-						{pattern : /(<script[^>]*>)(.*?)(<\/script>)/g},

-						{pattern : /(<noscript[^>]*>)(.*?)(<\/noscript>)/g},

-						{pattern : /(<style[^>]*>)(.*?)(<\/style>)/g},

-						{pattern : /(<pre[^>]*>)(.*?)(<\/pre>)/g, encode : 1},

-						{pattern : /(<!--\[CDATA\[)(.*?)(\]\]-->)/g}

-					]

-				});

-

-				h = p.content;

+		// Force script into CDATA sections and remove the mce- prefix also add comments around styles

+		htmlParser.addNodeFilter('script,style', function(nodes, name) {

+			var i = nodes.length, node, value;

 

-				// Entity encode

-				if (s.entity_encoding !== 'raw')

-					h = t._encode(h);

+			function trim(value) {

+				return value.replace(/(<!--\[CDATA\[|\]\]-->)/g, '\n')

+						.replace(/^[\r\n]*|[\r\n]*$/g, '')

+						.replace(/^\s*((<!--)?(\s*\/\/)?\s*<!\[CDATA\[|(<!--\s*)?\/\*\s*<!\[CDATA\[\s*\*\/|(\/\/)?\s*<!--|\/\*\s*<!--\s*\*\/)\s*[\r\n]*/gi, '')

+						.replace(/\s*(\/\*\s*\]\]>\s*\*\/(-->)?|\s*\/\/\s*\]\]>(-->)?|\/\/\s*(-->)?|\]\]>|\/\*\s*-->\s*\*\/|\s*-->\s*)\s*$/g, '');

+			};

 

-				// Use BR instead of &nbsp; padded P elements inside editor and use <p>&nbsp;</p> outside editor

-/*				if (o.set)

-					h = h.replace(/<p>\s+(&nbsp;|&#160;|\u00a0|<br \/>)\s+<\/p>/g, '<p><br /></p>');

-				else

-					h = h.replace(/<p>\s+(&nbsp;|&#160;|\u00a0|<br \/>)\s+<\/p>/g, '<p>$1</p>');*/

+			while (i--) {

+				node = nodes[i];

+				value = node.firstChild ? node.firstChild.value : '';

 

-				// Since Gecko and Safari keeps whitespace in the DOM we need to

-				// remove it inorder to match other browsers. But I think Gecko and Safari is right.

-				// This process is only done when getting contents out from the editor.

-				if (!o.set) {

-					// We need to replace paragraph whitespace with an nbsp before indentation to keep the \u00a0 char

-					h = h.replace(/<p>\s+<\/p>|<p([^>]+)>\s+<\/p>/g, s.entity_encoding == 'numeric' ? '<p$1>&#160;</p>' : '<p$1>&nbsp;</p>');

+				if (name === "script") {

+					// Remove mce- prefix from script elements

+					node.attr('type', (node.attr('type') || 'text/javascript').replace(/^mce\-/, ''));

 

-					if (s.remove_linebreaks) {

-						h = h.replace(/\r?\n|\r/g, ' ');

-						h = h.replace(/(<[^>]+>)\s+/g, '$1 ');

-						h = h.replace(/\s+(<\/[^>]+>)/g, ' $1');

-						h = h.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object) ([^>]+)>\s+/g, '<$1 $2>'); // Trim block start

-						h = h.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>\s+/g, '<$1>'); // Trim block start

-						h = h.replace(/\s+<\/(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>/g, '</$1>'); // Trim block end

-					}

-

-					// Simple indentation

-					if (s.apply_source_formatting && s.indent_mode == 'simple') {

-						// Add line breaks before and after block elements

-						h = h.replace(/<(\/?)(ul|hr|table|meta|link|tbody|tr|object|body|head|html|map)(|[^>]+)>\s*/g, '\n<$1$2$3>\n');

-						h = h.replace(/\s*<(p|h[1-6]|blockquote|div|title|style|pre|script|td|li|area)(|[^>]+)>/g, '\n<$1$2>');

-						h = h.replace(/<\/(p|h[1-6]|blockquote|div|title|style|pre|script|td|li)>\s*/g, '</$1>\n');

-						h = h.replace(/\n\n/g, '\n');

-					}

+					if (value.length > 0)

+						node.firstChild.value = '// <![CDATA[\n' + trim(value) + '\n// ]]>';

+				} else {

+					if (value.length > 0)

+						node.firstChild.value = '<!--\n' + trim(value) + '\n-->';

 				}

-

-				h = t._unprotect(h, p);

-

-				// Restore CDATA sections

-				h = h.replace(/<!--\[CDATA\[([\s\S]+)\]\]-->/g, '<![CDATA[$1]]>');

-

-				// Restore the \u00a0 character if raw mode is enabled

-				if (s.entity_encoding == 'raw')

-					h = h.replace(/<p>&nbsp;<\/p>|<p([^>]+)>&nbsp;<\/p>/g, '<p$1>\u00a0</p>');

-

-				// Restore noscript elements

-				h = h.replace(/<noscript([^>]+|)>([\s\S]*?)<\/noscript>/g, function(v, attribs, text) {

-					return '<noscript' + attribs + '>' + t.dom.decode(text.replace(/<!--|-->/g, '')) + '</noscript>';

-				});

 			}

+		});

 

-			o.content = h;

-		},

-

-		_serializeNode : function(n, inner) {

-			var t = this, s = t.settings, w = t.writer, hc, el, cn, i, l, a, at, no, v, nn, ru, ar, iv, closed, keep, type;

-

-			if (!s.node_filter || s.node_filter(n)) {

-				switch (n.nodeType) {

-					case 1: // Element

-						if (n.hasAttribute ? n.hasAttribute('_mce_bogus') : n.getAttribute('_mce_bogus'))

-							return;

-

-						iv = keep = false;

-						hc = n.hasChildNodes();

-						nn = n.getAttribute('_mce_name') || n.nodeName.toLowerCase();

-

-						// Get internal type

-						type = n.getAttribute('_mce_type');

-						if (type) {

-							if (!t._info.cleanup) {

-								iv = true;

-								return;

-							} else

-								keep = 1;

-						}

-

-						// Add correct prefix on IE

-						if (isIE) {

-							if (n.scopeName !== 'HTML' && n.scopeName !== 'html')

-								nn = n.scopeName + ':' + nn;

-						}

-

-						// Remove mce prefix on IE needed for the abbr element

-						if (nn.indexOf('mce:') === 0)

-							nn = nn.substring(4);

-

-						// Check if valid

-						if (!keep) {

-							if (!t.validElementsRE || !t.validElementsRE.test(nn) || (t.invalidElementsRE && t.invalidElementsRE.test(nn)) || inner) {

-								iv = true;

-								break;

-							}

-						}

-

-						if (isIE) {

-							// Fix IE content duplication (DOM can have multiple copies of the same node)

-							if (s.fix_content_duplication) {

-								if (n._mce_serialized == t.key)

-									return;

-

-								n._mce_serialized = t.key;

-							}

-

-							// IE sometimes adds a / infront of the node name

-							if (nn.charAt(0) == '/')

-								nn = nn.substring(1);

-						} else if (isGecko) {

-							// Ignore br elements

-							if (n.nodeName === 'BR' && n.getAttribute('type') == '_moz')

-								return;

-						}

-

-						// Check if valid child

-						if (s.validate_children) {

-							if (t.elementName && !t.schema.isValid(t.elementName, nn)) {

-								iv = true;

-								break;

-							}

-

-							t.elementName = nn;

-						}

-

-						ru = t.findRule(nn);

-						

-						// No valid rule for this element could be found then skip it

-						if (!ru) {

-							iv = true;

-							break;

-						}

-

-						nn = ru.name || nn;

-						closed = s.closed.test(nn);

-

-						// Skip empty nodes or empty node name in IE

-						if ((!hc && ru.noEmpty) || (isIE && !nn)) {

-							iv = true;

-							break;

-						}

-

-						// Check required

-						if (ru.requiredAttribs) {

-							a = ru.requiredAttribs;

-

-							for (i = a.length - 1; i >= 0; i--) {

-								if (this.dom.getAttrib(n, a[i]) !== '')

-									break;

-							}

-

-							// None of the required was there

-							if (i == -1) {

-								iv = true;

-								break;

-							}

-						}

-

-						w.writeStartElement(nn);

-

-						// Add ordered attributes

-						if (ru.attribs) {

-							for (i=0, at = ru.attribs, l = at.length; i<l; i++) {

-								a = at[i];

-								v = t._getAttrib(n, a);

-

-								if (v !== null)

-									w.writeAttribute(a.name, v);

-							}

-						}

-

-						// Add wild attributes

-						if (ru.validAttribsRE) {

-							at = t.dom.getAttribs(n);

-							for (i=at.length-1; i>-1; i--) {

-								no = at[i];

-

-								if (no.specified) {

-									a = no.nodeName.toLowerCase();

-

-									if (s.invalid_attrs.test(a) || !ru.validAttribsRE.test(a))

-										continue;

-

-									ar = t.findAttribRule(ru, a);

-									v = t._getAttrib(n, ar, a);

-

-									if (v !== null)

-										w.writeAttribute(a, v);

-								}

-							}

-						}

-

-						// Keep type attribute

-						if (type && keep)

-							w.writeAttribute('_mce_type', type);

-

-						// Write text from script

-						if (nn === 'script' && tinymce.trim(n.innerHTML)) {

-							w.writeText('// '); // Padd it with a comment so it will parse on older browsers

-							w.writeCDATA(n.innerHTML.replace(/<!--|-->|<\[CDATA\[|\]\]>/g, '')); // Remove comments and cdata stuctures

-							hc = false;

-							break;

-						}

-

-						// Padd empty nodes with a &nbsp;

-						if (ru.padd) {

-							// If it has only one bogus child, padd it anyway workaround for <td><br /></td> bug

-							if (hc && (cn = n.firstChild) && cn.nodeType === 1 && n.childNodes.length === 1) {

-								if (cn.hasAttribute ? cn.hasAttribute('_mce_bogus') : cn.getAttribute('_mce_bogus'))

-									w.writeText('\u00a0');

-							} else if (!hc)

-								w.writeText('\u00a0'); // No children then padd it

-						}

-

-						break;

-

-					case 3: // Text

-						// Check if valid child

-						if (s.validate_children && t.elementName && !t.schema.isValid(t.elementName, '#text'))

-							return;

-

-						return w.writeText(n.nodeValue);

-

-					case 4: // CDATA

-						return w.writeCDATA(n.nodeValue);

-

-					case 8: // Comment

-						return w.writeComment(n.nodeValue);

+		// Convert comments to cdata and handle protected comments

+		htmlParser.addNodeFilter('#comment', function(nodes, name) {

+			var i = nodes.length, node;

+

+			while (i--) {

+				node = nodes[i];

+

+				if (node.value.indexOf('[CDATA[') === 0) {

+					node.name = '#cdata';

+					node.type = 4;

+					node.value = node.value.replace(/^\[CDATA\[|\]\]$/g, '');

+				} else if (node.value.indexOf('mce:protected ') === 0) {

+					node.name = "#text";

+					node.type = 3;

+					node.raw = true;

+					node.value = unescape(node.value).substr(14);

 				}

-			} else if (n.nodeType == 1)

-				hc = n.hasChildNodes();

+			}

+		});

 

-			if (hc && !closed) {

-				cn = n.firstChild;

+		htmlParser.addNodeFilter('xml:namespace,input', function(nodes, name) {

+			var i = nodes.length, node;

 

-				while (cn) {

-					t._serializeNode(cn);

-					t.elementName = nn;

-					cn = cn.nextSibling;

+			while (i--) {

+				node = nodes[i];

+				if (node.type === 7)

+					node.remove();

+				else if (node.type === 1) {

+					if (name === "input" && !("type" in node.attributes.map))

+						node.attr('type', 'text');

 				}

 			}

+		});

 

-			// Write element end

-			if (!iv) {

-				if (!closed)

-					w.writeFullEndElement();

-				else

-					w.writeEndElement();

-			}

-		},

-

-		_protect : function(o) {

-			var t = this;

-

-			o.items = o.items || [];

-

-			function enc(s) {

-				return s.replace(/[\r\n\\]/g, function(c) {

-					if (c === '\n')

-						return '\\n';

-					else if (c === '\\')

-						return '\\\\';

-

-					return '\\r';

-				});

-			};

-

-			function dec(s) {

-				return s.replace(/\\[\\rn]/g, function(c) {

-					if (c === '\\n')

-						return '\n';

-					else if (c === '\\\\')

-						return '\\';

-

-					return '\r';

-				});

-			};

-

-			each(o.patterns, function(p) {

-				o.content = dec(enc(o.content).replace(p.pattern, function(x, a, b, c) {

-					b = dec(b);

-

-					if (p.encode)

-						b = t._encode(b);

-

-					o.items.push(b);

-					return a + '<!--mce:' + (o.items.length - 1) + '-->' + c;

-				}));

-			});

+		// Fix list elements, TODO: Replace this later

+		if (settings.fix_list_elements) {

+			htmlParser.addNodeFilter('ul,ol', function(nodes, name) {

+				var i = nodes.length, node, parentNode;

 

-			return o;

-		},

+				while (i--) {

+					node = nodes[i];

+					parentNode = node.parent;

 

-		_unprotect : function(h, o) {

-			h = h.replace(/\<!--mce:([0-9]+)--\>/g, function(a, b) {

-				return o.items[parseInt(b)];

+					if (parentNode.name === 'ul' || parentNode.name === 'ol') {

+						if (node.prev && node.prev.name === 'li') {

+							node.prev.append(node);

+						}

+					}

+				}

 			});

+		}

 

-			o.items = [];

-

-			return h;

-		},

-

-		_encode : function(h) {

-			var t = this, s = t.settings, l;

-

-			// Entity encode

-			if (s.entity_encoding !== 'raw') {

-				if (s.entity_encoding.indexOf('named') != -1) {

-					t.setEntities(s.entities);

-					l = t.entityLookup;

-

-					h = h.replace(/[\u007E-\uFFFF]/g, function(a) {

-						var v;

-

-						if (v = l[a])

-							a = '&' + v + ';';

-

-						return a;

-					});

-				}

+		// Remove internal data attributes

+		htmlParser.addAttributeFilter('data-mce-src,data-mce-href,data-mce-style', function(nodes, name) {

+			var i = nodes.length;

 

-				if (s.entity_encoding.indexOf('numeric') != -1) {

-					h = h.replace(/[\u007E-\uFFFF]/g, function(a) {

-						return '&#' + a.charCodeAt(0) + ';';

-					});

-				}

+			while (i--) {

+				nodes[i].attr(name, null);

 			}

+		});

 

-			return h;

-		},

+		// Return public methods

+		return {

+			schema : schema,

 

-		_setup : function() {

-			var t = this, s = this.settings;

+			addNodeFilter : htmlParser.addNodeFilter,

 

-			if (t.done)

-				return;

+			addAttributeFilter : htmlParser.addAttributeFilter,

 

-			t.done = 1;

+			onPreProcess : onPreProcess,

 

-			t.setRules(s.valid_elements);

-			t.addRules(s.extended_valid_elements);

+			onPostProcess : onPostProcess,

 

-			if (s.invalid_elements)

-				t.invalidElementsRE = new RegExp('^(' + wildcardToRE(s.invalid_elements.replace(/,/g, '|').toLowerCase()) + ')$');

+			serialize : function(node, args) {

+				var impl, doc, oldDoc, htmlSerializer, content;

 

-			if (s.attrib_value_filter)

-				t.attribValueFilter = s.attribValueFilter;

-		},

+				// Explorer won't clone contents of script and style and the

+				// selected index of select elements are cleared on a clone operation.

+				if (isIE && dom.select('script,style,select,map').length > 0) {

+					content = node.innerHTML;

+					node = node.cloneNode(false);

+					dom.setHTML(node, content);

+				} else

+					node = node.cloneNode(true);

+

+				// Nodes needs to be attached to something in WebKit/Opera

+				// Older builds of Opera crashes if you attach the node to an document created dynamically

+				// and since we can't feature detect a crash we need to sniff the acutal build number

+				// This fix will make DOM ranges and make Sizzle happy!

+				impl = node.ownerDocument.implementation;

+				if (impl.createHTMLDocument) {

+					// Create an empty HTML document

+					doc = impl.createHTMLDocument("");

+

+					// Add the element or it's children if it's a body element to the new document

+					each(node.nodeName == 'BODY' ? node.childNodes : [node], function(node) {

+						doc.body.appendChild(doc.importNode(node, true));

+					});

 

-		_getAttrib : function(n, a, na) {

-			var i, v;

+					// Grab first child or body element for serialization

+					if (node.nodeName != 'BODY')

+						node = doc.body.firstChild;

+					else

+						node = doc.body;

 

-			na = na || a.name;

+					// set the new document in DOMUtils so createElement etc works

+					oldDoc = dom.doc;

+					dom.doc = doc;

+				}

 

-			if (a.forcedVal && (v = a.forcedVal)) {

-				if (v === '{$uid}')

-					return this.dom.uniqueId();

+				args = args || {};

+				args.format = args.format || 'html';

 

-				return v;

-			}

+				// Pre process

+				if (!args.no_events) {

+					args.node = node;

+					onPreProcess.dispatch(self, args);

+				}

 

-			v = this.dom.getAttrib(n, na);

+				// Setup serializer

+				htmlSerializer = new tinymce.html.Serializer(settings, schema);

 

-			switch (na) {

-				case 'rowspan':

-				case 'colspan':

-					// Whats the point? Remove usless attribute value

-					if (v == '1')

-						v = '';

+				// Parse and serialize HTML

+				args.content = htmlSerializer.serialize(

+					htmlParser.parse(args.getInner ? node.innerHTML : tinymce.trim(dom.getOuterHTML(node), args), args)

+				);

 

-					break;

-			}

+				// Replace all BOM characters for now until we can find a better solution

+				if (!args.cleanup)

+					args.content = args.content.replace(/\uFEFF|\u200B/g, '');

 

-			if (this.attribValueFilter)

-				v = this.attribValueFilter(na, v, n);

+				// Post process

+				if (!args.no_events)

+					onPostProcess.dispatch(self, args);

 

-			if (a.validVals) {

-				for (i = a.validVals.length - 1; i >= 0; i--) {

-					if (v == a.validVals[i])

-						break;

-				}

+				// Restore the old document if it was changed

+				if (oldDoc)

+					dom.doc = oldDoc;

 

-				if (i == -1)

-					return null;

-			}

+				args.node = null;

 

-			if (v === '' && typeof(a.defaultVal) != 'undefined') {

-				v = a.defaultVal;

+				return args.content;

+			},

 

-				if (v === '{$uid}')

-					return this.dom.uniqueId();

+			addRules : function(rules) {

+				schema.addValidElements(rules);

+			},

 

-				return v;

-			} else {

-				// Remove internal mceItemXX classes when content is extracted from editor

-				if (na == 'class' && this.processObj.get)

-					v = v.replace(/\s?mceItem\w+\s?/g, '');

+			setRules : function(rules) {

+				schema.setValidElements(rules);

 			}

-

-			if (v === '')

-				return null;

-

-

-			return v;

-		}

-	});

+		};

+	};

 })(tinymce);

-

 (function(tinymce) {

 	tinymce.dom.ScriptLoader = function(settings) {

 		var QUEUED = 0,

@@ -6850,6 +9277,17 @@ window.tinymce.dom.Sizzle = Sizzle;
 

 				callback();

 			};

+			

+			function error() {

+				// Report the error so it's easier for people to spot loading errors

+				if (typeof(console) !== "undefined" && console.log)

+					console.log("Failed to load: " + url);

+

+				// We can't mark it as done if there is a load error since

+				// A) We don't want to produce 404 errors on the server and

+				// B) the onerror event won't fire on all browsers.

+				// done();

+			};

 

 			id = dom.uniqueId();

 

@@ -6859,7 +9297,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 

 				// If script is from same domain and we

 				// use IE 6 then use XHR since it's more reliable

-				if (uri.host == loc.hostname && uri.port == loc.port && (uri.protocol + ':') == loc.protocol) {

+				if (uri.host == loc.hostname && uri.port == loc.port && (uri.protocol + ':') == loc.protocol && uri.protocol.toLowerCase() != 'file') {

 					tinymce.util.XHR.send({

 						url : tinymce._addVer(uri.getURI()),

 						success : function(content) {

@@ -6874,7 +9312,9 @@ window.tinymce.dom.Sizzle = Sizzle;
 							dom.remove(script);

 

 							done();

-						}

+						},

+						

+						error : error

 					});

 

 					return;

@@ -6888,17 +9328,26 @@ window.tinymce.dom.Sizzle = Sizzle;
 				src : tinymce._addVer(url)

 			});

 

-			// Add onload and readystate listeners

-			elm.onload = done;

-			elm.onreadystatechange = function() {

-				var state = elm.readyState;

+			// Add onload listener for non IE browsers since IE9

+			// fires onload event before the script is parsed and executed

+			if (!tinymce.isIE)

+				elm.onload = done;

 

-				// Loaded state is passed on IE 6 however there

-				// are known issues with this method but we can't use

-				// XHR in a cross domain loading

-				if (state == 'complete' || state == 'loaded')

-					done();

-			};

+			// Add onerror event will get fired on some browsers but not all of them

+			elm.onerror = error;

+

+			// Opera 9.60 doesn't seem to fire the onreadystate event at correctly

+			if (!tinymce.isOpera) {

+				elm.onreadystatechange = function() {

+					var state = elm.readyState;

+

+					// Loaded state is passed on IE 6 however there

+					// are known issues with this method but we can't use

+					// XHR in a cross domain loading

+					if (state == 'complete' || state == 'loaded')

+						done();

+				};

+			}

 

 			// Most browsers support this feature so we report errors

 			// for those at least to help users track their missing plugins etc

@@ -7046,164 +9495,10 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 	};

 

 	this.prev = function(shallow) {

-		return (node = findSibling(node, 'lastChild', 'lastSibling', shallow));

+		return (node = findSibling(node, 'lastChild', 'previousSibling', shallow));

 	};

 };

 

-(function() {

-	var transitional = {};

-

-	function unpack(lookup, data) {

-		var key;

-

-		function replace(value) {

-			return value.replace(/[A-Z]+/g, function(key) {

-				return replace(lookup[key]);

-			});

-		};

-

-		// Unpack lookup

-		for (key in lookup) {

-			if (lookup.hasOwnProperty(key))

-				lookup[key] = replace(lookup[key]);

-		}

-

-		// Unpack and parse data into object map

-		replace(data).replace(/#/g, '#text').replace(/(\w+)\[([^\]]+)\]/g, function(str, name, children) {

-			var i, map = {};

-

-			children = children.split(/\|/);

-

-			for (i = children.length - 1; i >= 0; i--)

-				map[children[i]] = 1;

-

-			transitional[name] = map;

-		});

-	};

-

-	// This is the XHTML 1.0 transitional elements with it's children packed to reduce it's size

-	// we will later include the attributes here and use it as a default for valid elements but it

-	// requires us to rewrite the serializer engine

-	unpack({

-		Z : '#|H|K|N|O|P',

-		Y : '#|X|form|R|Q',

-		X : 'p|T|div|U|W|isindex|fieldset|table',

-		W : 'pre|hr|blockquote|address|center|noframes',

-		U : 'ul|ol|dl|menu|dir',

-		ZC : '#|p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q',

-		T : 'h1|h2|h3|h4|h5|h6',

-		ZB : '#|X|S|Q',

-		S : 'R|P',

-		ZA : '#|a|G|J|M|O|P',

-		R : '#|a|H|K|N|O',

-		Q : 'noscript|P',

-		P : 'ins|del|script',

-		O : 'input|select|textarea|label|button',

-		N : 'M|L',

-		M : 'em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym',

-		L : 'sub|sup',

-		K : 'J|I',

-		J : 'tt|i|b|u|s|strike',

-		I : 'big|small|font|basefont',

-		H : 'G|F',

-		G : 'br|span|bdo',

-		F : 'object|applet|img|map|iframe'

-	}, 'script[]' + 

-		'style[]' + 

-		'object[#|param|X|form|a|H|K|N|O|Q]' + 

-		'param[]' + 

-		'p[S]' + 

-		'a[Z]' + 

-		'br[]' + 

-		'span[S]' + 

-		'bdo[S]' + 

-		'applet[#|param|X|form|a|H|K|N|O|Q]' + 

-		'h1[S]' + 

-		'img[]' + 

-		'map[X|form|Q|area]' + 

-		'h2[S]' + 

-		'iframe[#|X|form|a|H|K|N|O|Q]' + 

-		'h3[S]' + 

-		'tt[S]' + 

-		'i[S]' + 

-		'b[S]' + 

-		'u[S]' + 

-		's[S]' + 

-		'strike[S]' + 

-		'big[S]' + 

-		'small[S]' + 

-		'font[S]' + 

-		'basefont[]' + 

-		'em[S]' + 

-		'strong[S]' + 

-		'dfn[S]' + 

-		'code[S]' + 

-		'q[S]' + 

-		'samp[S]' + 

-		'kbd[S]' + 

-		'var[S]' + 

-		'cite[S]' + 

-		'abbr[S]' + 

-		'acronym[S]' + 

-		'sub[S]' + 

-		'sup[S]' + 

-		'input[]' + 

-		'select[optgroup|option]' + 

-		'optgroup[option]' + 

-		'option[]' + 

-		'textarea[]' + 

-		'label[S]' + 

-		'button[#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]' + 

-		'h4[S]' + 

-		'ins[#|X|form|a|H|K|N|O|Q]' + 

-		'h5[S]' + 

-		'del[#|X|form|a|H|K|N|O|Q]' + 

-		'h6[S]' + 

-		'div[#|X|form|a|H|K|N|O|Q]' + 

-		'ul[li]' + 

-		'li[#|X|form|a|H|K|N|O|Q]' + 

-		'ol[li]' + 

-		'dl[dt|dd]' + 

-		'dt[S]' + 

-		'dd[#|X|form|a|H|K|N|O|Q]' + 

-		'menu[li]' + 

-		'dir[li]' + 

-		'pre[ZA]' + 

-		'hr[]' + 

-		'blockquote[#|X|form|a|H|K|N|O|Q]' + 

-		'address[S|p]' + 

-		'center[#|X|form|a|H|K|N|O|Q]' + 

-		'noframes[#|X|form|a|H|K|N|O|Q]' + 

-		'isindex[]' + 

-		'fieldset[#|legend|X|form|a|H|K|N|O|Q]' + 

-		'legend[S]' + 

-		'table[caption|col|colgroup|thead|tfoot|tbody|tr]' + 

-		'caption[S]' + 

-		'col[]' + 

-		'colgroup[col]' + 

-		'thead[tr]' + 

-		'tr[th|td]' + 

-		'th[#|X|form|a|H|K|N|O|Q]' + 

-		'form[#|X|a|H|K|N|O|Q]' + 

-		'noscript[#|X|form|a|H|K|N|O|Q]' + 

-		'td[#|X|form|a|H|K|N|O|Q]' + 

-		'tfoot[tr]' + 

-		'tbody[tr]' + 

-		'area[]' + 

-		'base[]' + 

-		'body[#|X|form|a|H|K|N|O|Q]'

-	);

-

-	tinymce.dom.Schema = function() {

-		var t = this, elements = transitional;

-

-		t.isValid = function(name, child_name) {

-			var element = elements[name];

-

-			return !!(element && (!child_name || element[child_name]));

-		};

-	};

-})();

 (function(tinymce) {

 	tinymce.dom.RangeUtils = function(dom) {

 		var INVISIBLE_CHAR = '\uFEFF';

@@ -7227,6 +9522,24 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 				return;

 			}

 

+			function exclude(nodes) {

+				var node;

+

+				// First node is excluded

+				node = nodes[0];

+				if (node.nodeType === 3 && node === startContainer && startOffset >= node.nodeValue.length) {

+					nodes.splice(0, 1);

+				}

+

+				// Last node is excluded

+				node = nodes[nodes.length - 1];

+				if (endOffset === 0 && nodes.length > 0 && node === endContainer && node.nodeType === 3) {

+					nodes.splice(nodes.length - 1, 1);

+				}

+

+				return nodes;

+			};

+

 			function collectSiblings(node, name, end_node) {

 				var siblings = [];

 

@@ -7256,7 +9569,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 						if (!next)

 							siblings.reverse();

 

-						callback(siblings);

+						callback(exclude(siblings));

 					}

 				}

 			};

@@ -7267,30 +9580,30 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 

 			// If index based end position then resolve it

 			if (endContainer.nodeType == 1 && endContainer.hasChildNodes())

-				endContainer = endContainer.childNodes[Math.min(startOffset == endOffset ? endOffset : endOffset - 1, endContainer.childNodes.length - 1)];

-

-			// Find common ancestor and end points

-			ancestor = dom.findCommonAncestor(startContainer, endContainer);

+				endContainer = endContainer.childNodes[Math.min(endOffset - 1, endContainer.childNodes.length - 1)];

 

 			// Same container

 			if (startContainer == endContainer)

-				return callback([startContainer]);

+				return callback(exclude([startContainer]));

 

+			// Find common ancestor and end points

+			ancestor = dom.findCommonAncestor(startContainer, endContainer);

+				

 			// Process left side

 			for (node = startContainer; node; node = node.parentNode) {

-				if (node == endContainer)

+				if (node === endContainer)

 					return walkBoundary(startContainer, ancestor, true);

 

-				if (node == ancestor)

+				if (node === ancestor)

 					break;

 			}

 

 			// Process right side

 			for (node = endContainer; node; node = node.parentNode) {

-				if (node == startContainer)

+				if (node === startContainer)

 					return walkBoundary(endContainer, ancestor);

 

-				if (node == ancestor)

+				if (node === ancestor)

 					break;

 			}

 

@@ -7309,48 +9622,46 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 			);

 

 			if (siblings.length)

-				callback(siblings);

+				callback(exclude(siblings));

 

 			// Walk right leaf

 			walkBoundary(endContainer, endPoint);

 		};

 

-		/*		this.split = function(rng) {

+		this.split = function(rng) {

 			var startContainer = rng.startContainer,

 				startOffset = rng.startOffset,

 				endContainer = rng.endContainer,

 				endOffset = rng.endOffset;

 

 			function splitText(node, offset) {

-				if (offset == node.nodeValue.length)

-					node.appendData(INVISIBLE_CHAR);

-

-				node = node.splitText(offset);

-

-				if (node.nodeValue === INVISIBLE_CHAR)

-					node.nodeValue = '';

-

-				return node;

+				return node.splitText(offset);

 			};

 

 			// Handle single text node

-			if (startContainer == endContainer) {

-				if (startContainer.nodeType == 3) {

-					if (startOffset != 0)

-						startContainer = endContainer = splitText(startContainer, startOffset);

-

-					if (endOffset - startOffset != startContainer.nodeValue.length)

-						splitText(startContainer, endOffset - startOffset);

+			if (startContainer == endContainer && startContainer.nodeType == 3) {

+				if (startOffset > 0 && startOffset < startContainer.nodeValue.length) {

+					endContainer = splitText(startContainer, startOffset);

+					startContainer = endContainer.previousSibling;

+

+					if (endOffset > startOffset) {

+						endOffset = endOffset - startOffset;

+						startContainer = endContainer = splitText(endContainer, endOffset).previousSibling;

+						endOffset = endContainer.nodeValue.length;

+						startOffset = 0;

+					} else {

+						endOffset = 0;

+					}

 				}

 			} else {

 				// Split startContainer text node if needed

-				if (startContainer.nodeType == 3 && startOffset != 0) {

+				if (startContainer.nodeType == 3 && startOffset > 0 && startOffset < startContainer.nodeValue.length) {

 					startContainer = splitText(startContainer, startOffset);

 					startOffset = 0;

 				}

 

 				// Split endContainer text node if needed

-				if (endContainer.nodeType == 3 && endOffset != endContainer.nodeValue.length) {

+				if (endContainer.nodeType == 3 && endOffset > 0 && endOffset < endContainer.nodeValue.length) {

 					endContainer = splitText(endContainer, endOffset).previousSibling;

 					endOffset = endContainer.nodeValue.length;

 				}

@@ -7363,7 +9674,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 				endOffset : endOffset

 			};

 		};

-*/

+

 	};

 

 	tinymce.dom.RangeUtils.compareRanges = function(rng1, rng2) {

@@ -7388,11 +9699,158 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 })(tinymce);

 

 (function(tinymce) {

+	var Event = tinymce.dom.Event, each = tinymce.each;

+

+	tinymce.create('tinymce.ui.KeyboardNavigation', {

+		KeyboardNavigation: function(settings, dom) {

+			var t = this, root = settings.root, items = settings.items,

+					enableUpDown = settings.enableUpDown, enableLeftRight = settings.enableLeftRight || !settings.enableUpDown,

+					excludeFromTabOrder = settings.excludeFromTabOrder,

+					itemFocussed, itemBlurred, rootKeydown, rootFocussed, focussedId;

+

+			dom = dom || tinymce.DOM;

+

+			itemFocussed = function(evt) {

+				focussedId = evt.target.id;

+			};

+			

+			itemBlurred = function(evt) {

+				dom.setAttrib(evt.target.id, 'tabindex', '-1');

+			};

+			

+			rootFocussed = function(evt) {

+				var item = dom.get(focussedId);

+				dom.setAttrib(item, 'tabindex', '0');

+				item.focus();

+			};

+			

+			t.focus = function() {

+				dom.get(focussedId).focus();

+			};

+

+			t.destroy = function() {

+				each(items, function(item) {

+					dom.unbind(dom.get(item.id), 'focus', itemFocussed);

+					dom.unbind(dom.get(item.id), 'blur', itemBlurred);

+				});

+

+				dom.unbind(dom.get(root), 'focus', rootFocussed);

+				dom.unbind(dom.get(root), 'keydown', rootKeydown);

+

+				items = dom = root = t.focus = itemFocussed = itemBlurred = rootKeydown = rootFocussed = null;

+				t.destroy = function() {};

+			};

+			

+			t.moveFocus = function(dir, evt) {

+				var idx = -1, controls = t.controls, newFocus;

+

+				if (!focussedId)

+					return;

+

+				each(items, function(item, index) {

+					if (item.id === focussedId) {

+						idx = index;

+						return false;

+					}

+				});

+

+				idx += dir;

+				if (idx < 0) {

+					idx = items.length - 1;

+				} else if (idx >= items.length) {

+					idx = 0;

+				}

+				

+				newFocus = items[idx];

+				dom.setAttrib(focussedId, 'tabindex', '-1');

+				dom.setAttrib(newFocus.id, 'tabindex', '0');

+				dom.get(newFocus.id).focus();

+

+				if (settings.actOnFocus) {

+					settings.onAction(newFocus.id);

+				}

+

+				if (evt)

+					Event.cancel(evt);

+			};

+			

+			rootKeydown = function(evt) {

+				var DOM_VK_LEFT = 37, DOM_VK_RIGHT = 39, DOM_VK_UP = 38, DOM_VK_DOWN = 40, DOM_VK_ESCAPE = 27, DOM_VK_ENTER = 14, DOM_VK_RETURN = 13, DOM_VK_SPACE = 32;

+				

+				switch (evt.keyCode) {

+					case DOM_VK_LEFT:

+						if (enableLeftRight) t.moveFocus(-1);

+						break;

+	

+					case DOM_VK_RIGHT:

+						if (enableLeftRight) t.moveFocus(1);

+						break;

+	

+					case DOM_VK_UP:

+						if (enableUpDown) t.moveFocus(-1);

+						break;

+

+					case DOM_VK_DOWN:

+						if (enableUpDown) t.moveFocus(1);

+						break;

+

+					case DOM_VK_ESCAPE:

+						if (settings.onCancel) {

+							settings.onCancel();

+							Event.cancel(evt);

+						}

+						break;

+

+					case DOM_VK_ENTER:

+					case DOM_VK_RETURN:

+					case DOM_VK_SPACE:

+						if (settings.onAction) {

+							settings.onAction(focussedId);

+							Event.cancel(evt);

+						}

+						break;

+				}

+			};

+

+			// Set up state and listeners for each item.

+			each(items, function(item, idx) {

+				var tabindex;

+

+				if (!item.id) {

+					item.id = dom.uniqueId('_mce_item_');

+				}

+

+				if (excludeFromTabOrder) {

+					dom.bind(item.id, 'blur', itemBlurred);

+					tabindex = '-1';

+				} else {

+					tabindex = (idx === 0 ? '0' : '-1');

+				}

+

+				dom.setAttrib(item.id, 'tabindex', tabindex);

+				dom.bind(dom.get(item.id), 'focus', itemFocussed);

+			});

+			

+			// Setup initial state for root element.

+			if (items[0]){

+				focussedId = items[0].id;

+			}

+

+			dom.setAttrib(root, 'tabindex', '-1');

+			

+			// Setup listeners for root element.

+			dom.bind(dom.get(root), 'focus', rootFocussed);

+			dom.bind(dom.get(root), 'keydown', rootKeydown);

+		}

+	});

+})(tinymce);

+

+(function(tinymce) {

 	// Shorten class names

 	var DOM = tinymce.DOM, is = tinymce.is;

 

 	tinymce.create('tinymce.ui.Control', {

-		Control : function(id, s) {

+		Control : function(id, s, editor) {

 			this.id = id;

 			this.settings = s = s || {};

 			this.rendered = false;

@@ -7401,22 +9859,23 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 			this.scope = s.scope || this;

 			this.disabled = 0;

 			this.active = 0;

+			this.editor = editor;

+		},

+		

+		setAriaProperty : function(property, value) {

+			var element = DOM.get(this.id + '_aria') || DOM.get(this.id);

+			if (element) {

+				DOM.setAttrib(element, 'aria-' + property, !!value);

+			}

+		},

+		

+		focus : function() {

+			DOM.get(this.id).focus();

 		},

 

 		setDisabled : function(s) {

-			var e;

-

 			if (s != this.disabled) {

-				e = DOM.get(this.id);

-

-				// Add accessibility title for unavailable actions

-				if (e && this.settings.unavailable_prefix) {

-					if (s) {

-						this.prevTitle = e.title;

-						e.title = this.settings.unavailable_prefix + ": " + e.title;

-					} else

-						e.title = this.prevTitle;

-				}

+				this.setAriaProperty('disabled', s);

 

 				this.setState('Disabled', s);

 				this.setState('Enabled', !s);

@@ -7432,6 +9891,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 			if (s != this.active) {

 				this.setState('Active', s);

 				this.active = s;

+				this.setAriaProperty('pressed', s);

 			}

 		},

 

@@ -7489,8 +9949,8 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 	});

 })(tinymce);

 tinymce.create('tinymce.ui.Container:tinymce.ui.Control', {

-	Container : function(id, s) {

-		this.parent(id, s);

+	Container : function(id, s, editor) {

+		this.parent(id, s, editor);

 

 		this.controls = [];

 

@@ -7514,10 +9974,11 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 	Separator : function(id, s) {

 		this.parent(id, s);

 		this.classPrefix = 'mceSeparator';

+		this.setDisabled(true);

 	},

 

 	renderHTML : function() {

-		return tinymce.DOM.createHTML('span', {'class' : this.classPrefix});

+		return tinymce.DOM.createHTML('span', {'class' : this.classPrefix, role : 'separator', 'aria-orientation' : 'vertical', tabindex : '-1'});

 	}

 });

 

@@ -7532,6 +9993,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 

 		setSelected : function(s) {

 			this.setState('Selected', s);

+			this.setAriaProperty('checked', !!s);

 			this.selected = s;

 		},

 

@@ -7679,12 +10141,20 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			s['class'] = s['class'] || cs['class'];

 			s.vp_offset_x = s.vp_offset_x || cs.vp_offset_x;

 			s.vp_offset_y = s.vp_offset_y || cs.vp_offset_y;

+			s.keyboard_focus = cs.keyboard_focus;

 			m = new tinymce.ui.DropMenu(s.id || DOM.uniqueId(), s);

 

 			m.onAddItem.add(t.onAddItem.dispatch, t.onAddItem);

 

 			return m;

 		},

+		

+		focus : function() {

+			var t = this;

+			if (t.keyboardNav) {

+				t.keyboardNav.focus();

+			}

+		},

 

 		update : function() {

 			var t = this, s = t.settings, tb = DOM.get('menu_' + t.id + '_tbl'), co = DOM.get('menu_' + t.id + '_co'), tw, th;

@@ -7780,7 +10250,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 					if (m.settings.onclick)

 						m.settings.onclick(e);

 

-					return Event.cancel(e); // Cancel to fix onbeforeunload problem

+					return false; // Cancel to fix onbeforeunload problem

 				}

 			});

 

@@ -7808,13 +10278,13 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 					}

 				});

 			}

+			

+			Event.add(co, 'keydown', t._keyHandler, t);

 

 			t.onShowMenu.dispatch(t);

 

-			if (s.keyboard_focus) {

-				Event.add(co, 'keydown', t._keyHandler, t);

-				DOM.select('a', 'menu_' + t.id)[0].focus(); // Select first link

-				t._focusIdx = 0;

+			if (s.keyboard_focus) { 

+				t._setupKeyboardNav(); 

 			}

 		},

 

@@ -7824,6 +10294,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			if (!t.isMenuVisible)

 				return;

 

+			if (t.keyboardNav) t.keyboardNav.destroy();

 			Event.remove(co, 'mouseover', t.mouseOverFunc);

 			Event.remove(co, 'click', t.mouseClickFunc);

 			Event.remove(co, 'keydown', t._keyHandler);

@@ -7868,8 +10339,11 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		destroy : function() {

 			var t = this, co = DOM.get('menu_' + t.id);

 

+			if (t.keyboardNav) t.keyboardNav.destroy();

 			Event.remove(co, 'mouseover', t.mouseOverFunc);

+			Event.remove(DOM.select('a', co), 'focus', t.mouseOverFunc);

 			Event.remove(co, 'click', t.mouseClickFunc);

+			Event.remove(co, 'keydown', t._keyHandler);

 

 			if (t.element)

 				t.element.remove();

@@ -7880,15 +10354,18 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		renderNode : function() {

 			var t = this, s = t.settings, n, tb, co, w;

 

-			w = DOM.create('div', {id : 'menu_' + t.id, 'class' : s['class'], 'style' : 'position:absolute;left:0;top:0;z-index:200000'});

-			co = DOM.add(w, 'div', {id : 'menu_' + t.id + '_co', 'class' : t.classPrefix + (s['class'] ? ' ' + s['class'] : '')});

+			w = DOM.create('div', {role: 'listbox', id : 'menu_' + t.id, 'class' : s['class'], 'style' : 'position:absolute;left:0;top:0;z-index:200000;outline:0'});

+			if (t.settings.parent) {

+				DOM.setAttrib(w, 'aria-parent', 'menu_' + t.settings.parent.id);

+			}

+			co = DOM.add(w, 'div', {role: 'presentation', id : 'menu_' + t.id + '_co', 'class' : t.classPrefix + (s['class'] ? ' ' + s['class'] : '')});

 			t.element = new Element('menu_' + t.id, {blocker : 1, container : s.container});

 

 			if (s.menu_line)

 				DOM.add(co, 'span', {'class' : t.classPrefix + 'Line'});

 

 //			n = DOM.add(co, 'div', {id : 'menu_' + t.id + '_co', 'class' : 'mceMenuContainer'});

-			n = DOM.add(co, 'table', {id : 'menu_' + t.id + '_tbl', border : 0, cellPadding : 0, cellSpacing : 0});

+			n = DOM.add(co, 'table', {role: 'presentation', id : 'menu_' + t.id + '_tbl', border : 0, cellPadding : 0, cellSpacing : 0});

 			tb = DOM.add(n, 'tbody');

 

 			each(t.items, function(o) {

@@ -7901,33 +10378,36 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		},

 

 		// Internal functions

+		_setupKeyboardNav : function(){

+			var contextMenu, menuItems, t=this; 

+			contextMenu = DOM.get('menu_' + t.id);

+			menuItems = DOM.select('a[role=option]', 'menu_' + t.id);

+			menuItems.splice(0,0,contextMenu);

+			t.keyboardNav = new tinymce.ui.KeyboardNavigation({

+				root: 'menu_' + t.id,

+				items: menuItems,

+				onCancel: function() {

+					t.hideMenu();

+				},

+				enableUpDown: true

+			});

+			contextMenu.focus();

+		},

 

-		_keyHandler : function(e) {

-			var t = this, kc = e.keyCode;

-

-			function focus(d) {

-				var i = t._focusIdx + d, e = DOM.select('a', 'menu_' + t.id)[i];

-

-				if (e) {

-					t._focusIdx = i;

-					e.focus();

-				}

-			};

-

-			switch (kc) {

-				case 38:

-					focus(-1); // Select first link

-					return;

-

-				case 40:

-					focus(1);

-					return;

-

-				case 13:

-					return;

-

-				case 27:

-					return this.hideMenu();

+		_keyHandler : function(evt) {

+			var t = this, e;

+			switch (evt.keyCode) {

+				case 37: // Left

+					if (t.settings.parent) {

+						t.hideMenu();

+						t.settings.parent.focus();

+						Event.cancel(evt);

+					}

+					break;

+				case 39: // Right

+					if (t.mouseOverFunc)

+						t.mouseOverFunc(evt);

+					break;

 			}

 		},

 

@@ -7945,8 +10425,13 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			}

 

 			n = ro = DOM.add(tb, 'tr', {id : o.id, 'class' : cp + 'Item ' + cp + 'ItemEnabled'});

-			n = it = DOM.add(n, 'td');

-			n = a = DOM.add(n, 'a', {href : 'javascript:;', onclick : "return false;", onmousedown : 'return false;'});

+			n = it = DOM.add(n, s.titleItem ? 'th' : 'td');

+			n = a = DOM.add(n, 'a', {id: o.id + '_aria',  role: s.titleItem ? 'presentation' : 'option', href : 'javascript:;', onclick : "return false;", onmousedown : 'return false;'});

+

+			if (s.parent) {

+				DOM.setAttrib(a, 'aria-haspopup', 'true');

+				DOM.setAttrib(a, 'aria-owns', 'menu_' + o.id);

+			}

 

 			DOM.addClass(it, s['class']);

 //			n = DOM.add(n, 'span', {'class' : 'item'});

@@ -7958,8 +10443,12 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 

 			n = DOM.add(n, s.element || 'span', {'class' : 'mceText', title : o.settings.title}, o.settings.title);

 

-			if (o.settings.style)

+			if (o.settings.style) {

+				if (typeof o.settings.style == "function")

+					o.settings.style = o.settings.style();

+

 				DOM.setAttrib(n, 'style', o.settings.style);

+			}

 

 			if (tb.childNodes.length == 1)

 				DOM.addClass(ro, 'mceFirst');

@@ -7981,8 +10470,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 	var DOM = tinymce.DOM;

 

 	tinymce.create('tinymce.ui.Button:tinymce.ui.Control', {

-		Button : function(id, s) {

-			this.parent(id, s);

+		Button : function(id, s, ed) {

+			this.parent(id, s, ed);

 			this.classPrefix = 'mceButton';

 		},

 

@@ -7990,21 +10479,39 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			var cp = this.classPrefix, s = this.settings, h, l;

 

 			l = DOM.encode(s.label || '');

-			h = '<a id="' + this.id + '" href="javascript:;" class="' + cp + ' ' + cp + 'Enabled ' + s['class'] + (l ? ' ' + cp + 'Labeled' : '') +'" onmousedown="return false;" onclick="return false;" title="' + DOM.encode(s.title) + '">';

-

-			if (s.image)

-				h += '<img class="mceIcon" src="' + s.image + '" />' + l + '</a>';

+			h = '<a role="button" id="' + this.id + '" href="javascript:;" class="' + cp + ' ' + cp + 'Enabled ' + s['class'] + (l ? ' ' + cp + 'Labeled' : '') +'" onmousedown="return false;" onclick="return false;" aria-labelledby="' + this.id + '_voice" title="' + DOM.encode(s.title) + '">';

+			if (s.image && !(this.editor  &&this.editor.forcedHighContrastMode) )

+				h += '<img class="mceIcon" src="' + s.image + '" alt="' + DOM.encode(s.title) + '" />' + l;

 			else

-				h += '<span class="mceIcon ' + s['class'] + '"></span>' + (l ? '<span class="' + cp + 'Label">' + l + '</span>' : '') + '</a>';

+				h += '<span class="mceIcon ' + s['class'] + '"></span>' + (l ? '<span class="' + cp + 'Label">' + l + '</span>' : '');

 

+			h += '<span class="mceVoiceLabel mceIconOnly" style="display: none;" id="' + this.id + '_voice">' + s.title + '</span>'; 

+			h += '</a>';

 			return h;

 		},

 

 		postRender : function() {

-			var t = this, s = t.settings;

-

+			var t = this, s = t.settings, imgBookmark;

+

+			// In IE a large image that occupies the entire editor area will be deselected when a button is clicked, so

+			// need to keep the selection in case the selection is lost

+			if (tinymce.isIE && t.editor) {

+				tinymce.dom.Event.add(t.id, 'mousedown', function(e) {

+					var nodeName = t.editor.selection.getNode().nodeName;

+					imgBookmark = nodeName === 'IMG' ? t.editor.selection.getBookmark() : null;

+				});

+			}

 			tinymce.dom.Event.add(t.id, 'click', function(e) {

-				if (!t.isDisabled())

+				if (!t.isDisabled()) {

+					// restore the selection in case the selection is lost in IE

+					if (tinymce.isIE && t.editor && imgBookmark !== null) {

+						t.editor.selection.moveToBookmark(imgBookmark);

+					}

+					return s.onclick.call(s.scope, e);

+				}

+			});

+			tinymce.dom.Event.add(t.id, 'keyup', function(e) {

+				if (!t.isDisabled() && e.keyCode==tinymce.VK.SPACEBAR)

 					return s.onclick.call(s.scope, e);

 			});

 		}

@@ -8015,10 +10522,10 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher;

 

 	tinymce.create('tinymce.ui.ListBox:tinymce.ui.Control', {

-		ListBox : function(id, s) {

+		ListBox : function(id, s, ed) {

 			var t = this;

 

-			t.parent(id, s);

+			t.parent(id, s, ed);

 

 			t.items = [];

 

@@ -8031,16 +10538,19 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			t.onRenderMenu = new tinymce.util.Dispatcher(this);

 

 			t.classPrefix = 'mceListBox';

+			t.marked = {};

 		},

 

 		select : function(va) {

 			var t = this, fv, f;

 

+			t.marked = {};

+

 			if (va == undefined)

 				return t.selectByIndex(-1);

 

 			// Is string or number make function selector

-			if (va && va.call)

+			if (va && typeof(va)=="function")

 				f = va;

 			else {

 				f = function(v) {

@@ -8065,27 +10575,37 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		},

 

 		selectByIndex : function(idx) {

-			var t = this, e, o;

+			var t = this, e, o, label;

+

+			t.marked = {};

 

 			if (idx != t.selectedIndex) {

 				e = DOM.get(t.id + '_text');

+				label = DOM.get(t.id + '_voiceDesc');

 				o = t.items[idx];

 

 				if (o) {

 					t.selectedValue = o.value;

 					t.selectedIndex = idx;

 					DOM.setHTML(e, DOM.encode(o.title));

+					DOM.setHTML(label, t.settings.title + " - " + o.title);

 					DOM.removeClass(e, 'mceTitle');

+					DOM.setAttrib(t.id, 'aria-valuenow', o.title);

 				} else {

 					DOM.setHTML(e, DOM.encode(t.settings.title));

+					DOM.setHTML(label, DOM.encode(t.settings.title));

 					DOM.addClass(e, 'mceTitle');

 					t.selectedValue = t.selectedIndex = null;

+					DOM.setAttrib(t.id, 'aria-valuenow', t.settings.title);

 				}

-

 				e = 0;

 			}

 		},

 

+		mark : function(value) {

+			this.marked[value] = true;

+		},

+

 		add : function(n, v, o) {

 			var t = this;

 

@@ -8106,16 +10626,17 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		renderHTML : function() {

 			var h = '', t = this, s = t.settings, cp = t.classPrefix;

 

-			h = '<table id="' + t.id + '" cellpadding="0" cellspacing="0" class="' + cp + ' ' + cp + 'Enabled' + (s['class'] ? (' ' + s['class']) : '') + '"><tbody><tr>';

-			h += '<td>' + DOM.createHTML('a', {id : t.id + '_text', href : 'javascript:;', 'class' : 'mceText', onclick : "return false;", onmousedown : 'return false;'}, DOM.encode(t.settings.title)) + '</td>';

-			h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', tabindex : -1, href : 'javascript:;', 'class' : 'mceOpen', onclick : "return false;", onmousedown : 'return false;'}, '<span></span>') + '</td>';

-			h += '</tr></tbody></table>';

+			h = '<span role="listbox" aria-haspopup="true" aria-labelledby="' + t.id +'_voiceDesc" aria-describedby="' + t.id + '_voiceDesc"><table role="presentation" tabindex="0" id="' + t.id + '" cellpadding="0" cellspacing="0" class="' + cp + ' ' + cp + 'Enabled' + (s['class'] ? (' ' + s['class']) : '') + '"><tbody><tr>';

+			h += '<td>' + DOM.createHTML('span', {id: t.id + '_voiceDesc', 'class': 'voiceLabel', style:'display:none;'}, t.settings.title); 

+			h += DOM.createHTML('a', {id : t.id + '_text', tabindex : -1, href : 'javascript:;', 'class' : 'mceText', onclick : "return false;", onmousedown : 'return false;'}, DOM.encode(t.settings.title)) + '</td>';

+			h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', tabindex : -1, href : 'javascript:;', 'class' : 'mceOpen', onclick : "return false;", onmousedown : 'return false;'}, '<span><span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span></span>') + '</td>';

+			h += '</tr></tbody></table></span>';

 

 			return h;

 		},

 

 		showMenu : function() {

-			var t = this, p1, p2, e = DOM.get(this.id), m;

+			var t = this, p2, e = DOM.get(this.id), m;

 

 			if (t.isDisabled() || t.items.length == 0)

 				return;

@@ -8128,7 +10649,6 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				t.isMenuRendered = true;

 			}

 

-			p1 = DOM.getPos(this.settings.menu_container);

 			p2 = DOM.getPos(e);

 

 			m = t.menu;

@@ -8137,13 +10657,19 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			m.settings.keyboard_focus = !tinymce.isOpera; // Opera is buggy when it comes to auto focus

 

 			// Select in menu

-			if (t.oldID)

-				m.items[t.oldID].setSelected(0);

+			each(t.items, function(o) {

+				if (m.items[o.id]) {

+					m.items[o.id].setSelected(0);

+				}

+			});

 

 			each(t.items, function(o) {

+				if (m.items[o.id] && t.marked[o.value]) {

+					m.items[o.id].setSelected(1);

+				}

+

 				if (o.value === t.selectedValue) {

 					m.items[o.id].setSelected(1);

-					t.oldID = o.id;

 				}

 			});

 

@@ -8159,6 +10685,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			var t = this;

 

 			if (t.menu && t.menu.isMenuVisible) {

+				DOM.removeClass(t.id, t.classPrefix + 'Selected');

+

 				// Prevent double toogles by canceling the mouse click event to the button

 				if (e && e.type == "mousedown" && (e.target.id == t.id + '_text' || e.target.id == t.id + '_open'))

 					return;

@@ -8181,7 +10709,10 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				max_height : 150

 			});

 

-			m.onHideMenu.add(t.hideMenu, t);

+			m.onHideMenu.add(function() {

+				t.hideMenu();

+				t.focus();

+			});

 

 			m.add({

 				title : t.settings.title,

@@ -8197,6 +10728,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				if (o.value === undefined) {

 					m.add({

 						title : o.title,

+						role : "option",

 						'class' : 'mceMenuItemTitle',

 						onclick : function() {

 							if (t.settings.onselect('') !== false)

@@ -8205,6 +10737,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 					});

 				} else {

 					o.id = DOM.uniqueId();

+					o.role= "option";

 					o.onclick = function() {

 						if (t.settings.onselect(o.value) !== false)

 							t.select(o.value); // Must be runned after

@@ -8222,40 +10755,39 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			var t = this, cp = t.classPrefix;

 

 			Event.add(t.id, 'click', t.showMenu, t);

-			Event.add(t.id + '_text', 'focus', function() {

+			Event.add(t.id, 'keydown', function(evt) {

+				if (evt.keyCode == 32) { // Space

+					t.showMenu(evt);

+					Event.cancel(evt);

+				}

+			});

+			Event.add(t.id, 'focus', function() {

 				if (!t._focused) {

-					t.keyDownHandler = Event.add(t.id + '_text', 'keydown', function(e) {

-						var idx = -1, v, kc = e.keyCode;

-

-						// Find current index

-						each(t.items, function(v, i) {

-							if (t.selectedValue == v.value)

-								idx = i;

-						});

-

-						// Move up/down

-						if (kc == 38)

-							v = t.items[idx - 1];

-						else if (kc == 40)

-							v = t.items[idx + 1];

-						else if (kc == 13) {

+					t.keyDownHandler = Event.add(t.id, 'keydown', function(e) {

+						if (e.keyCode == 40) {

+							t.showMenu();

+							Event.cancel(e);

+						}

+					});

+					t.keyPressHandler = Event.add(t.id, 'keypress', function(e) {

+						var v;

+						if (e.keyCode == 13) {

 							// Fake select on enter

 							v = t.selectedValue;

 							t.selectedValue = null; // Needs to be null to fake change

+							Event.cancel(e);

 							t.settings.onselect(v);

-							return Event.cancel(e);

-						}

-

-						if (v) {

-							t.hideMenu();

-							t.select(v.value);

 						}

 					});

 				}

 

 				t._focused = 1;

 			});

-			Event.add(t.id + '_text', 'blur', function() {Event.remove(t.id + '_text', 'keydown', t.keyDownHandler); t._focused = 0;});

+			Event.add(t.id, 'blur', function() {

+				Event.remove(t.id, 'keydown', t.keyDownHandler);

+				Event.remove(t.id, 'keypress', t.keyPressHandler);

+				t._focused = 0;

+			});

 

 			// Old IE doesn't have hover on all elements

 			if (tinymce.isIE6 || !DOM.boxModel) {

@@ -8281,6 +10813,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		}

 	});

 })(tinymce);

+

 (function(tinymce) {

 	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher;

 

@@ -8292,6 +10825,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 

 		setDisabled : function(s) {

 			DOM.get(this.id).disabled = s;

+			this.setAriaProperty('disabled', s);

 		},

 

 		isDisabled : function() {

@@ -8305,7 +10839,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				return t.selectByIndex(-1);

 

 			// Is string or number make function selector

-			if (va && va.call)

+			if (va && typeof(va)=="function")

 				f = va;

 			else {

 				f = function(v) {

@@ -8366,13 +10900,13 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				h += DOM.createHTML('option', {value : it.value}, it.title);

 			});

 

-			h = DOM.createHTML('select', {id : t.id, 'class' : 'mceNativeListBox'}, h);

-

+			h = DOM.createHTML('select', {id : t.id, 'class' : 'mceNativeListBox', 'aria-labelledby': t.id + '_aria'}, h);

+			h += DOM.createHTML('span', {id : t.id + '_aria', 'style': 'display: none'}, t.settings.title);

 			return h;

 		},

 

 		postRender : function() {

-			var t = this, ch;

+			var t = this, ch, changeListenerAdded = true;

 

 			t.rendered = true;

 

@@ -8394,12 +10928,20 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				var bf;

 

 				Event.remove(t.id, 'change', ch);

+				changeListenerAdded = false;

 

 				bf = Event.add(t.id, 'blur', function() {

+					if (changeListenerAdded) return;

+					changeListenerAdded = true;

 					Event.add(t.id, 'change', onChange);

 					Event.remove(t.id, 'blur', bf);

 				});

 

+				//prevent default left and right keys on chrome - so that the keyboard navigation is used.

+				if (tinymce.isWebKit && (e.keyCode==37 ||e.keyCode==39)) {

+					return Event.prevent(e);

+				}

+				

 				if (e.keyCode == 13 || e.keyCode == 32) {

 					onChange(e);

 					return Event.cancel(e);

@@ -8410,12 +10952,13 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		}

 	});

 })(tinymce);

+

 (function(tinymce) {

 	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each;

 

 	tinymce.create('tinymce.ui.MenuButton:tinymce.ui.Button', {

-		MenuButton : function(id, s) {

-			this.parent(id, s);

+		MenuButton : function(id, s, ed) {

+			this.parent(id, s, ed);

 

 			this.onRenderMenu = new tinymce.util.Dispatcher(this);

 

@@ -8462,7 +11005,10 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				icons : t.settings.icons

 			});

 

-			m.onHideMenu.add(t.hideMenu, t);

+			m.onHideMenu.add(function() {

+				t.hideMenu();

+				t.focus();

+			});

 

 			t.onRenderMenu.dispatch(t, m);

 			t.menu = m;

@@ -8504,8 +11050,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each;

 

 	tinymce.create('tinymce.ui.SplitButton:tinymce.ui.MenuButton', {

-		SplitButton : function(id, s) {

-			this.parent(id, s);

+		SplitButton : function(id, s, ed) {

+			this.parent(id, s, ed);

 			this.classPrefix = 'mceSplitButton';

 		},

 

@@ -8515,33 +11061,50 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			h = '<tbody><tr>';

 

 			if (s.image)

-				h1 = DOM.createHTML('img ', {src : s.image, 'class' : 'mceAction ' + s['class']});

+				h1 = DOM.createHTML('img ', {src : s.image, role: 'presentation', 'class' : 'mceAction ' + s['class']});

 			else

 				h1 = DOM.createHTML('span', {'class' : 'mceAction ' + s['class']}, '');

 

-			h += '<td>' + DOM.createHTML('a', {id : t.id + '_action', href : 'javascript:;', 'class' : 'mceAction ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';

+			h1 += DOM.createHTML('span', {'class': 'mceVoiceLabel mceIconOnly', id: t.id + '_voice', style: 'display:none;'}, s.title);

+			h += '<td >' + DOM.createHTML('a', {role: 'button', id : t.id + '_action', tabindex: '-1', href : 'javascript:;', 'class' : 'mceAction ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';

 	

-			h1 = DOM.createHTML('span', {'class' : 'mceOpen ' + s['class']});

-			h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', href : 'javascript:;', 'class' : 'mceOpen ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';

+			h1 = DOM.createHTML('span', {'class' : 'mceOpen ' + s['class']}, '<span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span>');

+			h += '<td >' + DOM.createHTML('a', {role: 'button', id : t.id + '_open', tabindex: '-1', href : 'javascript:;', 'class' : 'mceOpen ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';

 

 			h += '</tr></tbody>';

-

-			return DOM.createHTML('table', {id : t.id, 'class' : 'mceSplitButton mceSplitButtonEnabled ' + s['class'], cellpadding : '0', cellspacing : '0', onmousedown : 'return false;', title : s.title}, h);

+			h = DOM.createHTML('table', { role: 'presentation',   'class' : 'mceSplitButton mceSplitButtonEnabled ' + s['class'], cellpadding : '0', cellspacing : '0', title : s.title}, h);

+			return DOM.createHTML('div', {id : t.id, role: 'button', tabindex: '0', 'aria-labelledby': t.id + '_voice', 'aria-haspopup': 'true'}, h);

 		},

 

 		postRender : function() {

-			var t = this, s = t.settings;

+			var t = this, s = t.settings, activate;

 

 			if (s.onclick) {

-				Event.add(t.id + '_action', 'click', function() {

-					if (!t.isDisabled())

+				activate = function(evt) {

+					if (!t.isDisabled()) {

 						s.onclick(t.value);

+						Event.cancel(evt);

+					}

+				};

+				Event.add(t.id + '_action', 'click', activate);

+				Event.add(t.id, ['click', 'keydown'], function(evt) {

+					var DOM_VK_SPACE = 32, DOM_VK_ENTER = 14, DOM_VK_RETURN = 13, DOM_VK_UP = 38, DOM_VK_DOWN = 40;

+					if ((evt.keyCode === 32 || evt.keyCode === 13 || evt.keyCode === 14) && !evt.altKey && !evt.ctrlKey && !evt.metaKey) {

+						activate();

+						Event.cancel(evt);

+					} else if (evt.type === 'click' || evt.keyCode === DOM_VK_DOWN) {

+						t.showMenu();

+						Event.cancel(evt);

+					}

 				});

 			}

 

-			Event.add(t.id + '_open', 'click', t.showMenu, t);

-			Event.add(t.id + '_open', 'focus', function() {t._focused = 1;});

-			Event.add(t.id + '_open', 'blur', function() {t._focused = 0;});

+			Event.add(t.id + '_open', 'click', function (evt) {

+				t.showMenu();

+				Event.cancel(evt);

+			});

+			Event.add([t.id, t.id + '_open'], 'focus', function() {t._focused = 1;});

+			Event.add([t.id, t.id + '_open'], 'blur', function() {t._focused = 0;});

 

 			// Old IE doesn't have hover on all elements

 			if (tinymce.isIE6 || !DOM.boxModel) {

@@ -8562,6 +11125,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 

 			Event.clear(this.id + '_action');

 			Event.clear(this.id + '_open');

+			Event.clear(this.id);

 		}

 	});

 })(tinymce);

@@ -8570,10 +11134,10 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 	var DOM = tinymce.DOM, Event = tinymce.dom.Event, is = tinymce.is, each = tinymce.each;

 

 	tinymce.create('tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton', {

-		ColorSplitButton : function(id, s) {

+		ColorSplitButton : function(id, s, ed) {

 			var t = this;

 

-			t.parent(id, s);

+			t.parent(id, s, ed);

 

 			t.settings = s = tinymce.extend({

 				colors : '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,008000,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF',

@@ -8631,30 +11195,31 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		hideMenu : function(e) {

 			var t = this;

 

-			// Prevent double toogles by canceling the mouse click event to the button

-			if (e && e.type == "mousedown" && DOM.getParent(e.target, function(e) {return e.id === t.id + '_open';}))

-				return;

-

-			if (!e || !DOM.getParent(e.target, '.mceSplitButtonMenu')) {

-				DOM.removeClass(t.id, 'mceSplitButtonSelected');

-				Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);

-				Event.remove(t.id + '_menu', 'keydown', t._keyHandler);

-				DOM.hide(t.id + '_menu');

-			}

+			if (t.isMenuVisible) {

+				// Prevent double toogles by canceling the mouse click event to the button

+				if (e && e.type == "mousedown" && DOM.getParent(e.target, function(e) {return e.id === t.id + '_open';}))

+					return;

 

-			t.onHideMenu.dispatch(t);

+				if (!e || !DOM.getParent(e.target, '.mceSplitButtonMenu')) {

+					DOM.removeClass(t.id, 'mceSplitButtonSelected');

+					Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);

+					Event.remove(t.id + '_menu', 'keydown', t._keyHandler);

+					DOM.hide(t.id + '_menu');

+				}

 

-			t.isMenuVisible = 0;

+				t.isMenuVisible = 0;

+				t.onHideMenu.dispatch();

+			}

 		},

 

 		renderMenu : function() {

-			var t = this, m, i = 0, s = t.settings, n, tb, tr, w;

+			var t = this, m, i = 0, s = t.settings, n, tb, tr, w, context;

 

-			w = DOM.add(s.menu_container, 'div', {id : t.id + '_menu', 'class' : s['menu_class'] + ' ' + s['class'], style : 'position:absolute;left:0;top:-1000px;'});

+			w = DOM.add(s.menu_container, 'div', {role: 'listbox', id : t.id + '_menu', 'class' : s['menu_class'] + ' ' + s['class'], style : 'position:absolute;left:0;top:-1000px;'});

 			m = DOM.add(w, 'div', {'class' : s['class'] + ' mceSplitButtonMenu'});

 			DOM.add(m, 'span', {'class' : 'mceMenuLine'});

 

-			n = DOM.add(m, 'table', {'class' : 'mceColorSplitMenu'});

+			n = DOM.add(m, 'table', {role: 'presentation', 'class' : 'mceColorSplitMenu'});

 			tb = DOM.add(n, 'tbody');

 

 			// Generate color grid

@@ -8668,20 +11233,38 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				}

 

 				n = DOM.add(tr, 'td');

-

-				n = DOM.add(n, 'a', {

+				var settings = {

 					href : 'javascript:;',

 					style : {

 						backgroundColor : '#' + c

 					},

-					_mce_color : '#' + c

-				});

+					'title': t.editor.getLang('colors.' + c, c),

+					'data-mce-color' : '#' + c

+				};

+

+				// adding a proper ARIA role = button causes JAWS to read things incorrectly on IE.

+				if (!tinymce.isIE ) {

+					settings['role']= 'option';

+				}

+

+				n = DOM.add(n, 'a', settings);

+

+				if (t.editor.forcedHighContrastMode) {

+					n = DOM.add(n, 'canvas', { width: 16, height: 16, 'aria-hidden': 'true' });

+					if (n.getContext && (context = n.getContext("2d"))) {

+						context.fillStyle = '#' + c;

+						context.fillRect(0, 0, 16, 16);

+					} else {

+						// No point leaving a canvas element around if it's not supported for drawing on anyway.

+						DOM.remove(n);

+					}

+				}

 			});

 

 			if (s.more_colors_func) {

 				n = DOM.add(tb, 'tr');

 				n = DOM.add(n, 'td', {colspan : s.grid_width, 'class' : 'mceMoreColors'});

-				n = DOM.add(n, 'a', {id : t.id + '_more', href : 'javascript:;', onclick : 'return false;', 'class' : 'mceMoreColors'}, s.more_colors_title);

+				n = DOM.add(n, 'a', {role: 'option', id : t.id + '_more', href : 'javascript:;', onclick : 'return false;', 'class' : 'mceMoreColors'}, s.more_colors_title);

 

 				Event.add(n, 'click', function(e) {

 					s.more_colors_func.call(s.more_colors_scope || this);

@@ -8690,29 +11273,45 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			}

 

 			DOM.addClass(m, 'mceColorSplitMenu');

+			

+			new tinymce.ui.KeyboardNavigation({

+				root: t.id + '_menu',

+				items: DOM.select('a', t.id + '_menu'),

+				onCancel: function() {

+					t.hideMenu();

+					t.focus();

+				}

+			});

+

+			// Prevent IE from scrolling and hindering click to occur #4019

+			Event.add(t.id + '_menu', 'mousedown', function(e) {return Event.cancel(e);});

 

 			Event.add(t.id + '_menu', 'click', function(e) {

 				var c;

 

-				e = e.target;

+				e = DOM.getParent(e.target, 'a', tb);

 

-				if (e.nodeName == 'A' && (c = e.getAttribute('_mce_color')))

+				if (e && e.nodeName.toLowerCase() == 'a' && (c = e.getAttribute('data-mce-color')))

 					t.setColor(c);

 

-				return Event.cancel(e); // Prevent IE auto save warning

+				return false; // Prevent IE auto save warning

 			});

 

 			return w;

 		},

 

 		setColor : function(c) {

+			this.displayColor(c);

+			this.hideMenu();

+			this.settings.onselect(c);

+		},

+		

+		displayColor : function(c) {

 			var t = this;

 

 			DOM.setStyle(t.id + '_preview', 'backgroundColor', c);

 

 			t.value = c;

-			t.hideMenu();

-			t.settings.onselect(c);

 		},

 

 		postRender : function() {

@@ -8733,9 +11332,72 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 	});

 })(tinymce);

 

+(function(tinymce) {

+// Shorten class names

+var dom = tinymce.DOM, each = tinymce.each, Event = tinymce.dom.Event;

+tinymce.create('tinymce.ui.ToolbarGroup:tinymce.ui.Container', {

+	renderHTML : function() {

+		var t = this, h = [], controls = t.controls, each = tinymce.each, settings = t.settings;

+

+		h.push('<div id="' + t.id + '" role="group" aria-labelledby="' + t.id + '_voice">');

+		//TODO: ACC test this out - adding a role = application for getting the landmarks working well.

+		h.push("<span role='application'>");

+		h.push('<span id="' + t.id + '_voice" class="mceVoiceLabel" style="display:none;">' + dom.encode(settings.name) + '</span>');

+		each(controls, function(toolbar) {

+			h.push(toolbar.renderHTML());

+		});

+		h.push("</span>");

+		h.push('</div>');

+

+		return h.join('');

+	},

+	

+	focus : function() {

+		var t = this;

+		dom.get(t.id).focus();

+	},

+	

+	postRender : function() {

+		var t = this, items = [];

+

+		each(t.controls, function(toolbar) {

+			each (toolbar.controls, function(control) {

+				if (control.id) {

+					items.push(control);

+				}

+			});

+		});

+

+		t.keyNav = new tinymce.ui.KeyboardNavigation({

+			root: t.id,

+			items: items,

+			onCancel: function() {

+				//Move focus if webkit so that navigation back will read the item.

+				if (tinymce.isWebKit) {

+					dom.get(t.editor.id+"_ifr").focus();

+				}

+				t.editor.focus();

+			},

+			excludeFromTabOrder: !t.settings.tab_focus_toolbar

+		});

+	},

+	

+	destroy : function() {

+		var self = this;

+

+		self.parent();

+		self.keyNav.destroy();

+		Event.clear(self.id);

+	}

+});

+})(tinymce);

+

+(function(tinymce) {

+// Shorten class names

+var dom = tinymce.DOM, each = tinymce.each;

 tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {

 	renderHTML : function() {

-		var t = this, h = '', c, co, dom = tinymce.DOM, s = t.settings, i, pr, nx, cl;

+		var t = this, h = '', c, co, s = t.settings, i, pr, nx, cl;

 

 		cl = t.controls;

 		for (i=0; i<cl.length; i++) {

@@ -8792,50 +11454,102 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 		h += dom.createHTML('td', {'class' : c}, dom.createHTML('span', null, '<!-- IE -->'));

 

-		return dom.createHTML('table', {id : t.id, 'class' : 'mceToolbar' + (s['class'] ? ' ' + s['class'] : ''), cellpadding : '0', cellspacing : '0', align : t.settings.align || ''}, '<tbody><tr>' + h + '</tr></tbody>');

+		return dom.createHTML('table', {id : t.id, 'class' : 'mceToolbar' + (s['class'] ? ' ' + s['class'] : ''), cellpadding : '0', cellspacing : '0', align : t.settings.align || '', role: 'presentation', tabindex: '-1'}, '<tbody><tr>' + h + '</tr></tbody>');

 	}

 });

+})(tinymce);

 

 (function(tinymce) {

 	var Dispatcher = tinymce.util.Dispatcher, each = tinymce.each;

 

 	tinymce.create('tinymce.AddOnManager', {

-		items : [],

-		urls : {},

-		lookup : {},

+		AddOnManager : function() {

+			var self = this;

 

-		onAdd : new Dispatcher(this),

+			self.items = [];

+			self.urls = {};

+			self.lookup = {};

+			self.onAdd = new Dispatcher(self);

+		},

 

 		get : function(n) {

-			return this.lookup[n];

+			if (this.lookup[n]) {

+				return this.lookup[n].instance;

+			} else {

+				return undefined;

+			}

+		},

+

+		dependencies : function(n) {

+			var result;

+			if (this.lookup[n]) {

+				result = this.lookup[n].dependencies;

+			}

+			return result || [];

 		},

 

 		requireLangPack : function(n) {

 			var s = tinymce.settings;

 

-			if (s && s.language)

+			if (s && s.language && s.language_load !== false)

 				tinymce.ScriptLoader.add(this.urls[n] + '/langs/' + s.language + '.js');

 		},

 

-		add : function(id, o) {

+		add : function(id, o, dependencies) {

 			this.items.push(o);

-			this.lookup[id] = o;

+			this.lookup[id] = {instance:o, dependencies:dependencies};

 			this.onAdd.dispatch(this, id, o);

 

 			return o;

 		},

+		createUrl: function(baseUrl, dep) {

+			if (typeof dep === "object") {

+				return dep

+			} else {

+				return {prefix: baseUrl.prefix, resource: dep, suffix: baseUrl.suffix};

+			}

+		},

+

+		addComponents: function(pluginName, scripts) {

+			var pluginUrl = this.urls[pluginName];

+			tinymce.each(scripts, function(script){

+				tinymce.ScriptLoader.add(pluginUrl+"/"+script);	

+			});

+		},

 

 		load : function(n, u, cb, s) {

-			var t = this;

+			var t = this, url = u;

+

+			function loadDependencies() {

+				var dependencies = t.dependencies(n);

+				tinymce.each(dependencies, function(dep) {

+					var newUrl = t.createUrl(u, dep);

+					t.load(newUrl.resource, newUrl, undefined, undefined);

+				});

+				if (cb) {

+					if (s) {

+						cb.call(s);

+					} else {

+						cb.call(tinymce.ScriptLoader);

+					}

+				}

+			}

 

 			if (t.urls[n])

 				return;

+			if (typeof u === "object")

+				url = u.prefix + u.resource + u.suffix;

 

-			if (u.indexOf('/') != 0 && u.indexOf('://') == -1)

-				u = tinymce.baseURL + '/' +  u;

+			if (url.indexOf('/') != 0 && url.indexOf('://') == -1)

+				url = tinymce.baseURL + '/' + url;

 

-			t.urls[n] = u.substring(0, u.lastIndexOf('/'));

-			tinymce.ScriptLoader.add(u, cb, s);

+			t.urls[n] = url.substring(0, url.lastIndexOf('/'));

+

+			if (t.lookup[n]) {

+				loadDependencies();

+			} else {

+				tinymce.ScriptLoader.add(url, loadDependencies, s);

+			}

 		}

 	});

 

@@ -8885,6 +11599,26 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		init : function(s) {

 			var t = this, pl, sl = tinymce.ScriptLoader, e, el = [], ed;

 

+			function createId(elm) {

+				var id = elm.id;

+	

+				// Use element id, or unique name or generate a unique id

+				if (!id) {

+					id = elm.name;

+	

+					if (id && !DOM.get(id)) {

+						id = elm.name;

+					} else {

+						// Generate unique name

+						id = DOM.uniqueId();

+					}

+

+					elm.setAttribute('id', id);

+				}

+

+				return id;

+			};

+

 			function execCallback(se, n, s) {

 				var f = se[n];

 

@@ -8908,7 +11642,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			t.settings = s;

 

 			// Legacy call

-			Event.add(document, 'init', function() {

+			Event.bind(window, 'ready', function() {

 				var l, co;

 

 				execCallback(s, 'onpageload');

@@ -8947,26 +11681,36 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 							return c.constructor === RegExp ? c.test(n.className) : DOM.hasClass(n, c);

 						};

 

-						each(DOM.select('textarea'), function(v) {

-							if (s.editor_deselector && hasClass(v, s.editor_deselector))

+						each(DOM.select('textarea'), function(elm) {

+							if (s.editor_deselector && hasClass(elm, s.editor_deselector))

 								return;

 

-							if (!s.editor_selector || hasClass(v, s.editor_selector)) {

-								// Can we use the name

-								e = DOM.get(v.name);

-								if (!v.id && !e)

-									v.id = v.name;

-

-								// Generate unique name if missing or already exists

-								if (!v.id || t.get(v.id))

-									v.id = DOM.uniqueId();

-

-								ed = new tinymce.Editor(v.id, s);

+							if (!s.editor_selector || hasClass(elm, s.editor_selector)) {

+								ed = new tinymce.Editor(createId(elm), s);

 								el.push(ed);

 								ed.render(1);

 							}

 						});

 						break;

+					

+					default:

+						if (s.types) {

+							// Process type specific selector

+							each(s.types, function(type) {

+								each(DOM.select(type.selector), function(elm) {

+									var editor = new tinymce.Editor(createId(elm), tinymce.extend({}, s, type));

+									el.push(editor);

+									editor.render(1);

+								});

+							});

+						} else if (s.selector) {

+							// Process global selector

+							each(DOM.select(s.selector), function(elm) {

+								var editor = new tinymce.Editor(createId(elm), s);

+								el.push(editor);

+								editor.render(1);

+							});

+						}

 				}

 

 				// Call onInit when all editors are initialized

@@ -9169,7 +11913,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		Dispatcher = tinymce.util.Dispatcher, each = tinymce.each, isGecko = tinymce.isGecko,

 		isIE = tinymce.isIE, isWebKit = tinymce.isWebKit, is = tinymce.is,

 		ThemeManager = tinymce.ThemeManager, PluginManager = tinymce.PluginManager,

-		inArray = tinymce.inArray, grep = tinymce.grep, explode = tinymce.explode;

+		inArray = tinymce.inArray, grep = tinymce.grep, explode = tinymce.explode, VK = tinymce.VK;

 

 	tinymce.create('tinymce.Editor', {

 		Editor : function(id, s) {

@@ -9193,6 +11937,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 				'onPostRender',

 

+				'onLoad',

+

 				'onInit',

 

 				'onRemove',

@@ -9255,7 +12001,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 				'onVisualAid',

 

-				'onSetProgressState'

+				'onSetProgressState',

+

+				'onSetAttrib'

 			], function(e) {

 				t[e] = new Dispatcher(t);

 			});

@@ -9289,10 +12037,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				visual_table_class : 'mceItemTable',

 				visual : 1,

 				font_size_style_values : 'xx-small,x-small,small,medium,large,x-large,xx-large',

+				font_size_legacy_values : 'xx-small,small,medium,large,x-large,xx-large,300%', // See: http://www.w3.org/TR/CSS2/fonts.html#propdef-font-size

 				apply_source_formatting : 1,

 				directionality : 'ltr',

 				forced_root_block : 'p',

-				valid_elements : '@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],a[rel|rev|charset|hreflang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur],strong/b,em/i,strike,u,#p,-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|src|border|alt=|title|hspace|vspace|width|height|align],-sub,-sup,-blockquote[cite],-table[border|cellspacing|cellpadding|width|frame|rules|height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot,#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div,-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite],object[classid|width|height|codebase|*],param[name|value],embed[type|width|height|src|*],script[src|type],map[name],area[shape|coords|href|alt|target],bdo,button,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|valign|width],dfn,fieldset,form[action|accept|accept-charset|enctype|method],input[accept|alt|checked|disabled|maxlength|name|readonly|size|src|type|value|tabindex|accesskey],kbd,label[for],legend,noscript,optgroup[label|disabled],option[disabled|label|selected|value],q[cite],samp,select[disabled|multiple|name|size],small,textarea[cols|rows|disabled|name|readonly],tt,var,big',

 				hidden_input : 1,

 				padd_empty_editor : 1,

 				render_ui : 1,

@@ -9302,7 +12050,15 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				keep_styles : 1,

 				fix_table_elements : 1,

 				inline_styles : 1,

-				convert_fonts_to_spans : true

+				convert_fonts_to_spans : true,

+				indent : 'simple',

+				indent_before : 'p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside',

+				indent_after : 'p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside',

+				validate : true,

+				entity_encoding : 'named',

+				url_converter : t.convertURL,

+				url_converter_scope : t,

+				ie7_compat : true

 			}, s);

 

 			t.documentBaseURI = new tinymce.util.URI(s.document_base_url || tinymce.documentBaseURL, {

@@ -9311,6 +12067,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			t.baseURI = tinymce.baseURI;

 

+			t.contentCSS = [];

+

 			// Call setup

 			t.execCallback('setup', t);

 		},

@@ -9320,7 +12078,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			// Page is not loaded yet, wait for it

 			if (!Event.domLoaded) {

-				Event.add(document, 'init', function() {

+				Event.add(window, 'ready', function() {

 					t.render();

 				});

 				return;

@@ -9332,10 +12090,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (!t.getElement())

 				return;

 

-			// Is a iPad/iPhone, then skip initialization. We need to sniff here since the

-			// browser says it has contentEditable support but there is no visible caret

-			// We will remove this check ones Apple implements full contentEditable support

-			if (tinymce.isIDevice)

+			// Is a iPad/iPhone and not on iOS5, then skip initialization. We need to sniff 

+			// here since the browser says it has contentEditable support but there is no visible

+			// caret We will remove this check ones Apple implements full contentEditable support

+			if (tinymce.isIDevice && !tinymce.isIOS5)

 				return;

 

 			// Add hidden input for non input elements inside form elements

@@ -9400,19 +12158,30 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			// Load scripts

 			function loadScripts() {

-				if (s.language)

+				if (s.language && s.language_load !== false)

 					sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');

 

 				if (s.theme && s.theme.charAt(0) != '-' && !ThemeManager.urls[s.theme])

 					ThemeManager.load(s.theme, 'themes/' + s.theme + '/editor_template' + tinymce.suffix + '.js');

 

 				each(explode(s.plugins), function(p) {

-					if (p && p.charAt(0) != '-' && !PluginManager.urls[p]) {

-						// Skip safari plugin, since it is removed as of 3.3b1

-						if (p == 'safari')

-							return;

-

-						PluginManager.load(p, 'plugins/' + p + '/editor_plugin' + tinymce.suffix + '.js');

+					if (p &&!PluginManager.urls[p]) {

+						if (p.charAt(0) == '-') {

+							p = p.substr(1, p.length);

+							var dependencies = PluginManager.dependencies(p);

+							each(dependencies, function(dep) {

+								var defaultSettings = {prefix:'plugins/', resource: dep, suffix:'/editor_plugin' + tinymce.suffix + '.js'};

+								var dep = PluginManager.createUrl(defaultSettings, dep);

+								PluginManager.load(dep.resource, dep);

+								

+							});

+						} else {

+							// Skip safari plugin, since it is removed as of 3.3b1

+							if (p == 'safari') {

+								return;

+							}

+							PluginManager.load(p, {prefix:'plugins/', resource: p, suffix:'/editor_plugin' + tinymce.suffix + '.js'});

+						}

 					}

 				});

 

@@ -9427,10 +12196,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		},

 

 		init : function() {

-			var n, t = this, s = t.settings, w, h, e = t.getElement(), o, ti, u, bi, bc, re;

+			var n, t = this, s = t.settings, w, h, e = t.getElement(), o, ti, u, bi, bc, re, i, initializedPlugins = [];

 

 			tinymce.add(t);

 

+			s.aria_label = s.aria_label || DOM.getAttrib(e, 'aria-label', t.getLang('aria.rich_text_area'));

+

 			if (s.theme) {

 				s.theme = s.theme.replace(/-/, '');

 				o = ThemeManager.get(s.theme);

@@ -9439,20 +12210,25 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				if (t.theme.init && s.init_theme)

 					t.theme.init(t, ThemeManager.urls[s.theme] || tinymce.documentBaseURL.replace(/\/$/, ''));

 			}

-

-			// Create all plugins

-			each(explode(s.plugins.replace(/\-/g, '')), function(p) {

+			function initPlugin(p) {

 				var c = PluginManager.get(p), u = PluginManager.urls[p] || tinymce.documentBaseURL.replace(/\/$/, ''), po;

-

-				if (c) {

+				if (c && tinymce.inArray(initializedPlugins,p) === -1) {

+					each(PluginManager.dependencies(p), function(dep){

+						initPlugin(dep);

+					});

 					po = new c(t, u);

 

 					t.plugins[p] = po;

 

-					if (po.init)

+					if (po.init) {

 						po.init(t, u);

+						initializedPlugins.push(p);

+					}

 				}

-			});

+			}

+			

+			// Create all plugins

+			each(explode(s.plugins.replace(/\-/g, '')), initPlugin);

 

 			// Setup popup CSS path(s)

 			if (s.popup_css !== false) {

@@ -9468,12 +12244,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			t.controlManager = new tinymce.ControlManager(t);

 

 			if (s.custom_undo_redo) {

-				// Add initial undo level

 				t.onBeforeExecCommand.add(function(ed, cmd, ui, val, a) {

-					if (cmd != 'Undo' && cmd != 'Redo' && cmd != 'mceRepaint' && (!a || !a.skip_undo)) {

-						if (!t.undoManager.hasUndo())

-							t.undoManager.add();

-					}

+					if (cmd != 'Undo' && cmd != 'Redo' && cmd != 'mceRepaint' && (!a || !a.skip_undo))

+						t.undoManager.beforeChange();

 				});

 

 				t.onExecCommand.add(function(ed, cmd, ui, val, a) {

@@ -9539,6 +12312,13 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				height : h

 			});

 

+			// Load specified content CSS last

+			if (s.content_css) {

+				tinymce.each(explode(s.content_css), function(u) {

+					t.contentCSS.push(t.documentBaseURI.toAbsolute(u));

+				});

+			}

+

 			h = (o.iframeHeight || h) + (typeof(h) == 'number' ? (o.deltaHeight || 0) : '');

 			if (h < 100)

 				h = 100;

@@ -9550,10 +12330,20 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (s.document_base_url != tinymce.documentBaseURL)

 				t.iframeHTML += '<base href="' + t.documentBaseURI.getURI() + '" />';

 

-			t.iframeHTML += '<meta http-equiv="X-UA-Compatible" content="IE=7" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';

+			// IE8 doesn't support carets behind images setting ie7_compat would force IE8+ to run in IE7 compat mode.

+			if (s.ie7_compat)

+				t.iframeHTML += '<meta http-equiv="X-UA-Compatible" content="IE=7" />';

+			else

+				t.iframeHTML += '<meta http-equiv="X-UA-Compatible" content="IE=edge" />';

+

+			t.iframeHTML += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';

+

+			// Load the CSS by injecting them into the HTML this will reduce "flicker"

+			for (i = 0; i < t.contentCSS.length; i++) {

+				t.iframeHTML += '<link type="text/css" rel="stylesheet" href="' + t.contentCSS[i] + '" />';

+			}

 

-			if (tinymce.relaxedDomain)

-				t.iframeHTML += '<script type="text/javascript">document.domain = "' + tinymce.relaxedDomain + '";</script>';

+			t.contentCSS = [];

 

 			bi = s.body_id || 'tinymce';

 			if (bi.indexOf('=') != -1) {

@@ -9567,33 +12357,35 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				bc = bc[t.id] || '';

 			}

 

-			t.iframeHTML += '</head><body id="' + bi + '" class="mceContentBody ' + bc + '"></body></html>';

+			t.iframeHTML += '</head><body id="' + bi + '" class="mceContentBody ' + bc + '" onload="window.parent.tinyMCE.get(\'' + t.id + '\').onLoad.dispatch();"><br></body></html>';

 

 			// Domain relaxing enabled, then set document domain

-			if (tinymce.relaxedDomain) {

+			if (tinymce.relaxedDomain && (isIE || (tinymce.isOpera && parseFloat(opera.version()) < 11))) {

 				// We need to write the contents here in IE since multiple writes messes up refresh button and back button

-				if (isIE || (tinymce.isOpera && parseFloat(opera.version()) >= 9.5))

-					u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";var ed = window.parent.tinyMCE.get("' + t.id + '");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()';

-				else if (tinymce.isOpera)

-					u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";document.close();ed.setupIframe();})()';					

+				u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";var ed = window.parent.tinyMCE.get("' + t.id + '");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()';

 			}

 

 			// Create iframe

-			n = DOM.add(o.iframeContainer, 'iframe', {

+			// TODO: ACC add the appropriate description on this.

+			n = DOM.add(o.iframeContainer, 'iframe', { 

 				id : t.id + "_ifr",

 				src : u || 'javascript:""', // Workaround for HTTPS warning in IE6/7

 				frameBorder : '0',

+				allowTransparency : "true",

+				title : s.aria_label,

 				style : {

 					width : '100%',

-					height : h

+					height : h,

+					display : 'block' // Important for Gecko to render the iframe correctly

 				}

 			});

 

 			t.contentAreaContainer = o.iframeContainer;

 			DOM.get(o.editorContainer).style.display = t.orgDisplay;

 			DOM.get(t.id).style.display = 'none';

+			DOM.setAttrib(t.id, 'aria-hidden', true);

 

-			if (!isIE || !tinymce.relaxedDomain)

+			if (!tinymce.relaxedDomain || !u)

 				t.setupIframe();

 

 			e = n = o = null; // Cleanup

@@ -9607,30 +12399,21 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				d.open();

 				d.write(t.iframeHTML);

 				d.close();

-			}

 

-			// Design mode needs to be added here Ctrl+A will fail otherwise

-			if (!isIE) {

-				try {

-					if (!s.readonly)

-						d.designMode = 'On';

-				} catch (ex) {

-					// Will fail on Gecko if the editor is placed in an hidden container element

-					// The design mode will be set ones the editor is focused

-				}

+				if (tinymce.relaxedDomain)

+					d.domain = tinymce.relaxedDomain;

 			}

 

-			// IE needs to use contentEditable or it will display non secure items for HTTPS

-			if (isIE) {

-				// It will not steal focus if we hide it while setting contentEditable

-				b = t.getBody();

-				DOM.hide(b);

+			// It will not steal focus while setting contentEditable

+			b = t.getBody();

+			b.disabled = true;

 

-				if (!s.readonly)

-					b.contentEditable = true;

+			if (!s.readonly)

+				b.contentEditable = true;

 

-				DOM.show(b);

-			}

+			b.disabled = false;

+

+			t.schema = new tinymce.html.Schema(s);

 

 			t.dom = new tinymce.dom.DOMUtils(t.getDoc(), {

 				keep_values : true,

@@ -9640,16 +12423,85 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				class_filter : s.class_filter,

 				update_styles : 1,

 				fix_ie_paragraphs : 1,

-				valid_styles : s.valid_styles

+				schema : t.schema

 			});

 

-			t.schema = new tinymce.dom.Schema();

+			t.parser = new tinymce.html.DomParser(s, t.schema);

 

-			t.serializer = new tinymce.dom.Serializer(extend(s, {

-				valid_elements : s.verify_html === false ? '*[*]' : s.valid_elements,

-				dom : t.dom,

-				schema : t.schema

-			}));

+			// Force anchor names closed, unless the setting "allow_html_in_named_anchor" is explicitly included.

+			if (!t.settings.allow_html_in_named_anchor) {

+				t.parser.addAttributeFilter('name', function(nodes, name) {

+					var i = nodes.length, sibling, prevSibling, parent, node;

+	

+					while (i--) {

+						node = nodes[i];

+						if (node.name === 'a' && node.firstChild) {

+							parent = node.parent;

+	

+							// Move children after current node

+							sibling = node.lastChild;

+							do {

+								prevSibling = sibling.prev;

+								parent.insert(sibling, node);

+								sibling = prevSibling;

+							} while (sibling);

+						}

+					}

+				});

+			}

+

+			// Convert src and href into data-mce-src, data-mce-href and data-mce-style

+			t.parser.addAttributeFilter('src,href,style', function(nodes, name) {

+				var i = nodes.length, node, dom = t.dom, value, internalName;

+

+				while (i--) {

+					node = nodes[i];

+					value = node.attr(name);

+					internalName = 'data-mce-' + name;

+

+					// Add internal attribute if we need to we don't on a refresh of the document

+					if (!node.attributes.map[internalName]) {	

+						if (name === "style")

+							node.attr(internalName, dom.serializeStyle(dom.parseStyle(value), node.name));

+						else

+							node.attr(internalName, t.convertURL(value, name, node.name));

+					}

+				}

+			});

+

+			// Keep scripts from executing

+			t.parser.addNodeFilter('script', function(nodes, name) {

+				var i = nodes.length, node;

+

+				while (i--) {

+					node = nodes[i];

+					node.attr('type', 'mce-' + (node.attr('type') || 'text/javascript'));

+				}

+			});

+

+			t.parser.addNodeFilter('#cdata', function(nodes, name) {

+				var i = nodes.length, node;

+

+				while (i--) {

+					node = nodes[i];

+					node.type = 8;

+					node.name = '#comment';

+					node.value = '[CDATA[' + node.value + ']]';

+				}

+			});

+

+			t.parser.addNodeFilter('p,h1,h2,h3,h4,h5,h6,div', function(nodes, name) {

+				var i = nodes.length, node, nonEmptyElements = t.schema.getNonEmptyElements();

+

+				while (i--) {

+					node = nodes[i];

+

+					if (node.isEmpty(nonEmptyElements))

+						node.empty().append(new tinymce.html.Node('br', 1)).shortEnded = true;

+				}

+			});

+

+			t.serializer = new tinymce.dom.Serializer(s, t.dom, t.schema);

 

 			t.selection = new tinymce.dom.Selection(t.dom, t.getWin(), t.serializer);

 

@@ -9658,53 +12510,67 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			// Register default formats

 			t.formatter.register({

 				alignleft : [

-					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'left'}},

-					{selector : 'img,table', styles : {'float' : 'left'}}

+					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'left'}, defaultBlock: 'div'},

+					{selector : 'img,table', collapsed : false, styles : {'float' : 'left'}}

 				],

 

 				aligncenter : [

-					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'center'}},

-					{selector : 'img', styles : {display : 'block', marginLeft : 'auto', marginRight : 'auto'}},

-					{selector : 'table', styles : {marginLeft : 'auto', marginRight : 'auto'}}

+					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'center'}, defaultBlock: 'div'},

+					{selector : 'img', collapsed : false, styles : {display : 'block', marginLeft : 'auto', marginRight : 'auto'}},

+					{selector : 'table', collapsed : false, styles : {marginLeft : 'auto', marginRight : 'auto'}}

 				],

 

 				alignright : [

-					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'right'}},

-					{selector : 'img,table', styles : {'float' : 'right'}}

+					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'right'}, defaultBlock: 'div'},

+					{selector : 'img,table', collapsed : false, styles : {'float' : 'right'}}

 				],

 

 				alignfull : [

-					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'justify'}}

+					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'justify'}, defaultBlock: 'div'}

 				],

 

 				bold : [

-					{inline : 'strong'},

+					{inline : 'strong', remove : 'all'},

 					{inline : 'span', styles : {fontWeight : 'bold'}},

-					{inline : 'b'}

+					{inline : 'b', remove : 'all'}

 				],

 

 				italic : [

-					{inline : 'em'},

+					{inline : 'em', remove : 'all'},

 					{inline : 'span', styles : {fontStyle : 'italic'}},

-					{inline : 'i'}

+					{inline : 'i', remove : 'all'}

 				],

 

 				underline : [

 					{inline : 'span', styles : {textDecoration : 'underline'}, exact : true},

-					{inline : 'u'}

+					{inline : 'u', remove : 'all'}

 				],

 

 				strikethrough : [

 					{inline : 'span', styles : {textDecoration : 'line-through'}, exact : true},

-					{inline : 'u'}

+					{inline : 'strike', remove : 'all'}

 				],

 

-				forecolor : {inline : 'span', styles : {color : '%value'}},

-				hilitecolor : {inline : 'span', styles : {backgroundColor : '%value'}},

+				forecolor : {inline : 'span', styles : {color : '%value'}, wrap_links : false},

+				hilitecolor : {inline : 'span', styles : {backgroundColor : '%value'}, wrap_links : false},

 				fontname : {inline : 'span', styles : {fontFamily : '%value'}},

 				fontsize : {inline : 'span', styles : {fontSize : '%value'}},

 				fontsize_class : {inline : 'span', attributes : {'class' : '%value'}},

 				blockquote : {block : 'blockquote', wrapper : 1, remove : 'all'},

+				subscript : {inline : 'sub'},

+				superscript : {inline : 'sup'},

+

+				link : {inline : 'a', selector : 'a', remove : 'all', split : true, deep : true,

+					onmatch : function(node) {

+						return true;

+					},

+

+					onformat : function(elm, fmt, vars) {

+						each(vars, function(value, key) {

+							t.dom.setAttrib(elm, key, value);

+						});

+					}

+				},

 

 				removeformat : [

 					{selector : 'b,strong,em,i,font,u,strike', remove : 'all', split : true, expand : false, block_expand : true, deep : true},

@@ -9725,7 +12591,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			// Pass through

 			t.undoManager.onAdd.add(function(um, l) {

-				if (!l.initial)

+				if (um.hasUndo())

 					return t.onChange.dispatch(t, l, um);

 			});

 

@@ -9737,9 +12603,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				return t.onRedo.dispatch(t, l, um);

 			});

 

-			t.forceBlocks = new tinymce.ForceBlocks(t, {

-				forced_root_block : s.forced_root_block

-			});

+			t.forceBlocks = new tinymce.ForceBlocks(t);

+			t.enterKey = new tinymce.EnterKey(t);

 

 			t.editorCommands = new tinymce.EditorCommands(t);

 

@@ -9763,35 +12628,14 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			t.controlManager.onPostRender.dispatch(t, t.controlManager);

 			t.onPostRender.dispatch(t);

 

+			t.quirks = new tinymce.util.Quirks(this);

+

 			if (s.directionality)

 				t.getBody().dir = s.directionality;

 

 			if (s.nowrap)

 				t.getBody().style.whiteSpace = "nowrap";

 

-			if (s.custom_elements) {

-				function handleCustom(ed, o) {

-					each(explode(s.custom_elements), function(v) {

-						var n;

-

-						if (v.indexOf('~') === 0) {

-							v = v.substring(1);

-							n = 'span';

-						} else

-							n = 'div';

-

-						o.content = o.content.replace(new RegExp('<(' + v + ')([^>]*)>', 'g'), '<' + n + ' _mce_name="$1"$2>');

-						o.content = o.content.replace(new RegExp('</(' + v + ')>', 'g'), '</' + n + '>');

-					});

-				};

-

-				t.onBeforeSetContent.add(handleCustom);

-				t.onPostProcess.add(function(ed, o) {

-					if (o.set)

-						handleCustom(ed, o);

-				});

-			}

-

 			if (s.handle_node_change_callback) {

 				t.onNodeChange.add(function(ed, cm, n) {

 					t.execCallback('handle_node_change_callback', t.id, n, -1, -1, true, t.selection.isCollapsed());

@@ -9813,16 +12657,22 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				});

 			}

 

-			if (s.convert_newlines_to_brs) {

+			if (s.protect) {

 				t.onBeforeSetContent.add(function(ed, o) {

-					if (o.initial)

-						o.content = o.content.replace(/\r?\n/g, '<br />');

+					if (s.protect) {

+						each(s.protect, function(pattern) {

+							o.content = o.content.replace(pattern, function(str) {

+								return '<!--mce:protected ' + escape(str) + '-->';

+							});

+						});

+					}

 				});

 			}

 

-			if (s.fix_nesting && isIE) {

+			if (s.convert_newlines_to_brs) {

 				t.onBeforeSetContent.add(function(ed, o) {

-					o.content = t._fixNesting(o.content);

+					if (o.initial)

+						o.content = o.content.replace(/\r?\n/g, '<br />');

 				});

 			}

 

@@ -9919,7 +12769,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						var pn = n.parentNode;

 

 						if (ed.dom.isBlock(pn) && pn.lastChild === n)

-							ed.dom.add(pn, 'br', {'_mce_bogus' : 1});

+							ed.dom.add(pn, 'br', {'data-mce-bogus' : 1});

 					});

 				};

 

@@ -9929,72 +12779,61 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				});

 

 				t.onSetContent.add(t.selection.onSetContent.add(fixLinks));

-

-				if (!s.readonly) {

-					try {

-						// Design mode must be set here once again to fix a bug where

-						// Ctrl+A/Delete/Backspace didn't work if the editor was added using mceAddControl then removed then added again

-						d.designMode = 'Off';

-						d.designMode = 'On';

-					} catch (ex) {

-						// Will fail on Gecko if the editor is placed in an hidden container element

-						// The design mode will be set ones the editor is focused

-					}

-				}

 			}

 

-			// A small timeout was needed since firefox will remove. Bug: #1838304

-			setTimeout(function () {

-				if (t.removed)

-					return;

+			t.load({initial : true, format : 'html'});

+			t.startContent = t.getContent({format : 'raw'});

+			t.undoManager.add();

+			t.initialized = true;

 

-				t.load({initial : true, format : (s.cleanup_on_startup ? 'html' : 'raw')});

-				t.startContent = t.getContent({format : 'raw'});

-				t.initialized = true;

+			t.onInit.dispatch(t);

+			t.execCallback('setupcontent_callback', t.id, t.getBody(), t.getDoc());

+			t.execCallback('init_instance_callback', t);

+			t.focus(true);

+			t.nodeChanged({initial : 1});

 

-				t.onInit.dispatch(t);

-				t.execCallback('setupcontent_callback', t.id, t.getBody(), t.getDoc());

-				t.execCallback('init_instance_callback', t);

-				t.focus(true);

-				t.nodeChanged({initial : 1});

+			// Load specified content CSS last

+			each(t.contentCSS, function(u) {

+				t.dom.loadCSS(u);

+			});

 

-				// Load specified content CSS last

-				if (s.content_css) {

-					tinymce.each(explode(s.content_css), function(u) {

-						t.dom.loadCSS(t.documentBaseURI.toAbsolute(u));

-					});

-				}

+			// Handle auto focus

+			if (s.auto_focus) {

+				setTimeout(function () {

+					var ed = tinymce.get(s.auto_focus);

 

-				// Handle auto focus

-				if (s.auto_focus) {

-					setTimeout(function () {

-						var ed = tinymce.get(s.auto_focus);

+					ed.selection.select(ed.getBody(), 1);

+					ed.selection.collapse(1);

+					ed.getBody().focus();

+					ed.getWin().focus();

+				}, 100);

+			}

 

-						ed.selection.select(ed.getBody(), 1);

-						ed.selection.collapse(1);

-						ed.getWin().focus();

-					}, 100);

-				}

-			}, 1);

-	

 			e = null;

 		},

 

 

 		focus : function(sf) {

-			var oed, t = this, ce = t.settings.content_editable, ieRng, controlElm, doc = t.getDoc();

+			var oed, t = this, selection = t.selection, ce = t.settings.content_editable, ieRng, controlElm, doc = t.getDoc();

 

 			if (!sf) {

 				// Get selected control element

-				ieRng = t.selection.getRng();

+				ieRng = selection.getRng();

 				if (ieRng.item) {

 					controlElm = ieRng.item(0);

 				}

 

+				t._refreshContentEditable();

+

 				// Is not content editable

 				if (!ce)

 					t.getWin().focus();

 

+				// Focus the body as well since it's contentEditable

+				if (tinymce.isGecko) {

+					t.getBody().focus();

+				}

+

 				// Restore selected control element

 				// This is needed when for example an image is selected within a

 				// layer a call to focus will then remove the control selection

@@ -10079,7 +12918,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		},

 

 		nodeChanged : function(o) {

-			var t = this, s = t.selection, n = (isIE ? s.getNode() : s.getStart()) || t.getBody();

+			var t = this, s = t.selection, n = s.getStart() || t.getBody();

 

 			// Fix for bug #1896577 it seems that this can not be fired while the editor is loading

 			if (t.initialized) {

@@ -10112,16 +12951,16 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			t.buttons[n] = s;

 		},

 

-		addCommand : function(n, f, s) {

-			this.execCommands[n] = {func : f, scope : s || this};

+		addCommand : function(name, callback, scope) {

+			this.execCommands[name] = {func : callback, scope : scope || this};

 		},

 

-		addQueryStateHandler : function(n, f, s) {

-			this.queryStateCommands[n] = {func : f, scope : s || this};

+		addQueryStateHandler : function(name, callback, scope) {

+			this.queryStateCommands[name] = {func : callback, scope : scope || this};

 		},

 

-		addQueryValueHandler : function(n, f, s) {

-			this.queryValueCommands[n] = {func : f, scope : s || this};

+		addQueryValueHandler : function(name, callback, scope) {

+			this.queryValueCommands[name] = {func : callback, scope : scope || this};

 		},

 

 		addShortcut : function(pa, desc, cmd_func, sc) {

@@ -10184,9 +13023,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(cmd) && (!a || !a.skip_focus))

 				t.focus();

 

-			o = {};

-			t.onBeforeExecCommand.dispatch(t, cmd, ui, val, o);

-			if (o.terminate)

+			a = extend({}, a);

+			t.onBeforeExecCommand.dispatch(t, cmd, ui, val, a);

+			if (a.terminate)

 				return false;

 

 			// Command callback

@@ -10224,12 +13063,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				return true;

 			}

 

-			// Execute global commands

-			if (tinymce.GlobalCommands.execCommand(t, cmd, ui, val)) {

-				t.onExecCommand.dispatch(t, cmd, ui, val, a);

-				return true;

-			}

-

 			// Editor commands

 			if (t.editorCommands.execCommand(cmd, ui, val)) {

 				t.onExecCommand.dispatch(t, cmd, ui, val, a);

@@ -10361,7 +13194,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			// Add undo level will trigger onchange event

 			if (!o.no_events) {

-				t.undoManager.typing = 0;

+				t.undoManager.typing = false;

 				t.undoManager.add();

 			}

 

@@ -10393,66 +13226,87 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			return h;

 		},

 

-		setContent : function(h, o) {

-			var t = this;

+		setContent : function(content, args) {

+			var self = this, rootNode, body = self.getBody(), forcedRootBlockName;

 

-			o = o || {};

-			o.format = o.format || 'html';

-			o.set = true;

-			o.content = h;

+			// Setup args object

+			args = args || {};

+			args.format = args.format || 'html';

+			args.set = true;

+			args.content = content;

 

-			if (!o.no_events)

-				t.onBeforeSetContent.dispatch(t, o);

+			// Do preprocessing

+			if (!args.no_events)

+				self.onBeforeSetContent.dispatch(self, args);

+

+			content = args.content;

 

 			// Padd empty content in Gecko and Safari. Commands will otherwise fail on the content

 			// It will also be impossible to place the caret in the editor unless there is a BR element present

-			if (!tinymce.isIE && (h.length === 0 || /^\s+$/.test(h))) {

-				o.content = t.dom.setHTML(t.getBody(), '<br _mce_bogus="1" />');

-				o.format = 'raw';

-			}

+			if (!tinymce.isIE && (content.length === 0 || /^\s+$/.test(content))) {

+				forcedRootBlockName = self.settings.forced_root_block;

+				if (forcedRootBlockName)

+					content = '<' + forcedRootBlockName + '><br data-mce-bogus="1"></' + forcedRootBlockName + '>';

+				else

+					content = '<br data-mce-bogus="1">';

 

-			o.content = t.dom.setHTML(t.getBody(), tinymce.trim(o.content));

+				body.innerHTML = content;

+				self.selection.select(body, true);

+				self.selection.collapse(true);

+				return;

+			}

 

-			if (o.format != 'raw' && t.settings.cleanup) {

-				o.getInner = true;

-				o.content = t.dom.setHTML(t.getBody(), t.serializer.serialize(t.getBody(), o));

+			// Parse and serialize the html

+			if (args.format !== 'raw') {

+				content = new tinymce.html.Serializer({}, self.schema).serialize(

+					self.parser.parse(content)

+				);

 			}

 

-			if (!o.no_events)

-				t.onSetContent.dispatch(t, o);

+			// Set the new cleaned contents to the editor

+			args.content = tinymce.trim(content);

+			self.dom.setHTML(body, args.content);

 

-			return o.content;

+			// Do post processing

+			if (!args.no_events)

+				self.onSetContent.dispatch(self, args);

+

+			self.selection.normalize();

+

+			return args.content;

 		},

 

-		getContent : function(o) {

-			var t = this, h;

+		getContent : function(args) {

+			var self = this, content;

 

-			o = o || {};

-			o.format = o.format || 'html';

-			o.get = true;

+			// Setup args object

+			args = args || {};

+			args.format = args.format || 'html';

+			args.get = true;

 

-			if (!o.no_events)

-				t.onBeforeGetContent.dispatch(t, o);

+			// Do preprocessing

+			if (!args.no_events)

+				self.onBeforeGetContent.dispatch(self, args);

 

-			if (o.format != 'raw' && t.settings.cleanup) {

-				o.getInner = true;

-				h = t.serializer.serialize(t.getBody(), o);

-			} else

-				h = t.getBody().innerHTML;

+			// Get raw contents or by default the cleaned contents

+			if (args.format == 'raw')

+				content = self.getBody().innerHTML;

+			else

+				content = self.serializer.serialize(self.getBody(), args);

 

-			h = h.replace(/^\s*|\s*$/g, '');

-			o.content = h;

+			args.content = tinymce.trim(content);

 

-			if (!o.no_events)

-				t.onGetContent.dispatch(t, o);

+			// Do post processing

+			if (!args.no_events)

+				self.onGetContent.dispatch(self, args);

 

-			return o.content;

+			return args.content;

 		},

 

 		isDirty : function() {

-			var t = this;

+			var self = this;

 

-			return tinymce.trim(t.startContent) != tinymce.trim(t.getContent({format : 'raw', no_events : 1})) && !t.isNotDirty;

+			return tinymce.trim(self.startContent) != tinymce.trim(self.getContent({format : 'raw', no_events : 1})) && !self.isNotDirty;

 		},

 

 		getContainer : function() {

@@ -10567,17 +13421,32 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		remove : function() {

 			var t = this, e = t.getContainer();

 

-			t.removed = 1; // Cancels post remove event execution

-			t.hide();

+			if (!t.removed) {

+				t.removed = 1; // Cancels post remove event execution

+				t.hide();

+

+				// Remove all events

+

+				// Don't clear the window or document if content editable

+				// is enabled since other instances might still be present

+				if (!t.settings.content_editable) {

+					Event.clear(t.getWin());

+					Event.clear(t.getDoc());

+				}

+

+				Event.clear(t.getBody());

+				Event.clear(t.formElement);

+				Event.unbind(e);

 

-			t.execCallback('remove_instance_callback', t);

-			t.onRemove.dispatch(t);

+				t.execCallback('remove_instance_callback', t);

+				t.onRemove.dispatch(t);

 

-			// Clear all execCommand listeners this is required to avoid errors if the editor was removed inside another command

-			t.onExecCommand.listeners = [];

+				// Clear all execCommand listeners this is required to avoid errors if the editor was removed inside another command

+				t.onExecCommand.listeners = [];

 

-			tinymce.remove(t);

-			DOM.remove(e);

+				tinymce.remove(t);

+				DOM.remove(e);

+			}

 		},

 

 		destroy : function(s) {

@@ -10587,6 +13456,13 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (t.destroyed)

 				return;

 

+			// We must unbind on Gecko since it would otherwise produce the pesky "attempt to run compile-and-go script on a cleared scope" message

+			if (isGecko) {

+				Event.unbind(t.getDoc());

+				Event.unbind(t.getWin());

+				Event.unbind(t.getBody());

+			}

+

 			if (!s) {

 				tinymce.removeUnload(t.destroy);

 				tinyMCE.onBeforeUnload.remove(t._beforeUnload);

@@ -10599,18 +13475,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				t.controlManager.destroy();

 				t.selection.destroy();

 				t.dom.destroy();

-

-				// Remove all events

-

-				// Don't clear the window or document if content editable

-				// is enabled since other instances might still be present

-				if (!t.settings.content_editable) {

-					Event.clear(t.getWin());

-					Event.clear(t.getDoc());

-				}

-

-				Event.clear(t.getBody());

-				Event.clear(t.formElement);

 			}

 

 			if (t.formElement) {

@@ -10630,7 +13494,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 		_addEvents : function() {

 			// 'focus', 'blur', 'dblclick', 'beforedeactivate', submit, reset

-			var t = this, i, s = t.settings, lo = {

+			var t = this, i, s = t.settings, dom = t.dom, lo = {

 				mouseup : 'onMouseUp',

 				mousedown : 'onMouseDown',

 				click : 'onClick',

@@ -10662,35 +13526,26 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			each(lo, function(v, k) {

 				switch (k) {

 					case 'contextmenu':

-						if (tinymce.isOpera) {

-							// Fake contextmenu on Opera

-							t.dom.bind(t.getBody(), 'mousedown', function(e) {

-								if (e.ctrlKey) {

-									e.fakeType = 'contextmenu';

-									eventHandler(e);

-								}

-							});

-						} else

-							t.dom.bind(t.getBody(), k, eventHandler);

+						dom.bind(t.getDoc(), k, eventHandler);

 						break;

 

 					case 'paste':

-						t.dom.bind(t.getBody(), k, function(e) {

+						dom.bind(t.getBody(), k, function(e) {

 							eventHandler(e);

 						});

 						break;

 

 					case 'submit':

 					case 'reset':

-						t.dom.bind(t.getElement().form || DOM.getParent(t.id, 'form'), k, eventHandler);

+						dom.bind(t.getElement().form || DOM.getParent(t.id, 'form'), k, eventHandler);

 						break;

 

 					default:

-						t.dom.bind(s.content_editable ? t.getBody() : t.getDoc(), k, eventHandler);

+						dom.bind(s.content_editable ? t.getBody() : t.getDoc(), k, eventHandler);

 				}

 			});

 

-			t.dom.bind(s.content_editable ? t.getBody() : (isGecko ? t.getDoc() : t.getWin()), 'focus', function(e) {

+			dom.bind(s.content_editable ? t.getBody() : (isGecko ? t.getDoc() : t.getWin()), 'focus', function(e) {

 				t.focus(true);

 			});

 

@@ -10698,22 +13553,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			// Fixes bug where a specified document_base_uri could result in broken images

 			// This will also fix drag drop of images in Gecko

 			if (tinymce.isGecko) {

-				// Convert all images to absolute URLs

-/*				t.onSetContent.add(function(ed, o) {

-					each(ed.dom.select('img'), function(e) {

-						var v;

-

-						if (v = e.getAttribute('_mce_src'))

-							e.src = t.documentBaseURI.toAbsolute(v);

-					})

-				});*/

-

-				t.dom.bind(t.getDoc(), 'DOMNodeInserted', function(e) {

+				dom.bind(t.getDoc(), 'DOMNodeInserted', function(e) {

 					var v;

 

 					e = e.target;

 

-					if (e.nodeType === 1 && e.nodeName === 'IMG' && (v = e.getAttribute('_mce_src')))

+					if (e.nodeType === 1 && e.nodeName === 'IMG' && (v = e.getAttribute('data-mce-src')))

 						e.src = t.documentBaseURI.toAbsolute(v);

 				});

 			}

@@ -10724,14 +13569,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					var t = this, d = t.getDoc(), s = t.settings;

 

 					if (isGecko && !s.readonly) {

-						if (t._isHidden()) {

-							try {

-								if (!s.content_editable)

-									d.designMode = 'On';

-							} catch (ex) {

-								// Fails if it's hidden

-							}

-						}

+						t._refreshContentEditable();

 

 						try {

 							// Try new Gecko method

@@ -10754,19 +13592,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				t.onMouseDown.add(setOpts);

 			}

 

-			// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250

-			// WebKit can't even do simple things like selecting an image

-			// This also fixes so it's possible to select mceItemAnchors

-			if (tinymce.isWebKit) {

-				t.onClick.add(function(ed, e) {

-					e = e.target;

-

-					// Needs tobe the setBaseAndExtend or it will fail to select floated images

-					if (e.nodeName == 'IMG' || (e.nodeName == 'A' && t.dom.hasClass(e, 'mceItemAnchor')))

-						t.selection.getSel().setBaseAndExtent(e, 0, e, 1);

-				});

-			}

-

 			// Add node change handlers

 			t.onMouseUp.add(t.nodeChanged);

 			//t.onClick.add(t.nodeChanged);

@@ -10777,6 +13602,37 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					t.nodeChanged();

 			});

 

+

+			// Add block quote deletion handler

+			t.onKeyDown.add(function(ed, e) {

+				if (e.keyCode != VK.BACKSPACE)

+					return;

+

+				var rng = ed.selection.getRng();

+				if (!rng.collapsed)

+					return;

+

+				var n = rng.startContainer;

+				var offset = rng.startOffset;

+

+				while (n && n.nodeType && n.nodeType != 1 && n.parentNode)

+					n = n.parentNode;

+

+				// Is the cursor at the beginning of a blockquote?

+				if (n && n.parentNode && n.parentNode.tagName === 'BLOCKQUOTE' && n.parentNode.firstChild == n && offset == 0) {

+					// Remove the blockquote

+					ed.formatter.toggle('blockquote', null, n.parentNode);

+

+					// Move the caret to the beginning of n

+					rng.setStart(n, 0);

+					rng.setEnd(n, 0);

+					ed.selection.setRng(rng);

+					ed.selection.collapse(false);

+				}

+			});

+

+

+

 			// Add reset handler

 			t.onReset.add(function() {

 				t.setContent(t.startContent, {format : 'raw'});

@@ -10798,9 +13654,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				for (i=1; i<=6; i++)

 					t.addShortcut('ctrl+' + i, '', ['FormatBlock', false, 'h' + i]);

 

-				t.addShortcut('ctrl+7', '', ['FormatBlock', false, '<p>']);

-				t.addShortcut('ctrl+8', '', ['FormatBlock', false, '<div>']);

-				t.addShortcut('ctrl+9', '', ['FormatBlock', false, '<address>']);

+				t.addShortcut('ctrl+7', '', ['FormatBlock', false, 'p']);

+				t.addShortcut('ctrl+8', '', ['FormatBlock', false, 'div']);

+				t.addShortcut('ctrl+9', '', ['FormatBlock', false, 'address']);

 

 				function find(e) {

 					var v = null;

@@ -10856,7 +13712,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (tinymce.isIE) {

 				// Fix so resize will only update the width and height attributes not the styles of an image

 				// It will also block mceItemNoResize items

-				t.dom.bind(t.getDoc(), 'controlselect', function(e) {

+				dom.bind(t.getDoc(), 'controlselect', function(e) {

 					var re = t.resizeInfo, cb;

 

 					e = e.target;

@@ -10866,28 +13722,28 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						return;

 

 					if (re)

-						t.dom.unbind(re.node, re.ev, re.cb);

+						dom.unbind(re.node, re.ev, re.cb);

 

-					if (!t.dom.hasClass(e, 'mceItemNoResize')) {

+					if (!dom.hasClass(e, 'mceItemNoResize')) {

 						ev = 'resizeend';

-						cb = t.dom.bind(e, ev, function(e) {

+						cb = dom.bind(e, ev, function(e) {

 							var v;

 

 							e = e.target;

 

-							if (v = t.dom.getStyle(e, 'width')) {

-								t.dom.setAttrib(e, 'width', v.replace(/[^0-9%]+/g, ''));

-								t.dom.setStyle(e, 'width', '');

+							if (v = dom.getStyle(e, 'width')) {

+								dom.setAttrib(e, 'width', v.replace(/[^0-9%]+/g, ''));

+								dom.setStyle(e, 'width', '');

 							}

 

-							if (v = t.dom.getStyle(e, 'height')) {

-								t.dom.setAttrib(e, 'height', v.replace(/[^0-9%]+/g, ''));

-								t.dom.setStyle(e, 'height', '');

+							if (v = dom.getStyle(e, 'height')) {

+								dom.setAttrib(e, 'height', v.replace(/[^0-9%]+/g, ''));

+								dom.setStyle(e, 'height', '');

 							}

 						});

 					} else {

 						ev = 'resizestart';

-						cb = t.dom.bind(e, 'resizestart', Event.cancel, Event);

+						cb = dom.bind(e, 'resizestart', Event.cancel, Event);

 					}

 

 					re = t.resizeInfo = {

@@ -10896,27 +13752,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						cb : cb

 					};

 				});

-

-				t.onKeyDown.add(function(ed, e) {

-					switch (e.keyCode) {

-						case 8:

-							// Fix IE control + backspace browser bug

-							if (t.selection.getRng().item) {

-								ed.dom.remove(t.selection.getRng().item(0));

-								return Event.cancel(e);

-							}

-					}

-				});

-

-				/*if (t.dom.boxModel) {

-					t.getBody().style.height = '100%';

-

-					Event.add(t.getWin(), 'resize', function(e) {

-						var docElm = t.getDoc().documentElement;

-

-						docElm.style.height = (docElm.offsetHeight - 10) + 'px';

-					});

-				}*/

 			}

 

 			if (tinymce.isOpera) {

@@ -10928,81 +13763,62 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			// Add custom undo/redo handlers

 			if (s.custom_undo_redo) {

 				function addUndo() {

-					t.undoManager.typing = 0;

+					t.undoManager.typing = false;

 					t.undoManager.add();

 				};

 

-				t.dom.bind(t.getDoc(), 'focusout', function(e) {

+				var focusLostFunc = tinymce.isGecko ? 'blur' : 'focusout';

+				dom.bind(t.getDoc(), focusLostFunc, function(e){

 					if (!t.removed && t.undoManager.typing)

 						addUndo();

 				});

 

+				// Add undo level when contents is drag/dropped within the editor

+				t.dom.bind(t.dom.getRoot(), 'dragend', function(e) {

+					addUndo();

+				});

+

 				t.onKeyUp.add(function(ed, e) {

-					if ((e.keyCode >= 33 && e.keyCode <= 36) || (e.keyCode >= 37 && e.keyCode <= 40) || e.keyCode == 13 || e.keyCode == 45 || e.ctrlKey)

+					var keyCode = e.keyCode;

+

+					if ((keyCode >= 33 && keyCode <= 36) || (keyCode >= 37 && keyCode <= 40) || keyCode == 13 || keyCode == 45 || e.ctrlKey)

 						addUndo();

 				});

 

 				t.onKeyDown.add(function(ed, e) {

-					var rng, tmpRng, parent, offset;

-

-					// IE has a really odd bug where the DOM might include an node that doesn't have

-					// a proper structure. If you try to access nodeValue it would throw an illegal value exception.

-					// This seems to only happen when you delete contents and it seems to be avoidable if you refresh the element

-					// after you delete contents from it. See: #3008923

-					if (isIE && e.keyCode == 46) {

-						rng = t.selection.getRng();

-

-						if (rng.parentElement) {

-							parent = rng.parentElement();

-

-							// Get the current caret position within the element

-							tmpRng = rng.duplicate();

-							tmpRng.moveToElementText(parent);

-							tmpRng.setEndPoint('EndToEnd', rng);

-							offset = tmpRng.text.length;

-

-							// Select next word when ctrl key is used in combo with delete

-							if (e.ctrlKey) {

-								rng.moveEnd('word', 1);

-								rng.select();

-							}

+					var keyCode = e.keyCode, sel;

 

-							// Delete contents

-							t.selection.getSel().clear();

+					if (keyCode == 8) {

+						sel = t.getDoc().selection;

 

-							// Check if we are within the same parent

-							if (rng.parentElement() == parent) {

-								try {

-									// Update the HTML and hopefully it will remove the artifacts

-									parent.innerHTML = parent.innerHTML;

-								} catch (ex) {

-									// And since it's IE it can sometimes produce an unknown runtime error

-								}

-

-								// Restore the caret position

-								tmpRng.moveToElementText(parent);

-								tmpRng.collapse();

-								tmpRng.move('character', offset);

-								tmpRng.select();

-							}

+						// Fix IE control + backspace browser bug

+						if (sel && sel.createRange && sel.createRange().item) {

+							t.undoManager.beforeChange();

+							ed.dom.remove(sel.createRange().item(0));

+							addUndo();

 

-							// Block the default delete behavior since it might be broken

-							e.preventDefault();

-							return;

+							return Event.cancel(e);

 						}

 					}

 

-					// Is caracter positon keys

-					if ((e.keyCode >= 33 && e.keyCode <= 36) || (e.keyCode >= 37 && e.keyCode <= 40) || e.keyCode == 13 || e.keyCode == 45) {

+					// Is caracter positon keys left,right,up,down,home,end,pgdown,pgup,enter

+					if ((keyCode >= 33 && keyCode <= 36) || (keyCode >= 37 && keyCode <= 40) || keyCode == 13 || keyCode == 45) {

+						// Add position before enter key is pressed, used by IE since it still uses the default browser behavior

+						// Todo: Remove this once we normalize enter behavior on IE

+						if (tinymce.isIE && keyCode == 13)

+							t.undoManager.beforeChange();

+

 						if (t.undoManager.typing)

 							addUndo();

 

 						return;

 					}

 

-					if (!t.undoManager.typing) {

+					// If key isn't shift,ctrl,alt,capslock,metakey

+					if ((keyCode < 16 || keyCode > 20) && keyCode != 224 && keyCode != 91 && !t.undoManager.typing) {

+						t.undoManager.beforeChange();

+						t.undoManager.typing = true;

 						t.undoManager.add();

-						t.undoManager.typing = 1;

 					}

 				});

 

@@ -11013,6 +13829,21 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			}

 		},

 

+		_refreshContentEditable : function() {

+			var self = this, body, parent;

+

+			// Check if the editor was hidden and the re-initalize contentEditable mode by removing and adding the body again

+			if (self._isHidden()) {

+				body = self.getBody();

+				parent = body.parentNode;

+

+				parent.removeChild(body);

+				parent.appendChild(body);

+

+				body.focus();

+			}

+		},

+

 		_isHidden : function() {

 			var s;

 

@@ -11022,57 +13853,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			// Weird, wheres that cursor selection?

 			s = this.selection.getSel();

 			return (!s || !s.rangeCount || s.rangeCount == 0);

-		},

-

-		// Fix for bug #1867292

-		_fixNesting : function(s) {

-			var d = [], i;

-

-			s = s.replace(/<(\/)?([^\s>]+)[^>]*?>/g, function(a, b, c) {

-				var e;

-

-				// Handle end element

-				if (b === '/') {

-					if (!d.length)

-						return '';

-

-					if (c !== d[d.length - 1].tag) {

-						for (i=d.length - 1; i>=0; i--) {

-							if (d[i].tag === c) {

-								d[i].close = 1;

-								break;

-							}

-						}

-

-						return '';

-					} else {

-						d.pop();

-

-						if (d.length && d[d.length - 1].close) {

-							a = a + '</' + d[d.length - 1].tag + '>';

-							d.pop();

-						}

-					}

-				} else {

-					// Ignore these

-					if (/^(br|hr|input|meta|img|link|param)$/i.test(c))

-						return a;

-

-					// Ignore closed ones

-					if (/\/>$/.test(a))

-						return a;

-

-					d.push({tag : c}); // Push start element

-				}

-

-				return a;

-			});

-

-			// End all open tags

-			for (i=d.length - 1; i>=0; i--)

-				s += '</' + d[i].tag + '>';

-

-			return s;

 		}

 	});

 })(tinymce);

@@ -11086,6 +13866,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			selection = editor.selection,

 			commands = {state: {}, exec : {}, value : {}},

 			settings = editor.settings,

+			formatter = editor.formatter,

 			bookmark;

 

 		function execCommand(command, ui, value) {

@@ -11151,11 +13932,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		};

 

 		function isFormatMatch(name) {

-			return editor.formatter.match(name);

+			return formatter.match(name);

 		};

 

 		function toggleFormat(name, value) {

-			editor.formatter.toggle(name, value ? {value : value} : undefined);

+			formatter.toggle(name, value ? {value : value} : undefined);

 		};

 

 		function storeSelection(type) {

@@ -11215,10 +13996,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				// Remove all other alignments first

 				each('left,center,right,full'.split(','), function(name) {

 					if (align != name)

-						editor.formatter.remove('align' + name);

+						formatter.remove('align' + name);

 				});

 

 				toggleFormat('align' + align);

+				execCommand('mceRepaint');

 			},

 

 			// Override list commands to fix WebKit bug

@@ -11244,7 +14026,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			},

 

 			// Override commands to use the text formatter engine

-			'Bold,Italic,Underline,Strikethrough' : function(command) {

+			'Bold,Italic,Underline,Strikethrough,Superscript,Subscript' : function(command) {

 				toggleFormat(command);

 			},

 

@@ -11271,7 +14053,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			},

 

 			RemoveFormat : function(command) {

-				editor.formatter.remove(command);

+				formatter.remove(command);

 			},

 

 			mceBlockQuote : function(command) {

@@ -11279,7 +14061,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			},

 

 			FormatBlock : function(command, ui, value) {

-				return toggleFormat(value);

+				return toggleFormat(value || 'p');

 			},

 

 			mceCleanup : function() {

@@ -11317,12 +14099,140 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			},

 

 			mceInsertContent : function(command, ui, value) {

-				selection.setContent(value);

+				var parser, serializer, parentNode, rootNode, fragment, args,

+					marker, nodeRect, viewPortRect, rng, node, node2, bookmarkHtml, viewportBodyElement;

+

+				//selection.normalize();

+

+				// Setup parser and serializer

+				parser = editor.parser;

+				serializer = new tinymce.html.Serializer({}, editor.schema);

+				bookmarkHtml = '<span id="mce_marker" data-mce-type="bookmark">\uFEFF</span>';

+

+				// Run beforeSetContent handlers on the HTML to be inserted

+				args = {content: value, format: 'html'};

+				selection.onBeforeSetContent.dispatch(selection, args);

+				value = args.content;

+

+				// Add caret at end of contents if it's missing

+				if (value.indexOf('{$caret}') == -1)

+					value += '{$caret}';

+

+				// Replace the caret marker with a span bookmark element

+				value = value.replace(/\{\$caret\}/, bookmarkHtml);

+

+				// Insert node maker where we will insert the new HTML and get it's parent

+				if (!selection.isCollapsed())

+					editor.getDoc().execCommand('Delete', false, null);

+

+				parentNode = selection.getNode();

+

+				// Parse the fragment within the context of the parent node

+				args = {context : parentNode.nodeName.toLowerCase()};

+				fragment = parser.parse(value, args);

+

+				// Move the caret to a more suitable location

+				node = fragment.lastChild;

+				if (node.attr('id') == 'mce_marker') {

+					marker = node;

+

+					for (node = node.prev; node; node = node.walk(true)) {

+						if (node.type == 3 || !dom.isBlock(node.name)) {

+							node.parent.insert(marker, node, node.name === 'br');

+							break;

+						}

+					}

+				}

+

+				// If parser says valid we can insert the contents into that parent

+				if (!args.invalid) {

+					value = serializer.serialize(fragment);

+

+					// Check if parent is empty or only has one BR element then set the innerHTML of that parent

+					node = parentNode.firstChild;

+					node2 = parentNode.lastChild;

+					if (!node || (node === node2 && node.nodeName === 'BR'))

+						dom.setHTML(parentNode, value);

+					else

+						selection.setContent(value);

+				} else {

+					// If the fragment was invalid within that context then we need

+					// to parse and process the parent it's inserted into

+

+					// Insert bookmark node and get the parent

+					selection.setContent(bookmarkHtml);

+					parentNode = editor.selection.getNode();

+					rootNode = editor.getBody();

+

+					// Opera will return the document node when selection is in root

+					if (parentNode.nodeType == 9)

+						parentNode = node = rootNode;

+					else

+						node = parentNode;

+

+					// Find the ancestor just before the root element

+					while (node !== rootNode) {

+						parentNode = node;

+						node = node.parentNode;

+					}

+

+					// Get the outer/inner HTML depending on if we are in the root and parser and serialize that

+					value = parentNode == rootNode ? rootNode.innerHTML : dom.getOuterHTML(parentNode);

+					value = serializer.serialize(

+						parser.parse(

+							// Need to replace by using a function since $ in the contents would otherwise be a problem

+							value.replace(/<span (id="mce_marker"|id=mce_marker).+?<\/span>/i, function() {

+								return serializer.serialize(fragment);

+							})

+						)

+					);

+

+					// Set the inner/outer HTML depending on if we are in the root or not

+					if (parentNode == rootNode)

+						dom.setHTML(rootNode, value);

+					else

+						dom.setOuterHTML(parentNode, value);

+				}

+

+				marker = dom.get('mce_marker');

+

+				// Scroll range into view scrollIntoView on element can't be used since it will scroll the main view port as well

+				nodeRect = dom.getRect(marker);

+				viewPortRect = dom.getViewPort(editor.getWin());

+

+				// Check if node is out side the viewport if it is then scroll to it

+				if ((nodeRect.y + nodeRect.h > viewPortRect.y + viewPortRect.h || nodeRect.y < viewPortRect.y) ||

+					(nodeRect.x > viewPortRect.x + viewPortRect.w || nodeRect.x < viewPortRect.x)) {

+					viewportBodyElement = tinymce.isIE ? editor.getDoc().documentElement : editor.getBody();

+					viewportBodyElement.scrollLeft = nodeRect.x;

+					viewportBodyElement.scrollTop = nodeRect.y - viewPortRect.h + 25;

+				}

+

+				// Move selection before marker and remove it

+				rng = dom.createRng();

+

+				// If previous sibling is a text node set the selection to the end of that node

+				node = marker.previousSibling;

+				if (node && node.nodeType == 3) {

+					rng.setStart(node, node.nodeValue.length);

+				} else {

+					// If the previous sibling isn't a text node or doesn't exist set the selection before the marker node

+					rng.setStartBefore(marker);

+					rng.setEndBefore(marker);

+				}

+

+				// Remove the marker node and set the new range

+				dom.remove(marker);

+				selection.setRng(rng);

+

+				// Dispatch after event and add any visual elements needed

+				selection.onSetContent.dispatch(selection, args);

+				editor.addVisual();

 			},

 

 			mceInsertRawHTML : function(command, ui, value) {

 				selection.setContent('tiny_mce_marker');

-				editor.setContent(editor.getContent().replace(/tiny_mce_marker/g, value));

+				editor.setContent(editor.getContent().replace(/tiny_mce_marker/g, function() { return value }));

 			},

 

 			mceSetContent : function(command, ui, value) {

@@ -11338,6 +14248,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				intentValue = parseInt(intentValue);

 

 				if (!queryCommandState('InsertUnorderedList') && !queryCommandState('InsertOrderedList')) {

+					// If forced_root_blocks is set to false we don't have a block to indent so lets create a div

+					if (!settings.forced_root_block && !dom.getParent(selection.getNode(), dom.isBlock)) {

+						formatter.apply('div');

+					}

+

 					each(selection.getSelectedBlocks(), function(element) {

 						if (command == 'outdent') {

 							value = Math.max(0, parseInt(element.style.paddingLeft || 0) - intentValue);

@@ -11368,11 +14283,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			},

 

 			mceToggleFormat : function(command, ui, value) {

-				editor.formatter.toggle(value);

+				formatter.toggle(value);

 			},

 

 			InsertHorizontalRule : function() {

-				selection.setContent('<hr />');

+				editor.execCommand('mceInsertContent', false, '<hr />');

 			},

 

 			mceToggleVisualAid : function() {

@@ -11381,33 +14296,37 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			},

 

 			mceReplaceContent : function(command, ui, value) {

-				selection.setContent(value.replace(/\{\$selection\}/g, selection.getContent({format : 'text'})));

+				editor.execCommand('mceInsertContent', false, value.replace(/\{\$selection\}/g, selection.getContent({format : 'text'})));

 			},

 

 			mceInsertLink : function(command, ui, value) {

-				var link = dom.getParent(selection.getNode(), 'a');

+				var anchor;

 

-				if (tinymce.is(value, 'string'))

+				if (typeof(value) == 'string')

 					value = {href : value};

 

-				if (!link) {

-					execNativeCommand('CreateLink', FALSE, 'javascript:mctmp(0);');

-					each(dom.select('a[href=javascript:mctmp(0);]'), function(link) {

-						dom.setAttribs(link, value);

-					});

-				} else {

-					if (value.href)

-						dom.setAttribs(link, value);

-					else

-						editor.dom.remove(link, TRUE);

+				anchor = dom.getParent(selection.getNode(), 'a');

+

+				// Spaces are never valid in URLs and it's a very common mistake for people to make so we fix it here.

+				value.href = value.href.replace(' ', '%20');

+

+				// Remove existing links if there could be child links or that the href isn't specified

+				if (!anchor || !value.href) {

+					formatter.remove('link');

+				}		

+

+				// Apply new link to selection

+				if (value.href) {

+					formatter.apply('link', value, anchor);

 				}

 			},

-			

+

 			selectAll : function() {

-				var root = dom.getRoot();

-				var rng = dom.createRng();

+				var root = dom.getRoot(), rng = dom.createRng();

+

 				rng.setStart(root, 0);

 				rng.setEnd(root, root.childNodes.length);

+

 				editor.selection.setRng(rng);

 			}

 		});

@@ -11416,10 +14335,17 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		addCommands({

 			// Override justify commands

 			'JustifyLeft,JustifyCenter,JustifyRight,JustifyFull' : function(command) {

-				return isFormatMatch('align' + command.substring(7));

+				var name = 'align' + command.substring(7);

+				// Use Formatter.matchNode instead of Formatter.match so that we don't match on parent node. This fixes bug where for both left

+				// and right align buttons can be active. This could occur when selected nodes have align right and the parent has align left.

+				var nodes = selection.isCollapsed() ? [selection.getNode()] : selection.getSelectedBlocks();

+				var matches = tinymce.map(nodes, function(node) {

+					return !!formatter.matchNode(node, name);

+				});

+				return tinymce.inArray(matches, TRUE) !== -1;

 			},

 

-			'Bold,Italic,Underline,Strikethrough' : function(command) {

+			'Bold,Italic,Underline,Strikethrough,Superscript,Subscript' : function(command) {

 				return isFormatMatch(command);

 			},

 

@@ -11476,23 +14402,31 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		}

 	};

 })(tinymce);

+

 (function(tinymce) {

 	var Dispatcher = tinymce.util.Dispatcher;

 

 	tinymce.UndoManager = function(editor) {

-		var self, index = 0, data = [];

+		var self, index = 0, data = [], beforeBookmark;

 

 		function getContent() {

-			return tinymce.trim(editor.getContent({format : 'raw', no_events : 1}));

+			// Remove whitespace before/after and remove pure bogus nodes

+			return tinymce.trim(editor.getContent({format : 'raw', no_events : 1}).replace(/<span[^>]+data-mce-bogus[^>]+>[\u200B\uFEFF]+<\/span>/g, ''));

 		};

 

 		return self = {

-			typing : 0,

+			typing : false,

 

 			onAdd : new Dispatcher(self),

+

 			onUndo : new Dispatcher(self),

+

 			onRedo : new Dispatcher(self),

 

+			beforeChange : function() {

+				beforeBookmark = editor.selection.getBookmark(2, true);

+			},

+

 			add : function(level) {

 				var i, settings = editor.settings, lastLevel;

 

@@ -11501,10 +14435,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 				// Add undo level if needed

 				lastLevel = data[index];

-				if (lastLevel && lastLevel.content == level.content) {

-					if (index > 0 || data.length == 1)

-						return null;

-				}

+				if (lastLevel && lastLevel.content == level.content)

+					return null;

+

+				// Set before bookmark on previous level

+				if (data[index])

+					data[index].beforeBookmark = beforeBookmark;

 

 				// Time to compress

 				if (settings.custom_undo_redo_levels) {

@@ -11521,13 +14457,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				level.bookmark = editor.selection.getBookmark(2, true);

 

 				// Crop array if needed

-				if (index < data.length - 1) {

-					// Treat first level as initial

-					if (index == 0)

-						data = [];

-					else

-						data.length = index + 1;

-				}

+				if (index < data.length - 1)

+					data.length = index + 1;

 

 				data.push(level);

 				index = data.length - 1;

@@ -11543,14 +14474,14 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 				if (self.typing) {

 					self.add();

-					self.typing = 0;

+					self.typing = false;

 				}

 

 				if (index > 0) {

 					level = data[--index];

 

 					editor.setContent(level.content, {format : 'raw'});

-					editor.selection.moveToBookmark(level.bookmark);

+					editor.selection.moveToBookmark(level.beforeBookmark);

 

 					self.onUndo.dispatch(self, level);

 				}

@@ -11575,758 +14506,110 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			clear : function() {

 				data = [];

-				index = self.typing = 0;

+				index = 0;

+				self.typing = false;

 			},

 

 			hasUndo : function() {

-				return index > 0 || self.typing;

+				return index > 0 || this.typing;

 			},

 

 			hasRedo : function() {

-				return index < data.length - 1;

+				return index < data.length - 1 && !this.typing;

 			}

 		};

 	};

 })(tinymce);

 

-(function(tinymce) {

-	// Shorten names

-	var Event = tinymce.dom.Event,

-		isIE = tinymce.isIE,

-		isGecko = tinymce.isGecko,

-		isOpera = tinymce.isOpera,

-		each = tinymce.each,

-		extend = tinymce.extend,

-		TRUE = true,

-		FALSE = false;

-

-	function cloneFormats(node) {

-		var clone, temp, inner;

-

-		do {

-			if (/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(node.nodeName)) {

-				if (clone) {

-					temp = node.cloneNode(false);

-					temp.appendChild(clone);

-					clone = temp;

-				} else {

-					clone = inner = node.cloneNode(false);

-				}

-

-				clone.removeAttribute('id');

-			}

-		} while (node = node.parentNode);

-

-		if (clone)

-			return {wrapper : clone, inner : inner};

-	};

-

-	// Checks if the selection/caret is at the end of the specified block element

-	function isAtEnd(rng, par) {

-		var rng2 = par.ownerDocument.createRange();

-

-		rng2.setStart(rng.endContainer, rng.endOffset);

-		rng2.setEndAfter(par);

-

-		// Get number of characters to the right of the cursor if it's zero then we are at the end and need to merge the next block element

-		return rng2.cloneContents().textContent.length == 0;

-	};

-

-	function isEmpty(n) {

-		n = n.innerHTML;

-

-		n = n.replace(/<(img|hr|table|input|select|textarea)[ \>]/gi, '-'); // Keep these convert them to - chars

-		n = n.replace(/<[^>]+>/g, ''); // Remove all tags

-

-		return n.replace(/[ \u00a0\t\r\n]+/g, '') == '';

-	};

-

-	function splitList(selection, dom, li) {

-		var listBlock, block;

-

-		if (isEmpty(li)) {

-			listBlock = dom.getParent(li, 'ul,ol');

-

-			if (!dom.getParent(listBlock.parentNode, 'ul,ol')) {

-				dom.split(listBlock, li);

-				block = dom.create('p', 0, '<br _mce_bogus="1" />');

-				dom.replace(block, li);

-				selection.select(block, 1);

-			}

-

-			return FALSE;

-		}

-

-		return TRUE;

-	};

-

-	tinymce.create('tinymce.ForceBlocks', {

-		ForceBlocks : function(ed) {

-			var t = this, s = ed.settings, elm;

-

-			t.editor = ed;

-			t.dom = ed.dom;

-			elm = (s.forced_root_block || 'p').toLowerCase();

-			s.element = elm.toUpperCase();

-

-			ed.onPreInit.add(t.setup, t);

-

-			t.reOpera = new RegExp('(\\u00a0|&#160;|&nbsp;)<\/' + elm + '>', 'gi');

-			t.rePadd = new RegExp('<p( )([^>]+)><\\\/p>|<p( )([^>]+)\\\/>|<p( )([^>]+)>\\s+<\\\/p>|<p><\\\/p>|<p\\\/>|<p>\\s+<\\\/p>'.replace(/p/g, elm), 'gi');

-			t.reNbsp2BR1 = new RegExp('<p( )([^>]+)>[\\s\\u00a0]+<\\\/p>|<p>[\\s\\u00a0]+<\\\/p>'.replace(/p/g, elm), 'gi');

-			t.reNbsp2BR2 = new RegExp('<%p()([^>]+)>(&nbsp;|&#160;)<\\\/%p>|<%p>(&nbsp;|&#160;)<\\\/%p>'.replace(/%p/g, elm), 'gi');

-			t.reBR2Nbsp = new RegExp('<p( )([^>]+)>\\s*<br \\\/>\\s*<\\\/p>|<p>\\s*<br \\\/>\\s*<\\\/p>'.replace(/p/g, elm), 'gi');

-

-			function padd(ed, o) {

-				if (isOpera)

-					o.content = o.content.replace(t.reOpera, '</' + elm + '>');

-

-				o.content = o.content.replace(t.rePadd, '<' + elm + '$1$2$3$4$5$6>\u00a0</' + elm + '>');

-

-				if (!isIE && !isOpera && o.set) {

-					// Use &nbsp; instead of BR in padded paragraphs

-					o.content = o.content.replace(t.reNbsp2BR1, '<' + elm + '$1$2><br /></' + elm + '>');

-					o.content = o.content.replace(t.reNbsp2BR2, '<' + elm + '$1$2><br /></' + elm + '>');

-				} else

-					o.content = o.content.replace(t.reBR2Nbsp, '<' + elm + '$1$2>\u00a0</' + elm + '>');

-			};

-

-			ed.onBeforeSetContent.add(padd);

-			ed.onPostProcess.add(padd);

-

-			if (s.forced_root_block) {

-				ed.onInit.add(t.forceRoots, t);

-				ed.onSetContent.add(t.forceRoots, t);

-				ed.onBeforeGetContent.add(t.forceRoots, t);

-			}

-		},

-

-		setup : function() {

-			var t = this, ed = t.editor, s = ed.settings, dom = ed.dom, selection = ed.selection;

-

-			// Force root blocks when typing and when getting output

-			if (s.forced_root_block) {

-				ed.onBeforeExecCommand.add(t.forceRoots, t);

-				ed.onKeyUp.add(t.forceRoots, t);

-				ed.onPreProcess.add(t.forceRoots, t);

-			}

-

-			if (s.force_br_newlines) {

-				// Force IE to produce BRs on enter

-				if (isIE) {

-					ed.onKeyPress.add(function(ed, e) {

-						var n;

-

-						if (e.keyCode == 13 && selection.getNode().nodeName != 'LI') {

-							selection.setContent('<br id="__" /> ', {format : 'raw'});

-							n = dom.get('__');

-							n.removeAttribute('id');

-							selection.select(n);

-							selection.collapse();

-							return Event.cancel(e);

-						}

-					});

-				}

-			}

-

-			if (s.force_p_newlines) {

-				if (!isIE) {

-					ed.onKeyPress.add(function(ed, e) {

-						if (e.keyCode == 13 && !e.shiftKey && !t.insertPara(e))

-							Event.cancel(e);

-					});

-				} else {

-					// Ungly hack to for IE to preserve the formatting when you press

-					// enter at the end of a block element with formatted contents

-					// This logic overrides the browsers default logic with

-					// custom logic that enables us to control the output

-					tinymce.addUnload(function() {

-						t._previousFormats = 0; // Fix IE leak

-					});

-

-					ed.onKeyPress.add(function(ed, e) {

-						t._previousFormats = 0;

-

-						// Clone the current formats, this will later be applied to the new block contents

-						if (e.keyCode == 13 && !e.shiftKey && ed.selection.isCollapsed() && s.keep_styles)

-							t._previousFormats = cloneFormats(ed.selection.getStart());

-					});

-

-					ed.onKeyUp.add(function(ed, e) {

-						// Let IE break the element and the wrap the new caret location in the previous formats

-						if (e.keyCode == 13 && !e.shiftKey) {

-							var parent = ed.selection.getStart(), fmt = t._previousFormats;

-

-							// Parent is an empty block

-							if (!parent.hasChildNodes()) {

-								parent = dom.getParent(parent, dom.isBlock);

-

-								if (parent) {

-									parent.innerHTML = '';

-	

-									if (t._previousFormats) {

-										parent.appendChild(fmt.wrapper);

-										fmt.inner.innerHTML = '\uFEFF';

-									} else

-										parent.innerHTML = '\uFEFF';

-

-									selection.select(parent, 1);

-									ed.getDoc().execCommand('Delete', false, null);

-								}

-							}

-						}

-					});

-				}

-

-				if (isGecko) {

-					ed.onKeyDown.add(function(ed, e) {

-						if ((e.keyCode == 8 || e.keyCode == 46) && !e.shiftKey)

-							t.backspaceDelete(e, e.keyCode == 8);

-					});

-				}

-			}

-

-			// Workaround for missing shift+enter support, http://bugs.webkit.org/show_bug.cgi?id=16973

-			if (tinymce.isWebKit) {

-				function insertBr(ed) {

-					var rng = selection.getRng(), br, div = dom.create('div', null, ' '), divYPos, vpHeight = dom.getViewPort(ed.getWin()).h;

-

-					// Insert BR element

-					rng.insertNode(br = dom.create('br'));

-

-					// Place caret after BR

-					rng.setStartAfter(br);

-					rng.setEndAfter(br);

-					selection.setRng(rng);

+tinymce.ForceBlocks = function(editor) {

+	var settings = editor.settings, dom = editor.dom, selection = editor.selection, blockElements = editor.schema.getBlockElements();

 

-					// Could not place caret after BR then insert an nbsp entity and move the caret

-					if (selection.getSel().focusNode == br.previousSibling) {

-						selection.select(dom.insertAfter(dom.doc.createTextNode('\u00a0'), br));

-						selection.collapse(TRUE);

-					}

+	// Force root blocks

+	if (settings.forced_root_block) {

+		function addRootBlocks() {

+			var node = selection.getStart(), rootNode = editor.getBody(), rng, startContainer, startOffset, endContainer, endOffset, rootBlockNode, tempNode, offset = -0xFFFFFF;

 

-					// Create a temporary DIV after the BR and get the position as it

-					// seems like getPos() returns 0 for text nodes and BR elements.

-					dom.insertAfter(div, br);

-					divYPos = dom.getPos(div).y;

-					dom.remove(div);

+			if (!node || node.nodeType !== 1 || !settings.forced_root_block)

+				return;

 

-					// Scroll to new position, scrollIntoView can't be used due to bug: http://bugs.webkit.org/show_bug.cgi?id=16117

-					if (divYPos > vpHeight) // It is not necessary to scroll if the DIV is inside the view port.

-						ed.getWin().scrollTo(0, divYPos);

-				};

+			// Check if node is wrapped in block

+			while (node != rootNode) {

+				if (blockElements[node.nodeName])

+					return;

 

-				ed.onKeyPress.add(function(ed, e) {

-					if (e.keyCode == 13 && (e.shiftKey || (s.force_br_newlines && !dom.getParent(selection.getNode(), 'h1,h2,h3,h4,h5,h6,ol,ul')))) {

-						insertBr(ed);

-						Event.cancel(e);

-					}

-				});

+				node = node.parentNode;

 			}

 

-			// Padd empty inline elements within block elements

-			// For example: <p><strong><em></em></strong></p> becomes <p><strong><em>&nbsp;</em></strong></p>

-			ed.onPreProcess.add(function(ed, o) {

-				each(dom.select('p,h1,h2,h3,h4,h5,h6,div', o.node), function(p) {

-					if (isEmpty(p)) {

-						each(dom.select('span,em,strong,b,i', o.node), function(n) {

-							if (!n.hasChildNodes()) {

-								n.appendChild(ed.getDoc().createTextNode('\u00a0'));

-								return FALSE; // Break the loop one padding is enough

-							}

-						});

-					}

-				});

-			});

-

-			// IE specific fixes

-			if (isIE) {

-				// Replaces IE:s auto generated paragraphs with the specified element name

-				if (s.element != 'P') {

-					ed.onKeyPress.add(function(ed, e) {

-						t.lastElm = selection.getNode().nodeName;

-					});

-

-					ed.onKeyUp.add(function(ed, e) {

-						var bl, n = selection.getNode(), b = ed.getBody();

-

-						if (b.childNodes.length === 1 && n.nodeName == 'P') {

-							n = dom.rename(n, s.element);

-							selection.select(n);

-							selection.collapse();

-							ed.nodeChanged();

-						} else if (e.keyCode == 13 && !e.shiftKey && t.lastElm != 'P') {

-							bl = dom.getParent(n, 'p');

-

-							if (bl) {

-								dom.rename(bl, s.element);

-								ed.nodeChanged();

-							}

-						}

-					});

+			// Get current selection

+			rng = selection.getRng();

+			if (rng.setStart) {

+				startContainer = rng.startContainer;

+				startOffset = rng.startOffset;

+				endContainer = rng.endContainer;

+				endOffset = rng.endOffset;

+			} else {

+				// Force control range into text range

+				if (rng.item) {

+					node = rng.item(0);

+					rng = editor.getDoc().body.createTextRange();

+					rng.moveToElementText(node);

 				}

-			}

-		},

 

-		find : function(n, t, s) {

-			var ed = this.editor, w = ed.getDoc().createTreeWalker(n, 4, null, FALSE), c = -1;

+				tmpRng = rng.duplicate();

+				tmpRng.collapse(true);

+				startOffset = tmpRng.move('character', offset) * -1;

 

-			while (n = w.nextNode()) {

-				c++;

-

-				// Index by node

-				if (t == 0 && n == s)

-					return c;

-

-				// Node by index

-				if (t == 1 && c == s)

-					return n;

-			}

-

-			return -1;

-		},

-

-		forceRoots : function(ed, e) {

-			var t = this, ed = t.editor, b = ed.getBody(), d = ed.getDoc(), se = ed.selection, s = se.getSel(), r = se.getRng(), si = -2, ei, so, eo, tr, c = -0xFFFFFF;

-			var nx, bl, bp, sp, le, nl = b.childNodes, i, n, eid;

-

-			// Fix for bug #1863847

-			//if (e && e.keyCode == 13)

-			//	return TRUE;

-

-			// Wrap non blocks into blocks

-			for (i = nl.length - 1; i >= 0; i--) {

-				nx = nl[i];

-

-				// Ignore internal elements

-				if (nx.nodeType === 1 && nx.getAttribute('_mce_type')) {

-					bl = null;

-					continue;

+				if (!tmpRng.collapsed) {

+					tmpRng = rng.duplicate();

+					tmpRng.collapse(false);

+					endOffset = (tmpRng.move('character', offset) * -1) - startOffset;

 				}

-

-				// Is text or non block element

-				if (nx.nodeType === 3 || (!t.dom.isBlock(nx) && nx.nodeType !== 8 && !/^(script|mce:script|style|mce:style)$/i.test(nx.nodeName))) {

-					if (!bl) {

-						// Create new block but ignore whitespace

-						if (nx.nodeType != 3 || /[^\s]/g.test(nx.nodeValue)) {

-							// Store selection

-							if (si == -2 && r) {

-								if (!isIE) {

-									// If selection is element then mark it

-									if (r.startContainer.nodeType == 1 && (n = r.startContainer.childNodes[r.startOffset]) && n.nodeType == 1) {

-										// Save the id of the selected element

-										eid = n.getAttribute("id");

-										n.setAttribute("id", "__mce");

-									} else {

-										// If element is inside body, might not be the case in contentEdiable mode

-										if (ed.dom.getParent(r.startContainer, function(e) {return e === b;})) {

-											so = r.startOffset;

-											eo = r.endOffset;

-											si = t.find(b, 0, r.startContainer);

-											ei = t.find(b, 0, r.endContainer);

-										}

-									}

-								} else {

-									// Force control range into text range

-									if (r.item) {

-										tr = d.body.createTextRange();

-										tr.moveToElementText(r.item(0));

-										r = tr;

-									}

-

-									tr = d.body.createTextRange();

-									tr.moveToElementText(b);

-									tr.collapse(1);

-									bp = tr.move('character', c) * -1;

-

-									tr = r.duplicate();

-									tr.collapse(1);

-									sp = tr.move('character', c) * -1;

-

-									tr = r.duplicate();

-									tr.collapse(0);

-									le = (tr.move('character', c) * -1) - sp;

-

-									si = sp - bp;

-									ei = le;

-								}

-							}

-

-							// Uses replaceChild instead of cloneNode since it removes selected attribute from option elements on IE

-							// See: http://support.microsoft.com/kb/829907

-							bl = ed.dom.create(ed.settings.forced_root_block);

-							nx.parentNode.replaceChild(bl, nx);

-							bl.appendChild(nx);

-						}

-					} else {

-						if (bl.hasChildNodes())

-							bl.insertBefore(nx, bl.firstChild);

-						else

-							bl.appendChild(nx);

-					}

-				} else

-					bl = null; // Time to create new block

 			}

 

-			// Restore selection

-			if (si != -2) {

-				if (!isIE) {

-					bl = b.getElementsByTagName(ed.settings.element)[0];

-					r = d.createRange();

-

-					// Select last location or generated block

-					if (si != -1)

-						r.setStart(t.find(b, 1, si), so);

-					else

-						r.setStart(bl, 0);

-

-					// Select last location or generated block

-					if (ei != -1)

-						r.setEnd(t.find(b, 1, ei), eo);

-					else

-						r.setEnd(bl, 0);

-

-					if (s) {

-						s.removeAllRanges();

-						s.addRange(r);

+			// Wrap non block elements and text nodes

+			for (node = rootNode.firstChild; node; node) {

+				if (node.nodeType === 3 || (node.nodeType == 1 && !blockElements[node.nodeName])) {

+					if (!rootBlockNode) {

+						rootBlockNode = dom.create(settings.forced_root_block);

+						node.parentNode.insertBefore(rootBlockNode, node);

 					}

-				} else {

-					try {

-						r = s.createRange();

-						r.moveToElementText(b);

-						r.collapse(1);

-						r.moveStart('character', si);

-						r.moveEnd('character', ei);

-						r.select();

-					} catch (ex) {

-						// Ignore

-					}

-				}

-			} else if (!isIE && (n = ed.dom.get('__mce'))) {

-				// Restore the id of the selected element

-				if (eid)

-					n.setAttribute('id', eid);

-				else

-					n.removeAttribute('id');

-

-				// Move caret before selected element

-				r = d.createRange();

-				r.setStartBefore(n);

-				r.setEndBefore(n);

-				se.setRng(r);

-			}

-		},

 

-		getParentBlock : function(n) {

-			var d = this.dom;

-

-			return d.getParent(n, d.isBlock);

-		},

-

-		insertPara : function(e) {

-			var t = this, ed = t.editor, dom = ed.dom, d = ed.getDoc(), se = ed.settings, s = ed.selection.getSel(), r = s.getRangeAt(0), b = d.body;

-			var rb, ra, dir, sn, so, en, eo, sb, eb, bn, bef, aft, sc, ec, n, vp = dom.getViewPort(ed.getWin()), y, ch, car;

-

-			// If root blocks are forced then use Operas default behavior since it's really good

-// Removed due to bug: #1853816

-//			if (se.forced_root_block && isOpera)

-//				return TRUE;

-

-			// Setup before range

-			rb = d.createRange();

-

-			// If is before the first block element and in body, then move it into first block element

-			rb.setStart(s.anchorNode, s.anchorOffset);

-			rb.collapse(TRUE);

-

-			// Setup after range

-			ra = d.createRange();

-

-			// If is before the first block element and in body, then move it into first block element

-			ra.setStart(s.focusNode, s.focusOffset);

-			ra.collapse(TRUE);

-

-			// Setup start/end points

-			dir = rb.compareBoundaryPoints(rb.START_TO_END, ra) < 0;

-			sn = dir ? s.anchorNode : s.focusNode;

-			so = dir ? s.anchorOffset : s.focusOffset;

-			en = dir ? s.focusNode : s.anchorNode;

-			eo = dir ? s.focusOffset : s.anchorOffset;

-

-			// If selection is in empty table cell

-			if (sn === en && /^(TD|TH)$/.test(sn.nodeName)) {

-				if (sn.firstChild.nodeName == 'BR')

-					dom.remove(sn.firstChild); // Remove BR

-

-				// Create two new block elements

-				if (sn.childNodes.length == 0) {

-					ed.dom.add(sn, se.element, null, '<br />');

-					aft = ed.dom.add(sn, se.element, null, '<br />');

+					tempNode = node;

+					node = node.nextSibling;

+					rootBlockNode.appendChild(tempNode);

 				} else {

-					n = sn.innerHTML;

-					sn.innerHTML = '';

-					ed.dom.add(sn, se.element, null, n);

-					aft = ed.dom.add(sn, se.element, null, '<br />');

+					rootBlockNode = null;

+					node = node.nextSibling;

 				}

-

-				// Move caret into the last one

-				r = d.createRange();

-				r.selectNodeContents(aft);

-				r.collapse(1);

-				ed.selection.setRng(r);

-

-				return FALSE;

 			}

 

-			// If the caret is in an invalid location in FF we need to move it into the first block

-			if (sn == b && en == b && b.firstChild && ed.dom.isBlock(b.firstChild)) {

-				sn = en = sn.firstChild;

-				so = eo = 0;

-				rb = d.createRange();

-				rb.setStart(sn, 0);

-				ra = d.createRange();

-				ra.setStart(en, 0);

-			}

-

-			// Never use body as start or end node

-			sn = sn.nodeName == "HTML" ? d.body : sn; // Fix for Opera bug: https://bugs.opera.com/show_bug.cgi?id=273224&comments=yes

-			sn = sn.nodeName == "BODY" ? sn.firstChild : sn;

-			en = en.nodeName == "HTML" ? d.body : en; // Fix for Opera bug: https://bugs.opera.com/show_bug.cgi?id=273224&comments=yes

-			en = en.nodeName == "BODY" ? en.firstChild : en;

-

-			// Get start and end blocks

-			sb = t.getParentBlock(sn);

-			eb = t.getParentBlock(en);

-			bn = sb ? sb.nodeName : se.element; // Get block name to create

-

-			// Return inside list use default browser behavior

-			if (n = t.dom.getParent(sb, 'li,pre')) {

-				if (n.nodeName == 'LI')

-					return splitList(ed.selection, t.dom, n);

-

-				return TRUE;

-			}

-

-			// If caption or absolute layers then always generate new blocks within

-			if (sb && (sb.nodeName == 'CAPTION' || /absolute|relative|fixed/gi.test(dom.getStyle(sb, 'position', 1)))) {

-				bn = se.element;

-				sb = null;

-			}

-

-			// If caption or absolute layers then always generate new blocks within

-			if (eb && (eb.nodeName == 'CAPTION' || /absolute|relative|fixed/gi.test(dom.getStyle(sb, 'position', 1)))) {

-				bn = se.element;

-				eb = null;

-			}

-

-			// Use P instead

-			if (/(TD|TABLE|TH|CAPTION)/.test(bn) || (sb && bn == "DIV" && /left|right/gi.test(dom.getStyle(sb, 'float', 1)))) {

-				bn = se.element;

-				sb = eb = null;

-			}

-

-			// Setup new before and after blocks

-			bef = (sb && sb.nodeName == bn) ? sb.cloneNode(0) : ed.dom.create(bn);

-			aft = (eb && eb.nodeName == bn) ? eb.cloneNode(0) : ed.dom.create(bn);

-

-			// Remove id from after clone

-			aft.removeAttribute('id');

-

-			// Is header and cursor is at the end, then force paragraph under

-			if (/^(H[1-6])$/.test(bn) && isAtEnd(r, sb))

-				aft = ed.dom.create(se.element);

-

-			// Find start chop node

-			n = sc = sn;

-			do {

-				if (n == b || n.nodeType == 9 || t.dom.isBlock(n) || /(TD|TABLE|TH|CAPTION)/.test(n.nodeName))

-					break;

-

-				sc = n;

-			} while ((n = n.previousSibling ? n.previousSibling : n.parentNode));

-

-			// Find end chop node

-			n = ec = en;

-			do {

-				if (n == b || n.nodeType == 9 || t.dom.isBlock(n) || /(TD|TABLE|TH|CAPTION)/.test(n.nodeName))

-					break;

-

-				ec = n;

-			} while ((n = n.nextSibling ? n.nextSibling : n.parentNode));

-

-			// Place first chop part into before block element

-			if (sc.nodeName == bn)

-				rb.setStart(sc, 0);

-			else

-				rb.setStartBefore(sc);

-

-			rb.setEnd(sn, so);

-			bef.appendChild(rb.cloneContents() || d.createTextNode('')); // Empty text node needed for Safari

-

-			// Place secnd chop part within new block element

-			try {

-				ra.setEndAfter(ec);

-			} catch(ex) {

-				//console.debug(s.focusNode, s.focusOffset);

-			}

-

-			ra.setStart(en, eo);

-			aft.appendChild(ra.cloneContents() || d.createTextNode('')); // Empty text node needed for Safari

-

-			// Create range around everything

-			r = d.createRange();

-			if (!sc.previousSibling && sc.parentNode.nodeName == bn) {

-				r.setStartBefore(sc.parentNode);

-			} else {

-				if (rb.startContainer.nodeName == bn && rb.startOffset == 0)

-					r.setStartBefore(rb.startContainer);

-				else

-					r.setStart(rb.startContainer, rb.startOffset);

-			}

-

-			if (!ec.nextSibling && ec.parentNode.nodeName == bn)

-				r.setEndAfter(ec.parentNode);

-			else

-				r.setEnd(ra.endContainer, ra.endOffset);

-

-			// Delete and replace it with new block elements

-			r.deleteContents();

-

-			if (isOpera)

-				ed.getWin().scrollTo(0, vp.y);

-

-			// Never wrap blocks in blocks

-			if (bef.firstChild && bef.firstChild.nodeName == bn)

-				bef.innerHTML = bef.firstChild.innerHTML;

-

-			if (aft.firstChild && aft.firstChild.nodeName == bn)

-				aft.innerHTML = aft.firstChild.innerHTML;

-

-			// Padd empty blocks

-			if (isEmpty(bef))

-				bef.innerHTML = '<br />';

-

-			function appendStyles(e, en) {

-				var nl = [], nn, n, i;

-

-				e.innerHTML = '';

-

-				// Make clones of style elements

-				if (se.keep_styles) {

-					n = en;

-					do {

-						// We only want style specific elements

-						if (/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(n.nodeName)) {

-							nn = n.cloneNode(FALSE);

-							dom.setAttrib(nn, 'id', ''); // Remove ID since it needs to be unique

-							nl.push(nn);

-						}

-					} while (n = n.parentNode);

-				}

-

-				// Append style elements to aft

-				if (nl.length > 0) {

-					for (i = nl.length - 1, nn = e; i >= 0; i--)

-						nn = nn.appendChild(nl[i]);

-

-					// Padd most inner style element

-					nl[0].innerHTML = isOpera ? '&nbsp;' : '<br />'; // Extra space for Opera so that the caret can move there

-					return nl[0]; // Move caret to most inner element

-				} else

-					e.innerHTML = isOpera ? '&nbsp;' : '<br />'; // Extra space for Opera so that the caret can move there

-			};

-

-			// Fill empty afterblook with current style

-			if (isEmpty(aft))

-				car = appendStyles(aft, en);

-

-			// Opera needs this one backwards for older versions

-			if (isOpera && parseFloat(opera.version()) < 9.5) {

-				r.insertNode(bef);

-				r.insertNode(aft);

+			if (rng.setStart) {

+				rng.setStart(startContainer, startOffset);

+				rng.setEnd(endContainer, endOffset);

+				selection.setRng(rng);

 			} else {

-				r.insertNode(aft);

-				r.insertNode(bef);

-			}

-

-			// Normalize

-			aft.normalize();

-			bef.normalize();

-

-			function first(n) {

-				return d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, FALSE).nextNode() || n;

-			};

-

-			// Move cursor and scroll into view

-			r = d.createRange();

-			r.selectNodeContents(isGecko ? first(car || aft) : car || aft);

-			r.collapse(1);

-			s.removeAllRanges();

-			s.addRange(r);

-

-			// scrollIntoView seems to scroll the parent window in most browsers now including FF 3.0b4 so it's time to stop using it and do it our selfs

-			y = ed.dom.getPos(aft).y;

-			ch = aft.clientHeight;

-

-			// Is element within viewport

-			if (y < vp.y || y + ch > vp.y + vp.h) {

-				ed.getWin().scrollTo(0, y < vp.y ? y : y - vp.h + 25); // Needs to be hardcoded to roughly one line of text if a huge text block is broken into two blocks

-				//console.debug('SCROLL!', 'vp.y: ' + vp.y, 'y' + y, 'vp.h' + vp.h, 'clientHeight' + aft.clientHeight, 'yyy: ' + (y < vp.y ? y : y - vp.h + aft.clientHeight));

-			}

-

-			return FALSE;

-		},

-

-		backspaceDelete : function(e, bs) {

-			var t = this, ed = t.editor, b = ed.getBody(), dom = ed.dom, n, se = ed.selection, r = se.getRng(), sc = r.startContainer, n, w, tn, walker;

+				try {

+					rng = editor.getDoc().body.createTextRange();

+					rng.moveToElementText(rootNode);

+					rng.collapse(true);

+					rng.moveStart('character', startOffset);

 

-			// Delete when caret is behind a element doesn't work correctly on Gecko see #3011651

-			if (!bs && r.collapsed && sc.nodeType == 1 && r.startOffset == sc.childNodes.length) {

-				walker = new tinymce.dom.TreeWalker(sc.lastChild, sc);

+					if (endOffset > 0)

+						rng.moveEnd('character', endOffset);

 

-				// Walk the dom backwards until we find a text node

-				for (n = sc.lastChild; n; n = walker.prev()) {

-					if (n.nodeType == 3) {

-						r.setStart(n, n.nodeValue.length);

-						r.collapse(true);

-						se.setRng(r);

-						return;

-					}

+					rng.select();

+				} catch (ex) {

+					// Ignore

 				}

 			}

 

-			// The caret sometimes gets stuck in Gecko if you delete empty paragraphs

-			// This workaround removes the element by hand and moves the caret to the previous element

-			if (sc && ed.dom.isBlock(sc) && !/^(TD|TH)$/.test(sc.nodeName) && bs) {

-				if (sc.childNodes.length == 0 || (sc.childNodes.length == 1 && sc.firstChild.nodeName == 'BR')) {

-					// Find previous block element

-					n = sc;

-					while ((n = n.previousSibling) && !ed.dom.isBlock(n)) ;

-

-					if (n) {

-						if (sc != b.firstChild) {

-							// Find last text node

-							w = ed.dom.doc.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, FALSE);

-							while (tn = w.nextNode())

-								n = tn;

-

-							// Place caret at the end of last text node

-							r = ed.getDoc().createRange();

-							r.setStart(n, n.nodeValue ? n.nodeValue.length : 0);

-							r.setEnd(n, n.nodeValue ? n.nodeValue.length : 0);

-							se.setRng(r);

-

-							// Remove the target container

-							ed.dom.remove(sc);

-						}

+			editor.nodeChanged();

+		};

 

-						return Event.cancel(e);

-					}

-				}

-			}

-		}

-	});

-})(tinymce);

+		editor.onKeyUp.add(addRootBlocks);

+		editor.onClick.add(addRootBlocks);

+	}

+};

 

 (function(tinymce) {

 	// Shorten names

@@ -12484,11 +14767,16 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			id = t.prefix + id;

 

-			if (ed.settings.use_native_selects)

+

+			function useNativeListForAccessibility(ed) {

+				return ed.settings.use_accessible_selects && !tinymce.isGecko

+			}

+

+			if (ed.settings.use_native_selects || useNativeListForAccessibility(ed))

 				c = new tinymce.ui.NativeListBox(id, s);

 			else {

 				cls = cc || t._cls.listbox || tinymce.ui.ListBox;

-				c = new cls(id, s);

+				c = new cls(id, s, ed);

 			}

 

 			t.controls[id] = c;

@@ -12543,11 +14831,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			if (s.menu_button) {

 				cls = cc || t._cls.menubutton || tinymce.ui.MenuButton;

-				c = new cls(id, s);

+				c = new cls(id, s, ed);

 				ed.onMouseDown.add(c.hideMenu, c);

 			} else {

 				cls = t._cls.button || tinymce.ui.Button;

-				c = new cls(id, s);

+				c = new cls(id, s, ed);

 			}

 

 			return t.add(c);

@@ -12590,7 +14878,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			id = t.prefix + id;

 			cls = cc || t._cls.splitbutton || tinymce.ui.SplitButton;

-			c = t.add(new cls(id, s));

+			c = t.add(new cls(id, s, ed));

 			ed.onMouseDown.add(c.hideMenu, c);

 

 			return c;

@@ -12630,7 +14918,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			id = t.prefix + id;

 			cls = cc || t._cls.colorsplitbutton || tinymce.ui.ColorSplitButton;

-			c = new cls(id, s);

+			c = new cls(id, s, ed);

 			ed.onMouseDown.add(c.hideMenu, c);

 

 			// Remove the menu element when the editor is removed

@@ -12662,13 +14950,25 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			id = t.prefix + id;

 			cls = cc || t._cls.toolbar || tinymce.ui.Toolbar;

-			c = new cls(id, s);

+			c = new cls(id, s, t.editor);

 

 			if (t.get(id))

 				return null;

 

 			return t.add(c);

 		},

+		

+		createToolbarGroup : function(id, s, cc) {

+			var c, t = this, cls;

+			id = t.prefix + id;

+			cls = cc || this._cls.toolbarGroup || tinymce.ui.ToolbarGroup;

+			c = new cls(id, s, t.editor);

+			

+			if (t.get(id))

+				return null;

+			

+			return t.add(c);

+		},

 

 		createSeparator : function(cc) {

 			var cls = cc || this._cls.separator || tinymce.ui.Separator;

@@ -12806,53 +15106,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 	});

 }(tinymce));

 (function(tinymce) {

-	function CommandManager() {

-		var execCommands = {}, queryStateCommands = {}, queryValueCommands = {};

-

-		function add(collection, cmd, func, scope) {

-			if (typeof(cmd) == 'string')

-				cmd = [cmd];

-

-			tinymce.each(cmd, function(cmd) {

-				collection[cmd.toLowerCase()] = {func : func, scope : scope};

-			});

-		};

-

-		tinymce.extend(this, {

-			add : function(cmd, func, scope) {

-				add(execCommands, cmd, func, scope);

-			},

-

-			addQueryStateHandler : function(cmd, func, scope) {

-				add(queryStateCommands, cmd, func, scope);

-			},

-

-			addQueryValueHandler : function(cmd, func, scope) {

-				add(queryValueCommands, cmd, func, scope);

-			},

-

-			execCommand : function(scope, cmd, ui, value, args) {

-				if (cmd = execCommands[cmd.toLowerCase()]) {

-					if (cmd.func.call(scope || cmd.scope, ui, value, args) !== false)

-						return true;

-				}

-			},

-

-			queryCommandValue : function() {

-				if (cmd = queryValueCommands[cmd.toLowerCase()])

-					return cmd.func.call(scope || cmd.scope, ui, value, args);

-			},

-

-			queryCommandState : function() {

-				if (cmd = queryStateCommands[cmd.toLowerCase()])

-					return cmd.func.call(scope || cmd.scope, ui, value, args);

-			}

-		});

-	};

-

-	tinymce.GlobalCommands = new CommandManager();

-})(tinymce);

-(function(tinymce) {

 	tinymce.Formatter = function(ed) {

 		var formats = {},

 			each = tinymce.each,

@@ -12860,16 +15113,28 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			selection = ed.selection,

 			TreeWalker = tinymce.dom.TreeWalker,

 			rangeUtils = new tinymce.dom.RangeUtils(dom),

-			isValid = ed.schema.isValid,

+			isValid = ed.schema.isValidChild,

 			isBlock = dom.isBlock,

 			forcedRootBlock = ed.settings.forced_root_block,

 			nodeIndex = dom.nodeIndex,

-			INVISIBLE_CHAR = '\uFEFF',

+			INVISIBLE_CHAR = tinymce.isGecko ? '\u200B' : '\uFEFF',

 			MCE_ATTR_RE = /^(src|href|style)$/,

 			FALSE = false,

 			TRUE = true,

-			undefined,

-			pendingFormats = {apply : [], remove : []};

+			undefined;

+

+		// Returns the content editable state of a node

+		function getContentEditable(node) {

+			var contentEditable = node.getAttribute("data-mce-contenteditable");

+

+			// Check for fake content editable

+			if (contentEditable && contentEditable !== "inherit") {

+				return contentEditable;

+			}

+

+			// Check for real content editable

+			return node.contentEditable !== "inherit" ? node.contentEditable : null;

+		};

 

 		function isArray(obj) {

 			return obj instanceof Array;

@@ -12880,7 +15145,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		};

 

 		function isCaretNode(node) {

-			return node.nodeType === 1 && (node.face === 'mceinline' || node.style.fontFamily === 'mceinline');

+			return node.nodeType === 1 && node.id === '_mce_caret';

 		};

 

 		// Public functions

@@ -12929,37 +15194,40 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			}

 		};

 

-		function apply(name, vars, node) {

-			var formatList = get(name), format = formatList[0], bookmark, rng, i;

+		var getTextDecoration = function(node) {

+			var decoration;

 

-			function moveStart(rng) {

-				var container = rng.startContainer,

-					offset = rng.startOffset,

-					walker, node;

-

-				// Move startContainer/startOffset in to a suitable node

-				if (container.nodeType == 1 || container.nodeValue === "") {

-					container = container.nodeType == 1 ? container.childNodes[offset] : container;

-

-					// Might fail if the offset is behind the last element in it's container

-					if (container) {

-						walker = new TreeWalker(container, container.parentNode);

-						for (node = walker.current(); node; node = walker.next()) {

-							if (node.nodeType == 3 && !isWhiteSpaceNode(node)) {

-								rng.setStart(node, 0);

-								break;

-							}

-						}

-					}

+			ed.dom.getParent(node, function(n) {

+				decoration = ed.dom.getStyle(n, 'text-decoration');

+				return decoration && decoration !== 'none';

+			});

+

+			return decoration;

+		};

+

+		var processUnderlineAndColor = function(node) {

+			var textDecoration;

+			if (node.nodeType === 1 && node.parentNode && node.parentNode.nodeType === 1) {

+				textDecoration = getTextDecoration(node.parentNode);

+				if (ed.dom.getStyle(node, 'color') && textDecoration) {

+					ed.dom.setStyle(node, 'text-decoration', textDecoration);

+				} else if (ed.dom.getStyle(node, 'textdecoration') === textDecoration) {

+					ed.dom.setStyle(node, 'text-decoration', null);

 				}

+			}

+		};

 

-				return rng;

-			};

+		function apply(name, vars, node) {

+			var formatList = get(name), format = formatList[0], bookmark, rng, i, isCollapsed = selection.isCollapsed();

 

 			function setElementFormat(elm, fmt) {

 				fmt = fmt || format;

 

 				if (elm) {

+					if (fmt.onformat) {

+						fmt.onformat(elm, fmt, vars, node);

+					}

+

 					each(fmt.styles, function(value, name) {

 						dom.setStyle(elm, name, replaceVars(value, vars));

 					});

@@ -12976,9 +15244,90 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					});

 				}

 			};

+			function adjustSelectionToVisibleSelection() {

+				function findSelectionEnd(start, end) {

+					var walker = new TreeWalker(end);

+					for (node = walker.current(); node; node = walker.prev()) {

+						if (node.childNodes.length > 1 || node == start) {

+							return node;

+						}

+					}

+				};

+

+				// Adjust selection so that a end container with a end offset of zero is not included in the selection

+				// as this isn't visible to the user.

+				var rng = ed.selection.getRng();

+				var start = rng.startContainer;

+				var end = rng.endContainer;

+

+				if (start != end && rng.endOffset == 0) {

+					var newEnd = findSelectionEnd(start, end);

+					var endOffset = newEnd.nodeType == 3 ? newEnd.length : newEnd.childNodes.length;

+

+					rng.setEnd(newEnd, endOffset);

+				}

+

+				return rng;

+			}

+			

+			function applyStyleToList(node, bookmark, wrapElm, newWrappers, process){

+				var nodes = [], listIndex = -1, list, startIndex = -1, endIndex = -1, currentWrapElm;

+				

+				// find the index of the first child list.

+				each(node.childNodes, function(n, index) {

+					if (n.nodeName === "UL" || n.nodeName === "OL") {

+						listIndex = index;

+						list = n;

+						return false;

+					}

+				});

+				

+				// get the index of the bookmarks

+				each(node.childNodes, function(n, index) {

+					if (n.nodeName === "SPAN" && dom.getAttrib(n, "data-mce-type") == "bookmark") {

+						if (n.id == bookmark.id + "_start") {

+							startIndex = index;

+						} else if (n.id == bookmark.id + "_end") {

+							endIndex = index;

+						}

+					}

+				});

+				

+				// if the selection spans across an embedded list, or there isn't an embedded list - handle processing normally

+				if (listIndex <= 0 || (startIndex < listIndex && endIndex > listIndex)) {

+					each(tinymce.grep(node.childNodes), process);

+					return 0;

+				} else {

+					currentWrapElm = dom.clone(wrapElm, FALSE);

 

-			function applyRngStyle(rng) {

-				var newWrappers = [], wrapName, wrapElm;

+					// create a list of the nodes on the same side of the list as the selection

+					each(tinymce.grep(node.childNodes), function(n, index) {

+						if ((startIndex < listIndex && index < listIndex) || (startIndex > listIndex && index > listIndex)) {

+							nodes.push(n); 

+							n.parentNode.removeChild(n);

+						}

+					});

+

+					// insert the wrapping element either before or after the list.

+					if (startIndex < listIndex) {

+						node.insertBefore(currentWrapElm, list);

+					} else if (startIndex > listIndex) {

+						node.insertBefore(currentWrapElm, list.nextSibling);

+					}

+					

+					// add the new nodes to the list.

+					newWrappers.push(currentWrapElm);

+

+					each(nodes, function(node) {

+						currentWrapElm.appendChild(node);

+					});

+

+					return currentWrapElm;

+				}

+			};

+

+			function applyRngStyle(rng, bookmark, node_specific) {

+				var newWrappers = [], wrapName, wrapElm, contentEditable = true;

 

 				// Setup wrapper element

 				wrapName = format.inline || format.block;

@@ -12989,7 +15338,18 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					var currentWrapElm;

 

 					function process(node) {

-						var nodeName = node.nodeName.toLowerCase(), parentName = node.parentNode.nodeName.toLowerCase(), found;

+						var nodeName, parentName, found, hasContentEditableState, lastContentEditable;

+

+						lastContentEditable = contentEditable;

+						nodeName = node.nodeName.toLowerCase();

+						parentName = node.parentNode.nodeName.toLowerCase();

+

+						// Node has a contentEditable value

+						if (node.nodeType === 1 && getContentEditable(node)) {

+							lastContentEditable = contentEditable;

+							contentEditable = getContentEditable(node) === "true";

+							hasContentEditableState = true; // We don't want to wrap the container only it's children

+						}

 

 						// Stop wrapping on br elements

 						if (isEq(nodeName, 'br')) {

@@ -13009,7 +15369,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						}

 

 						// Can we rename the block

-						if (format.block && !format.wrapper && isTextBlock(nodeName)) {

+						if (contentEditable && !hasContentEditableState && format.block && !format.wrapper && isTextBlock(nodeName)) {

 							node = dom.rename(node, wrapName);

 							setElementFormat(node);

 							newWrappers.push(node);

@@ -13021,6 +15381,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						if (format.selector) {

 							// Look for matching formats

 							each(formatList, function(format) {

+								// Check collapsed state if it exists

+								if ('collapsed' in format && format.collapsed !== isCollapsed) {

+									return;

+								}

+

 								if (dom.is(node, format.selector) && !isCaretNode(node)) {

 									setElementFormat(node, format);

 									found = true;

@@ -13035,22 +15400,30 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						}

 

 						// Is it valid to wrap this item

-						if (isValid(wrapName, nodeName) && isValid(parentName, wrapName)) {

+						if (contentEditable && !hasContentEditableState && isValid(wrapName, nodeName) && isValid(parentName, wrapName) &&

+								!(!node_specific && node.nodeType === 3 && node.nodeValue.length === 1 && node.nodeValue.charCodeAt(0) === 65279) && !isCaretNode(node)) {

 							// Start wrapping

 							if (!currentWrapElm) {

 								// Wrap the node

-								currentWrapElm = wrapElm.cloneNode(FALSE);

+								currentWrapElm = dom.clone(wrapElm, FALSE);

 								node.parentNode.insertBefore(currentWrapElm, node);

 								newWrappers.push(currentWrapElm);

 							}

 

 							currentWrapElm.appendChild(node);

+						} else if (nodeName == 'li' && bookmark) {

+							// Start wrapping - if we are in a list node and have a bookmark, then we will always begin by wrapping in a new element.

+							currentWrapElm = applyStyleToList(node, bookmark, wrapElm, newWrappers, process);

 						} else {

 							// Start a new wrapper for possible children

 							currentWrapElm = 0;

-

+							

 							each(tinymce.grep(node.childNodes), process);

 

+							if (hasContentEditableState) {

+								contentEditable = lastContentEditable; // Restore last contentEditable state from stack

+							}

+

 							// End the last wrapper

 							currentWrapElm = 0;

 						}

@@ -13060,7 +15433,32 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					each(nodes, process);

 				});

 

+				// Wrap links inside as well, for example color inside a link when the wrapper is around the link

+				if (format.wrap_links === false) {

+					each(newWrappers, function(node) {

+						function process(node) {

+							var i, currentWrapElm, children;

+

+							if (node.nodeName === 'A') {

+								currentWrapElm = dom.clone(wrapElm, FALSE);

+								newWrappers.push(currentWrapElm);

+

+								children = tinymce.grep(node.childNodes);

+								for (i = 0; i < children.length; i++)

+									currentWrapElm.appendChild(children[i]);

+

+								node.appendChild(currentWrapElm);

+							}

+

+							each(tinymce.grep(node.childNodes), process);

+						};

+

+						process(node);

+					});

+				}

+

 				// Cleanup

+				

 				each(newWrappers, function(node) {

 					var childCount;

 

@@ -13087,7 +15485,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 						// If child was found and of the same type as the current node

 						if (child && matchName(child, format)) {

-							clone = child.cloneNode(FALSE);

+							clone = dom.clone(child, FALSE);

 							setElementFormat(clone);

 

 							dom.replace(clone, node, TRUE);

@@ -13099,8 +15497,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 					childCount = getChildCount(node);

 

-					// Remove empty nodes

-					if (childCount === 0) {

+					// Remove empty nodes but only if there is multiple wrappers and they are not block

+					// elements so never remove single <h1></h1> since that would remove the currrent empty block element where the caret is at

+					if ((newWrappers.length > 1 || !isBlock(node)) && childCount === 0) {

 						dom.remove(node, 1);

 						return;

 					}

@@ -13116,6 +15515,19 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 							// this: <span style="color:red"><b><span style="color:red; font-size:10px">text</span></b></span>

 							// will become: <span style="color:red"><b><span style="font-size:10px">text</span></b></span>

 							each(dom.select(format.inline, node), function(child) {

+								var parent;

+

+								// When wrap_links is set to false we don't want

+								// to remove the format on children within links

+								if (format.wrap_links === false) {

+									parent = child.parentNode;

+

+									do {

+										if (parent.nodeName === 'A')

+											return;

+									} while (parent = parent.parentNode);

+								}

+

 								removeFormat(format, vars, child, format.exact ? child : null);

 							});

 						});

@@ -13139,7 +15551,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						}

 

 						// Merge next and previous siblings if they are similar <b>text</b><b>text</b> becomes <b>texttext</b>

-						if (node) {

+						if (node && format.merge_siblings !== false) {

 							node = mergeSiblings(getNonWhiteSpaceSibling(node), node);

 							node = mergeSiblings(node, getNonWhiteSpaceSibling(node, TRUE));

 						}

@@ -13149,20 +15561,38 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			if (format) {

 				if (node) {

-					rng = dom.createRng();

-

-					rng.setStartBefore(node);

-					rng.setEndAfter(node);

-

-					applyRngStyle(expandRng(rng, formatList));

+					if (node.nodeType) {

+						rng = dom.createRng();

+						rng.setStartBefore(node);

+						rng.setEndAfter(node);

+						applyRngStyle(expandRng(rng, formatList), null, true);

+					} else {

+						applyRngStyle(node, null, true);

+					}

 				} else {

-					if (!selection.isCollapsed() || !format.inline) {

+					if (!isCollapsed || !format.inline || dom.select('td.mceSelected,th.mceSelected').length) {

+						// Obtain selection node before selection is unselected by applyRngStyle()

+						var curSelNode = ed.selection.getNode();

+

+						// If the formats have a default block and we can't find a parent block then start wrapping it with a DIV this is for forced_root_blocks: false

+						// It's kind of a hack but people should be using the default block type P since all desktop editors work that way

+						if (!forcedRootBlock && formatList[0].defaultBlock && !dom.getParent(curSelNode, dom.isBlock)) {

+							apply(formatList[0].defaultBlock);

+						}

+

 						// Apply formatting to selection

+						ed.selection.setRng(adjustSelectionToVisibleSelection());

 						bookmark = selection.getBookmark();

-						applyRngStyle(expandRng(selection.getRng(TRUE), formatList));

+						applyRngStyle(expandRng(selection.getRng(TRUE), formatList), bookmark);

+

+						// Colored nodes should be underlined so that the color of the underline matches the text color.

+						if (format.styles && (format.styles.color || format.styles.textDecoration)) {

+							tinymce.walk(curSelNode, processUnderlineAndColor, 'childNodes');

+							processUnderlineAndColor(curSelNode);

+						}

 

 						selection.moveToBookmark(bookmark);

-						selection.setRng(moveStart(selection.getRng(TRUE)));

+						moveStart(selection.getRng(TRUE));

 						ed.nodeChanged();

 					} else

 						performCaretAction('apply', name, vars);

@@ -13171,25 +15601,40 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		};

 

 		function remove(name, vars, node) {

-			var formatList = get(name), format = formatList[0], bookmark, i, rng;

+			var formatList = get(name), format = formatList[0], bookmark, i, rng, contentEditable = true;

 

 			// Merges the styles for each node

 			function process(node) {

-				var children, i, l;

+				var children, i, l, localContentEditable, lastContentEditable, hasContentEditableState;

+

+				// Node has a contentEditable value

+				if (node.nodeType === 1 && getContentEditable(node)) {

+					lastContentEditable = contentEditable;

+					contentEditable = getContentEditable(node) === "true";

+					hasContentEditableState = true; // We don't want to wrap the container only it's children

+				}

 

 				// Grab the children first since the nodelist might be changed

 				children = tinymce.grep(node.childNodes);

 

 				// Process current node

-				for (i = 0, l = formatList.length; i < l; i++) {

-					if (removeFormat(formatList[i], vars, node, node))

-						break;

+				if (contentEditable && !hasContentEditableState) {

+					for (i = 0, l = formatList.length; i < l; i++) {

+						if (removeFormat(formatList[i], vars, node, node))

+							break;

+					}

 				}

 

 				// Process the children

 				if (format.deep) {

-					for (i = 0, l = children.length; i < l; i++)

-						process(children[i]);

+					if (children.length) {					

+						for (i = 0, l = children.length; i < l; i++)

+							process(children[i]);

+

+						if (hasContentEditableState) {

+							contentEditable = lastContentEditable; // Restore last contentEditable state from stack

+						}

+					}

 				}

 			};

 

@@ -13220,7 +15665,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					formatRootParent = format_root.parentNode;

 

 					for (parent = container.parentNode; parent && parent != formatRootParent; parent = parent.parentNode) {

-						clone = parent.cloneNode(FALSE);

+						clone = dom.clone(parent, FALSE);

 

 						for (i = 0; i < formatList.length; i++) {

 							if (removeFormat(formatList[i], vars, clone, clone)) {

@@ -13285,8 +15730,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 					if (startContainer != endContainer) {

 						// Wrap start/end nodes in span element since these might be cloned/moved

-						startContainer = wrap(startContainer, 'span', {id : '_start', _mce_type : 'bookmark'});

-						endContainer = wrap(endContainer, 'span', {id : '_end', _mce_type : 'bookmark'});

+						startContainer = wrap(startContainer, 'span', {id : '_start', 'data-mce-type' : 'bookmark'});

+						endContainer = wrap(endContainer, 'span', {id : '_end', 'data-mce-type' : 'bookmark'});

 

 						// Split start/end

 						splitToFormatRoot(startContainer);

@@ -13309,30 +15754,56 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				rangeUtils.walk(rng, function(nodes) {

 					each(nodes, function(node) {

 						process(node);

+

+						// Remove parent span if it only contains text-decoration: underline, yet a parent node is also underlined.

+						if (node.nodeType === 1 && ed.dom.getStyle(node, 'text-decoration') === 'underline' && node.parentNode && getTextDecoration(node.parentNode) === 'underline') {

+							removeFormat({'deep': false, 'exact': true, 'inline': 'span', 'styles': {'textDecoration' : 'underline'}}, null, node);

+						}

 					});

 				});

 			};

 

 			// Handle node

 			if (node) {

-				rng = dom.createRng();

-				rng.setStartBefore(node);

-				rng.setEndAfter(node);

-				removeRngStyle(rng);

+				if (node.nodeType) {

+					rng = dom.createRng();

+					rng.setStartBefore(node);

+					rng.setEndAfter(node);

+					removeRngStyle(rng);

+				} else {

+					removeRngStyle(node);

+				}

+

 				return;

 			}

 

-			if (!selection.isCollapsed() || !format.inline) {

+			if (!selection.isCollapsed() || !format.inline || dom.select('td.mceSelected,th.mceSelected').length) {

 				bookmark = selection.getBookmark();

 				removeRngStyle(selection.getRng(TRUE));

 				selection.moveToBookmark(bookmark);

+

+				// Check if start element still has formatting then we are at: "<b>text|</b>text" and need to move the start into the next text node

+				if (format.inline && match(name, vars, selection.getStart())) {

+					moveStart(selection.getRng(true));

+				}

+

 				ed.nodeChanged();

 			} else

 				performCaretAction('remove', name, vars);

+

+			// Removed this logic since it breaks unit tests and produces empty caret elements since they will be destroyed in the cleanup process

+			// Also there must be a better way to rerender a table and I couldn't reproduce the case causing this might be some old WebKit

+			/*

+			// When you remove formatting from a table cell in WebKit (cell, not the contents of a cell) there is a rendering issue with column width

+			if (tinymce.isWebKit) {

+				ed.execCommand('mceCleanup');

+			}*/

 		};

 

 		function toggle(name, vars, node) {

-			if (match(name, vars, node))

+			var fmt = get(name);

+

+			if (match(name, vars, node) && (!('toggle' in fmt[0]) || fmt[0]['toggle']))

 				remove(name, vars, node);

 			else

 				apply(name, vars, node);

@@ -13344,6 +15815,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			function matchItems(node, format, item_name) {

 				var key, value, items = format[item_name], i;

 

+				// Custom match

+				if (format.onmatch) {

+					return format.onmatch(node, format, item_name);

+				}

+

 				// Check all items

 				if (items) {

 					// Non indexed object

@@ -13396,7 +15872,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		};

 

 		function match(name, vars, node) {

-			var startNode, i;

+			var startNode;

 

 			function matchParents(node) {

 				// Find first node with similar format settings

@@ -13412,21 +15888,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (node)

 				return matchParents(node);

 

-			// Check pending formats

-			if (selection.isCollapsed()) {

-				for (i = pendingFormats.apply.length - 1; i >= 0; i--) {

-					if (pendingFormats.apply[i].name == name)

-						return true;

-				}

-

-				for (i = pendingFormats.remove.length - 1; i >= 0; i--) {

-					if (pendingFormats.remove[i].name == name)

-						return false;

-				}

-

-				return matchParents(selection.getNode());

-			}

-

 			// Check selected node

 			node = selection.getNode();

 			if (matchParents(node))

@@ -13445,33 +15906,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		function matchAll(names, vars) {

 			var startElement, matchedFormatNames = [], checkedMap = {}, i, ni, name;

 

-			// If the selection is collapsed then check pending formats

-			if (selection.isCollapsed()) {

-				for (ni = 0; ni < names.length; ni++) {

-					// If the name is to be removed, then stop it from being added

-					for (i = pendingFormats.remove.length - 1; i >= 0; i--) {

-						name = names[ni];

-

-						if (pendingFormats.remove[i].name == name) {

-							checkedMap[name] = true;

-							break;

-						}

-					}

-				}

-

-				// If the format is to be applied

-				for (i = pendingFormats.apply.length - 1; i >= 0; i--) {

-					for (ni = 0; ni < names.length; ni++) {

-						name = names[ni];

-

-						if (!checkedMap[name] && pendingFormats.apply[i].name == name) {

-							checkedMap[name] = true;

-							matchedFormatNames.push(name);

-						}

-					}

-				}

-			}

-

 			// Check start of selection for formats

 			startElement = selection.getStart();

 			dom.getParent(startElement, function(node) {

@@ -13580,7 +16014,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		};

 

 		function isWhiteSpaceNode(node) {

-			return node && node.nodeType === 3 && /^([\s\r\n]+|)$/.test(node.nodeValue);

+			return node && node.nodeType === 3 && /^([\t \r\n]+|)$/.test(node.nodeValue);

 		};

 

 		function wrap(node, name, attrs) {

@@ -13593,39 +16027,64 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		};

 

 		function expandRng(rng, format, remove) {

-			var startContainer = rng.startContainer,

+			var sibling, lastIdx, leaf,

+				startContainer = rng.startContainer,

 				startOffset = rng.startOffset,

 				endContainer = rng.endContainer,

-				endOffset = rng.endOffset, sibling, lastIdx;

+				endOffset = rng.endOffset, sibling, lastIdx, leaf, endPoint;

 

 			// This function walks up the tree if there is no siblings before/after the node

-			function findParentContainer(container, child_name, sibling_name, root) {

-				var parent, child;

-

-				root = root || dom.getRoot();

+			function findParentContainer(start) {

+				var container, parent, child, sibling, siblingName;

 

-				for (;;) {

-					// Check if we can move up are we at root level or body level

-					parent = container.parentNode;

+				container = parent = start ? startContainer : endContainer;

+				siblingName = start ? 'previousSibling' : 'nextSibling';

+				root = dom.getRoot();

 

-					// Stop expanding on block elements or root depending on format

-					if (parent == root || (!format[0].block_expand && isBlock(parent)))

+				// If it's a text node and the offset is inside the text

+				if (container.nodeType == 3 && !isWhiteSpaceNode(container)) {

+					if (start ? startOffset > 0 : endOffset < container.nodeValue.length) {

 						return container;

+					}

+				}

 

-					for (sibling = parent[child_name]; sibling && sibling != container; sibling = sibling[sibling_name]) {

-						if (sibling.nodeType == 1 && !isBookmarkNode(sibling))

-							return container;

+				for (;;) {

+					// Stop expanding on block elements

+					if (!format[0].block_expand && isBlock(parent))

+						return parent;

+

+					// Walk left/right

+					for (sibling = parent[siblingName]; sibling; sibling = sibling[siblingName]) {

+						if (!isBookmarkNode(sibling) && !isWhiteSpaceNode(sibling)) {

+							return parent;

+						}

+					}

 

-						if (sibling.nodeType == 3 && !isWhiteSpaceNode(sibling))

-							return container;

+					// Check if we can move up are we at root level or body level

+					if (parent.parentNode == root) {

+						container = parent;

+						break;

 					}

 

-					container = container.parentNode;

+					parent = parent.parentNode;

 				}

 

 				return container;

 			};

 

+			// This function walks down the tree to find the leaf at the selection.

+			// The offset is also returned as if node initially a leaf, the offset may be in the middle of the text node.

+			function findLeaf(node, offset) {

+				if (offset === undefined)

+					offset = node.nodeType === 3 ? node.length : node.childNodes.length;

+				while (node && node.hasChildNodes()) {

+					node = node.childNodes[offset];

+					if (node)

+						offset = node.nodeType === 3 ? node.length : node.childNodes.length;

+				}

+				return { node: node, offset: offset };

+			}

+

 			// If index based start position then resolve it

 			if (startContainer.nodeType == 1 && startContainer.hasChildNodes()) {

 				lastIdx = startContainer.childNodes.length - 1;

@@ -13644,32 +16103,161 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					endOffset = endContainer.nodeValue.length;

 			}

 

-			// Exclude bookmark nodes if possible

-			if (isBookmarkNode(startContainer.parentNode))

-				startContainer = startContainer.parentNode;

+			// Expands the node to the closes contentEditable false element if it exists

+			function findParentContentEditable(node) {

+				var parent = node;

+

+				while (parent) {

+					if (parent.nodeType === 1 && getContentEditable(parent)) {

+						return getContentEditable(parent) === "false" ? parent : node;

+					}

+

+					parent = parent.parentNode;

+				}

+

+				return node;

+			};

 

-			if (isBookmarkNode(startContainer))

+			// Expand to closest contentEditable element

+			startContainer = findParentContentEditable(startContainer);

+			endContainer = findParentContentEditable(endContainer);

+

+			// Exclude bookmark nodes if possible

+			if (isBookmarkNode(startContainer.parentNode) || isBookmarkNode(startContainer)) {

+				startContainer = isBookmarkNode(startContainer) ? startContainer : startContainer.parentNode;

 				startContainer = startContainer.nextSibling || startContainer;

 

-			if (isBookmarkNode(endContainer.parentNode))

-				endContainer = endContainer.parentNode;

+				if (startContainer.nodeType == 3)

+					startOffset = 0;

+			}

 

-			if (isBookmarkNode(endContainer))

+			if (isBookmarkNode(endContainer.parentNode) || isBookmarkNode(endContainer)) {

+				endContainer = isBookmarkNode(endContainer) ? endContainer : endContainer.parentNode;

 				endContainer = endContainer.previousSibling || endContainer;

 

+				if (endContainer.nodeType == 3)

+					endOffset = endContainer.length;

+			}

+

+			if (format[0].inline) {

+				if (rng.collapsed) {

+					function findWordEndPoint(container, offset, start) {

+						var walker, node, pos, lastTextNode;

+

+						function findSpace(node, offset) {

+							var pos, pos2, str = node.nodeValue;

+

+							if (typeof(offset) == "undefined") {

+								offset = start ? str.length : 0;

+							}

+

+							if (start) {

+								pos = str.lastIndexOf(' ', offset);

+								pos2 = str.lastIndexOf('\u00a0', offset);

+								pos = pos > pos2 ? pos : pos2;

+

+								// Include the space on remove to avoid tag soup

+								if (pos !== -1 && !remove) {

+									pos++;

+								}

+							} else {

+								pos = str.indexOf(' ', offset);

+								pos2 = str.indexOf('\u00a0', offset);

+								pos = pos !== -1 && (pos2 === -1 || pos < pos2) ? pos : pos2;

+							}

+

+							return pos;

+						};

+

+						if (container.nodeType === 3) {

+							pos = findSpace(container, offset);

+

+							if (pos !== -1) {

+								return {container : container, offset : pos};

+							}

+

+							lastTextNode = container;

+						}

+

+						// Walk the nodes inside the block

+						walker = new TreeWalker(container, dom.getParent(container, isBlock) || ed.getBody());

+						while (node = walker[start ? 'prev' : 'next']()) {

+							if (node.nodeType === 3) {

+								lastTextNode = node;

+								pos = findSpace(node);

+

+								if (pos !== -1) {

+									return {container : node, offset : pos};

+								}

+							} else if (isBlock(node)) {

+								break;

+							}

+						}

+

+						if (lastTextNode) {

+							if (start) {

+								offset = 0;

+							} else {

+								offset = lastTextNode.length;

+							}

+

+							return {container: lastTextNode, offset: offset};

+						}

+					}

+

+					// Expand left to closest word boundery

+					endPoint = findWordEndPoint(startContainer, startOffset, true);

+					if (endPoint) {

+						startContainer = endPoint.container;

+						startOffset = endPoint.offset;

+					}

+

+					// Expand right to closest word boundery

+					endPoint = findWordEndPoint(endContainer, endOffset);

+					if (endPoint) {

+						endContainer = endPoint.container;

+						endOffset = endPoint.offset;

+					}

+				}

+

+				// Avoid applying formatting to a trailing space.

+				leaf = findLeaf(endContainer, endOffset);

+				if (leaf.node) {

+					while (leaf.node && leaf.offset === 0 && leaf.node.previousSibling)

+						leaf = findLeaf(leaf.node.previousSibling);

+

+					if (leaf.node && leaf.offset > 0 && leaf.node.nodeType === 3 &&

+							leaf.node.nodeValue.charAt(leaf.offset - 1) === ' ') {

+

+						if (leaf.offset > 1) {

+							endContainer = leaf.node;

+							endContainer.splitText(leaf.offset - 1);

+						} else if (leaf.node.previousSibling) {

+							// TODO: Figure out why this is in here

+							//endContainer = leaf.node.previousSibling;

+						}

+					}

+				}

+			}

+

 			// Move start/end point up the tree if the leaves are sharp and if we are in different containers

 			// Example * becomes !: !<p><b><i>*text</i><i>text*</i></b></p>!

 			// This will reduce the number of wrapper elements that needs to be created

 			// Move start point up the tree

 			if (format[0].inline || format[0].block_expand) {

-				startContainer = findParentContainer(startContainer, 'firstChild', 'nextSibling');

-				endContainer = findParentContainer(endContainer, 'lastChild', 'previousSibling');

+				if (!format[0].inline || (startContainer.nodeType != 3 || startOffset === 0)) {

+					startContainer = findParentContainer(true);

+				}

+

+				if (!format[0].inline || (endContainer.nodeType != 3 || endOffset === endContainer.nodeValue.length)) {

+					endContainer = findParentContainer();

+				}

 			}

 

 			// Expand start/end container to matching selector

 			if (format[0].selector && format[0].expand !== FALSE && !format[0].inline) {

 				function findSelectorEndPoint(container, sibling_name) {

-					var parents, i, y;

+					var parents, i, y, curFormat;

 

 					if (container.nodeType == 3 && container.nodeValue.length == 0 && container[sibling_name])

 						container = container[sibling_name];

@@ -13677,7 +16265,13 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					parents = getParents(container);

 					for (i = 0; i < parents.length; i++) {

 						for (y = 0; y < format.length; y++) {

-							if (dom.is(parents[i], format[y].selector))

+							curFormat = format[y];

+

+							// If collapsed state is set then skip formats that doesn't match that

+							if ("collapsed" in curFormat && curFormat.collapsed !== rng.collapsed)

+								continue;

+

+							if (dom.is(parents[i], curFormat.selector))

 								return parents[i];

 						}

 					}

@@ -13731,10 +16325,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				// Non block element then try to expand up the leaf

 				if (format[0].block) {

 					if (!isBlock(startContainer))

-						startContainer = findParentContainer(startContainer, 'firstChild', 'nextSibling');

+						startContainer = findParentContainer(true);

 

 					if (!isBlock(endContainer))

-						endContainer = findParentContainer(endContainer, 'lastChild', 'previousSibling');

+						endContainer = findParentContainer();

 				}

 			}

 

@@ -13787,7 +16381,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				// Remove style attribute if it's empty

 				if (stylesModified && dom.getAttrib(node, 'style') == '') {

 					node.removeAttribute('style');

-					node.removeAttribute('_mce_style');

+					node.removeAttribute('data-mce-style');

 				}

 

 				// Remove attributes

@@ -13828,7 +16422,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 						// Remove mce prefixed attributes

 						if (MCE_ATTR_RE.test(name))

-							node.removeAttribute('_mce_' + name);

+							node.removeAttribute('data-mce-' + name);

 

 						node.removeAttribute(name);

 					}

@@ -13913,7 +16507,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		};

 

 		function isBookmarkNode(node) {

-			return node && node.nodeType == 1 && node.getAttribute('_mce_type') == 'bookmark';

+			return node && node.nodeType == 1 && node.getAttribute('data-mce-type') == 'bookmark';

 		};

 

 		function mergeSiblings(prev, next) {

@@ -13984,7 +16578,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (prev && next) {

 				function findElementSibling(node, sibling_name) {

 					for (sibling = node; sibling; sibling = sibling[sibling_name]) {

-						if (sibling.nodeType == 3 && !isWhiteSpaceNode(sibling))

+						if (sibling.nodeType == 3 && sibling.nodeValue.length !== 0)

 							return node;

 

 						if (sibling.nodeType == 1 && !isBookmarkNode(sibling))

@@ -14027,7 +16621,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		};

 

 		function getContainer(rng, start) {

-			var container, offset, lastIdx;

+			var container, offset, lastIdx, walker;

 

 			container = rng[start ? 'startContainer' : 'endContainer'];

 			offset = rng[start ? 'startOffset' : 'endOffset'];

@@ -14041,102 +16635,312 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				container = container.childNodes[offset > lastIdx ? lastIdx : offset];

 			}

 

+			// If start text node is excluded then walk to the next node

+			if (container.nodeType === 3 && start && offset >= container.nodeValue.length) {

+				container = new TreeWalker(container, ed.getBody()).next() || container;

+			}

+

+			// If end text node is excluded then walk to the previous node

+			if (container.nodeType === 3 && !start && offset == 0) {

+				container = new TreeWalker(container, ed.getBody()).prev() || container;

+			}

+

 			return container;

 		};

 

 		function performCaretAction(type, name, vars) {

-			var i, currentPendingFormats = pendingFormats[type],

-				otherPendingFormats = pendingFormats[type == 'apply' ? 'remove' : 'apply'];

+			var caretContainerId = '_mce_caret', debug = ed.settings.caret_debug;

+

+			// Creates a caret container bogus element

+			function createCaretContainer(fill) {

+				var caretContainer = dom.create('span', {id: caretContainerId, 'data-mce-bogus': true, style: debug ? 'color:red' : ''});

+

+				if (fill) {

+					caretContainer.appendChild(ed.getDoc().createTextNode(INVISIBLE_CHAR));

+				}

+

+				return caretContainer;

+			};

+

+			function isCaretContainerEmpty(node, nodes) {

+				while (node) {

+					if ((node.nodeType === 3 && node.nodeValue !== INVISIBLE_CHAR) || node.childNodes.length > 1) {

+						return false;

+					}

+

+					// Collect nodes

+					if (nodes && node.nodeType === 1) {

+						nodes.push(node);

+					}

+

+					node = node.firstChild;

+				}

 

-			function hasPending() {

-				return pendingFormats.apply.length || pendingFormats.remove.length;

+				return true;

 			};

+			

+			// Returns any parent caret container element

+			function getParentCaretContainer(node) {

+				while (node) {

+					if (node.id === caretContainerId) {

+						return node;

+					}

 

-			function resetPending() {

-				pendingFormats.apply = [];

-				pendingFormats.remove = [];

+					node = node.parentNode;

+				}

 			};

 

-			function perform(caret_node) {

-				// Apply pending formats

-				each(pendingFormats.apply.reverse(), function(item) {

-					apply(item.name, item.vars, caret_node);

-				});

+			// Finds the first text node in the specified node

+			function findFirstTextNode(node) {

+				var walker;

 

-				// Remove pending formats

-				each(pendingFormats.remove.reverse(), function(item) {

-					remove(item.name, item.vars, caret_node);

-				});

+				if (node) {

+					walker = new TreeWalker(node, node);

 

-				dom.remove(caret_node, 1);

-				resetPending();

+					for (node = walker.current(); node; node = walker.next()) {

+						if (node.nodeType === 3) {

+							return node;

+						}

+					}

+				}

 			};

 

-			// Check if it already exists then ignore it

-			for (i = currentPendingFormats.length - 1; i >= 0; i--) {

-				if (currentPendingFormats[i].name == name)

+			// Removes the caret container for the specified node or all on the current document

+			function removeCaretContainer(node, move_caret) {

+				var child, rng;

+

+				if (!node) {

+					node = getParentCaretContainer(selection.getStart());

+

+					if (!node) {

+						while (node = dom.get(caretContainerId)) {

+							removeCaretContainer(node, false);

+						}

+					}

+				} else {

+					rng = selection.getRng(true);

+

+					if (isCaretContainerEmpty(node)) {

+						if (move_caret !== false) {

+							rng.setStartBefore(node);

+							rng.setEndBefore(node);

+						}

+

+						dom.remove(node);

+					} else {

+						child = findFirstTextNode(node);

+

+						if (child.nodeValue.charAt(0) === INVISIBLE_CHAR) {

+							child = child.deleteData(0, 1);

+						}

+

+						dom.remove(node, 1);

+					}

+

+					selection.setRng(rng);

+				}

+			};

+			

+			// Applies formatting to the caret postion

+			function applyCaretFormat() {

+				var rng, caretContainer, textNode, offset, bookmark, container, text;

+

+				rng = selection.getRng(true);

+				offset = rng.startOffset;

+				container = rng.startContainer;

+				text = container.nodeValue;

+

+				caretContainer = getParentCaretContainer(selection.getStart());

+				if (caretContainer) {

+					textNode = findFirstTextNode(caretContainer);

+				}

+

+				// Expand to word is caret is in the middle of a text node and the char before/after is a alpha numeric character

+				if (text && offset > 0 && offset < text.length && /\w/.test(text.charAt(offset)) && /\w/.test(text.charAt(offset - 1))) {

+					// Get bookmark of caret position

+					bookmark = selection.getBookmark();

+

+					// Collapse bookmark range (WebKit)

+					rng.collapse(true);

+

+					// Expand the range to the closest word and split it at those points

+					rng = expandRng(rng, get(name));

+					rng = rangeUtils.split(rng);

+

+					// Apply the format to the range

+					apply(name, vars, rng);

+

+					// Move selection back to caret position

+					selection.moveToBookmark(bookmark);

+				} else {

+					if (!caretContainer || textNode.nodeValue !== INVISIBLE_CHAR) {

+						caretContainer = createCaretContainer(true);

+						textNode = caretContainer.firstChild;

+

+						rng.insertNode(caretContainer);

+						offset = 1;

+

+						apply(name, vars, caretContainer);

+					} else {

+						apply(name, vars, caretContainer);

+					}

+

+					// Move selection to text node

+					selection.setCursorLocation(textNode, offset);

+				}

+			};

+

+			function removeCaretFormat() {

+				var rng = selection.getRng(true), container, offset, bookmark,

+					hasContentAfter, node, formatNode, parents = [], i, caretContainer;

+

+				container = rng.startContainer;

+				offset = rng.startOffset;

+				node = container;

+

+				if (container.nodeType == 3) {

+					if (offset != container.nodeValue.length || container.nodeValue === INVISIBLE_CHAR) {

+						hasContentAfter = true;

+					}

+

+					node = node.parentNode;

+				}

+

+				while (node) {

+					if (matchNode(node, name, vars)) {

+						formatNode = node;

+						break;

+					}

+

+					if (node.nextSibling) {

+						hasContentAfter = true;

+					}

+

+					parents.push(node);

+					node = node.parentNode;

+				}

+

+				// Node doesn't have the specified format

+				if (!formatNode) {

 					return;

-			}

+				}

 

-			currentPendingFormats.push({name : name, vars : vars});

+				// Is there contents after the caret then remove the format on the element

+				if (hasContentAfter) {

+					// Get bookmark of caret position

+					bookmark = selection.getBookmark();

 

-			// Check if it's in the other type, then remove it

-			for (i = otherPendingFormats.length - 1; i >= 0; i--) {

-				if (otherPendingFormats[i].name == name)

-					otherPendingFormats.splice(i, 1);

-			}

+					// Collapse bookmark range (WebKit)

+					rng.collapse(true);

 

-			// Pending apply or remove formats

-			if (hasPending()) {

-				ed.getDoc().execCommand('FontName', false, 'mceinline');

-				pendingFormats.lastRng = selection.getRng();

+					// Expand the range to the closest word and split it at those points

+					rng = expandRng(rng, get(name), true);

+					rng = rangeUtils.split(rng);

 

-				// IE will convert the current word

-				each(dom.select('font,span'), function(node) {

-					var bookmark;

+					// Remove the format from the range

+					remove(name, vars, rng);

 

-					if (isCaretNode(node)) {

-						bookmark = selection.getBookmark();

-						perform(node);

-						selection.moveToBookmark(bookmark);

-						ed.nodeChanged();

+					// Move selection back to caret position

+					selection.moveToBookmark(bookmark);

+				} else {

+					caretContainer = createCaretContainer();

+

+					node = caretContainer;

+					for (i = parents.length - 1; i >= 0; i--) {

+						node.appendChild(dom.clone(parents[i], false));

+						node = node.firstChild;

 					}

-				});

 

-				// Only register listeners once if we need to

-				if (!pendingFormats.isListening && hasPending()) {

-					pendingFormats.isListening = true;

-

-					each('onKeyDown,onKeyUp,onKeyPress,onMouseUp'.split(','), function(event) {

-						ed[event].addToTop(function(ed, e) {

-							// Do we have pending formats and is the selection moved has moved

-							if (hasPending() && !tinymce.dom.RangeUtils.compareRanges(pendingFormats.lastRng, selection.getRng())) {

-								each(dom.select('font,span'), function(node) {

-									var textNode, rng;

-

-									// Look for marker

-									if (isCaretNode(node)) {

-										textNode = node.firstChild;

-

-										if (textNode) {

-											perform(node);

-

-											rng = dom.createRng();

-											rng.setStart(textNode, textNode.nodeValue.length);

-											rng.setEnd(textNode, textNode.nodeValue.length);

-											selection.setRng(rng);

-											ed.nodeChanged();

-										} else

-											dom.remove(node);

-									}

-								});

+					// Insert invisible character into inner most format element

+					node.appendChild(dom.doc.createTextNode(INVISIBLE_CHAR));

+					node = node.firstChild;

 

-								// Always unbind and clear pending styles on keyup

-								if (e.type == 'keyup' || e.type == 'mouseup')

-									resetPending();

-							}

-						});

+					// Insert caret container after the formated node

+					dom.insertAfter(caretContainer, formatNode);

+

+					// Move selection to text node

+					selection.setCursorLocation(node, 1);

+				}

+			};

+

+			// Only bind the caret events once

+			if (!self._hasCaretEvents) {

+				// Mark current caret container elements as bogus when getting the contents so we don't end up with empty elements

+				ed.onBeforeGetContent.addToTop(function() {

+					var nodes = [], i;

+

+					if (isCaretContainerEmpty(getParentCaretContainer(selection.getStart()), nodes)) {

+						// Mark children

+						i = nodes.length;

+						while (i--) {

+							dom.setAttrib(nodes[i], 'data-mce-bogus', '1');

+						}

+					}

+				});

+

+				// Remove caret container on mouse up and on key up

+				tinymce.each('onMouseUp onKeyUp'.split(' '), function(name) {

+					ed[name].addToTop(function() {

+						removeCaretContainer();

 					});

+				});

+

+				// Remove caret container on keydown and it's a backspace, enter or left/right arrow keys

+				ed.onKeyDown.addToTop(function(ed, e) {

+					var keyCode = e.keyCode;

+

+					if (keyCode == 8 || keyCode == 37 || keyCode == 39) {

+						removeCaretContainer(getParentCaretContainer(selection.getStart()));

+					}

+				});

+

+				self._hasCaretEvents = true;

+			}

+

+			// Do apply or remove caret format

+			if (type == "apply") {

+				applyCaretFormat();

+			} else {

+				removeCaretFormat();

+			}

+		};

+

+		function moveStart(rng) {

+			var container = rng.startContainer,

+					offset = rng.startOffset,

+					walker, node, nodes, tmpNode;

+

+			// Convert text node into index if possible

+			if (container.nodeType == 3 && offset >= container.nodeValue.length) {

+				// Get the parent container location and walk from there

+				container = container.parentNode;

+				offset = nodeIndex(container) + 1;

+			}

+

+			// Move startContainer/startOffset in to a suitable node

+			if (container.nodeType == 1) {

+				nodes = container.childNodes;

+				container = nodes[Math.min(offset, nodes.length - 1)];

+				walker = new TreeWalker(container, dom.getParent(container, dom.isBlock));

+

+				// If offset is at end of the parent node walk to the next one

+				if (offset > nodes.length - 1)

+					walker.next();

+

+				for (node = walker.current(); node; node = walker.next()) {

+					if (node.nodeType == 3 && !isWhiteSpaceNode(node)) {

+						// IE has a "neat" feature where it moves the start node into the closest element

+						// we can avoid this by inserting an element before it and then remove it after we set the selection

+						tmpNode = dom.create('a', null, INVISIBLE_CHAR);

+						node.parentNode.insertBefore(tmpNode, node);

+

+						// Set selection and remove tmpNode

+						rng.setStart(node, 0);

+						selection.setRng(rng);

+						dom.remove(tmpNode);

+

+						return;

+					}

 				}

 			}

 		};

@@ -14147,12 +16951,15 @@ tinymce.onAddEditor.add(function(tinymce, ed) {
 	var filters, fontSizes, dom, settings = ed.settings;

 

 	if (settings.inline_styles) {

-		fontSizes = tinymce.explode(settings.font_size_style_values);

+		fontSizes = tinymce.explode(settings.font_size_legacy_values);

 

 		function replaceWithSpan(node, styles) {

-			dom.replace(dom.create('span', {

-				style : styles

-			}), node, 1);

+			tinymce.each(styles, function(value, name) {

+				if (value)

+					dom.setStyle(node, name, value);

+			});

+

+			dom.rename(node, 'span');

 		};

 

 		filters = {

@@ -14189,6 +16996,7 @@ tinymce.onAddEditor.add(function(tinymce, ed) {
 		};

 

 		ed.onPreProcess.add(convert);

+		ed.onSetContent.add(convert);

 

 		ed.onInit.add(function() {

 			ed.selection.onSetContent.add(convert);

@@ -14196,3 +17004,393 @@ tinymce.onAddEditor.add(function(tinymce, ed) {
 	}

 });

 

+(function(tinymce) {

+	var TreeWalker = tinymce.dom.TreeWalker;

+

+	tinymce.EnterKey = function(editor) {

+		var dom = editor.dom, selection = editor.selection, settings = editor.settings, undoManager = editor.undoManager;

+

+		function handleEnterKey(evt) {

+			var rng = selection.getRng(true), tmpRng, container, offset, parentBlock, newBlock, fragment, containerBlock, parentBlockName, containerBlockName, newBlockName;

+

+			// Returns true if the block can be split into two blocks or not

+			function canSplitBlock(node) {

+				return node && dom.isBlock(node) && !/^(TD|TH|CAPTION)$/.test(node.nodeName) && !/^(fixed|absolute)/i.test(node.style.position);

+			};

+

+			// Moves the caret to a suitable position within the root for example in the first non pure whitespace text node or before an image

+			function moveToCaretPosition(root) {

+				var walker, node, rng, y, viewPort, lastNode = root;

+

+				rng = dom.createRng();

+

+				if (root.hasChildNodes()) {

+					walker = new TreeWalker(root, root);

+

+					while (node = walker.current()) {

+						if (node.nodeType == 3) {

+							rng.setStart(node, 0);

+							rng.setEnd(node, 0);

+							break;

+						}

+

+						if (/^(BR|IMG)$/.test(node.nodeName)) {

+							rng.setStartBefore(node);

+							rng.setEndBefore(node);

+							break;

+						}

+

+						lastNode = node;

+						node = walker.next();

+					}

+

+					if (!node) {

+						rng.setStart(lastNode, 0);

+						rng.setEnd(lastNode, 0);

+					}

+				} else {

+					if (root.nodeName == 'BR') {

+						rng.setStartAfter(root);

+						rng.setEndAfter(root);

+					} else {

+						rng.setStart(root, 0);

+						rng.setEnd(root, 0);

+					}

+				}

+

+				selection.setRng(rng);

+

+				viewPort = dom.getViewPort(editor.getWin());

+

+				// scrollIntoView seems to scroll the parent window in most browsers now including FF 3.0b4 so it's time to stop using it and do it our selfs

+				y = dom.getPos(root).y;

+				if (y < viewPort.y || y + 25 > viewPort.y + viewPort.h) {

+					editor.getWin().scrollTo(0, y < viewPort.y ? y : y - viewPort.h + 25); // Needs to be hardcoded to roughly one line of text if a huge text block is broken into two blocks

+				}

+			};

+

+			// Creates a new block element by cloning the current one or creating a new one if the name is specified

+			// This function will also copy any text formatting from the parent block and add it to the new one

+			function createNewBlock(name) {

+				var node = container, block, clonedNode, caretNode;

+

+				block = name ? dom.create(name) : parentBlock.cloneNode(false);

+				caretNode = block;

+

+				// Clone any parent styles

+				do {

+					if (/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(node.nodeName)) {

+						clonedNode = node.cloneNode(false);

+						dom.setAttrib(clonedNode, 'id', ''); // Remove ID since it needs to be document unique

+

+						if (block.hasChildNodes()) {

+							clonedNode.appendChild(block.firstChild);

+							block.appendChild(clonedNode);

+						} else {

+							caretNode = clonedNode;

+							block.appendChild(clonedNode);

+						}

+					}

+				} while (node = node.parentNode);

+

+				// BR is needed in empty blocks on non IE browsers

+				if (!tinymce.isIE) {

+					caretNode.innerHTML = '<br>';

+				}

+

+				return block;

+			};

+

+			// Returns true/false if the caret is at the start/end of the parent block element

+			function isCaretAtStartOrEndOfBlock(start) {

+				var walker, node;

+

+				// Caret is in the middle of a text node like "a|b"

+				if (container.nodeType == 3 && (start ? offset > 0 : offset < container.nodeValue.length)) {

+					return false;

+				}

+

+				// Walk the DOM and look for text nodes or non empty elements

+				walker = new TreeWalker(container, parentBlock);

+				while (node = (start ? walker.prev() : walker.next())) {

+					if (node.nodeType === 1) {

+						// Ignore bogus elements

+						if (node.getAttribute('data-mce-bogus')) {

+							continue;

+						}

+

+						// Keep empty elements like <img />

+						name = node.nodeName.toLowerCase();

+						if (name === 'IMG') {

+							return false;

+						}

+					} else if (node.nodeType === 3 && !/^[ \t\r\n]*$/.test(node.nodeValue)) {

+						return false;

+					}

+				}

+

+				return true;

+			};

+

+			// Wraps any text nodes or inline elements in the specified forced root block name

+			function wrapSelfAndSiblingsInDefaultBlock(container, offset) {

+				var newBlock, parentBlock, startNode, node, next;

+

+				// Not in a block element or in a table cell or caption

+				parentBlock = dom.getParent(container, dom.isBlock);

+				if (newBlockName && !evt.shiftKey && (!parentBlock || !canSplitBlock(parentBlock))) {

+					parentBlock = parentBlock || dom.getRoot();

+

+					if (!parentBlock.hasChildNodes()) {

+						newBlock = dom.create(newBlockName);

+						parentBlock.appendChild(newBlock);

+						rng.setStart(newBlock, 0);

+						rng.setEnd(newBlock, 0);

+						return newBlock;

+					}

+

+					// Find parent that is the first child of parentBlock

+					node = container;

+					while (node.parentNode != parentBlock) {

+						node = node.parentNode;

+					}

+

+					// Loop left to find start node start wrapping at

+					while (node && !dom.isBlock(node)) {

+						startNode = node;

+						node = node.previousSibling;

+					}

+

+					if (startNode) {

+						newBlock = dom.create(newBlockName);

+						startNode.parentNode.insertBefore(newBlock, startNode);

+

+						// Start wrapping until we hit a block

+						node = startNode;

+						while (node && !dom.isBlock(node)) {

+							next = node.nextSibling;

+							newBlock.appendChild(node);

+							node = next;

+						}

+

+						// Restore range to it's past location

+						rng.setStart(container, offset);

+						rng.setEnd(container, offset);

+					}

+				}

+

+				return container;

+			};

+

+			// Inserts a block or br before/after or in the middle of a split list of the LI is empty

+			function handleEmptyListItem() {

+				function isFirstOrLastLi(first) {

+					var node = containerBlock[first ? 'firstChild' : 'lastChild'];

+

+					// Find first/last element since there might be whitespace there

+					while (node) {

+						if (node.nodeType == 1) {

+							break;

+						}

+

+						node = node[first ? 'nextSibling' : 'previousSibling'];

+					}

+

+					return node === parentBlock;

+				};

+

+				newBlock = newBlockName ? createNewBlock(newBlockName) : dom.create('BR');

+

+				if (isFirstOrLastLi(true) && isFirstOrLastLi()) {

+					// Is first and last list item then replace the OL/UL with a text block

+					dom.replace(newBlock, containerBlock);

+				} else if (isFirstOrLastLi(true)) {

+					// First LI in list then remove LI and add text block before list

+					containerBlock.parentNode.insertBefore(newBlock, containerBlock);

+				} else if (isFirstOrLastLi()) {

+					// Last LI in list then temove LI and add text block after list

+					dom.insertAfter(newBlock, containerBlock);

+				} else {

+					// Middle LI in list the split the list and insert a text block in the middle

+					// Extract after fragment and insert it after the current block

+					tmpRng = rng.cloneRange();

+					tmpRng.setStartAfter(parentBlock);

+					tmpRng.setEndAfter(containerBlock);

+					fragment = tmpRng.extractContents();

+					dom.insertAfter(fragment, containerBlock);

+					dom.insertAfter(newBlock, containerBlock);

+				}

+

+				dom.remove(parentBlock);

+				moveToCaretPosition(newBlock);

+				undoManager.add();

+			};

+

+			// Walks the parent block to the right and look for BR elements

+			function hasRightSideBr() {

+				var walker = new TreeWalker(container, parentBlock), node;

+

+				while (node = walker.current()) {

+					if (node.nodeName == 'BR') {

+						return true;

+					}

+

+					node = walker.next();

+				}

+			}

+			

+			// Inserts a BR element if the forced_root_block option is set to false or empty string

+			function insertBr() {

+				var brElm, extraBr, documentMode;

+

+				if (container && container.nodeType == 3 && offset >= container.nodeValue.length) {

+					// Insert extra BR element at the end block elements

+					if (!tinymce.isIE && !hasRightSideBr()) {

+						brElm = dom.create('br')

+						rng.insertNode(brElm);

+						rng.setStartAfter(brElm);

+						rng.setEndAfter(brElm);

+						extraBr = true;

+					}

+				}

+

+				brElm = dom.create('br');

+				rng.insertNode(brElm);

+

+				// Rendering modes below IE8 doesn't display BR elements in PRE unless we have a \n before it

+				documentMode = dom.doc.documentMode;

+				if (tinymce.isIE && parentBlockName == 'PRE' && (!documentMode || documentMode < 8)) {

+					brElm.parentNode.insertBefore(dom.doc.createTextNode('\r'), brElm);

+				}

+

+				if (!extraBr) {

+					rng.setStartAfter(brElm);

+					rng.setEndAfter(brElm);

+				} else {

+					rng.setStartBefore(brElm);

+					rng.setEndBefore(brElm);

+				}

+

+				selection.setRng(rng);

+				undoManager.add();

+			};

+

+			// Trims any linebreaks at the beginning of node user for example when pressing enter in a PRE element

+			function trimLeadingLineBreaks(node) {

+				do {

+					if (node.nodeType === 3) {

+						node.nodeValue = node.nodeValue.replace(/^[\r\n]+/, '');

+					}

+

+					node = node.firstChild;

+				} while (node);

+			};

+		

+			// Delete any selected contents

+			if (!rng.collapsed) {

+				editor.execCommand('Delete');

+				return;

+			}

+

+			// Event is blocked by some other handler for example the lists plugin

+			if (evt.isDefaultPrevented()) {

+				return;

+			}

+

+			// Setup range items and newBlockName

+			container = rng.startContainer;

+			offset = rng.startOffset;

+			newBlockName = settings.forced_root_block;

+			newBlockName = newBlockName ? newBlockName.toUpperCase() : '';

+

+			// Resolve node index

+			if (container.nodeType == 1 && container.hasChildNodes()) {

+				container = container.childNodes[Math.min(offset, container.childNodes.length - 1)] || container;

+				offset = 0;

+			}

+

+			undoManager.beforeChange();

+

+			// Wrap the current node and it's sibling in a default block if it's needed.

+			// for example this <td>text|<b>text2</b></td> will become this <td><p>text|<b>text2</p></b></td>

+			container = wrapSelfAndSiblingsInDefaultBlock(container, offset);

+

+			// Find parent block and setup empty block paddings

+			parentBlock = dom.getParent(container, dom.isBlock);

+			containerBlock = parentBlock ? dom.getParent(parentBlock.parentNode, dom.isBlock) : null;

+

+			// Setup block names

+			parentBlockName = parentBlock ? parentBlock.nodeName.toUpperCase() : ''; // IE < 9 & HTML5

+			containerBlockName = containerBlock ? containerBlock.nodeName.toUpperCase() : ''; // IE < 9 & HTML5

+

+			// Handle enter inside an empty list item

+			if (parentBlockName == 'LI' && dom.isEmpty(parentBlock)) {

+				// Let the list plugin or browser handle nested lists for now

+				if (/^(UL|OL|LI)$/.test(containerBlock.parentNode.nodeName)) {

+					return false;

+				}

+

+				handleEmptyListItem();

+				return;

+			}

+

+			// Don't split PRE tags but insert a BR instead easier when writing code samples etc

+			if (parentBlockName == 'PRE' && settings.br_in_pre !== false) {

+				if (!evt.shiftKey) {

+					insertBr();

+					return;

+				}

+			} else {

+				// If no root block is configured then insert a BR by default or if the shiftKey is pressed

+				if ((!newBlockName && !evt.shiftKey && parentBlockName != 'LI') || (newBlockName && evt.shiftKey)) {

+					insertBr();

+					return;

+				}

+			}

+

+			// Default block name if it's not configured

+			newBlockName = newBlockName || 'P';

+

+			// Insert new block before/after the parent block depending on caret location

+			if (isCaretAtStartOrEndOfBlock()) {

+				// If the caret is at the end of a header we produce a P tag after it similar to Word unless we are in a hgroup

+				if (/^(H[1-6]|PRE)$/.test(parentBlockName) && containerBlockName != 'HGROUP') {

+					newBlock = createNewBlock(newBlockName);

+				} else {

+					newBlock = createNewBlock();

+				}

+

+				// Split the current container block element if enter is pressed inside an empty inner block element

+				if (settings.end_container_on_empty_block && canSplitBlock(containerBlock) && dom.isEmpty(parentBlock)) {

+					// Split container block for example a BLOCKQUOTE at the current blockParent location for example a P

+					newBlock = dom.split(containerBlock, parentBlock);

+				} else {

+					dom.insertAfter(newBlock, parentBlock);

+				}

+			} else if (isCaretAtStartOrEndOfBlock(true)) {

+				// Insert new block before

+				newBlock = parentBlock.parentNode.insertBefore(createNewBlock(), parentBlock);

+			} else {

+				// Extract after fragment and insert it after the current block

+				tmpRng = rng.cloneRange();

+				tmpRng.setEndAfter(parentBlock);

+				fragment = tmpRng.extractContents();

+				trimLeadingLineBreaks(fragment);

+				newBlock = fragment.firstChild;

+				dom.insertAfter(fragment, parentBlock);

+			}

+

+			dom.setAttrib(newBlock, 'id', ''); // Remove ID since it needs to be document unique

+			moveToCaretPosition(newBlock);

+			undoManager.add();

+		}

+

+		editor.onKeyDown.add(function(ed, evt) {

+			if (evt.keyCode == 13) {

+				if (handleEnterKey(evt) !== false) {

+					evt.preventDefault();

+				}

+			}

+		});

+	};

+})(tinymce);

diff --git a/library/tinymce/jscripts/tiny_mce/utils/editable_selects.js b/library/tinymce/jscripts/tiny_mce/utils/editable_selects.js
index fd943c0f8..4b920f3d1 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/utils/editable_selects.js
+++ b/library/tinymce/jscripts/tiny_mce/utils/editable_selects.js
@@ -16,7 +16,7 @@ var TinyMCE_EditableSelects = {
 

 		for (i=0; i<nl.length; i++) {

 			if (nl[i].className.indexOf('mceEditableSelect') != -1) {

-				o = new Option('(value)', '__mce_add_custom__');

+				o = new Option(tinyMCEPopup.editor.translate('value'), '__mce_add_custom__');

 

 				o.className = 'mceAddSelectValue';

 

diff --git a/library/tinymce/jscripts/tiny_mce/utils/form_utils.js b/library/tinymce/jscripts/tiny_mce/utils/form_utils.js
index 2617a26ed..59da01399 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/utils/form_utils.js
+++ b/library/tinymce/jscripts/tiny_mce/utils/form_utils.js
@@ -11,10 +11,14 @@
 var themeBaseURL = tinyMCEPopup.editor.baseURI.toAbsolute('themes/' + tinyMCEPopup.getParam("theme"));

 

 function getColorPickerHTML(id, target_form_element) {

-	var h = "";

+	var h = "", dom = tinyMCEPopup.dom;

 

-	h += '<a id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element +'\');" onmousedown="return false;" class="pickcolor">';

-	h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;</span></a>';

+	if (label = dom.select('label[for=' + target_form_element + ']')[0]) {

+		label.id = label.id || dom.uniqueId();

+	}

+

+	h += '<a role="button" aria-labelledby="' + id + '_label" id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element +'\');" onmousedown="return false;" class="pickcolor">';

+	h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;<span id="' + id + '_label" class="mceVoiceLabel mceIconOnly" style="display:none;">' + tinyMCEPopup.getLang('browse') + '</span></span></a>';

 

 	return h;

 }

@@ -67,6 +71,9 @@ function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
 	if (!form_obj || !form_obj.elements[field_name])

 		return;

 

+	if (!value)

+		value = "";

+

 	var sel = form_obj.elements[field_name];

 

 	var found = false;

@@ -171,7 +178,7 @@ function convertHexToRGB(col) {
 }

 

 function trimSize(size) {

-	return size.replace(/([0-9\.]+)px|(%|in|cm|mm|em|ex|pt|pc)/, '$1$2');

+	return size.replace(/([0-9\.]+)(px|%|in|cm|mm|em|ex|pt|pc)/i, '$1$2');

 }

 

 function getCSSSize(size) {

@@ -183,6 +190,9 @@ function getCSSSize(size) {
 	// Add px

 	if (/^[0-9]+$/.test(size))

 		size += 'px';

+	// Sanity check, IE doesn't like broken values

+	else if (!(/^[0-9\.]+(px|%|in|cm|mm|em|ex|pt|pc)$/i.test(size)))

+		return "";

 

 	return size;

 }

diff --git a/library/tinymce/jscripts/tiny_mce/utils/mctabs.js b/library/tinymce/jscripts/tiny_mce/utils/mctabs.js
index 825d4c143..458ec86da 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/utils/mctabs.js
+++ b/library/tinymce/jscripts/tiny_mce/utils/mctabs.js
@@ -10,6 +10,7 @@
 

 function MCTabs() {

 	this.settings = [];

+	this.onChange = tinyMCEPopup.editor.windowManager.createInstance('tinymce.util.Dispatcher');

 };

 

 MCTabs.prototype.init = function(settings) {

@@ -28,26 +29,62 @@ MCTabs.prototype.getParam = function(name, default_value) {
 	return value;

 };

 

-MCTabs.prototype.displayTab = function(tab_id, panel_id) {

-	var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i;

+MCTabs.prototype.showTab =function(tab){

+	tab.className = 'current';

+	tab.setAttribute("aria-selected", true);

+	tab.setAttribute("aria-expanded", true);

+	tab.tabIndex = 0;

+};

+

+MCTabs.prototype.hideTab =function(tab){

+	var t=this;

+

+	tab.className = '';

+	tab.setAttribute("aria-selected", false);

+	tab.setAttribute("aria-expanded", false);

+	tab.tabIndex = -1;

+};

+

+MCTabs.prototype.showPanel = function(panel) {

+	panel.className = 'current'; 

+	panel.setAttribute("aria-hidden", false);

+};

+

+MCTabs.prototype.hidePanel = function(panel) {

+	panel.className = 'panel';

+	panel.setAttribute("aria-hidden", true);

+}; 

+

+MCTabs.prototype.getPanelForTab = function(tabElm) {

+	return tinyMCEPopup.dom.getAttrib(tabElm, "aria-controls");

+};

+

+MCTabs.prototype.displayTab = function(tab_id, panel_id, avoid_focus) {

+	var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i, t = this;

+

+	tabElm = document.getElementById(tab_id);

+

+	if (panel_id === undefined) {

+		panel_id = t.getPanelForTab(tabElm);

+	}

 

 	panelElm= document.getElementById(panel_id);

 	panelContainerElm = panelElm ? panelElm.parentNode : null;

-	tabElm = document.getElementById(tab_id);

 	tabContainerElm = tabElm ? tabElm.parentNode : null;

-	selectionClass = this.getParam('selection_class', 'current');

+	selectionClass = t.getParam('selection_class', 'current');

 

 	if (tabElm && tabContainerElm) {

 		nodes = tabContainerElm.childNodes;

 

 		// Hide all other tabs

 		for (i = 0; i < nodes.length; i++) {

-			if (nodes[i].nodeName == "LI")

-				nodes[i].className = '';

+			if (nodes[i].nodeName == "LI") {

+				t.hideTab(nodes[i]);

+			}

 		}

 

 		// Show selected tab

-		tabElm.className = 'current';

+		t.showTab(tabElm);

 	}

 

 	if (panelElm && panelContainerElm) {

@@ -56,11 +93,15 @@ MCTabs.prototype.displayTab = function(tab_id, panel_id) {
 		// Hide all other panels

 		for (i = 0; i < nodes.length; i++) {

 			if (nodes[i].nodeName == "DIV")

-				nodes[i].className = 'panel';

+				t.hidePanel(nodes[i]);

+		}

+

+		if (!avoid_focus) { 

+			tabElm.focus();

 		}

 

 		// Show selected panel

-		panelElm.className = 'current';

+		t.showPanel(panelElm);

 	}

 };

 

@@ -73,5 +114,49 @@ MCTabs.prototype.getAnchor = function() {
 	return "";

 };

 

-// Global instance

+

+//Global instance

 var mcTabs = new MCTabs();

+

+tinyMCEPopup.onInit.add(function() {

+	var tinymce = tinyMCEPopup.getWin().tinymce, dom = tinyMCEPopup.dom, each = tinymce.each;

+

+	each(dom.select('div.tabs'), function(tabContainerElm) {

+		var keyNav;

+

+		dom.setAttrib(tabContainerElm, "role", "tablist"); 

+

+		var items = tinyMCEPopup.dom.select('li', tabContainerElm);

+		var action = function(id) {

+			mcTabs.displayTab(id, mcTabs.getPanelForTab(id));

+			mcTabs.onChange.dispatch(id);

+		};

+

+		each(items, function(item) {

+			dom.setAttrib(item, 'role', 'tab');

+			dom.bind(item, 'click', function(evt) {

+				action(item.id);

+			});

+		});

+

+		dom.bind(dom.getRoot(), 'keydown', function(evt) {

+			if (evt.keyCode === 9 && evt.ctrlKey && !evt.altKey) { // Tab

+				keyNav.moveFocus(evt.shiftKey ? -1 : 1);

+				tinymce.dom.Event.cancel(evt);

+			}

+		});

+

+		each(dom.select('a', tabContainerElm), function(a) {

+			dom.setAttrib(a, 'tabindex', '-1');

+		});

+

+		keyNav = tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', {

+			root: tabContainerElm,

+			items: items,

+			onAction: action,

+			actOnFocus: true,

+			enableLeftRight: true,

+			enableUpDown: true

+		}, tinyMCEPopup.dom);

+	});

+});
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/utils/validate.js b/library/tinymce/jscripts/tiny_mce/utils/validate.js
index a6fcf9701..27cbfab81 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/utils/validate.js
+++ b/library/tinymce/jscripts/tiny_mce/utils/validate.js
@@ -32,7 +32,7 @@ var Validator = {
 	},

 

 	isSize : function(s) {

-		return this.test(s, '^[0-9]+(%|in|cm|mm|em|ex|pt|pc|px)?$');

+		return this.test(s, '^[0-9.]+(%|in|cm|mm|em|ex|pt|pc|px)?$');

 	},

 

 	isId : function(s) {

@@ -96,8 +96,10 @@ var AutoValidator = {
 		var i, nl, s = this.settings, c = 0;

 

 		nl = this.tags(f, 'label');

-		for (i=0; i<nl.length; i++)

+		for (i=0; i<nl.length; i++) {

 			this.removeClass(nl[i], s.invalid_cls);

+			nl[i].setAttribute('aria-invalid', false);

+		}

 

 		c += this.validateElms(f, 'input');

 		c += this.validateElms(f, 'select');

@@ -109,6 +111,33 @@ var AutoValidator = {
 	invalidate : function(n) {

 		this.mark(n.form, n);

 	},

+	

+	getErrorMessages : function(f) {

+		var nl, i, s = this.settings, field, msg, values, messages = [], ed = tinyMCEPopup.editor;

+		nl = this.tags(f, "label");

+		for (i=0; i<nl.length; i++) {

+			if (this.hasClass(nl[i], s.invalid_cls)) {

+				field = document.getElementById(nl[i].getAttribute("for"));

+				values = { field: nl[i].textContent };

+				if (this.hasClass(field, s.min_cls, true)) {

+					message = ed.getLang('invalid_data_min');

+					values.min = this.getNum(field, s.min_cls);

+				} else if (this.hasClass(field, s.number_cls)) {

+					message = ed.getLang('invalid_data_number');

+				} else if (this.hasClass(field, s.size_cls)) {

+					message = ed.getLang('invalid_data_size');

+				} else {

+					message = ed.getLang('invalid_data');

+				}

+				

+				message = message.replace(/{\#([^}]+)\}/g, function(a, b) {

+					return values[b] || '{#' + b + '}';

+				});

+				messages.push(message);

+			}

+		}

+		return messages;

+	},

 

 	reset : function(e) {

 		var t = ['label', 'input', 'select', 'textarea'];

@@ -119,8 +148,10 @@ var AutoValidator = {
 

 		for (i=0; i<t.length; i++) {

 			nl = this.tags(e.form ? e.form : e, t[i]);

-			for (j=0; j<nl.length; j++)

+			for (j=0; j<nl.length; j++) {

 				this.removeClass(nl[j], s.invalid_cls);

+				nl[j].setAttribute('aria-invalid', false);

+			}

 		}

 	},

 

@@ -201,6 +232,7 @@ var AutoValidator = {
 		var s = this.settings;

 

 		this.addClass(n, s.invalid_cls);

+		n.setAttribute('aria-invalid', 'true');

 		this.markLabels(f, n, s.invalid_cls);

 

 		return false;

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 94bf44503..a395027c1 100755..100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -37,7 +37,7 @@ function admin_post(&$a){
 							$func($a);
 						}
 				}
-				goaway($a->get_baseurl() . '/admin/plugins/' . $a->argv[2] );
+				goaway($a->get_baseurl(true) . '/admin/plugins/' . $a->argv[2] );
 				return; // NOTREACHED
 				break;
 			case 'logs':
@@ -49,7 +49,7 @@ function admin_post(&$a){
 		}
 	}
 
-	goaway($a->get_baseurl() . '/admin' );
+	goaway($a->get_baseurl(true) . '/admin' );
 	return; // NOTREACHED	
 }
 
@@ -68,11 +68,11 @@ function admin_content(&$a) {
 
 	// array( url, name, extra css classes )
 	$aside = Array(
-		'site'	 =>	Array($a->get_baseurl()."/admin/site/", t("Site") , "site"),
-		'users'	 =>	Array($a->get_baseurl()."/admin/users/", t("Users") , "users"),
-		'plugins'=>	Array($a->get_baseurl()."/admin/plugins/", t("Plugins") , "plugins"),
-		'themes' =>	Array($a->get_baseurl()."/admin/themes/", t("Themes") , "themes"),
-		'update' =>	Array($a->get_baseurl()."/admin/update/", t("Update") , "update")
+		'site'	 =>	Array($a->get_baseurl(true)."/admin/site/", t("Site") , "site"),
+		'users'	 =>	Array($a->get_baseurl(true)."/admin/users/", t("Users") , "users"),
+		'plugins'=>	Array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"),
+		'themes' =>	Array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"),
+		'update' =>	Array($a->get_baseurl(true)."/admin/update/", t("Update") , "update")
 	);
 	
 	/* get plugins admin page */
@@ -81,18 +81,18 @@ function admin_content(&$a) {
 	$aside['plugins_admin']=Array();
 	foreach ($r as $h){
 		$plugin =$h['name'];
-		$aside['plugins_admin'][] = Array($a->get_baseurl()."/admin/plugins/".$plugin, $plugin, "plugin");
+		$aside['plugins_admin'][] = Array($a->get_baseurl(true)."/admin/plugins/".$plugin, $plugin, "plugin");
 		// temp plugins with admin
 		$a->plugins_admin[] = $plugin;
 	}
 		
-	$aside['logs'] = Array($a->get_baseurl()."/admin/logs/", t("Logs"), "logs");
+	$aside['logs'] = Array($a->get_baseurl(true)."/admin/logs/", t("Logs"), "logs");
 
 	$t = get_markup_template("admin_aside.tpl");
 	$a->page['aside'] = replace_macros( $t, array(
 			'$admin' => $aside, 
 			'$h_pending' => t('User registrations waiting for confirmation'),
-			'$admurl'=> $a->get_baseurl()."/admin/"
+			'$admurl'=> $a->get_baseurl(true)."/admin/"
 	));
 
 
@@ -145,16 +145,13 @@ function admin_page_summary(&$a) {
 		Array( t('Automatic Friend Account'), 0)
 	);
 	$users=0;
-	foreach ($r as $u){ $accounts[$u['page-flags']][1] = $u['count']; $users+=$u['count']; }
+	foreach ($r as $u){ $accounts[$u['page-flags']][1] = $u['count']; $users+= $u['count']; }
+
+	logger('accounts: ' . print_r($accounts,true));
 
-	
 	$r = q("SELECT COUNT(id) as `count` FROM `register`");
 	$pending = $r[0]['count'];
-	
-	
-	
-	
-	
+		
 	$t = get_markup_template("admin_summary.tpl");
 	return replace_macros($t, array(
 		'$title' => t('Administration'),
@@ -209,7 +206,49 @@ function admin_page_site_post(&$a){
 	$dfrn_only          =	((x($_POST,'dfrn_only'))	    ? True	:	False);
     $ostatus_disabled   =   !((x($_POST,'ostatus_disabled')) ? True  :   False);
 	$diaspora_enabled   =   ((x($_POST,'diaspora_enabled')) ? True   :  False);
-
+	$ssl_policy         =   ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0);
+
+	if($ssl_policy != intval(get_config('system','ssl_policy'))) {
+		if($ssl_policy == SSL_POLICY_FULL) {
+			q("update `contact` set 
+				`url`     = replace(`url`    , 'http:' , 'https:'),
+				`photo`   = replace(`photo`  , 'http:' , 'https:'),
+				`thumb`   = replace(`thumb`  , 'http:' , 'https:'),
+				`micro`   = replace(`micro`  , 'http:' , 'https:'),
+				`request` = replace(`request`, 'http:' , 'https:'),
+				`notify`  = replace(`notify` , 'http:' , 'https:'),
+				`poll`    = replace(`poll`   , 'http:' , 'https:'),
+				`confirm` = replace(`confirm`, 'http:' , 'https:'),
+				`poco`    = replace(`poco`   , 'http:' , 'https:')
+				where `self` = 1"
+			);
+			q("update `profile` set 
+				`photo`   = replace(`photo`  , 'http:' , 'https:'),
+				`thumb`   = replace(`thumb`  , 'http:' , 'https:')
+				where 1 "
+			);
+		}
+		elseif($ssl_policy == SSL_POLICY_SELFSIGN) {
+			q("update `contact` set 
+				`url`     = replace(`url`    , 'https:' , 'http:'),
+				`photo`   = replace(`photo`  , 'https:' , 'http:'),
+				`thumb`   = replace(`thumb`  , 'https:' , 'http:'),
+				`micro`   = replace(`micro`  , 'https:' , 'http:'),
+				`request` = replace(`request`, 'https:' , 'http:'),
+				`notify`  = replace(`notify` , 'https:' , 'http:'),
+				`poll`    = replace(`poll`   , 'https:' , 'http:'),
+				`confirm` = replace(`confirm`, 'https:' , 'http:'),
+				`poco`    = replace(`poco`   , 'https:' , 'http:')
+				where `self` = 1"
+			);
+			q("update `profile` set 
+				`photo`   = replace(`photo`  , 'https:' , 'http:'),
+				`thumb`   = replace(`thumb`  , 'https:' , 'http:')
+				where 1 "
+			);
+		}
+	}
+	set_config('system','ssl_policy',$ssl_policy);
 
 	set_config('config','sitename',$sitename);
 	if ($banner==""){
@@ -257,7 +296,7 @@ function admin_page_site_post(&$a){
 	set_config('system','diaspora_enabled', $diaspora_enabled);
 
 	info( t('Site settings updated.') . EOL);
-	goaway($a->get_baseurl() . '/admin/site' );
+	goaway($a->get_baseurl(true) . '/admin/site' );
 	return; // NOTREACHED	
 	
 }
@@ -304,7 +343,13 @@ function admin_page_site(&$a) {
 		REGISTER_APPROVE => t("Requires approval"),
 		REGISTER_OPEN => t("Open")
 	); 
-	
+
+	$ssl_choices = array(
+		SSL_POLICY_NONE => t("No SSL policy, links will track page SSL state"),
+		SSL_POLICY_FULL => t("Force all links to use SSL"),
+		SSL_POLICY_SELFSIGN => t("Self-signed certificate, use SSL for local links only (discouraged)")
+	);
+
 	$t = get_markup_template("admin_site.tpl");
 	return replace_macros($t, array(
 		'$title' => t('Administration'),
@@ -315,37 +360,37 @@ function admin_page_site(&$a) {
 		'$corporate' => t('Policies'),
 		'$advanced' => t('Advanced'),
 		
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => $a->get_baseurl(true),
 									// name, label, value, help string, extra data...
 		'$sitename' 		=> array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), ""),
 		'$banner'			=> array('banner', t("Banner/Logo"), $banner, ""),
 		'$language' 		=> array('language', t("System language"), get_config('system','language'), "", $lang_choices),
-		'$theme' 			=> array('theme', t("System theme"), get_config('system','theme'), "Default system theme (which may be over-ridden by user profiles)", $theme_choices),
-
-		'$maximagesize'		=> array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), "Maximum size in bytes of uploaded images. Default is 0, which means no limits."),
+		'$theme' 			=> array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles"), $theme_choices),
+		'$ssl_policy'       => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
+		'$maximagesize'		=> array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
 
 		'$register_policy'	=> array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices),
-		'$register_text'	=> array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES), "Will be displayed prominently on the registration page."),
+		'$register_text'	=> array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES), t("Will be displayed prominently on the registration page.")),
 		'$abandon_days'     => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')),
-		'$allowed_sites'	=> array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), "Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"),
-		'$allowed_email'	=> array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), "Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"),
-		'$block_public'		=> array('block_public', t("Block public"), get_config('system','block_public'), "Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."),
-		'$force_publish'	=> array('publish_all', t("Force publish"), get_config('system','publish_all'), "Check to force all profiles on this site to be listed in the site directory."),
-		'$global_directory'	=> array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), "URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."),
+		'$allowed_sites'	=> array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")),
+		'$allowed_email'	=> array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")),
+		'$block_public'		=> array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")),
+		'$force_publish'	=> array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")),
+		'$global_directory'	=> array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), t("URL to update the global directory. If this is not set, the global directory is completely unavailable to the application.")),
 			
-		'$no_multi_reg'		=> array('no_multi_reg', t("Block multiple registrations"),  get_config('system','block_extended_register'), "Disallow users to register additional accounts for use as pages."),
-		'$no_openid'		=> array('no_openid', t("OpenID support"), !get_config('system','no_openid'), "OpenID support for registration and logins."),
-		'$no_gravatar'		=> array('no_gravatar', t("Gravatar support"), !get_config('system','no_gravatar'), "Search new user's photo on Gravatar."),
-		'$no_regfullname'	=> array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), "Force users to register with a space between firstname and lastname in Full name, as an antispam measure"),
-		'$no_utf'			=> array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), "Use PHP UTF8 regular expressions"),
-		'$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), "Display a Community page showing all recent public postings on this site."),
-		'$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), "Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."),	
-		'$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), "Provide built-in Diaspora network compatibility."),	
-		'$dfrn_only'        => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), "All contacts must use Friendica protocols. All other built-in communication protocols disabled."),
-		'$verifyssl' 		=> array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), "If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."),
+		'$no_multi_reg'		=> array('no_multi_reg', t("Block multiple registrations"),  get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
+		'$no_openid'		=> array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")),
+		'$no_gravatar'		=> array('no_gravatar', t("Gravatar support"), !get_config('system','no_gravatar'), t("Search new user's photo on Gravatar.")),
+		'$no_regfullname'	=> array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")),
+		'$no_utf'			=> array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), t("Use PHP UTF8 regular expressions")),
+		'$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), t("Display a Community page showing all recent public postings on this site.")),
+		'$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), t("Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")),	
+		'$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")),	
+		'$dfrn_only'        => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")),
+		'$verifyssl' 		=> array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.")),
 		'$proxyuser'		=> array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""),
 		'$proxy'			=> array('proxy', t("Proxy URL"), get_config('system','proxy'), ""),
-		'$timeout'			=> array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), "Value is in seconds. Set to 0 for unlimited (not recommended)."),
+		'$timeout'			=> array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")),
 
 			
 	));
@@ -388,7 +433,7 @@ function admin_page_users_post(&$a){
 			user_deny($hash);
 		}
 	}
-	goaway($a->get_baseurl() . '/admin/users' );
+	goaway($a->get_baseurl(true) . '/admin/users' );
 	return; // NOTREACHED	
 }
  
@@ -398,7 +443,7 @@ function admin_page_users(&$a){
 		$user = q("SELECT * FROM `user` WHERE `uid`=%d", intval($uid));
 		if (count($user)==0){
 			notice( 'User not found' . EOL);
-			goaway($a->get_baseurl() . '/admin/users' );
+			goaway($a->get_baseurl(true) . '/admin/users' );
 			return; // NOTREACHED						
 		}		
 		switch($a->argv[2]){
@@ -417,7 +462,7 @@ function admin_page_users(&$a){
 				notice( sprintf( ($user[0]['blocked']?t("User '%s' unblocked"):t("User '%s' blocked")) , $user[0]['username']) . EOL);
 			}; break;
 		}
-		goaway($a->get_baseurl() . '/admin/users' );
+		goaway($a->get_baseurl(true) . '/admin/users' );
 		return; // NOTREACHED	
 		
 	}
@@ -496,7 +541,7 @@ function admin_page_users(&$a){
 
 
 		// values //
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => $a->get_baseurl(true),
 
 		'$pending' => $pending,
 		'$users' => $users,
@@ -535,7 +580,7 @@ function admin_page_plugins(&$a){
 				info( sprintf( t("Plugin %s enabled."), $plugin ) );
 			}
 			set_config("system","addon", implode(", ",$a->plugins));
-			goaway($a->get_baseurl() . '/admin/plugins' );
+			goaway($a->get_baseurl(true) . '/admin/plugins' );
 			return; // NOTREACHED	
 		}
 		// display plugin details
@@ -568,15 +613,18 @@ function admin_page_plugins(&$a){
 			'$page' => t('Plugins'),
 			'$toggle' => t('Toggle'),
 			'$settings' => t('Settings'),
-			'$baseurl' => $a->get_baseurl(),
+			'$baseurl' => $a->get_baseurl(true),
 		
 			'$plugin' => $plugin,
 			'$status' => $status,
 			'$action' => $action,
 			'$info' => get_plugin_info($plugin),
+			'$str_author' => t('Author: '),
+			'$str_maintainer' => t('Maintainer: '),			
 		
 			'$admin_form' => $admin_form,
 			'$function' => 'plugins',
+			'$screenshot' => '',
 			'$readme' => $readme
 		));
 	} 
@@ -604,7 +652,7 @@ function admin_page_plugins(&$a){
 		'$title' => t('Administration'),
 		'$page' => t('Plugins'),
 		'$submit' => t('Submit'),
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => $a->get_baseurl(true),
 		'$function' => 'plugins',	
 		'$plugins' => $plugins
 	));
@@ -710,7 +758,7 @@ function admin_page_themes(&$a){
 				info( sprintf('Theme %s disabled.',$theme));
 
 			set_config('system','allowed_themes',$s);
-			goaway($a->get_baseurl() . '/admin/themes' );
+			goaway($a->get_baseurl(true) . '/admin/themes' );
 			return; // NOTREACHED	
 		}
 
@@ -732,14 +780,18 @@ 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'),
 			'$page' => t('Themes'),
 			'$toggle' => t('Toggle'),
 			'$settings' => t('Settings'),
-			'$baseurl' => $a->get_baseurl(),
+			'$baseurl' => $a->get_baseurl(true),
 		
 			'$plugin' => $theme,
 			'$status' => $status,
@@ -747,7 +799,9 @@ function admin_page_themes(&$a){
 			'$info' => get_theme_info($theme),
 			'$function' => 'themes',		
 			'$admin_form' => $admin_form,
-			
+			'$str_author' => t('Author: '),
+			'$str_maintainer' => t('Maintainer: '),			
+			'$screenshot' => $screenshot,
 			'$readme' => $readme
 		));
 	} 
@@ -770,7 +824,7 @@ function admin_page_themes(&$a){
 		'$title' => t('Administration'),
 		'$page' => t('Themes'),
 		'$submit' => t('Submit'),
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => $a->get_baseurl(true),
 		'$function' => 'themes',
 		'$plugins' => $xthemes,
 		'$experimental' => t('[Experimental]'),
@@ -798,7 +852,7 @@ function admin_page_logs_post(&$a) {
 	}
 
 	info( t("Log settings updated.") );
-	goaway($a->get_baseurl() . '/admin/logs' );
+	goaway($a->get_baseurl(true) . '/admin/logs' );
 	return; // NOTREACHED	
 }
  
@@ -852,7 +906,7 @@ readable.");
 		'$submit' => t('Submit'),
 		'$clear' => t('Clear'),
 		'$data' => $data,
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => $a->get_baseurl(true),
 		'$logname' =>  get_config('system','logfile'),
 		
 									// name, label, value, help string, extra data...
@@ -897,7 +951,7 @@ function admin_page_remoteupdate(&$a) {
 	
 	$tpl = get_markup_template("admin_remoteupdate.tpl");
 	return replace_macros($tpl, array(
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => $a->get_baseurl(true),
 		'$submit' => t("Update now"),
 		'$close' => t("Close"),
 		'$localversion' => FRIENDICA_VERSION,
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 a98999942..f8cc3305b 100755..100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -41,15 +41,16 @@ function community_content(&$a, $update = 0) {
 
 
 	// Here is the way permissions work in this module...
-	// Only public wall posts can be shown
+	// Only public posts can be shown
 	// OR your own posts if you are a logged in member
 
 
 	$r = q("SELECT COUNT(*) 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 `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
-		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `user`.`hidewall` = 0 
+		AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
+		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
+		AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 "
 	);
 
@@ -69,8 +70,9 @@ function community_content(&$a, $update = 0) {
 		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 `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
-		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `user`.`hidewall` = 0 
+		AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
+		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
+		AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 		ORDER BY `received` DESC LIMIT %d, %d ",
 		intval($a->pager['start']),
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 c99ac1452..8aa51d00a 100755..100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -61,7 +61,7 @@ function contacts_post(&$a) {
 
 	if(! count($orig_record)) {
 		notice( t('Could not access contact record.') . EOL);
-		goaway($a->get_baseurl() . '/contacts');
+		goaway($a->get_baseurl(true) . '/contacts');
 		return; // NOTREACHED
 	}
 
@@ -141,7 +141,7 @@ function contacts_content(&$a) {
 
 		if(! count($orig_record)) {
 			notice( t('Could not access contact record.') . EOL);
-			goaway($a->get_baseurl() . '/contacts');
+			goaway($a->get_baseurl(true) . '/contacts');
 			return; // NOTREACHED
 		}
 
@@ -149,7 +149,7 @@ function contacts_content(&$a) {
 
 			// pull feed and consume it, which should subscribe to the hub.
 			proc_run('php',"include/poller.php","$contact_id");
-			goaway($a->get_baseurl() . '/contacts/' . $contact_id);
+			goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
 			// NOTREACHED
 		}
 
@@ -164,7 +164,7 @@ function contacts_content(&$a) {
 				//notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL );
 				info( (($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL );
 			}
-			goaway($a->get_baseurl() . '/contacts/' . $contact_id);
+			goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
 			return; // NOTREACHED
 		}
 
@@ -178,7 +178,7 @@ function contacts_content(&$a) {
 			if($r) {
 				info( (($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL );
 			}
-			goaway($a->get_baseurl() . '/contacts/' . $contact_id);
+			goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
 			return; // NOTREACHED
 		}
 
@@ -220,9 +220,9 @@ function contacts_content(&$a) {
 			contact_remove($orig_record[0]['id']);
 			info( t('Contact has been removed.') . EOL );
 			if(x($_SESSION,'return_url'))
-				goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
+				goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
 			else
-				goaway($a->get_baseurl() . '/contacts');
+				goaway($a->get_baseurl(true) . '/contacts');
 			return; // NOTREACHED
 		}
 	}
@@ -233,7 +233,7 @@ function contacts_content(&$a) {
 		$contact = $a->data['contact'];
 
 		$tpl = get_markup_template('contact_head.tpl');
-		$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
+		$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl(true)));
 
 		require_once('include/contact_selectors.php');
 
@@ -295,17 +295,17 @@ function contacts_content(&$a) {
 		$tabs = array(
 			array(
 				'label' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
-				'url'   => $a->get_baseurl() . '/contacts/' . $contact_id . '/block',
+				'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/block',
 				'sel'   => '',
 			),
 			array(
 				'label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
-				'url'   => $a->get_baseurl() . '/contacts/' . $contact_id . '/ignore',
+				'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/ignore',
 				'sel'   => '',
 			),
 			array(
 				'label' => t('Repair'),
-				'url'   => $a->get_baseurl() . '/crepair/' . $contact_id,
+				'url'   => $a->get_baseurl(true) . '/crepair/' . $contact_id,
 				'sel'   => '',
 			)
 		);
@@ -322,7 +322,7 @@ function contacts_content(&$a) {
 			'$lbl_info1' => t('Contact Information / Notes'),
 			'$infedit' => t('Edit contact notes'),
 			'$common_text' => $common_text,
-			'$common_link' => $a->get_baseurl() . '/common/' . $contact['id'],
+			'$common_link' => $a->get_baseurl(true) . '/common/' . $contact['id'],
 			'$all_friends' => $all_friends,
 			'$relation_text' => $relation_text,
 			'$visit' => sprintf( t('Visit %s\'s profile [%s]'),$contact['name'],$contact['url']),
@@ -396,31 +396,36 @@ function contacts_content(&$a) {
 
 	$tabs = array(
 		array(
+			'label' => t('Suggestions'),
+			'url'   => $a->get_baseurl(true) . '/suggest', 
+			'sel'   => '',
+		),
+		array(
 			'label' => t('All Contacts'),
-			'url'   => $a->get_baseurl() . '/contacts/all', 
+			'url'   => $a->get_baseurl(true) . '/contacts/all', 
 			'sel'   => ($all) ? 'active' : '',
 		),
 		array(
 			'label' => t('Unblocked Contacts'),
-			'url'   => $a->get_baseurl() . '/contacts',
+			'url'   => $a->get_baseurl(true) . '/contacts',
 			'sel'   => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets) && (! $ignored)) ? 'active' : '',
 		),
 
 		array(
 			'label' => t('Blocked Contacts'),
-			'url'   => $a->get_baseurl() . '/contacts/blocked',
+			'url'   => $a->get_baseurl(true) . '/contacts/blocked',
 			'sel'   => ($blocked) ? 'active' : '',
 		),
 
 		array(
 			'label' => t('Ignored Contacts'),
-			'url'   => $a->get_baseurl() . '/contacts/ignored',
+			'url'   => $a->get_baseurl(true) . '/contacts/ignored',
 			'sel'   => ($ignored) ? 'active' : '',
 		),
 
 		array(
 			'label' => t('Hidden Contacts'),
-			'url'   => $a->get_baseurl() . '/contacts/hidden',
+			'url'   => $a->get_baseurl(true) . '/contacts/hidden',
 			'sel'   => ($hidden) ? 'active' : '',
 		),
 
@@ -445,15 +450,16 @@ function contacts_content(&$a) {
 
 	
 	$r = q("SELECT COUNT(*) AS `total` FROM `contact` 
-		WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ",
+		WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ",
 		intval($_SESSION['uid']));
-	if(count($r))
+	if(count($r)) {
 		$a->set_pager_total($r[0]['total']);
+		$total = $r[0]['total'];
+	}
 
 
 
-
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ",
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ",
 		intval($_SESSION['uid']),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
@@ -464,8 +470,6 @@ function contacts_content(&$a) {
 	if(count($r)) {
 
 		foreach($r as $rr) {
-			if($rr['self'])
-				continue;
 
 			switch($rr['rel']) {
 				case CONTACT_IS_FRIEND:
@@ -518,7 +522,7 @@ function contacts_content(&$a) {
 	$o .= replace_macros($tpl,array(
 		'$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
 		'$tabs' => $t,
-		'$total' => $r[0]['total'],
+		'$total' => $total,
 		'$search' => $search_hdr,
 		'$desc' => t('Search your contacts'),
 		'$finding' => (strlen($search) ? t('Finding: ') . "'" . $search . "'" : ""),
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_confirm.php b/mod/dfrn_confirm.php
index 0bc3ea7df..efb5be3a4 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -207,6 +207,9 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			if($duplex == 1)
 				$params['duplex'] = 1;
 
+			if($user['page-flags'] == PAGE_COMMUNITY)
+				$params['page'] = 1;
+
 			logger('dfrn_confirm: Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA);
 
 			/**
@@ -522,6 +525,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		$source_url = ((x($_POST,'source_url'))   ? hex2bin($_POST['source_url'])  : '');
 		$aes_key    = ((x($_POST,'aes_key'))      ? $_POST['aes_key']              : '');
 		$duplex     = ((x($_POST,'duplex'))       ? intval($_POST['duplex'])       : 0 );
+		$page       = ((x($_POST,'page'))         ? intval($_POST['page'])         : 0 );
 		$version_id = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
 	
 		logger('dfrn_confirm: requestee contacted: ' . $node);
@@ -651,7 +655,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		if(count($r))
 			$photo = $r[0]['photo'];
 		else
-			$photo = $a->get_baseurl() . '/images/default-profile.jpg';
+			$photo = $a->get_baseurl() . '/images/person-175.jpg';
 				
 		require_once("Photo.php");
 
@@ -677,6 +681,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			`blocked` = 0, 
 			`pending` = 0,
 			`duplex` = %d, 
+			`forum` = %d,
 			`network` = '%s' WHERE `id` = %d LIMIT 1
 		",
 			dbesc($photos[0]),
@@ -687,6 +692,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
 			intval($duplex),
+			intval($page),
 			dbesc(NETWORK_DFRN),
 			intval($dfrn_record)
 		);
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 0c0c27e3d..65d39d5fe 100755..100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -14,6 +14,8 @@ function dfrn_notify_post(&$a) {
 	$key          = ((x($_POST,'key'))          ? $_POST['key']                     : '');
 	$dissolve     = ((x($_POST,'dissolve'))     ? intval($_POST['dissolve'])        :  0);
 	$perm         = ((x($_POST,'perm'))         ? notags(trim($_POST['perm']))      : 'r');
+	$ssl_policy   = ((x($_POST,'ssl_policy'))   ? notags(trim($_POST['ssl_policy'])): 'none');
+	$page         = ((x($_POST,'page'))         ? intval($_POST['page'])            :  0);
 
 	$writable = (-1);
 	if($dfrn_version >= 2.21) {
@@ -86,14 +88,22 @@ function dfrn_notify_post(&$a) {
 
 	$importer = $r[0];
 
-	if(($writable != (-1)) && ($writable != $importer['writable'])) {
-		q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1",
-			intval($writable),
+	if((($writable != (-1)) && ($writable != $importer['writable'])) || ($importer['forum'] != $page)) {
+		q("UPDATE `contact` SET `writable` = %d, forum = %d WHERE `id` = %d LIMIT 1",
+			intval(($writable == (-1)) ? $importer['writable'] : $writable),
+			intval($page),
 			intval($importer['id'])
 		);
-		$importer['writable'] = $writable;
+		if($writable != (-1))
+			$importer['writable'] = $writable;
+		$importer['forum'] = $page;
 	}
 
+
+	// if contact's ssl policy changed, update our links
+
+	fix_contact_ssl_policy($importer,$ssl_policy);
+
 	logger('dfrn_notify: received notify from ' . $importer['name'] . ' for ' . $importer['username']);
 	logger('dfrn_notify: data: ' . $data, LOGGER_DATA);
 
@@ -110,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));
@@ -197,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])
@@ -235,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");
 
@@ -242,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 b12e07132..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();
 	}
 
@@ -199,7 +202,7 @@ function dfrn_poll_post(&$a) {
 	$ptype        = ((x($_POST,'type'))         ? $_POST['type']                 : '');
 	$dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
 	$perm         = ((x($_POST,'perm'))         ? $_POST['perm']                 : 'r');
-
+          
 	if($ptype === 'profile-check') {
 
 		if((strlen($challenge)) && (strlen($sec))) {
@@ -358,8 +361,8 @@ function dfrn_poll_post(&$a) {
 					intval($contact_id)
 				);
 			}
-		}				
-
+		}
+				
 		header("Content-type: application/atom+xml");
 		$o = get_feed_for($a,$dfrn_id, $a->argv[1], $last_update, $direction);
 		echo $o;
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index bc159137d..5881b7b51 100755..100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -43,7 +43,7 @@ function dfrn_request_post(&$a) {
 		return;
 
 
-	if($_POST['cancel']) {
+	if(x($_POST, 'cancel')) {
 		goaway(z_root());
 	} 
 
@@ -77,9 +77,10 @@ function dfrn_request_post(&$a) {
 				 * Lookup the contact based on their URL (which is the only unique thing we have at the moment)
 				 */
 	
-				$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
+				$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND (`url` = '%s' OR `nurl` = '%s') AND `self` = 0 LIMIT 1",
 					intval(local_user()),
-					dbesc($dfrn_url)
+					dbesc($dfrn_url),
+					dbesc(normalise_link($dfrn_url))
 				);
 	
 				if(count($r)) {
@@ -663,10 +664,28 @@ 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 social networks:");
+		$page_desc .= t("Please enter your 'Identity Address' from one of the following supported communications networks:");
+
+		// see if we are allowed to have NETWORK_MAIL2 contacts
+
+		$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",
+				intval($a->profile['uid'])
+			);
+			if(! count($r))
+				$mail_disabled = 1;
+		}
+
+		$emailnet = (($mail_disabled) ? '' : t("<strike>Connect as an email follower</strike> \x28Coming soon\x29"));
+
+		$invite_desc = t('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>.');
 
 		$o .= replace_macros($tpl,array(
 			'$header' => t('Friend/Connection Request'),
@@ -680,8 +699,10 @@ 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,
 			'$submit' => t('Submit Request'),
 			'$cancel' => t('Cancel'),
 			'$nickname' => $a->argv[1],
diff --git a/mod/directory.php b/mod/directory.php
index 962188945..7f18bd026 100755..100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -25,10 +25,6 @@ function directory_post(&$a) {
 
 function directory_content(&$a) {
 
-	$everything = (($a->argc > 1 && $a->argv[1] === 'all' && is_site_admin()) ? true : false);
-	if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
-		$everything = false;
-
 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
 		notice( t('Public access denied.') . EOL);
 		return;
@@ -52,12 +48,6 @@ function directory_content(&$a) {
 	}
 
 	$admin = '';
-	if(is_site_admin()) {
-		if($everything)
-			$admin =  '<ul><li><div id="directory-admin-link"><a href="' . $a->get_baseurl() . '/directory' . '">' . t('Normal site view') . '</a></div></li></ul>';
-		else
-			$admin = '<ul><li><div id="directory-admin-link"><a href="' . $a->get_baseurl() . '/directory/all' . '">' . t('Admin - View all site entries') . '</a></div></li></ul>';
-	}
 
 	$o .= replace_macros($tpl, array(
 		'$search' => $search,
@@ -73,17 +63,14 @@ function directory_content(&$a) {
 		$search = dbesc($search);
 	$sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `pdesc`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`,`pub_keywords`,`prv_keywords` ) AGAINST ('$search' IN BOOLEAN MODE) " : "");
 
-	$publish = ((get_config('system','publish_all') || $everything) ? '' : " AND `publish` = 1 " );
+	$publish = ((get_config('system','publish_all')) ? '' : " AND `publish` = 1 " );
 
 
 	$r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra ");
 	if(count($r))
 		$a->set_pager_total($r[0]['total']);
 
-	if($everything)
-		$order = " ORDER BY `register_date` DESC ";
-	else
-		$order = " ORDER BY `name` ASC "; 
+	$order = " ORDER BY `name` ASC "; 
 
 
 	$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` 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 ",
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 f510f793d..81ed174ac 100755..100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -16,7 +16,15 @@ function display_content(&$a) {
 
 	$o = '<div id="live-display"></div>' . "\r\n";
 
-	$a->page['htmlhead'] .= '<script>$(document).ready(function() {	$(".comment-edit-wrapper  textarea").contact_autocomplete(baseurl+"/acl"); });</script>';
+	$a->page['htmlhead'] .= <<<EOT
+<script>
+$(document).ready(function() {
+	$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+	// make auto-complete work in more places
+	$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+});
+</script>
+EOT;
 
 
 	$nick = (($a->argc > 1) ? $a->argv[1] : '');
@@ -85,7 +93,7 @@ function display_content(&$a) {
 		$o .= status_editor($a,$x,0,true);
 
 
-	$sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups);
+	$sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
 	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
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
new file mode 100644
index 000000000..c0cca9e6d
--- /dev/null
+++ b/mod/filer.php
@@ -0,0 +1,36 @@
+<?php
+
+require_once('include/security.php');
+require_once('include/bbcode.php');
+require_once('include/items.php');
+
+
+function filer_content(&$a) {
+
+	if(! local_user()) {
+		killme();
+	}
+
+	$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)){
+		// 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
new file mode 100644
index 000000000..c520fec7a
--- /dev/null
+++ b/mod/filerm.php
@@ -0,0 +1,21 @@
+<?php
+
+function filerm_content(&$a) {
+
+	if(! local_user()) {
+		killme();
+	}
+
+	$term = unxmlify(trim($_GET['term']));
+	$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
+
+	logger('filerm: tag ' . $term . ' item ' . $item_id);
+
+	if($item_id && strlen($term))
+		file_tag_unsave_file(local_user(),$item_id,$term);
+
+	if(x($_SESSION,'return_url'))
+		goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
+	
+	killme();
+}
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 13401ef0d..a282dbccf 100755..100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -21,6 +21,8 @@ function group_post(&$a) {
 	}
 
 	if(($a->argc == 2) && ($a->argv[1] === 'new')) {
+		check_form_security_token_redirectOnErr('/group/new', 'group_edit');
+		
 		$name = notags(trim($_POST['groupname']));
 		$r = group_add(local_user(),$name);
 		if($r) {
@@ -35,6 +37,8 @@ function group_post(&$a) {
 		return; // NOTREACHED
 	}
 	if(($a->argc == 2) && (intval($a->argv[1]))) {
+		check_form_security_token_redirectOnErr('/group', 'group_edit');
+		
 		$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($a->argv[1]),
 			intval(local_user())
@@ -62,7 +66,8 @@ function group_post(&$a) {
 }
 
 function group_content(&$a) {
-
+	$change = false;
+	
 	if(! local_user()) {
 		notice( t('Permission denied') . EOL);
 		return;
@@ -83,14 +88,17 @@ function group_content(&$a) {
 		
 		return replace_macros($tpl, $context + array(
 			'$title' => t('Create a group of contacts/friends.'),
-			'$gname' => array('groupname',t('Group Name: '),$group['name'], ''),
+			'$gname' => array('groupname',t('Group Name: '), '', ''),
 			'$gid' => 'new',
+			'$form_security_token' => get_form_security_token("group_edit"),
 		));
 
 
 	}
 
 	if(($a->argc == 3) && ($a->argv[1] === 'drop')) {
+		check_form_security_token_redirectOnErr('/group', 'group_drop', 't');
+		
 		if(intval($a->argv[2])) {
 			$r = q("SELECT `name` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 				intval($a->argv[2]),
@@ -108,6 +116,8 @@ function group_content(&$a) {
 	}
 
 	if(($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
+		check_form_security_token_ForbiddenOnErr('group_member_change', 't');
+		
 		$r = q("SELECT `id` FROM `contact` WHERE `id` = %d AND `uid` = %d and `self` = 0 and `blocked` = 0 AND `pending` = 0 LIMIT 1",
 			intval($a->argv[2]),
 			intval(local_user())
@@ -155,7 +165,8 @@ function group_content(&$a) {
 		$drop_tpl = get_markup_template('group_drop.tpl');
 		$drop_txt = replace_macros($drop_tpl, array(
 			'$id' => $group['id'],
-			'$delete' => t('Delete')
+			'$delete' => t('Delete'),
+			'$form_security_token' => get_form_security_token("group_drop"),
 		));
 
 		$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
@@ -166,6 +177,7 @@ function group_content(&$a) {
 			'$gname' => array('groupname',t('Group Name: '),$group['name'], ''),
 			'$gid' => $group['id'],
 			'$drop' => $drop_txt,
+			'$form_security_token' => get_form_security_token('group_edit'),
 		);
 
 	}
@@ -177,14 +189,14 @@ function group_content(&$a) {
 		'label_members' => t('Members'),
 		'members' => array(),
 		'label_contacts' => t('All Contacts'),
-		'contacts' => arraY(),
+		'contacts' => array(),
 	);
 		
-
+	$sec_token = addslashes(get_form_security_token('group_member_change'));
 	$textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false);
 	foreach($members as $member) {
 		if($member['url']) {
-			$member['click'] = 'groupChangeMember(' . $group['id'] . ',' . $member['id'] . '); return true;';
+			$member['click'] = 'groupChangeMember(' . $group['id'] . ',' . $member['id'] . ',\'' . $sec_token . '\'); return true;';
 			$groupeditor['members'][] = micropro($member,true,'mpgroup', $textmode);
 		}
 		else
@@ -199,7 +211,7 @@ function group_content(&$a) {
 		$textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
 		foreach($r as $member) {
 			if(! in_array($member['id'],$preselected)) {
-				$member['click'] = 'groupChangeMember(' . $group['id'] . ',' . $member['id'] . '); return true;';
+				$member['click'] = 'groupChangeMember(' . $group['id'] . ',' . $member['id'] . ',\'' . $sec_token . '\'); return true;';
 				$groupeditor['contacts'][] = micropro($member,true,'mpall', $textmode);
 			}
 		}
diff --git a/mod/hcard.php b/mod/hcard.php
index 19e649dcb..6d2d9e2eb 100755..100644
--- a/mod/hcard.php
+++ b/mod/hcard.php
@@ -21,7 +21,7 @@ function hcard_init(&$a) {
 	profile_load($a,$which,$profile);
 
 	if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
-		$a->page['htmlhead'] .= '<meta name="friendika.community" content="true" />';
+		$a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
 	}
 	if(x($a->profile,'openidserver'))				
 		$a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
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 81d7c753b..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,7 +243,6 @@ function item_post(&$a) {
 			}
 		}
 
-
 		if(! strlen($body)) {
 			if($preview)
 				killme();
@@ -253,6 +253,28 @@ function item_post(&$a) {
 		}
 	}
 
+        if(strlen($categories)) {
+	        // get the "fileas" tags for this post
+                $filedas = file_tag_file_to_list($categories, 'file');
+	}
+        // save old and new categories, so we can determine what needs to be deleted from pconfig
+        $categories_old = $categories;
+        $categories = file_tag_list_to_file(trim($_REQUEST['category']), 'category');
+        $categories_new = $categories;
+        if(strlen($filedas)) {
+	        // append the fileas stuff to the new categories list
+	        $categories .= file_tag_list_to_file($filedas, 'file');
+	}
+
+	// Work around doubled linefeeds in Tinymce 3.5b2
+	// First figure out if it's a status post that would've been
+	// created using tinymce. Otherwise leave it alone. 
+
+	$plaintext = (local_user() ? intval(get_pconfig(local_user(),'system','plaintext')) : 0);
+	if((! $parent) && (! $api_source) && (! $plaintext)) {
+		$body = str_replace("\r\n","\n",$body);
+		$body = str_replace("\n\n","\n",$body);
+	}
 
 
 	// get contact info for poster
@@ -425,110 +447,7 @@ function item_post(&$a) {
 
 	if(count($tags)) {
 		foreach($tags as $tag) {
-			
-			if(isset($profile))
-				unset($profile);
-			if(strpos($tag,'#') === 0) {
-				if(strpos($tag,'[url='))
-					continue;
-				$basetag = str_replace('_',' ',substr($tag,1));
-				$body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
-
-				$newtag = '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
-				if(! stristr($str_tags,$newtag)) {
-					if(strlen($str_tags))
-						$str_tags .= ',';
-					$str_tags .= $newtag;
-				} 
-				continue;
-			}
-			if(strpos($tag,'@') === 0) {
-				if(strpos($tag,'[url='))
-					continue;
-				$stat = false;
-				$name = substr($tag,1);
-				if((strpos($name,'@')) || (strpos($name,'http://'))) {
-					$newname = $name;
-					$links = @lrdd($name);
-					if(count($links)) {
-						foreach($links as $link) {
-							if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
-                    			$profile = $link['@attributes']['href'];
-							if($link['@attributes']['rel'] === 'salmon') {
-								if(strlen($inform))
-									$inform .= ',';
-                    			$inform .= 'url:' . str_replace(',','%2c',$link['@attributes']['href']);
-							}
-						}
-					}
-				}
-				else {
-					$newname = $name;
-					$alias = '';
-					$tagcid = 0;
-					if(strrpos($newname,'+')) {
-						$tagcid = intval(substr($newname,strrpos($newname,'+') + 1));
-						if(strpos($name,' '))
-							$name = substr($name,0,strpos($name,' '));
-					}	
-					if($tagcid) {
-						$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-							intval($tagcid),
-							intval($profile_uid)
-						);
-					}
-					elseif(strstr($name,'_') || strstr($name,' ')) {
-						$newname = str_replace('_',' ',$name);
-						$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
-							dbesc($newname),
-							intval($profile_uid)
-						);
-					}
-					else {
-						$r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
-							dbesc($name),
-							dbesc($name),
-							intval($profile_uid)
-						);
-					}
-					if(count($r)) {
-						$profile = $r[0]['url'];
-						if($r[0]['network'] === 'stat') {
-							$newname = $r[0]['nick'];
-							$stat = true;
-							if($r[0]['alias'])
-								$alias = $r[0]['alias'];
-						}
-						else
-							$newname = $r[0]['name'];
-						if(strlen($inform))
-							$inform .= ',';
-						$inform .= 'cid:' . $r[0]['id'];
-					}
-				}
-				if($profile) {
-					$body = str_replace('@' . $name, '@' . '[url=' . $profile . ']' . $newname	. '[/url]', $body);
-					$profile = str_replace(',','%2c',$profile);
-					$newtag = '@[url=' . $profile . ']' . $newname	. '[/url]';
-					if(! stristr($str_tags,$newtag)) {
-						if(strlen($str_tags))
-							$str_tags .= ',';
-						$str_tags .= $newtag;
-					}
-
-					// Status.Net seems to require the numeric ID URL in a mention if the person isn't 
-					// subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both. 
-
-					if(strlen($alias)) {
-						$newtag = '@[url=' . $alias . ']' . $newname	. '[/url]';
-						if(! stristr($str_tags,$newtag)) {
-							if(strlen($str_tags))
-								$str_tags .= ',';
-							$str_tags .= $newtag;
-						}
-					}
-				}
-			}
+			handle_tag($a, $body, $inform, $str_tags, $profile_uid, $tag); 
 		}
 	}
 
@@ -593,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;
@@ -627,7 +547,7 @@ function item_post(&$a) {
 
 	if($preview) {
 		require_once('include/conversation.php');
-		$o = conversation(&$a,array(array_merge($contact_record,$datarray)),'search',false,true);
+		$o = conversation($a,array(array_merge($contact_record,$datarray)),'search',false,true);
 		logger('preview: ' . $o);
 		echo json_encode(array('preview' => $o));
 		killme();
@@ -652,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);
@@ -673,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']),
@@ -712,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']));
@@ -721,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
@@ -922,3 +852,142 @@ function item_content(&$a) {
 		drop_item($a->argv[2]);
 	}
 }
+
+/**
+ * This function removes the tag $tag from the text $body and replaces it with 
+ * the appropiate link. 
+ * 
+ * @param unknown_type $body the text to replace the tag in
+ * @param unknown_type $inform a comma-seperated string containing everybody to inform
+ * @param unknown_type $str_tags string to add the tag to
+ * @param unknown_type $profile_uid
+ * @param unknown_type $tag the tag to replace
+ */
+function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
+	//is it a hash tag? 
+	if(strpos($tag,'#') === 0) {
+		//if the tag is replaced...
+		if(strpos($tag,'[url='))
+			//...do nothing
+			return;
+		//base tag has the tags name only
+		$basetag = str_replace('_',' ',substr($tag,1));
+		//create text for link
+		$newtag = '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+		//replace tag by the link
+		$body = str_replace($tag, $newtag, $body);
+	
+		//is the link already in str_tags?
+		if(! stristr($str_tags,$newtag)) {
+			//append or set str_tags
+			if(strlen($str_tags))
+				$str_tags .= ',';
+			$str_tags .= $newtag;
+		}
+		return;
+	}
+	//is it a person tag? 
+	if(strpos($tag,'@') === 0) {
+		//is it already replaced? 
+		if(strpos($tag,'[url='))
+			return;
+		$stat = false;
+		//get the person's name
+		$name = substr($tag,1);
+		//is it a link or a full dfrn address? 
+		if((strpos($name,'@')) || (strpos($name,'http://'))) {
+			$newname = $name;
+			//get the profile links
+			$links = @lrdd($name);
+			if(count($links)) {
+				//for all links, collect how is to inform and how's profile is to link
+				foreach($links as $link) {
+					if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
+						$profile = $link['@attributes']['href'];
+					if($link['@attributes']['rel'] === 'salmon') {
+						if(strlen($inform))
+							$inform .= ',';
+						$inform .= 'url:' . str_replace(',','%2c',$link['@attributes']['href']);
+					}
+				}
+			}
+		} else { //if it is a name rather than an address
+			$newname = $name;
+			$alias = '';
+			$tagcid = 0;
+			//is it some generated name?
+			if(strrpos($newname,'+')) {
+				//get the id
+				$tagcid = intval(substr($newname,strrpos($newname,'+') + 1));
+				//remove the next word from tag's name
+				if(strpos($name,' ')) {
+					$name = substr($name,0,strpos($name,' '));
+				}
+			}
+			if($tagcid) { //if there was an id
+				//select contact with that id from the logged in user's contact list
+				$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+						intval($tagcid),
+						intval($profile_uid)
+				);
+			} elseif(strstr($name,'_') || strstr($name,' ')) { //no id
+				//get the real name
+				$newname = str_replace('_',' ',$name);
+				//select someone from this user's contacts by name
+				$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
+						dbesc($newname),
+						intval($profile_uid)
+				);
+			} else {
+				//select someone by attag or nick and the name passed in
+				$r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
+						dbesc($name),
+						dbesc($name),
+						intval($profile_uid)
+				);
+			}
+			//$r is set, if someone could be selected
+			if(count($r)) {
+				$profile = $r[0]['url'];
+				//set newname to nick, find alias
+				if($r[0]['network'] === 'stat') {
+					$newname = $r[0]['nick'];
+					$stat = true;
+					if($r[0]['alias'])
+						$alias = $r[0]['alias'];
+				}
+				else
+					$newname = $r[0]['name'];
+				//add person's id to $inform
+				if(strlen($inform))
+					$inform .= ',';
+				$inform .= 'cid:' . $r[0]['id'];
+			}
+		}
+		//if there is an url for this persons profile
+		if(isset($profile)) {
+			//create profile link
+			$profile = str_replace(',','%2c',$profile);
+			$newtag = '@[url=' . $profile . ']' . $newname	. '[/url]';
+			$body = str_replace('@' . $name, $newtag, $body);
+			//append tag to str_tags
+			if(! stristr($str_tags,$newtag)) {
+				if(strlen($str_tags))
+					$str_tags .= ',';
+				$str_tags .= $newtag;
+			}
+	
+			// Status.Net seems to require the numeric ID URL in a mention if the person isn't
+			// subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both.
+	
+			if(strlen($alias)) {
+				$newtag = '@[url=' . $alias . ']' . $newname	. '[/url]';
+				if(! stristr($str_tags,$newtag)) {
+					if(strlen($str_tags))
+						$str_tags .= ',';
+					$str_tags .= $newtag;
+				}
+			}
+		}
+	}
+}
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 b71398fa4..57e6d6965 100755..100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -3,13 +3,13 @@
 
 function lostpass_post(&$a) {
 
-	$email = notags(trim($_POST['login-name']));
-	if(! $email)
+	$loginame = notags(trim($_POST['login-name']));
+	if(! $loginame)
 		goaway(z_root());
 
 	$r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) AND `verified` = 1 AND `blocked` = 0 LIMIT 1",
-		dbesc($email),
-		dbesc($email)
+		dbesc($loginame),
+		dbesc($loginame)
 	);
 
 	if(! count($r)) {
@@ -19,6 +19,7 @@ function lostpass_post(&$a) {
 
 	$uid = $r[0]['uid'];
 	$username = $r[0]['username'];
+	$email = $r[0]['email'];
 
 	$new_password = autoname(12) . mt_rand(100,9999);
 	$new_password_encoded = hash('whirlpool',$new_password);
diff --git a/mod/manage.php b/mod/manage.php
index ec4dcd8a0..84dfa6917 100755..100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -74,7 +74,7 @@ function manage_post(&$a) {
 	if($limited_id)
 		$_SESSION['submanage'] = $original_id;
 
-	goaway($a->get_baseurl() . '/profile/' . $a->user['nickname']);
+	goaway($a->get_baseurl(true) . '/profile/' . $a->user['nickname']);
 	// NOTREACHED
 }
 
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 4b494e906..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()) {
@@ -10,17 +39,26 @@ function message_post(&$a) {
 		return;
 	}
 
-	$replyto   = ((x($_POST,'replyto'))   ? notags(trim($_POST['replyto']))   : '');
-	$subject   = ((x($_POST,'subject'))   ? notags(trim($_POST['subject']))   : '');
-	$body      = ((x($_POST,'body'))      ? escape_tags(trim($_POST['body'])) : '');
-	$recipient = ((x($_POST,'messageto')) ? intval($_POST['messageto'])       : 0 );
+	$replyto   = ((x($_REQUEST,'replyto'))   ? notags(trim($_REQUEST['replyto']))   : '');
+	$subject   = ((x($_REQUEST,'subject'))   ? notags(trim($_REQUEST['subject']))   : '');
+	$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;
 
 	switch($ret){
 		case -1:
 			notice( t('No recipient selected.') . EOL );
+			$norecip = true;
 			break;
 		case -2:
 			notice( t('Unable to locate contact information.') . EOL );
@@ -35,6 +73,13 @@ function message_post(&$a) {
 			info( t('Message sent.') . EOL );
 	}
 
+	// fake it to go back to the input form if no recipient listed
+
+	if($norecip) {
+		$a->argc = 2;
+		$a->argv[1] = 'new';
+	}
+
 }
 
 function message_content(&$a) {
@@ -47,28 +92,10 @@ function message_content(&$a) {
 		return;
 	}
 
-	$myprofile = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
+	$myprofile = $a->get_baseurl(true) . '/profile/' . $a->user['nickname'];
+
 
 
-	$tabs = array(
-		array(
-			'label' => t('Inbox'),
-			'url'=> $a->get_baseurl() . '/message',
-			'sel'=> (($a->argc == 1) ? 'active' : ''),
-		),
-		array(
-			'label' => t('Outbox'),
-			'url' => $a->get_baseurl() . '/message/sent',
-			'sel'=> (($a->argv[1] == 'sent') ? 'active' : ''),
-		),
-		array(
-			'label' => t('New Message'),
-			'url' => $a->get_baseurl() . '/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');
@@ -90,7 +117,7 @@ function message_content(&$a) {
 			if($r) {
 				info( t('Message deleted.') . EOL );
 			}
-			goaway($a->get_baseurl() . '/message' );
+			goaway($a->get_baseurl(true) . '/message' );
 		}
 		else {
 			$r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -120,7 +147,7 @@ function message_content(&$a) {
 				if($r)
 					info( t('Conversation removed.') . EOL );
 			} 
-			goaway($a->get_baseurl() . '/message' );
+			goaway($a->get_baseurl(true) . '/message' );
 		}	
 	
 	}
@@ -129,23 +156,30 @@ function message_content(&$a) {
 		
 		$o .= $header;
 		
+		$plaintext = false;
+		if(intval(get_pconfig(local_user(),'system','plaintext')))
+			$plaintext = true;
+
+
 		$tpl = get_markup_template('msg-header.tpl');
 
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
-			'$baseurl' => $a->get_baseurl(),
+			'$baseurl' => $a->get_baseurl(true),
+			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 			'$nickname' => $a->user['nickname'],
 			'$linkurl' => t('Please enter a link URL:')
 		));
 	
 		$preselect = (isset($a->argv[2])?array($a->argv[2]):false);
 	
-		$select = contact_select('messageto','message-to-select', $preselect, 4, true);
+		$select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10);
 		$tpl = get_markup_template('prv_message.tpl');
 		$o .= replace_macros($tpl,array(
 			'$header' => t('Send Private Message'),
 			'$to' => t('To:'),
 			'$subject' => t('Subject:'),
-			'$subjtxt' => '',
+			'$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
+			'$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
 			'$readonly' => '',
 			'$yourmessage' => t('Your message:'),
 			'$select' => $select,
@@ -158,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()),
@@ -176,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` 
+			`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 `created` 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'])
 		);
@@ -191,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_url' => (($rr['network'] === NETWORK_DFRN) ? $a->get_baseurl() . '/redir/' . $rr['contact-id'] : $rr['url']),
+				'$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);	
@@ -251,49 +295,68 @@ function message_content(&$a) {
 	
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
 			'$nickname' => $a->user['nickname'],
-			'$baseurl' => $a->get_baseurl()
+			'$baseurl' => $a->get_baseurl(true)
 		));
 
 
-		$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 = '';
 			}
 			else {
-				$from_url = $a->get_baseurl() . '/redir/' . $message['contact-id'];
+				$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:'),
 			'$subjtxt' => template_escape($message['title']),
 			'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
 			'$yourmessage' => t('Your message:'),
+			'$text' => '',
 			'$select' => $select,
 			'$parent' => $parent,
 			'$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 894ac48ed..b12bd16da 100755..100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -44,21 +44,26 @@ function network_init(&$a) {
 	}
 	
 	$a->page['aside'] .= group_side('network','network',true,$group_id);
-	$a->page['aside'] .= networks_widget($a->get_baseurl() . '/network',(($_GET['nets']) ? $_GET['nets'] : ''));
+	$a->page['aside'] .= networks_widget($a->get_baseurl(true) . '/network',(x($_GET, 'nets') ? $_GET['nets'] : ''));
 	$a->page['aside'] .= saved_searches($search);
+	$a->page['aside'] .= fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : ''));
 
 }
 
 function saved_searches($search) {
 
-	$srchurl = '/network' 
-		. ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') 
-		. ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '')
-		. ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '')
-		. ((x($_GET,'conv')) ? '?conv=' . $_GET['conv'] : '')
-		. ((x($_GET,'nets')) ? '?nets=' . $_GET['nets'] : '')
-		. ((x($_GET,'cmin')) ? '?cmin=' . $_GET['cmin'] : '')
-		. ((x($_GET,'cmax')) ? '?cmax=' . $_GET['cmax'] : '');
+	$a = get_app();
+
+	$srchurl = '/network?f=' 
+		. ((x($_GET,'cid'))   ? '&cid='   . $_GET['cid']   : '') 
+		. ((x($_GET,'star'))  ? '&star='  . $_GET['star']  : '')
+		. ((x($_GET,'bmark')) ? '&bmark=' . $_GET['bmark'] : '')
+		. ((x($_GET,'conv'))  ? '&conv='  . $_GET['conv']  : '')
+		. ((x($_GET,'nets'))  ? '&nets='  . $_GET['nets']  : '')
+		. ((x($_GET,'cmin'))  ? '&cmin='  . $_GET['cmin']  : '')
+		. ((x($_GET,'cmax'))  ? '&cmax='  . $_GET['cmax']  : '')
+		. ((x($_GET,'file'))  ? '&file='  . $_GET['file']  : '');
+	;
 	
 	$o = '';
 
@@ -130,15 +135,15 @@ function network_content(&$a, $update = 0) {
 		$starred_active = 'active';
 	}
 	
-	if($_GET['bmark']) {
+	if(x($_GET,'bmark')) {
 		$bookmarked_active = 'active';
 	}
 
-	if($_GET['conv']) {
+	if(x($_GET,'conv')) {
 		$conv_active = 'active';
 	}
 
-	if($_GET['spam']) {
+	if(x($_GET,'spam')) {
 		$spam_active = 'active';
 	}
 
@@ -164,45 +169,49 @@ function network_content(&$a, $update = 0) {
 	$tabs = array(
 		array(
 			'label' => t('Commented Order'),
-			'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : ''), 
+			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?f=&cid=' . $_GET['cid'] : ''), 
 			'sel'=>$all_active,
 		),
 		array(
 			'label' => t('Posted Order'),
-			'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '?order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 
+			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 
 			'sel'=>$postord_active,
 		),
 
 		array(
 			'label' => t('Personal'),
-			'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&conv=1',
+			'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&conv=1',
 			'sel' => $conv_active,
 		),
 		array(
 			'label' => t('New'),
-			'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '/new' . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : ''),
+			'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . '/new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''),
 			'sel' => $new_active,
 		),
 		array(
 			'label' => t('Starred'),
-			'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&star=1',
+			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&star=1',
 			'sel'=>$starred_active,
 		),
 		array(
-			'label' => t('Bookmarks'),
-			'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&bmark=1',
+			'label' => t('Shared Links'),
+			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&bmark=1',
 			'sel'=>$bookmarked_active,
 		),	
 //		array(
 //			'label' => t('Spam'),
-//			'url'=>$a->get_baseurl() . '/network?f=&spam=1'
+//			'url'=>$a->get_baseurl(true) . '/network?f=&spam=1'
 //			'sel'=> $spam_active,
 //		),	
 
 
 	);
-	$tpl = get_markup_template('common_tabs.tpl');
-	$o .= replace_macros($tpl, array('$tabs'=>$tabs));
+
+	$arr = array('tabs' => $tabs);
+	call_hooks('network_tabs', $arr);
+
+	$o .= replace_macros(get_markup_template('common_tabs.tpl'), array('$tabs'=> $arr['tabs']));
+
 	// --- end item filter tabs
 
 
@@ -226,6 +235,7 @@ function network_content(&$a, $update = 0) {
 	$nets = ((x($_GET,'nets')) ? $_GET['nets'] : '');
 	$cmin = ((x($_GET,'cmin')) ? intval($_GET['cmin']) : 0);
 	$cmax = ((x($_GET,'cmax')) ? intval($_GET['cmax']) : 99);
+	$file = ((x($_GET,'file')) ? $_GET['file'] : '');
 
 	if(($a->argc > 2) && $a->argv[2] === 'new')
 		$nouveau = true;
@@ -239,13 +249,27 @@ function network_content(&$a, $update = 0) {
 		}
 	}
 
-	if(x($_GET,'search'))
+	if(x($_GET,'search') || x($_GET,'file'))
 		$nouveau = true;
 	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($group) {
 			if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
 				notice( sprintf( tt('Warning: This group contains %s member from an insecure network.',
 									'Warning: This group contains %s members from an insecure network.',
@@ -256,8 +280,6 @@ function network_content(&$a, $update = 0) {
 
 		nav_set_selected('network');
 
-		$_SESSION['return_url'] = $a->query_string;
-
 		$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
 		$x = array(
@@ -265,9 +287,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()
 		);
@@ -298,7 +320,7 @@ function network_content(&$a, $update = 0) {
 			if($update)
 				killme();
 			notice( t('No such group') . EOL );
-			goaway($a->get_baseurl() . '/network');
+			goaway($a->get_baseurl(true) . '/network');
 			// NOTREACHED
 		}
 
@@ -330,7 +352,7 @@ function network_content(&$a, $update = 0) {
 		}
 		else {
 			notice( t('Invalid contact.') . EOL);
-			goaway($a->get_baseurl() . '/network');
+			goaway($a->get_baseurl(true) . '/network');
 			// NOTREACHED
 		}
 	}
@@ -360,6 +382,7 @@ function network_content(&$a, $update = 0) {
 			. ((x($_GET,'nets'))   ? '&nets='   . $_GET['nets']   : '') 
 			. ((x($_GET,'cmin'))   ? '&cmin='   . $_GET['cmin']   : '') 
 			. ((x($_GET,'cmax'))   ? '&cmax='   . $_GET['cmax']   : '') 
+			. ((x($_GET,'file'))   ? '&file='   . $_GET['file']   : '') 
 
 			. "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 	}
@@ -373,6 +396,9 @@ function network_content(&$a, $update = 0) {
 			dbesc('\\]' . preg_quote($search) . '\\[')
 		);
 	}
+	if(strlen($file)) {
+		$sql_extra .= file_tag_file_query('item',unxmlify($file));
+	}
 
 	if($conv) {
 		$myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
@@ -405,7 +431,8 @@ function network_content(&$a, $update = 0) {
 
 		if(count($r)) {
 			$a->set_pager_total($r[0]['total']);
-			$a->set_pager_itemspage(40);
+	                $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
+                        $a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40));
 		}
 		$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
 	}
@@ -472,7 +499,7 @@ function network_content(&$a, $update = 0) {
 
 		if(count($r)) {
 			foreach($r as $rr)
-				if(! array_key_exists($rr['item_id'],$parents_arr))
+				if(! in_array($rr['item_id'],$parents_arr))
 					$parents_arr[] = $rr['item_id'];
 			$parents_str = implode(', ', $parents_arr);
 
@@ -492,7 +519,9 @@ function network_content(&$a, $update = 0) {
 
 			$items = conv_sort($items,$ordering);
 
-		}	
+		} else {
+			$items = array();
+		}
 	}
 
 
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 99031a1d5..690a99562 100755..100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -37,17 +37,21 @@ 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())
 				);
 			}
-			goaway($a->get_baseurl() . '/notifications/intros');
+			goaway($a->get_baseurl(true) . '/notifications/intros');
 		}
 		if($_POST['submit'] == t('Ignore')) {
 			$r = q("UPDATE `intro` SET `ignore` = 1 WHERE `id` = %d LIMIT 1",
 				intval($intro_id));
-			goaway($a->get_baseurl() . '/notifications/intros');
+			goaway($a->get_baseurl(true) . '/notifications/intros');
 		}
 	}
 }
@@ -69,32 +73,32 @@ function notifications_content(&$a) {
 	$tabs = array(
 		array(
 			'label' => t('System'),
-			'url'=>$a->get_baseurl() . '/notifications/system',
+			'url'=>$a->get_baseurl(true) . '/notifications/system',
 			'sel'=> (($a->argv[1] == 'system') ? 'active' : ''),
 		),
 		array(
 			'label' => t('Network'),
-			'url'=>$a->get_baseurl() . '/notifications/network',
+			'url'=>$a->get_baseurl(true) . '/notifications/network',
 			'sel'=> (($a->argv[1] == 'network') ? 'active' : ''),
 		),
 		array(
 			'label' => t('Personal'),
-			'url'=>$a->get_baseurl() . '/notifications/personal',
+			'url'=>$a->get_baseurl(true) . '/notifications/personal',
 			'sel'=> (($a->argv[1] == 'personal') ? 'active' : ''),
 		),
 		array(
 			'label' => t('Home'),
-			'url' => $a->get_baseurl() . '/notifications/home',
+			'url' => $a->get_baseurl(true) . '/notifications/home',
 			'sel'=> (($a->argv[1] == 'home') ? 'active' : ''),
 		),
 		array(
 			'label' => t('Introductions'),
-			'url' => $a->get_baseurl() . '/notifications/intros',
+			'url' => $a->get_baseurl(true) . '/notifications/intros',
 			'sel'=> (($a->argv[1] == 'intros') ? 'active' : ''),
 		),
 		array(
 			'label' => t('Messages'),
-			'url' => $a->get_baseurl() . '/message',
+			'url' => $a->get_baseurl(true) . '/message',
 			'sel'=> '',
 		),
 	);
@@ -143,9 +147,9 @@ function notifications_content(&$a) {
 						'$intro_id' => $rr['intro_id'],
 						'$madeby' => sprintf( t('suggested by %s'),$rr['name']),
 						'$contact_id' => $rr['contact-id'],
-						'$photo' => ((x($rr,'fphoto')) ? $rr['fphoto'] : "images/default-profile.jpg"),
+						'$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')),
 
@@ -191,11 +195,11 @@ function notifications_content(&$a) {
 					'$uid' => $_SESSION['uid'],
 					'$intro_id' => $rr['intro_id'],
 					'$contact_id' => $rr['contact-id'],
-					'$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/default-profile.jpg"),
+					'$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/person-175.jpg"),
 					'$fullname' => $rr['name'],
 					'$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
 					'$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')),
-					'$url' => $rr['url'],
+					'$url' => zrl($rr['url']),
 					'$knowyou' => $knowyou,
 					'$approve' => t('Approve'),
 					'$note' => $rr['note'],
@@ -244,7 +248,7 @@ function notifications_content(&$a) {
 				switch($it['verb']){
 					case ACTIVITY_LIKE:
 						$notif_content .= replace_macros($tpl_item_likes,array(
-							'$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+							'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
 							'$item_image' => $it['author-avatar'],
 							'$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']),
 							'$item_when' => relative_date($it['created'])
@@ -253,7 +257,7 @@ function notifications_content(&$a) {
 						
 					case ACTIVITY_DISLIKE:
 						$notif_content .= replace_macros($tpl_item_dislikes,array(
-							'$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+							'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
 							'$item_image' => $it['author-avatar'],
 							'$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']),
 							'$item_when' => relative_date($it['created'])
@@ -267,7 +271,7 @@ function notifications_content(&$a) {
 						$it['fname'] = $obj->title;
 						
 						$notif_content .= replace_macros($tpl_item_friends,array(
-							'$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+							'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
 							'$item_image' => $it['author-avatar'],
 							'$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']),
 							'$item_when' => relative_date($it['created'])
@@ -281,7 +285,7 @@ function notifications_content(&$a) {
 						$tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments);
 
 						$notif_content .= replace_macros($tpl,array(
-							'$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+							'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
 							'$item_image' => $it['author-avatar'],
 							'$item_text' => $item_text,
 							'$item_when' => relative_date($it['created'])
@@ -314,7 +318,7 @@ function notifications_content(&$a) {
 		if (count($r) > 0) {
 			foreach ($r as $it) {
 				$notif_content .= replace_macros($not_tpl,array(
-					'$item_link' => $a->get_baseurl().'/notify/view/'. $it['id'],
+					'$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'],
 					'$item_image' => $it['photo'],
 					'$item_text' => strip_tags(bbcode($it['msg'])),
 					'$item_when' => relative_date($it['date'])
@@ -334,7 +338,7 @@ function notifications_content(&$a) {
 		
 		$notif_tpl = get_markup_template('notifications.tpl');
 		
-		$myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
+		$myurl = $a->get_baseurl(true) . '/profile/'. $a->user['nickname'];
 		$myurl = substr($myurl,strpos($myurl,'://')+3);
 		$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
 		$diasp_url = str_replace('/profile/','/u/',$myurl);
@@ -369,7 +373,7 @@ function notifications_content(&$a) {
 				switch($it['verb']){
 					case ACTIVITY_LIKE:
 						$notif_content .= replace_macros($tpl_item_likes,array(
-							'$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+							'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
 							'$item_image' => $it['author-avatar'],
 							'$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']),
 							'$item_when' => relative_date($it['created'])
@@ -378,7 +382,7 @@ function notifications_content(&$a) {
 						
 					case ACTIVITY_DISLIKE:
 						$notif_content .= replace_macros($tpl_item_dislikes,array(
-							'$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+							'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
 							'$item_image' => $it['author-avatar'],
 							'$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']),
 							'$item_when' => relative_date($it['created'])
@@ -392,7 +396,7 @@ function notifications_content(&$a) {
 						$it['fname'] = $obj->title;
 						
 						$notif_content .= replace_macros($tpl_item_friends,array(
-							'$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+							'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
 							'$item_image' => $it['author-avatar'],
 							'$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']),
 							'$item_when' => relative_date($it['created'])
@@ -406,7 +410,7 @@ function notifications_content(&$a) {
 						$tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments);
 
 						$notif_content .= replace_macros($tpl,array(
-							'$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+							'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
 							'$item_image' => $it['author-avatar'],
 							'$item_text' => $item_text,
 							'$item_when' => relative_date($it['created'])
@@ -456,7 +460,7 @@ function notifications_content(&$a) {
 				switch($it['verb']){
 					case ACTIVITY_LIKE:
 						$notif_content .= replace_macros($tpl_item_likes,array(
-							'$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+							'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
 							'$item_image' => $it['author-avatar'],
 							'$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']),
 							'$item_when' => relative_date($it['created'])
@@ -465,7 +469,7 @@ function notifications_content(&$a) {
 						break;
 					case ACTIVITY_DISLIKE:
 						$notif_content .= replace_macros($tpl_item_dislikes,array(
-							'$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+							'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
 							'$item_image' => $it['author-avatar'],
 							'$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']),
 							'$item_when' => relative_date($it['created'])
@@ -479,7 +483,7 @@ function notifications_content(&$a) {
 						$it['fname'] = $obj->title;
 						
 						$notif_content .= replace_macros($tpl_item_friends,array(
-							'$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+							'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
 							'$item_image' => $it['author-avatar'],
 							'$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']),
 							'$item_when' => relative_date($it['created'])
@@ -488,7 +492,7 @@ function notifications_content(&$a) {
 						break;
 					default:
 						$notif_content .= replace_macros($tpl_item_comments,array(
-							'$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+							'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
 							'$item_image' => $it['author-avatar'],
 							'$item_text' => sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']),
 							'$item_when' => relative_date($it['created'])
diff --git a/mod/notify.php b/mod/notify.php
index a572b1534..ae8273a1d 100644
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -20,7 +20,7 @@ function notify_init(&$a) {
 			goaway($r[0]['link']);
 		}
 
-		goaway($a->get_baseurl());
+		goaway($a->get_baseurl(true));
 	}
 
 	if($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all' ) {
@@ -51,7 +51,7 @@ function notify_content(&$a) {
 		if (count($r) > 0) {
 			foreach ($r as $it) {
 				$notif_content .= replace_macros($not_tpl,array(
-					'$item_link' => $a->get_baseurl().'/notify/view/'. $it['id'],
+					'$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'],
 					'$item_image' => $it['photo'],
 					'$item_text' => strip_tags(bbcode($it['msg'])),
 					'$item_when' => relative_date($it['date'])
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 df074b299..e2cea7d85 100755..100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -10,68 +10,84 @@ function openid_content(&$a) {
 	if($noid)
 		goaway(z_root());
 
+	logger('mod_openid ' . print_r($_REQUEST,true), LOGGER_DATA);
+
 	if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) {
+
 		$openid = new LightOpenID;
 
 		if($openid->validate()) {
 
-			if(x($_SESSION,'register')) {
-				unset($_SESSION['register']);
-				$args = '';
-				$attr = $openid->getAttributes();
-				if(is_array($attr) && count($attr)) {
-					foreach($attr as $k => $v) {
-						if($k === 'namePerson/friendly')
-							$nick = notags(trim($v));
-						if($k === 'namePerson/first')
-							$first = notags(trim($v));
-						if($k === 'namePerson')
-							$args .= '&username=' . notags(trim($v));
-						if($k === 'contact/email')
-							$args .= '&email=' . notags(trim($v));
-						if($k === 'media/image/aspect11')
-							$photosq = bin2hex(trim($v));
-						if($k === 'media/image/default')
-							$photo = bin2hex(trim($v));
-					}
-				}
-				if($nick)
-					$args .= '&nickname=' . $nick;
-				elseif($first)
-					$args .= '&nickname=' . $first;
+			$authid = normalise_openid($_REQUEST['openid_identity']);
 
-				if($photosq)
-					$args .= '&photo=' . $photosq;
-				elseif($photo)
-					$args .= '&photo=' . $photo;
+			if(! strlen($authid)) {
+				logger( t('OpenID protocol error. No ID returned.') . EOL);
+				goaway(z_root());
+			}
 
-				$args .= '&openid_url=' . notags(trim($_SESSION['openid']));
-				if($a->config['register_policy'] != REGISTER_CLOSED)
-					goaway($a->get_baseurl() . '/register' . $args);
-				else
-					goaway(z_root());
+			$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` 
+				FROM `user` WHERE `openid` = '%s' AND `blocked` = 0 
+				AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
+				dbesc($authid)
+			);
 
-				// NOTREACHED
-			} 
+			if($r && count($r)) {
 
+				// successful OpenID login
 
-			$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` 
-				FROM `user` WHERE `openid` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
-				dbesc($_SESSION['openid'])
-			);
-			if(! count($r)) {
-				notice( t('Login failed.') . EOL );
+				unset($_SESSION['openid']);
+
+				require_once('include/security.php');
+				authenticate_success($r[0],true,true);
+
+				// just in case there was no return url set 
+				// and we fell through
+
+				goaway(z_root());
+			}
+
+			// Successful OpenID login - but we can't match it to an existing account.
+			// New registration?
+
+			if($a->config['register_policy'] == REGISTER_CLOSED) {
+				notice( t('Account not found and OpenID registration is not permitted on this site.') . EOL);
 				goaway(z_root());
-  			}
-			unset($_SESSION['openid']);
+			}
+
+			unset($_SESSION['register']);
+			$args = '';
+			$attr = $openid->getAttributes();
+			if(is_array($attr) && count($attr)) {
+				foreach($attr as $k => $v) {
+					if($k === 'namePerson/friendly')
+						$nick = notags(trim($v));
+					if($k === 'namePerson/first')
+						$first = notags(trim($v));
+					if($k === 'namePerson')
+						$args .= '&username=' . notags(trim($v));
+					if($k === 'contact/email')
+						$args .= '&email=' . notags(trim($v));
+					if($k === 'media/image/aspect11')
+						$photosq = bin2hex(trim($v));
+					if($k === 'media/image/default')
+						$photo = bin2hex(trim($v));
+				}
+			}
+			if($nick)
+				$args .= '&nickname=' . $nick;
+			elseif($first)
+				$args .= '&nickname=' . $first;
+
+			if($photosq)
+				$args .= '&photo=' . $photosq;
+			elseif($photo)
+				$args .= '&photo=' . $photo;
 
-			require_once('include/security.php');
-			authenticate_success($r[0],true,true);
+			$args .= '&openid_url=' . notags(trim($authid));
 
-			// just in case there was no return url set 
-			// and we fell through
+			goaway($a->get_baseurl() . '/register' . $args);
 
-			goaway(z_root());
+			// NOTREACHED
 		}
 	}
 	notice( t('Login failed.') . EOL);
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 e0b378f68..27dac4d5d 100755..100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -188,7 +188,7 @@ function parse_url_content(&$a) {
 
 	if(! $text) {
 		logger('parsing meta');
-		$items = $domhead->getElementsByTagName('meta');
+		$items = (isset($domhead) && is_object($domhead) ? $domhead->getElementsByTagName('meta') : null);
 		if($items) {
 			foreach($items as $item) {
 				$property = $item->getAttribute('property');
diff --git a/mod/photo.php b/mod/photo.php
index c4a93769a..3a7025120 100755..100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -23,7 +23,7 @@ function photo_init(&$a) {
 			// NOTREACHED
 	}
 
-	$default = 'images/default-profile.jpg';
+	$default = 'images/person-175.jpg';
 
 	if(isset($type)) {
 
@@ -39,12 +39,12 @@ function photo_init(&$a) {
 				break;
 			case 'micro':
 				$resolution = 6;
-				$default = 'images/default-profile-mm.jpg';
+				$default = 'images/person-48.jpg';
 				break;
 			case 'avatar':
 			default:
 				$resolution = 5;
-				$default = 'images/default-profile-sm.jpg';
+				$default = 'images/person-80.jpg';
 				break;
 		}
 
@@ -115,8 +115,24 @@ function photo_init(&$a) {
 	}
 
 	if(! isset($data)) {
-		killme();
-		// NOTREACHED
+		if(isset($resolution)) {
+			switch($resolution) {
+
+				case 4:
+					$data = file_get_contents('images/person-175.jpg');
+					break;
+				case 5:
+					$data = file_get_contents('images/person-80.jpg');
+					break;
+				case 6:
+					$data = file_get_contents('images/person-48.jpg');
+					break;
+				default:
+					killme();
+					// NOTREACHED
+					break;
+			}
+		}
 	}
 
 	if(isset($customres) && $customres > 0 && $customres < 500) {
diff --git a/mod/photos.php b/mod/photos.php
index e40ae0d74..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>';
 			}
@@ -1081,6 +1082,17 @@ function photos_content(&$a) {
 			
 		}
 
+		if(! $cmd !== 'edit') {
+			$a->page['htmlhead'] .= '<script>
+				$(document).keydown(function(event) {' . "\n";
+
+			if($prevlink)
+				$a->page['htmlhead'] .= 'if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = \'' . $prevlink . '\'; }' . "\n";
+			if($nextlink)
+				$a->page['htmlhead'] .= 'if(event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = \'' . $nextlink . '\'; }' . "\n";
+			$a->page['htmlhead'] .= '});</script>';
+		}
+
 		if($prevlink)
 			$prevlink = array($prevlink, '<div class="icon prev"></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 74e1a2302..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)
@@ -27,7 +32,7 @@ function profile_init(&$a) {
 	profile_load($a,$which,$profile);
 
 	if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
-		$a->page['htmlhead'] .= '<meta name="friendika.community" content="true" />';
+		$a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
 	}
 	if(x($a->profile,'openidserver'))				
 		$a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
@@ -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(
@@ -159,7 +174,7 @@ function profile_content(&$a, $update = 0) {
 	 * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
 	 */
 
-	$sql_extra = permissions_sql($a->profile['profile_uid'],$remote_contact,$groups);
+	$sql_extra = item_permissions_sql($a->profile['profile_uid'],$remote_contact,$groups);
 
 
 	if($update) {
@@ -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 e3dbdaf39..ace8dadd4 100755..100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -15,11 +15,13 @@ function profile_photo_init(&$a) {
 
 function profile_photo_post(&$a) {
 
-        if(! local_user()) {
-                notice ( t('Permission denied.') . EOL );
-                return;
-        }
-
+	if(! local_user()) {
+		notice ( t('Permission denied.') . EOL );
+		return;
+	}
+	
+	check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
+        
 	if((x($_POST,'cropfinal')) && ($_POST['cropfinal'] == 1)) {
 
 		// phase 2 - we have finished cropping
@@ -148,7 +150,9 @@ function profile_photo_content(&$a) {
 			notice( t('Permission denied.') . EOL );
 			return;
 		};
-			
+		
+//		check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
+        
 		$resource_id = $a->argv[2];
 		//die(":".local_user());
 		$r=q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' ORDER BY `scale` ASC",
@@ -203,6 +207,7 @@ function profile_photo_content(&$a) {
 			'$lbl_upfile' => t('Upload File:'),
 			'$title' => t('Upload Profile Photo'),
 			'$submit' => t('Upload'),
+			'$form_security_token' => get_form_security_token("profile_photo"),
 			'$select' => sprintf('%s %s', t('or'), ($newuser) ? '<a href="' . $a->get_baseurl() . '">' . t('skip this step') . '</a>' : '<a href="'. $a->get_baseurl() . '/photos/' . $a->user['nickname'] . '">' . t('select a photo from your photo albums') . '</a>')
 		));
 
@@ -218,6 +223,7 @@ function profile_photo_content(&$a) {
 			'$image_url' => $a->get_baseurl() . '/photo/' . $filename,
 			'$title' => t('Crop Image'),
 			'$desc' => t('Please adjust the image cropping for optimum viewing.'),
+			'$form_security_token' => get_form_security_token("profile_photo"),
 			'$done' => t('Done Editing')
 		));
 		return $o;
diff --git a/mod/profiles.php b/mod/profiles.php
index ccd7d5474..7b3b6ccc1 100755..100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -21,6 +21,9 @@ function profiles_post(&$a) {
 			notice( t('Profile not found.') . EOL);
 			return;
 		}
+		
+		check_form_security_token_redirectOnErr('/profiles', 'profile_edit');
+		
 		$is_default = (($orig[0]['is-default']) ? 1 : 0);
 
 		$profile_name = notags(trim($_POST['profile_name']));
@@ -237,9 +240,11 @@ function profiles_content(&$a) {
 		);
 		if(! count($r)) {
 			notice( t('Profile not found.') . EOL);
-			goaway($a->get_baseurl() . '/profiles');
+			goaway($a->get_baseurl(true) . '/profiles');
 			return; // NOTREACHED
 		}
+		
+		check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't');
 
 		// move every contact using this profile as their default to the user default
 
@@ -255,7 +260,7 @@ function profiles_content(&$a) {
 		if($r)
 			info( t('Profile deleted.') . EOL);
 
-		goaway($a->get_baseurl() . '/profiles');
+		goaway($a->get_baseurl(true) . '/profiles');
 		return; // NOTREACHED
 	}
 
@@ -264,6 +269,8 @@ function profiles_content(&$a) {
 
 
 	if(($a->argc > 1) && ($a->argv[1] === 'new')) {
+		
+		check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
 
 		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
 			intval(local_user()));
@@ -290,11 +297,14 @@ function profiles_content(&$a) {
 
 		info( t('New profile created.') . EOL);
 		if(count($r3) == 1)
-			goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']);
-		goaway($a->get_baseurl() . '/profiles');
-	}		 
+			goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
+		
+		goaway($a->get_baseurl(true) . '/profiles');
+	} 
 
 	if(($a->argc > 2) && ($a->argv[1] === 'clone')) {
+		
+		check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
 
 		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
 			intval(local_user()));
@@ -329,10 +339,12 @@ function profiles_content(&$a) {
 		);
 		info( t('New profile created.') . EOL);
 		if(count($r3) == 1)
-			goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']);
-	goaway($a->get_baseurl() . '/profiles');
-	return; // NOTREACHED
-	}		 
+			goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
+		
+		goaway($a->get_baseurl(true) . '/profiles');
+		
+		return; // NOTREACHED
+	}
 
 
 	if(($a->argc > 1) && (intval($a->argv[1]))) {
@@ -361,7 +373,7 @@ function profiles_content(&$a) {
 		));
 
 
-		$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
+		$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl(true)));
 		$a->page['htmlhead'] .= "<script type=\"text/javascript\" src=\"js/country.js\" ></script>";
 
 		$f = get_config('system','birthday_input_format');
@@ -371,6 +383,9 @@ function profiles_content(&$a) {
 		$is_default = (($r[0]['is-default']) ? 1 : 0);
 		$tpl = get_markup_template("profile_edit.tpl");
 		$o .= replace_macros($tpl,array(
+			'$form_security_token' => get_form_security_token("profile_edit"),
+			'$profile_clone_link' => 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone"),
+			'$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"),
 			'$banner' => t('Edit Profile Details'),
 			'$submit' => t('Submit'),
 			'$viewprof' => t('View this profile'),
@@ -410,7 +425,7 @@ function profiles_content(&$a) {
 			'$lbl_work' => t('Work/employment'),
 			'$lbl_school' => t('School/education'),
 			'$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''),
-			'$baseurl' => $a->get_baseurl(),
+			'$baseurl' => $a->get_baseurl(true),
 			'$profile_id' => $r[0]['id'],
 			'$profile_name' => $r[0]['profile-name'],
 			'$default' => (($is_default) ? '<p id="profile-edit-default-desc">' . t('This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.') . '</p>' : ""),
@@ -460,7 +475,8 @@ function profiles_content(&$a) {
 			$o .= replace_macros($tpl_header,array(
 				'$header' => t('Edit/Manage Profiles'),
 				'$chg_photo' => t('Change profile photo'),
-				'$cr_new' => t('Create New Profile')
+				'$cr_new' => t('Create New Profile'),
+				'$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new")
 			));
 
 
@@ -473,7 +489,7 @@ function profiles_content(&$a) {
 					'$alt' => t('Profile Image'),
 					'$profile_name' => $rr['profile-name'],
 					'$visible' => (($rr['is-default']) ? '<strong>' . t('visible to everybody') . '</strong>' 
-						: '<a href="' . $a->get_baseurl() . '/profperm/' . $rr['id'] . '" />' . t('Edit visibility') . '</a>')
+						: '<a href="' . $a->get_baseurl(true) . '/profperm/' . $rr['id'] . '" />' . t('Edit visibility') . '</a>')
 				));
 			}
 		}
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 388b3e250..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) {
@@ -150,6 +152,16 @@ function register_post(&$a) {
 	if(count($r))
 		$err .= t('Nickname is already registered. Please choose another.') . EOL;
 
+	// Check deleted accounts that had this nickname. Doesn't matter to us,
+	// but could be a security issue for federated platforms.
+
+	$r = q("SELECT * FROM `userd`
+               	WHERE `username` = '%s' LIMIT 1",
+               	dbesc($nickname)
+	);
+	if(count($r))
+		$err .= t('Nickname was once registered here and may not be re-used. Please choose another.') . EOL;
+
 	if(strlen($err)) {
 		notice( $err );
 		return;
@@ -208,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),
@@ -530,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 17e728ba2..21f41eb01 100755..100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -64,6 +64,11 @@ function user_allow($hash) {
 
 }
 
+
+// This does not have to go through user_remove() and save the nickname
+// permanently against re-registration, as the person was not yet
+// allowed to have friends on this system
+
 function user_deny($hash) {
 
 	$register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
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 fe09b671f..4ca7db9bb 100755..100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -93,33 +93,30 @@ function search_content(&$a) {
 		return $o;
 
 	// Here is the way permissions work in the search module...
-	// Only public wall posts can be shown
+	// Only public posts can be shown
 	// 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 (( `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `user`.`hidewall` = 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`,
@@ -127,12 +124,15 @@ function search_content(&$a) {
 		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 (( `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `user`.`hidewall` = 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
+		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 a9d00bc98..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']);
@@ -53,16 +66,20 @@ function settings_post(&$a) {
 	$old_page_flags = $a->user['page-flags'];
 
 	if(($a->argc > 1) && ($a->argv[1] === 'oauth') && x($_POST,'remove')){
+		check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
+		
 		$key = $_POST['remove'];
 		q("DELETE FROM tokens WHERE id='%s' AND uid=%d",
 			dbesc($key),
 			local_user());
-		goaway($a->get_baseurl()."/settings/oauth/");
+		goaway($a->get_baseurl(true)."/settings/oauth/");
 		return;			
 	}
 
 	if(($a->argc > 2) && ($a->argv[1] === 'oauth')  && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && x($_POST,'submit')) {
 		
+		check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
+		
 		$name   	= ((x($_POST,'name')) ? $_POST['name'] : '');
 		$key		= ((x($_POST,'key')) ? $_POST['key'] : '');
 		$secret		= ((x($_POST,'secret')) ? $_POST['secret'] : '');
@@ -100,18 +117,23 @@ function settings_post(&$a) {
 						local_user());
 			}
 		}
-		goaway($a->get_baseurl()."/settings/oauth/");
+		goaway($a->get_baseurl(true)."/settings/oauth/");
 		return;
 	}
 
 	if(($a->argc > 1) && ($a->argv[1] == 'addon')) {
+		check_form_security_token_redirectOnErr('/settings/addon', 'settings_addon');
+		
 		call_hooks('plugin_settings_post', $_POST);
 		return;
 	}
 
 	if(($a->argc > 1) && ($a->argv[1] == 'connectors')) {
-
-		if(x($_POST['imap-submit'])) {
+		
+		check_form_security_token_redirectOnErr('/settings/connectors', 'settings_connectors');
+		
+		if(x($_POST, 'imap-submit')) {
+			
 			$mail_server       = ((x($_POST,'mail_server')) ? $_POST['mail_server'] : '');
 			$mail_port         = ((x($_POST,'mail_port')) ? $_POST['mail_port'] : '');
 			$mail_ssl          = ((x($_POST,'mail_ssl')) ? strtolower(trim($_POST['mail_ssl'])) : '');
@@ -184,8 +206,49 @@ 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');
+	
 	call_hooks('settings_post', $_POST);
 
 	if((x($_POST,'npassword')) || (x($_POST,'confirm'))) {
@@ -217,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']))     : '');
@@ -232,10 +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;
 
 
 	$allow_location   = (((x($_POST,'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
@@ -245,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);
@@ -308,6 +368,7 @@ function settings_post(&$a) {
 	$str_contact_deny  = perms2str($_POST['contact_deny']);
 
 	$openidserver = $a->user['openidserver'];
+	$openid = normalise_openid($openid);
 
 	// If openid has changed or if there's an openid but no openidserver, try and discover it.
 
@@ -330,9 +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);
 
-	$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),
@@ -345,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)
@@ -396,7 +458,7 @@ function settings_post(&$a) {
 
 	}
 
-	goaway($a->get_baseurl() . '/settings' );
+	goaway($a->get_baseurl(true) . '/settings' );
 	return; // NOTREACHED
 }
 		
@@ -420,27 +482,33 @@ function settings_content(&$a) {
 	$tabs = array(
 		array(
 			'label'	=> t('Account settings'),
-			'url' 	=> $a->get_baseurl().'/settings',
+			'url' 	=> $a->get_baseurl(true).'/settings',
 			'sel'	=> (($a->argc == 1)?'active':''),
 		),	
 		array(
+			'label'	=> t('Display settings'),
+			'url' 	=> $a->get_baseurl(true).'/settings/display',
+			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
+		),	
+		
+		array(
 			'label'	=> t('Connector settings'),
-			'url' 	=> $a->get_baseurl().'/settings/connectors',
+			'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().'/settings/addon',
+			'url' 	=> $a->get_baseurl(true).'/settings/addon',
 			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
 		),
 		array(
 			'label' => t('Connections'),
-			'url' => $a->get_baseurl() . '/settings/oauth',
+			'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() . '/uexport',
+			'url' => $a->get_baseurl(true) . '/uexport',
 			'sel' => ''
 		)
 	);
@@ -455,6 +523,7 @@ function settings_content(&$a) {
 		if(($a->argc > 2) && ($a->argv[2] === 'add')) {
 			$tpl = get_markup_template("settings_oauth_edit.tpl");
 			$o .= replace_macros($tpl, array(
+				'$form_security_token' => get_form_security_token("settings_oauth"),
 				'$tabs'		=> $tabs,
 				'$title'	=> t('Add application'),
 				'$submit'	=> t('Submit'),
@@ -481,6 +550,7 @@ function settings_content(&$a) {
 			
 			$tpl = get_markup_template("settings_oauth_edit.tpl");
 			$o .= replace_macros($tpl, array(
+				'$form_security_token' => get_form_security_token("settings_oauth"),
 				'$tabs'		=> $tabs,
 				'$title'	=> t('Add application'),
 				'$submit'	=> t('Update'),
@@ -495,10 +565,12 @@ function settings_content(&$a) {
 		}
 		
 		if(($a->argc > 3) && ($a->argv[2] === 'delete')) {
+			check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth', 't');
+		
 			$r = q("DELETE FROM clients WHERE client_id='%s' AND uid=%d",
 					dbesc($a->argv[3]),
 					local_user());
-			goaway($a->get_baseurl()."/settings/oauth/");
+			goaway($a->get_baseurl(true)."/settings/oauth/");
 			return;			
 		}
 		
@@ -513,7 +585,8 @@ function settings_content(&$a) {
 		
 		$tpl = get_markup_template("settings_oauth.tpl");
 		$o .= replace_macros($tpl, array(
-			'$baseurl'	=> $a->get_baseurl(),
+			'$form_security_token' => get_form_security_token("settings_oauth"),
+			'$baseurl'	=> $a->get_baseurl(true),
 			'$title'	=> t('Connected Apps'),
 			'$add'		=> t('Add application'),
 			'$edit'		=> t('Edit'),
@@ -539,6 +612,7 @@ function settings_content(&$a) {
 		
 		$tpl = get_markup_template("settings_addons.tpl");
 		$o .= replace_macros($tpl, array(
+			'$form_security_token' => get_form_security_token("settings_addon"),
 			'$title'	=> t('Plugin Settings'),
 			'$tabs'		=> $tabs,
 			'$settings_addons' => $settings_addons
@@ -555,60 +629,134 @@ 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"),
+			
 			'$title'	=> t('Connector Settings'),
 			'$tabs'		=> $tabs,
 
-		'$diasp_enabled' => $diasp_enabled,
-		'$ostat_enabled' => $ostat_enabled,
+			'$diasp_enabled' => $diasp_enabled,
+			'$ostat_enabled' => $ostat_enabled,
+
+			'$h_imap' => t('Email/Mailbox Setup'),
+			'$imap_desc' => t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."),
+			'$imap_lastcheck' => array('imap_lastcheck', t('Last successful email check:'), $mail_chk,''),
+			'$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( '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'),
+			'$mail_pubmail'	=> array('mail_pubmail', t('Send public posts to all email contacts:'), $mail_pubmail, ''),
+			'$mail_action'	=> array('mail_action',	 t('Action after import:'), $mail_action, '', array(0=>t('None'), 1=>t('Delete'), 2=>t('Mark as seen'), 3=>t('Move to folder'))),
+			'$mail_movetofolder'	=> array('mail_movetofolder',	 t('Move to folder:'), $mail_movetofolder, ''),
+			'$submit' => t('Submit'),
 
-		'$h_imap' => t('Email/Mailbox Setup'),
-		'$imap_desc' => t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."),
-		'$imap_lastcheck' => array('imap_lastcheck', t('Last successful email check:'), $mail_chk,''),
-		'$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_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'),
-		'$mail_pubmail'	=> array('mail_pubmail', t('Send public posts to all email contacts:'), $mail_pubmail, ''),
-		'$mail_action'	=> array('mail_action',	 t('Action after import:'), $mail_action, '', array(0=>t('None'), 1=>t('Delete'), 2=>t('Mark as seen'), 3=>t('Move to folder'))),
-		'$mail_movetofolder'	=> array('mail_movetofolder',	 t('Move to folder:'), $mail_movetofolder, ''),
-		'$submit' => t('Submit'),
+			'$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);
 
-			'$settings_connectors' => $settings_connectors
+		
+		$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');
 
@@ -618,36 +766,37 @@ 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
+	$expire_items = (($expire_items===false)? '1' : $expire_items); // default if not set: 1
 	
 	$expire_notes = get_pconfig(local_user(), 'expire','notes');
-	$expire_notes = (($expire_notes===false)?1:$expire_notes); // default if not set: 1
+	$expire_notes = (($expire_notes===false)? '1' : $expire_notes); // default if not set: 1
 
 	$expire_starred = get_pconfig(local_user(), 'expire','starred');
-	$expire_starred = (($expire_starred===false)?1:$expire_starred); // default if not set: 1
+	$expire_starred = (($expire_starred===false)? '1' : $expire_starred); // default if not set: 1
 	
 	$expire_photos = get_pconfig(local_user(), 'expire','photos');
-	$expire_photos = (($expire_photos===false)?0:$expire_photos); // default if not set: 0
+	$expire_photos = (($expire_photos===false)? '0' : $expire_photos); // default if not set: 0
 
 
 	$suggestme = get_pconfig(local_user(), 'system','suggestme');
-	$suggestme = (($suggestme===false)?0:$suggestme); // default if not set: 0
+	$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
 	
 	if(! strlen($a->user['timezone']))
 		$timezone = date_default_timezone_get();
@@ -712,13 +861,13 @@ function settings_content(&$a) {
 	));
 
 	$blockwall = replace_macros($opt_tpl,array(
-			'$field' 	=> array('blockwall',  t('Allow friends to post to your profile page?'), ! $a->user['blockwall'], '', array(t('No'),t('Yes'))),
+			'$field' 	=> array('blockwall',  t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'),t('Yes'))),
 
 	));
  
 
 	$blocktags = replace_macros($opt_tpl,array(
-			'$field' 	=> array('blocktags',  t('Allow friends to tag your posts?'), ! $a->user['blocktags'], '', array(t('No'),t('Yes'))),
+			'$field' 	=> array('blocktags',  t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'),t('Yes'))),
 
 	));
 
@@ -729,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);
 
@@ -736,36 +891,10 @@ 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() . '/profile/' . $nickname : '');
+	$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl(true) . '/profile/' . $nickname : '');
 
 	$tpl_addr = get_markup_template("settings_nick_set.tpl");
 
@@ -795,8 +924,9 @@ function settings_content(&$a) {
 		'$ptitle' 	=> t('Account Settings'),
 
 		'$submit' 	=> t('Submit'),
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => $a->get_baseurl(true),
 		'$uid' => local_user(),
+		'$form_security_token' => get_form_security_token("settings"),
 		
 		'$nickname_block' => $prof_addr,
 		
@@ -812,8 +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')),
+		
 
 		'$h_prv' 	=> t('Security and Privacy Settings'),
 
@@ -831,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 bba527342..6c6098c83 100755..100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -16,10 +16,18 @@ function share_init(&$a) {
 
 	$o = '';
 
-	$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);
-	echo $o . '<br />';
+//	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 .= $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
new file mode 100644
index 000000000..ee00f5654
--- /dev/null
+++ b/spec/dfrn-snap2.jpg
diff --git a/spec/dfrn2.odt b/spec/dfrn2.odt
new file mode 100644
index 000000000..390fc4bb8
--- /dev/null
+++ b/spec/dfrn2.odt
diff --git a/spec/dfrn2.pdf b/spec/dfrn2.pdf
new file mode 100644
index 000000000..e46225f7e
--- /dev/null
+++ b/spec/dfrn2.pdf
diff --git a/zot.txt b/spec/zot.txt
index 2c3bbb180..2c3bbb180 100755..100644
--- a/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
new file mode 100644
index 000000000..c83e4a471
--- /dev/null
+++ b/tests/autoname_test.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * this file contains tests for the autoname function
+ * 
+ * @package test.util
+ */
+
+/** required, it is the file under test */
+require_once('include/text.php');
+
+/**
+ * TestCase for the autoname function
+ * 
+ * @author Alexander Kampmann
+ * @package test.util
+ */
+class AutonameTest extends PHPUnit_Framework_TestCase {
+	/**

+	 *autonames should be random, even length

+	 */

+	public function testAutonameEven() {

+		$autoname1=autoname(10);

+		$autoname2=autoname(10);

+	

+		$this->assertNotEquals($autoname1, $autoname2);

+	}

+	

+	/**

+	 *autonames should be random, odd length

+	 */

+	public function testAutonameOdd() {

+		$autoname1=autoname(9);

+		$autoname2=autoname(9);

+	

+		$this->assertNotEquals($autoname1, $autoname2);

+	}

+	

+	/**

+	 * try to fail autonames

+	 */

+	public function testAutonameNoLength() {

+		$autoname1=autoname(0);

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

+	}

+	
+	/**
+	 * try to fail it with invalid input
+	 * 
+	 * TODO: What's corect behaviour here? An exception?
+	 */

+	public function testAutonameNegativeLength() {

+		$autoname1=autoname(-23);

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

+	}

+	

+	// 	public function testAutonameMaxLength() {

+	// 		$autoname2=autoname(PHP_INT_MAX);

+	// 		$this->assertEquals(PHP_INT_MAX, count($autoname2));

+	// 	}

+	
+	/**
+	 * test with a length, that may be too short
+	 */

+	public function testAutonameLength1() {

+		$autoname1=autoname(1);

+		$this->assertEquals(1, count($autoname1));
+		
+		$autoname2=autoname(1);

+		$this->assertEquals(1, count($autoname2));
+		
+		$this->assertFalse($autoname1==$autoname2); 

+	}
+}
\ No newline at end of file
diff --git a/tests/contains_attribute_test.php b/tests/contains_attribute_test.php
new file mode 100644
index 000000000..b0bb06acf
--- /dev/null
+++ b/tests/contains_attribute_test.php
@@ -0,0 +1,51 @@
+<?php
+/**

+ * this test tests the contains_attribute function

+ *

+ * @package test.util

+ */

+

+/** required, it is the file under test */

+require_once('include/text.php');

+

+/**

+ * TestCase for the contains_attribute function

+ *

+ * @author Alexander Kampmann

+ * @package test.util

+ */

+class ContainsAttributeTest extends PHPUnit_Framework_TestCase {
+	/**

+	 * test attribute contains

+	 */

+	public function testAttributeContains1() {

+		$testAttr="class1 notclass2 class3";

+		$this->assertTrue(attribute_contains($testAttr, "class3"));

+		$this->assertFalse(attribute_contains($testAttr, "class2"));

+	}

+	

+	/**

+	 * test attribute contains

+	 */

+	public function testAttributeContains2() {

+		$testAttr="class1 not-class2 class3";

+		$this->assertTrue(attribute_contains($testAttr, "class3"));

+		$this->assertFalse(attribute_contains($testAttr, "class2"));

+	}

+	
+	/**
+	 * test with empty input
+	 */

+	public function testAttributeContainsEmpty() {

+		$testAttr="";

+		$this->assertFalse(attribute_contains($testAttr, "class2"));

+	}

+	
+	/**
+	 * test input with special chars
+	 */

+	public function testAttributeContainsSpecialChars() {

+		$testAttr="--... %\$ä() /(=?}";

+		$this->assertFalse(attribute_contains($testAttr, "class2"));

+	}
+}
\ No newline at end of file
diff --git a/tests/expand_acl_test.php b/tests/expand_acl_test.php
new file mode 100644
index 000000000..154bc921d
--- /dev/null
+++ b/tests/expand_acl_test.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * this test tests the expand_acl function
+ *
+ * @package test.util
+ */
+
+/** required, it is the file under test */
+require_once('include/text.php');
+
+/**

+ * TestCase for the expand_acl function

+ *

+ * @author Alexander Kampmann

+ * @package test.util

+ */

+class ExpandAclTest extends PHPUnit_Framework_TestCase {
+	
+	/**

+	 * test expand_acl, perfect input

+	 */

+	public function testExpandAclNormal() {

+		$text='<1><2><3>';

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

+	}

+	
+	/**
+	 * test with a big number
+	 */

+	public function testExpandAclBigNumber() {

+		$text='<1><'.PHP_INT_MAX.'><15>';

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

+	}

+	
+	/**
+	 * test with a string in it. 
+	 * 
+	 * TODO: is this valid input? Otherwise: should there be an exception?
+	 */

+	public function testExpandAclString() {

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

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

+	}

+	
+	/**
+	 * test with a ' ' in it. 
+	 * 
+	 * TODO: is this valid input? Otherwise: should there be an exception?
+	 */

+	public function testExpandAclSpace() {

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

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

+	}

+	
+	/**
+	 * test empty input
+	 */

+	public function testExpandAclEmpty() {

+		$text=""; 

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

+	}

+	
+	/**
+	 * test invalid input, no < at all
+	 * 
+	 * TODO: should there be an exception?
+	 */

+	public function testExpandAclNoBrackets() {

+		$text="According to documentation, that's invalid. "; //should be invalid

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

+	}

+	
+	/**

+	 * test invalid input, just open <

+	 *

+	 * TODO: should there be an exception?

+	 */

+	public function testExpandAclJustOneBracket1() {

+		$text="<Another invalid string"; //should be invalid

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

+	}

+	
+	/**

+	 * test invalid input, just close >

+	 *

+	 * TODO: should there be an exception?

+	 */

+	public function testExpandAclJustOneBracket2() {

+		$text="Another invalid> string"; //should be invalid

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

+	}

+	
+	/**

+	 * test invalid input, just close >

+	 *

+	 * TODO: should there be an exception?

+	 */

+	public function testExpandAclCloseOnly() {

+		$text="Another> invalid> string>"; //should be invalid

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

+	}

+	
+	/**

+	 * test invalid input, just open <

+	 *

+	 * TODO: should there be an exception?

+	 */

+	public function testExpandAclOpenOnly() {

+		$text="<Another< invalid string<"; //should be invalid

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

+	}

+	
+	/**

+	 * test invalid input, open and close do not match

+	 *

+	 * TODO: should there be an exception?

+	 */

+	public function testExpandAclNoMatching1() {

+		$text="<Another<> invalid <string>"; //should be invalid

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

+	}

+	
+	/**

+	 * test invalid input, open and close do not match

+	 *

+	 * TODO: should there be an exception?

+	 */

+	public function testExpandAclNoMatching2() {

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

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

+	}
+	
+	/**

+	 * test invalid input, empty <>

+	 *

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

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

+	public function testExpandAclEmptyMatch() {

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

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

+	}
+}
\ No newline at end of file
diff --git a/tests/get_tags_test.php b/tests/get_tags_test.php
new file mode 100644
index 000000000..e5c6485de
--- /dev/null
+++ b/tests/get_tags_test.php
@@ -0,0 +1,326 @@
+<?php
+/**
+ * This file contains the tests for get_tags and the tag handling in item.php
+ * 
+ * @package test.util
+ */
+
+/**
+ * required, because it contains the get_tags() function
+ */
+require_once 'include/text.php';
+/**
+ * required, because it contains the tag handling
+ */
+require_once 'mod/item.php';
+
+/**
+ * A class which can be used as replacement for an app if
+ * only get_baseurl is used. 
+ * 
+ * @author Alexander Kampmann
+ * @package test.util
+ */
+class MockApp {
+	function get_baseurl() {
+		return "baseurl"; 
+	}
+}; 
+
+/**
+ * the test should not rely on a database, 
+ * so this is a replacement for the database access method q. 
+ * 
+ * It simulates the user with uid 11 has one contact, named Mike Lastname. 
+ * 
+ * @param string $sql
+ */
+function q($sql) {
+	$result=array(array('id'=>15, 
+			'attag'=>'', 'network'=>'dfrn', 
+			'name'=>'Mike Lastname', 'alias'=>'Mike', 
+			'nick'=>'Mike', 'url'=>"http://justatest.de")); 
+	
+	$args=func_get_args(); 
+
+	//last parameter is always (in this test) uid, so, it should be 11
+	if($args[count($args)-1]!=11) {
+		return; 
+	}
+	
+	
+	if(3==count($args)) {
+		//first call in handle_body, id only
+		if($result[0]['id']==$args[1]) {
+			return $result; 
+		}
+		//second call in handle_body, name
+		if($result[0]['name']===$args[1]) {

+			return $result;

+		}
+	}
+	//third call in handle_body, nick or attag
+	if($result[0]['nick']===$args[2] || $result[0]['attag']===$args[1]) {

+		return $result;

+	}
+}
+
+/**
+ * replacement for dbesc. 
+ * I don't want to test dbesc here, so
+ * I just return the input. It won't be a problem, because 
+ * the test does not use a real database. 
+ * 
+ * DON'T USE HAT FUNCTION OUTSIDE A TEST!
+ * 
+ * @param string $str
+ * @return input
+ */
+function dbesc($str) {
+	return $str; 
+}
+
+/**
+ * TestCase for tag handling. 
+ * 
+ * @author alexander
+ * @package test.util
+ */
+class GetTagsTest extends PHPUnit_Framework_TestCase {
+	/** the mock to use as app */
+	private $a; 

+
+	/**
+	 * initialize the test. That's a phpUnit function, 
+	 * don't change its name.
+	 */

+	public function setUp() {

+		$this->a=new MockApp(); 
+	}
+
+	/**

+	 * test with one Person tag

+	 */

+	public function testGetTagsShortPerson() {

+		$text="hi @Mike";

+

+		$tags=get_tags($text);

+
+		$inform=''; 
+		$str_tags='';
+		foreach($tags as $tag) {
+			handle_tag($this->a, $text, $inform, $str_tags, 11, $tag);
+		}
+
+		//correct tags found?
+		$this->assertEquals(1, count($tags)); 

+		$this->assertTrue(in_array("@Mike", $tags));
+		
+		//correct output from handle_tag?
+		$this->assertEquals("cid:15", $inform); 
+		$this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags);
+		$this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url]", $text);

+	}
+	
+	/**

+	 * test with one Person tag. 
+	 * There's a minor spelling mistake...

+	 */

+	public function testGetTagsShortPersonSpelling() {

+		$text="hi @Mike.because";

+	

+		$tags=get_tags($text);

+	
+		//correct tags found?

+		$this->assertEquals(1, count($tags));

+		$this->assertTrue(in_array("@Mike.because", $tags));
+		

+		$inform='';

+		$str_tags='';

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

+	

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

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

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

+	 */

+
+	public function testGetTagsPerson2Spelling() {

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

+	

+		$tags=get_tags($text);

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

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

+	}

+
+	/**
+	 * Test with one hash tag.
+	 */

+	public function testGetTagsShortTag() {

+		$text="This is a #test_case";

+

+		$tags=get_tags($text);

+
+		$this->assertEquals(1, count($tags));

+		$this->assertTrue(in_array("#test_case", $tags));

+	}

+
+	/**
+	 * test with a person and a hash tag
+	 */

+	public function testGetTagsShortTagAndPerson() {

+		$text="hi @Mike This is a #test_case";

+

+		$tags=get_tags($text);

+
+		$this->assertEquals(3, count($tags));
+		$this->assertTrue(in_array("@Mike", $tags));
+		$this->assertTrue(in_array("@Mike This", $tags));

+		$this->assertTrue(in_array("#test_case", $tags));

+
+		$inform='';
+		$str_tags='';
+		foreach($tags as $tag) {
+			handle_tag($this->a, $text, $inform, $str_tags, 11, $tag);
+		}
+		

+		$this->assertEquals("cid:15", $inform); 
+		$this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url],#[url=baseurl/search?search=test%20case]test case[/url]", $str_tags);
+		$this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url] This is a #[url=baseurl/search?search=test%20case]test case[/url]", $text); 
+		

+	}

+
+	/**
+	 * test with a person, a hash tag and some special chars.
+	 */

+	public function testGetTagsShortTagAndPersonSpecialChars() {

+		$text="hi @Mike, This is a #test_case.";

+

+		$tags=get_tags($text);

+

+		$this->assertEquals(2, count($tags));
+		$this->assertTrue(in_array("@Mike", $tags));
+		$this->assertTrue(in_array("#test_case", $tags));

+	}

+
+	/**
+	 * Test with a person tag and text behind it.
+	 */

+	public function testGetTagsPersonOnly() {

+		$text="@Test I saw the Theme Dev group was created.";

+

+		$tags=get_tags($text);

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

+		$this->assertTrue(in_array("@Test I", $tags));
+		$this->assertTrue(in_array("@Test", $tags));

+	}

+
+	/**
+	 * this test demonstrates strange behaviour by intval. 
+	 * It makes the next test fail. 
+	 */
+	public function testIntval() {
+		$this->assertEquals(15, intval("15 it")); 
+	}
+	
+	/**
+	 * test a tag with an id in it
+	 */
+	public function testIdTag() {
+		$text="Test with @mike+15 id tag"; 
+		
+		$tags=get_tags($text); 
+		
+		$this->assertEquals(2, count($tags)); 
+		$this->assertTrue(in_array("@mike+15", $tags));
+		
+		//happens right now, but it shouldn't be necessary
+		$this->assertTrue(in_array("@mike+15 id", $tags));
+		
+		$inform='';

+		$str_tags='';
+		foreach($tags as $tag) {
+			handle_tag($this->a, $text, $inform, $str_tags, 11, $tag);
+		}
+		
+		$this->assertEquals("Test with @[url=http://justatest.de]Mike Lastname[/url] id tag", $text);

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

+		// this test may produce two cid:15 entries - which is OK because duplicates are pruned before delivery
+		$this->assertContains("cid:15",$inform);
+	}
+	
+	/**
+	 * test with two persons and one special tag.
+	 */

+	public function testGetTags2Persons1TagSpecialChars() {

+		$text="hi @Mike, I'm just writing #test_cases, so"

+		." so @somebody@friendica.com may change #things.";

+

+		$tags=get_tags($text);

+
+		$this->assertEquals(5, count($tags));

+		$this->assertTrue(in_array("@Mike", $tags));

+		$this->assertTrue(in_array("#test_cases", $tags));
+		$this->assertTrue(in_array("@somebody@friendica.com", $tags));

+		$this->assertTrue(in_array("@somebody@friendica.com may", $tags));

+		$this->assertTrue(in_array("#things", $tags));

+	}

+
+	/**
+	 * test with a long text.
+	 */

+	public function testGetTags() {

+		$text="hi @Mike, I'm just writing #test_cases, "

+		." so @somebody@friendica.com may change #things. Of course I "

+		."look for a lot of #pitfalls, like #tags at the end of a sentence "

+		."@comment. I hope noone forgets about @fullstops.because that might"

+		." break #things. @Mike@campino@friendica.eu is also #nice, isn't it? "

+		."Now, add a @first_last tag. ";

+		

+		$tags=get_tags($text);

+

+		$this->assertTrue(in_array("@Mike", $tags));

+		$this->assertTrue(in_array("#test_cases", $tags));

+		$this->assertTrue(in_array("@somebody@friendica.com", $tags));

+		$this->assertTrue(in_array("#things", $tags));

+		$this->assertTrue(in_array("#pitfalls", $tags));

+		$this->assertTrue(in_array("#tags", $tags));

+		$this->assertTrue(in_array("@comment", $tags));

+		$this->assertTrue(in_array("@fullstops.because", $tags));

+		$this->assertTrue(in_array("#things", $tags));

+		$this->assertTrue(in_array("@Mike", $tags));

+		$this->assertTrue(in_array("#nice", $tags));

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

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

+	}

+
+	/**
+	 * test with an empty string
+	 */

+	public function testGetTagsEmpty() {

+		$tags=get_tags("");

+		$this->assertEquals(0, count($tags));

+	}
+}
\ No newline at end of file
diff --git a/tests/template_test.php b/tests/template_test.php
new file mode 100644
index 000000000..1f9f80531
--- /dev/null
+++ b/tests/template_test.php
@@ -0,0 +1,224 @@
+<?php
+/**

+ * this file contains tests for the template engine

+ *

+ * @package test.util

+ */

+

+/** required, it is the file under test */

+require_once('include/template_processor.php');
+require_once('include/text.php');
+
+class TemplateMockApp {
+	public $theme_info=array();
+}
+
+if(!function_exists('current_theme')) {
+function current_theme() {

+	return 'clean';

+}
+}
+
+if(!function_exists('x')) {
+function x($s,$k = NULL) {
+	return false;
+}
+}
+
+if(!function_exists('get_app')) {
+function get_app() {
+	return new TemplateMockApp();
+}
+}
+
+/**

+ * TestCase for the template engine

+ *

+ * @author Alexander Kampmann

+ * @package test.util

+ */

+class TemplateTest extends PHPUnit_Framework_TestCase {
+
+	public function setUp() {
+		global $t;
+		$t=new Template;
+	}
+
+	public function testListToShort() {
+		@list($first, $second)=array('first');
+
+		$this->assertTrue(is_null($second));
+	}
+
+	public function testSimpleVariableString() {
+		$tpl='Hello $name!';
+
+		$text=replace_macros($tpl, array('$name'=>'Anna'));
+
+		$this->assertEquals('Hello Anna!', $text);
+	}
+
+	public function testSimpleVariableInt() {

+		$tpl='There are $num new messages!';

+

+		$text=replace_macros($tpl, array('$num'=>172));

+

+		$this->assertEquals('There are 172 new messages!', $text);

+	}
+
+	public function testConditionalElse() {

+		$tpl='There{{ if $num!=1 }} are $num new messages{{ else }} is 1 new message{{ endif }}!';

+

+		$text1=replace_macros($tpl, array('$num'=>1));
+		$text22=replace_macros($tpl, array('$num'=>22));

+

+		$this->assertEquals('There is 1 new message!', $text1);
+		$this->assertEquals('There are 22 new messages!', $text22);

+	}
+
+	public function testConditionalNoElse() {

+		$tpl='{{ if $num!=0 }}There are $num new messages!{{ endif }}';

+

+		$text0=replace_macros($tpl, array('$num'=>0));

+		$text22=replace_macros($tpl, array('$num'=>22));

+

+		$this->assertEquals('', $text0);

+		$this->assertEquals('There are 22 new messages!', $text22);

+	}
+
+	public function testConditionalFail() {

+		$tpl='There {{ if $num!=1 }} are $num new messages{{ else }} is 1 new message{{ endif }}!';

+

+		$text1=replace_macros($tpl, array());

+

+		//$this->assertEquals('There is 1 new message!', $text1);

+	}
+
+	public function testSimpleFor() {

+		$tpl='{{ for $messages as $message }} $message {{ endfor }}';

+

+		$text=replace_macros($tpl, array('$messages'=>array('message 1', 'message 2')));

+

+		$this->assertEquals(' message 1  message 2 ', $text);

+	}
+
+	public function testFor() {

+		$tpl='{{ for $messages as $message }} from: $message.from to $message.to {{ endfor }}';

+

+		$text=replace_macros($tpl, array('$messages'=>array(array('from'=>'Mike', 'to'=>'Alex'), array('from'=>'Alex', 'to'=>'Mike'))));

+

+		$this->assertEquals(' from: Mike to Alex  from: Alex to Mike ', $text);

+	}
+	
+	public function testKeyedFor() {

+		$tpl='{{ for $messages as $from=>$to }} from: $from to $to {{ endfor }}';

+	

+		$text=replace_macros($tpl, array('$messages'=>array('Mike'=>'Alex', 'Sven'=>'Mike')));

+	

+		$this->assertEquals(' from: Mike to Alex  from: Sven to Mike ', $text);

+	}
+
+	public function testForEmpty() {

+		$tpl='messages: {{for $messages as $message}} from: $message.from to $message.to  {{ endfor }}';

+

+		$text=replace_macros($tpl, array('$messages'=>array()));

+

+		$this->assertEquals('messages: ', $text);

+	}
+
+	public function testForWrongType() {

+		$tpl='messages: {{for $messages as $message}} from: $message.from to $message.to  {{ endfor }}';

+

+		$text=replace_macros($tpl, array('$messages'=>11));

+

+		$this->assertEquals('messages: ', $text);

+	}
+
+	public function testForConditional() {

+		$tpl='new messages: {{for $messages as $message}}{{ if $message.new }} $message.text{{endif}}{{ endfor }}';

+

+		$text=replace_macros($tpl, array('$messages'=>array(
+				array('new'=>true, 'text'=>'new message'),
+				array('new'=>false, 'text'=>'old message'))));

+

+		$this->assertEquals('new messages:  new message', $text);

+	}
+	
+	public function testConditionalFor() {

+		$tpl='{{ if $enabled }}new messages:{{for $messages as $message}} $message.text{{ endfor }}{{endif}}';

+	

+		$text=replace_macros($tpl, array('$enabled'=>true, 
+				'$messages'=>array(

+				array('new'=>true, 'text'=>'new message'),

+				array('new'=>false, 'text'=>'old message'))));

+	

+		$this->assertEquals('new messages: new message old message', $text);

+	}
+
+	public function testFantasy() {

+		$tpl='Fantasy: {{fantasy $messages}}';

+

+		$text=replace_macros($tpl, array('$messages'=>'no no'));

+

+		$this->assertEquals('Fantasy: {{fantasy no no}}', $text);

+	}
+
+	public function testInc() {

+		$tpl='{{inc field_input.tpl with $field=$myvar}}{{ endinc }}';

+

+		$text=replace_macros($tpl, array('$myvar'=>array('myfield', 'label', 'value', 'help')));

+

+		$this->assertEquals("	\n"
+				."	<div class='field input'>\n"
+				."		<label for='id_myfield'>label</label>\n"
+				."		<input name='myfield' id='id_myfield' value=\"value\">\n"
+				."		<span class='field_help'>help</span>\n"
+				."	</div>\n", $text);

+	}
+
+	public function testIncNoVar() {

+		$tpl='{{inc field_input.tpl }}{{ endinc }}';

+

+		$text=replace_macros($tpl, array('$field'=>array('myfield', 'label', 'value', 'help')));

+

+		$this->assertEquals("	\n	<div class='field input'>\n		<label for='id_myfield'>label</label>\n"

+				."		<input name='myfield' id='id_myfield' value=\"value\">\n"

+				."		<span class='field_help'>help</span>\n"

+				."	</div>\n", $text);

+	}
+	
+	public function testDoubleUse() {

+		$tpl='Hello $name! {{ if $enabled }} I love you! {{ endif }}';

+	

+		$text=replace_macros($tpl, array('$name'=>'Anna', '$enabled'=>false));

+	

+		$this->assertEquals('Hello Anna! ', $text);
+		
+		$tpl='Hey $name! {{ if $enabled }} I hate you! {{ endif }}';

+		

+		$text=replace_macros($tpl, array('$name'=>'Max', '$enabled'=>true));

+		

+		$this->assertEquals('Hey Max!  I hate you! ', $text);

+	}
+	
+	public function testIncDouble() {

+		$tpl='{{inc field_input.tpl with $field=$var1}}{{ endinc }}'
+		.'{{inc field_input.tpl with $field=$var2}}{{ endinc }}';

+	

+		$text=replace_macros($tpl, array('$var1'=>array('myfield', 'label', 'value', 'help'), 
+				'$var2'=>array('myfield2', 'label2', 'value2', 'help2')));

+		

+		$this->assertEquals("	\n"

+				."	<div class='field input'>\n"

+				."		<label for='id_myfield'>label</label>\n"

+				."		<input name='myfield' id='id_myfield' value=\"value\">\n"

+				."		<span class='field_help'>help</span>\n"

+				."	</div>\n"
+				."	\n"
+				."	<div class='field input'>\n"
+				."		<label for='id_myfield2'>label2</label>\n"
+				."		<input name='myfield2' id='id_myfield2' value=\"value2\">\n"
+				."		<span class='field_help'>help2</span>\n"
+				."	</div>\n", $text);

+	}
+}
\ No newline at end of file
diff --git a/tests/xss_filter_test.php b/tests/xss_filter_test.php
new file mode 100644
index 000000000..3fb6ac310
--- /dev/null
+++ b/tests/xss_filter_test.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * tests several functions which are used to prevent xss attacks
+ * 
+ * @package test.util
+ */
+
+require_once('include/text.php');
+
+class AntiXSSTest extends PHPUnit_Framework_TestCase {
+
+	/**
+	 * test, that tags are escaped
+	 */
+	public function testEscapeTags() {
+		$invalidstring='<submit type="button" onclick="alert(\'failed!\');" />';
+
+		$validstring=notags($invalidstring);
+		$escapedString=escape_tags($invalidstring);
+
+		$this->assertEquals('[submit type="button" onclick="alert(\'failed!\');" /]', $validstring);
+		$this->assertEquals("&lt;submit type=&quot;button&quot; onclick=&quot;alert('failed!');&quot; /&gt;", $escapedString);
+	}
+
+	/**
+	 *xmlify and unxmlify
+	 */
+	public function testXmlify() {
+		$text="<tag>I want to break\n this!11!<?hard?></tag>";
+		$xml=xmlify($text); 
+		$retext=unxmlify($text);
+
+		$this->assertEquals($text, $retext);
+	}
+	
+	/**

+	 * xmlify and put in a document

+	 */

+	public function testXmlifyDocument() {

+		$tag="<tag>I want to break</tag>";

+		$xml=xmlify($tag);
+		$text='<text>'.$xml.'</text>'; 

+		
+		$xml_parser=xml_parser_create(); 
+		//should be possible to parse it
+		$values=array(); $index=array(); 
+		$this->assertEquals(1, xml_parse_into_struct($xml_parser, $text, $values, $index)); 
+		
+		$this->assertEquals(array('TEXT'=>array(0)), 
+				$index); 
+		$this->assertEquals(array(array('tag'=>'TEXT', 'type'=>'complete', 'level'=>1, 'value'=>$tag)),

+				$values);
+		
+		xml_parser_free($xml_parser); 

+	}
+
+	/**
+	 * test hex2bin and reverse
+	 */
+	public function testHex2Bin() {
+		$this->assertEquals(-3, hex2bin(bin2hex(-3)));
+		$this->assertEquals(0, hex2bin(bin2hex(0)));
+		$this->assertEquals(12, hex2bin(bin2hex(12)));
+		$this->assertEquals(PHP_INT_MAX, hex2bin(bin2hex(PHP_INT_MAX)));
+	}
+
+	//function qp, quick and dirty??
+	//get_mentions
+	//get_contact_block, bis Zeile 538
+}
+?>
diff --git a/update.php b/update.php
index c29394b48..1a36c754d 100755..100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1131 );
+define( 'UPDATE_VERSION' , 1137 );
 
 /**
  *
@@ -1122,3 +1122,87 @@ function update_1130() {
 	q("ALTER TABLE `item` ADD `file` MEDIUMTEXT NOT NULL AFTER `inform`, ADD FULLTEXT KEY (`file`) ");
 }
 
+function update_1131() {
+	q("ALTER TABLE `contact` ADD `forum` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `writable` , ADD INDEX ( `forum` ) ");
+}
+
+
+function update_1132() {
+	q("CREATE TABLE IF NOT EXISTS `userd` (
+`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`username` CHAR( 255 ) NOT NULL,
+INDEX ( `username` )
+) ENGINE = MYISAM ");
+
+}
+
+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() {
+	// faulty update merged forward
+	// had a hardwired tablename of 'friendica' which isn't the right name on most systems
+}
+
+function update_1135() {
+	//there can't be indexes with more than 1000 bytes in mysql, 
+	//so change charset to be smaller
+	q("ALTER TABLE `config` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
+CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL"); 
+	
+	//same thing for pconfig
+	q("ALTER TABLE `pconfig` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
+	CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL"); 
+	// faulty update merged forward. Bad update in 1134 caused duplicate k,cat pairs
+	// these have to be cleared before the unique keys can be added.	
+}
+
+function update_1136() {
+
+	$arr = array();
+
+	// order in reverse so that we save the newest entry
+
+	$r = q("select * from config where 1 order by id desc");
+	if(count($r)) {
+		foreach($r as $rr) {
+			$found = false;
+			foreach($arr as $x) {
+				if($x['cat'] == $rr['cat'] && $x['k'] == $rr['k']) {
+					$found = true;
+					q("delete from config where id = %d limit 1",
+						intval($rr['id'])
+					);
+				}
+			}
+			if(! $found) {
+				$arr[] = $rr;
+			}
+		}
+	}
+			
+	$arr = array();
+	$r = q("select * from pconfig where 1 order by id desc");
+	if(count($r)) {
+		foreach($r as $rr) {
+			$found = false;
+			foreach($arr as $x) {
+				if($x['uid'] == $rr['uid'] && $x['cat'] == $rr['cat'] && $x['k'] == $rr['k']) {
+					$found = true;
+					q("delete from pconfig where id = %d limit 1",
+						intval($rr['id'])
+					);
+				}
+			}
+			if(! $found) {
+				$arr[] = $rr;
+			}
+		}
+	}
+	q("ALTER TABLE `config` ADD UNIQUE `access` ( `cat` , `k` ) "); 
+	q("ALTER TABLE `pconfig` ADD UNIQUE `access` ( `uid` , `cat` , `k` )"); 
+
+}
\ No newline at end of file
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 a6177324a..35620e80b 100755..100644
--- a/util/db_update.php
+++ b/util/db_update.php
@@ -26,7 +26,7 @@ echo "New DB VERSION: " . DB_UPDATE_VERSION . "\n";
 
 if($build != DB_UPDATE_VERSION) {
 	echo "Updating database...";
-	check_config();
+	check_config($a);
 	echo "Done\n";
 }
 
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 1f2575603..0cb9d094d 100755..100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3.1262\n"
+"Project-Id-Version: 2.3.1304\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-24 22:44-0800\n"
+"POT-Creation-Date: 2012-04-06 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -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:404
-#: ../../mod/settings.php:409 ../../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:130 ../../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:2968 ../../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:455
-#: ../../mod/settings.php:481 ../../mod/admin.php:480 ../../mod/admin.php:489
+#: ../../mod/crepair.php:148 ../../mod/settings.php:531
+#: ../../mod/settings.php:558 ../../mod/admin.php:528 ../../mod/admin.php:537
 msgid "Name"
 msgstr ""
 
@@ -119,37 +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:453 ../../mod/settings.php:592
-#: ../../mod/settings.php:786 ../../mod/manage.php:109 ../../mod/group.php:84
-#: ../../mod/group.php:167 ../../mod/admin.php:312 ../../mod/admin.php:477
-#: ../../mod/admin.php:603 ../../mod/admin.php:769 ../../mod/admin.php:847
-#: ../../mod/profiles.php:375 ../../mod/invite.php:106
-#: ../../addon/facebook/facebook.php:411 ../../addon/yourls/yourls.php:76
-#: ../../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/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:60
+#: ../../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/numfriends/numfriends.php:85 ../../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/posterous/posterous.php:90
-#: ../../include/conversation.php:542
+#: ../../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:180
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:369
+#: ../../addon/posterous/posterous.php:90
+#: ../../view/theme/quattro/config.php:21 ../../include/conversation.php:555
 msgid "Submit"
 msgstr ""
 
@@ -157,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 ""
 
@@ -203,11 +207,15 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:272 ../../include/text.php:964
+#: ../../mod/events.php:272 ../../include/text.php:1053
 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 ""
 
@@ -257,7 +265,7 @@ msgid "Description:"
 msgstr ""
 
 #: ../../mod/events.php:395 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:290 ../../boot.php:980
+#: ../../include/bb2diaspora.php:260 ../../boot.php:1042
 msgid "Location:"
 msgstr ""
 
@@ -266,8 +274,8 @@ msgid "Share this event"
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:686 ../../mod/settings.php:454
-#: ../../mod/settings.php:480 ../../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 ""
 
@@ -287,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 ""
@@ -310,245 +318,257 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:676
-#: ../../mod/settings.php:681 ../../mod/settings.php:687
-#: ../../mod/settings.php:695 ../../mod/settings.php:699
-#: ../../mod/settings.php:704 ../../mod/settings.php:710
-#: ../../mod/settings.php:716 ../../mod/settings.php:776
-#: ../../mod/settings.php:777 ../../mod/settings.php:778
-#: ../../mod/settings.php:779 ../../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:681 ../../mod/settings.php:687
-#: ../../mod/settings.php:695 ../../mod/settings.php:699
-#: ../../mod/settings.php:704 ../../mod/settings.php:710
-#: ../../mod/settings.php:716 ../../mod/settings.php:776
-#: ../../mod/settings.php:777 ../../mod/settings.php:778
-#: ../../mod/settings.php:779 ../../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
+#: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70
 #: ../../addon/communityhome/communityhome.php:163
-#: ../../include/diaspora.php:1600 ../../include/conversation.php:53
+#: ../../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:1297
+#: ../../include/diaspora.php:1654 ../../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:472
+#: ../../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:519
+#: ../../mod/photos.php:1212 ../../include/conversation.php:529
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1201 ../../include/conversation.php:520
+#: ../../mod/photos.php:1213 ../../include/conversation.php:530
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1202 ../../include/conversation.php:914
+#: ../../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:343 ../../include/conversation.php:677
-#: ../../include/conversation.php:931
+#: ../../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:539
+#: ../../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:541
-#: ../../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:543 ../../include/conversation.php:949
+#: ../../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:513
-#: ../../mod/group.php:154 ../../mod/admin.php:484
-#: ../../include/conversation.php:302 ../../include/conversation.php:563
+#: ../../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 ""
 
@@ -556,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 ""
 
@@ -604,26 +628,28 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:80 ../../include/conversation.php:900
+#: ../../mod/editpost.php:80 ../../include/conversation.php:946
 msgid "Post to Email"
 msgstr ""
 
-#: ../../mod/editpost.php:95 ../../mod/settings.php:512
-#: ../../include/conversation.php:550
+#: ../../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:915
+#: ../../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:917
+#: ../../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:919
+#: ../../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 ""
 
@@ -639,201 +665,212 @@ msgstr ""
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editpost.php:102 ../../include/conversation.php:925
+#: ../../mod/editpost.php:102 ../../include/conversation.php:971
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:103 ../../include/conversation.php:927
+#: ../../mod/editpost.php:103 ../../include/conversation.php:973
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:932
+#: ../../mod/editpost.php:105 ../../include/conversation.php:980
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:941
+#: ../../mod/editpost.php:113 ../../include/conversation.php:989
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:942
+#: ../../mod/editpost.php:114 ../../include/conversation.php:990
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:930
+#: ../../mod/editpost.php:117 ../../include/conversation.php:976
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:118 ../../include/conversation.php:944
+#: ../../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:2504
+#: ../../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:548
+#: ../../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 ""
 
@@ -973,7 +1010,7 @@ msgid "This is required for message delivery to work."
 msgstr ""
 
 #: ../../mod/install.php:343
-msgid "PHP \"register_argc_argv\""
+msgid "PHP register_argc_argv"
 msgstr ""
 
 #: ../../mod/install.php:364
@@ -1082,7 +1119,7 @@ msgid "Errors encountered creating database tables."
 msgstr ""
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:268
+#: ../../include/bb2diaspora.php:238
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
@@ -1128,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 ""
 
@@ -1153,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:482
+#: ../../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:59
+#: ../../mod/notifications.php:328 ../../mod/notify.php:61
 msgid "No more system notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:328 ../../mod/notify.php:63
+#: ../../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 ""
 
@@ -1422,12 +1462,12 @@ msgid "View all contacts"
 msgstr ""
 
 #: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:534
 msgid "Unblock"
 msgstr ""
 
 #: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:533
 msgid "Block"
 msgstr ""
 
@@ -1462,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 ""
@@ -1496,7 +1536,7 @@ msgstr ""
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:341 ../../mod/admin.php:896
+#: ../../mod/contacts.php:341 ../../mod/admin.php:955
 msgid "Update now"
 msgstr ""
 
@@ -1513,57 +1553,64 @@ msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: ../../mod/contacts.php:399 ../../mod/group.php:194
+#: ../../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:773
+#: ../../mod/contacts.php:502 ../../include/Contact.php:141
+#: ../../include/conversation.php:817
 msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/contacts.php:518 ../../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:522
+#: ../../mod/contacts.php:527
 msgid "Search your contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:523 ../../mod/directory.php:67
+#: ../../mod/contacts.php:528 ../../mod/directory.php:57
 msgid "Finding: "
 msgstr ""
 
-#: ../../mod/contacts.php:524 ../../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 ""
 
@@ -1571,494 +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:716
-#: ../../include/items.php:2513
+#: ../../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:70
+#: ../../mod/settings.php:89
 msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/settings.php:73 ../../mod/settings.php:479 ../../mod/admin.php:75
+#: ../../mod/settings.php:92 ../../mod/settings.php:556 ../../mod/admin.php:75
 msgid "Update"
 msgstr ""
 
-#: ../../mod/settings.php:168
+#: ../../mod/settings.php:197
 msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: ../../mod/settings.php:173
+#: ../../mod/settings.php:202
 msgid "Email settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:191
+#: ../../mod/settings.php:261
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:196
+#: ../../mod/settings.php:266
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:207
+#: ../../mod/settings.php:277
 msgid "Password changed."
 msgstr ""
 
-#: ../../mod/settings.php:209
+#: ../../mod/settings.php:279
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:273
+#: ../../mod/settings.php:340
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:275
+#: ../../mod/settings.php:342
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:281
+#: ../../mod/settings.php:348
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:283
+#: ../../mod/settings.php:350
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:351 ../../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:415 ../../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:420
+#: ../../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:425
+#: ../../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:430
+#: ../../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:435
+#: ../../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:452 ../../mod/settings.php:478
-#: ../../mod/settings.php:511
+#: ../../mod/settings.php:528 ../../mod/settings.php:555
+#: ../../mod/settings.php:591
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:456 ../../mod/settings.php:482
-#: ../../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:457 ../../mod/settings.php:483
-#: ../../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:458 ../../mod/settings.php:484
+#: ../../mod/settings.php:534 ../../mod/settings.php:561
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:459 ../../mod/settings.php:485
+#: ../../mod/settings.php:535 ../../mod/settings.php:562
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:470
+#: ../../mod/settings.php:546
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:510
+#: ../../mod/settings.php:590
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:514
+#: ../../mod/settings.php:594
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:515
+#: ../../mod/settings.php:595
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:516
+#: ../../mod/settings.php:596
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:528
+#: ../../mod/settings.php:608
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:535 ../../addon/widgets/widgets.php:122
+#: ../../mod/settings.php:616 ../../addon/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:548 ../../mod/settings.php:549
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: ../../mod/settings.php:548 ../../mod/settings.php:549
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
 msgid "enabled"
 msgstr ""
 
-#: ../../mod/settings.php:548 ../../mod/settings.php:549
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
 msgid "disabled"
 msgstr ""
 
-#: ../../mod/settings.php:549
+#: ../../mod/settings.php:630
 msgid "StatusNet"
 msgstr ""
 
-#: ../../mod/settings.php:575
+#: ../../mod/settings.php:660
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:581
+#: ../../mod/settings.php:666
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/settings.php:582
+#: ../../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:583
+#: ../../mod/settings.php:668
 msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/settings.php:584
+#: ../../mod/settings.php:669
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/settings.php:585
+#: ../../mod/settings.php:670
 msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/settings.php:586
+#: ../../mod/settings.php:671
 msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/settings.php:587
+#: ../../mod/settings.php:672
 msgid "Security:"
 msgstr ""
 
-#: ../../mod/settings.php:587
+#: ../../mod/settings.php:672 ../../mod/settings.php:677
 msgid "None"
 msgstr ""
 
-#: ../../mod/settings.php:588
+#: ../../mod/settings.php:673
 msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/settings.php:589
+#: ../../mod/settings.php:674
 msgid "Email password:"
 msgstr ""
 
-#: ../../mod/settings.php:590
+#: ../../mod/settings.php:675
 msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/settings.php:591
+#: ../../mod/settings.php:676
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/settings.php:648 ../../mod/admin.php:142 ../../mod/admin.php:459
+#: ../../mod/settings.php:677
+msgid "Action after import:"
+msgstr ""
+
+#: ../../mod/settings.php:677
+msgid "Mark as seen"
+msgstr ""
+
+#: ../../mod/settings.php:677
+msgid "Move to folder"
+msgstr ""
+
+#: ../../mod/settings.php:678
+msgid "Move to folder:"
+msgstr ""
+
+#: ../../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:649
+#: ../../mod/settings.php:809
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/settings.php:652 ../../mod/admin.php:143 ../../mod/admin.php:460
+#: ../../mod/settings.php:812 ../../mod/admin.php:143 ../../mod/admin.php:507
 msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/settings.php:653
+#: ../../mod/settings.php:813
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/settings.php:656 ../../mod/admin.php:144 ../../mod/admin.php:461
+#: ../../mod/settings.php:816 ../../mod/admin.php:144 ../../mod/admin.php:508
 msgid "Community/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:657
+#: ../../mod/settings.php:817
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/settings.php:660 ../../mod/admin.php:145 ../../mod/admin.php:462
+#: ../../mod/settings.php:820 ../../mod/admin.php:145 ../../mod/admin.php:509
 msgid "Automatic Friend Account"
 msgstr ""
 
-#: ../../mod/settings.php:661
+#: ../../mod/settings.php:821
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/settings.php:671
+#: ../../mod/settings.php:831
 msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/settings.php:671
+#: ../../mod/settings.php:831
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:681
+#: ../../mod/settings.php:841
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/settings.php:687
+#: ../../mod/settings.php:847
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:855
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/settings.php:699
+#: ../../mod/settings.php:859
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/settings.php:704
+#: ../../mod/settings.php:864
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/settings.php:710
+#: ../../mod/settings.php:870
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: ../../mod/settings.php:716
+#: ../../mod/settings.php:876
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:725
+#: ../../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:757 ../../mod/profile_photo.php:206
+#: ../../mod/settings.php:897 ../../mod/profile_photo.php:211
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:762
+#: ../../mod/settings.php:902
 msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/settings.php:773
+#: ../../mod/settings.php:913
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:773
+#: ../../mod/settings.php:913
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/settings.php:774
+#: ../../mod/settings.php:914
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:775
+#: ../../mod/settings.php:915
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:776
+#: ../../mod/settings.php:916
 msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/settings.php:777
+#: ../../mod/settings.php:917
 msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/settings.php:778
+#: ../../mod/settings.php:918
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:779
+#: ../../mod/settings.php:919
 msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/settings.php:784
+#: ../../mod/settings.php:924
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:792
+#: ../../mod/settings.php:933
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:793
+#: ../../mod/settings.php:934
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:794
+#: ../../mod/settings.php:935
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:794
+#: ../../mod/settings.php:935
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:798
+#: ../../mod/settings.php:939
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:799 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:940 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/settings.php:800
+#: ../../mod/settings.php:941
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:801
+#: ../../mod/settings.php:942
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:802
+#: ../../mod/settings.php:943
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:803
+#: ../../mod/settings.php:944
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:804
-msgid "Display Theme:"
-msgstr ""
-
-#: ../../mod/settings.php:805
-msgid "Update browser every xx seconds"
-msgstr ""
-
-#: ../../mod/settings.php:805
-msgid "Minimum of 10 seconds, no maximum"
-msgstr ""
-
-#: ../../mod/settings.php:807
+#: ../../mod/settings.php:947
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:809
+#: ../../mod/settings.php:949
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:809
+#: ../../mod/settings.php:949 ../../mod/settings.php:964
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:810
+#: ../../mod/settings.php:950
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:811
+#: ../../mod/settings.php:951
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:826
+#: ../../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:827
+#: ../../mod/settings.php:968
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:828
+#: ../../mod/settings.php:969
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:829
+#: ../../mod/settings.php:970
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:830
+#: ../../mod/settings.php:971
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:831
+#: ../../mod/settings.php:972
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:832
+#: ../../mod/settings.php:973
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:833
+#: ../../mod/settings.php:974
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:834
+#: ../../mod/settings.php:975
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:837
+#: ../../mod/settings.php:978
 msgid "Advanced Page Settings"
 msgstr ""
 
@@ -2080,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:274
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
@@ -2120,42 +2230,103 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/network.php:253
+#: ../../mod/network.php:277
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:300
+#: ../../mod/network.php:322
 msgid "No such group"
 msgstr ""
 
-#: ../../mod/network.php:311
+#: ../../mod/network.php:333
 msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/network.php:315
+#: ../../mod/network.php:337
 msgid "Group: "
 msgstr ""
 
-#: ../../mod/network.php:325
+#: ../../mod/network.php:347
 msgid "Contact: "
 msgstr ""
 
-#: ../../mod/network.php:327
+#: ../../mod/network.php:349
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:332
+#: ../../mod/network.php:354
 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:639
+#: ../../mod/notes.php:63 ../../mod/filer.php:30
+#: ../../addon/facebook/facebook.php:673 ../../include/text.php:652
 msgid "Save"
 msgstr ""
 
+#: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr ""
+
+#: ../../mod/wallmessage.php:56 ../../mod/message.php: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 ""
@@ -2174,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 "
@@ -2187,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 "
@@ -2250,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."
@@ -2271,54 +2449,54 @@ 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:123
+#: ../../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:82
+#: ../../mod/group.php:90
 msgid "Create a group of contacts/friends."
 msgstr ""
 
-#: ../../mod/group.php:83 ../../mod/group.php:166
+#: ../../mod/group.php:91 ../../mod/group.php:177
 msgid "Group Name: "
 msgstr ""
 
-#: ../../mod/group.php:98
+#: ../../mod/group.php:110
 msgid "Group removed."
 msgstr ""
 
-#: ../../mod/group.php:100
+#: ../../mod/group.php:112
 msgid "Unable to remove group."
 msgstr ""
 
-#: ../../mod/group.php:164 ../../mod/profperm.php:105
-msgid "Click on a contact to add or remove."
-msgstr ""
-
-#: ../../mod/group.php:165
+#: ../../mod/group.php:176
 msgid "Group Editor"
 msgstr ""
 
-#: ../../mod/group.php:179
+#: ../../mod/group.php:189
 msgid "Members"
 msgstr ""
 
+#: ../../mod/group.php:221 ../../mod/profperm.php:105
+msgid "Click on a contact to add or remove."
+msgstr ""
+
 #: ../../mod/profperm.php:25 ../../mod/profperm.php:55
 msgid "Invalid profile identifier."
 msgstr ""
@@ -2327,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 ""
 
@@ -2345,157 +2526,163 @@ msgstr ""
 msgid "No contacts."
 msgstr ""
 
-#: ../../mod/viewcontacts.php:73 ../../include/text.php:578
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:589
 msgid "View Contacts"
 msgstr ""
 
-#: ../../mod/register.php:62
+#: ../../mod/register.php:64
 msgid "An invitation is required."
 msgstr ""
 
-#: ../../mod/register.php:67
+#: ../../mod/register.php:69
 msgid "Invitation could not be verified."
 msgstr ""
 
-#: ../../mod/register.php:75
+#: ../../mod/register.php:77
 msgid "Invalid OpenID url"
 msgstr ""
 
-#: ../../mod/register.php:90
+#: ../../mod/register.php:92
 msgid "Please enter the required information."
 msgstr ""
 
-#: ../../mod/register.php:104
+#: ../../mod/register.php:106
 msgid "Please use a shorter name."
 msgstr ""
 
-#: ../../mod/register.php:106
+#: ../../mod/register.php:108
 msgid "Name too short."
 msgstr ""
 
-#: ../../mod/register.php:121
+#: ../../mod/register.php:123
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: ../../mod/register.php:126
+#: ../../mod/register.php:128
 msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: ../../mod/register.php:129
+#: ../../mod/register.php:131
 msgid "Not a valid email address."
 msgstr ""
 
-#: ../../mod/register.php:139
+#: ../../mod/register.php:141
 msgid "Cannot use that email."
 msgstr ""
 
-#: ../../mod/register.php:145
+#: ../../mod/register.php:147
 msgid ""
 "Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
 "must also begin with a letter."
 msgstr ""
 
-#: ../../mod/register.php:151 ../../mod/register.php: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:313
+#: ../../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 ""
 
@@ -2504,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:1654 ../../include/conversation.php:48
 #: ../../include/conversation.php:57 ../../include/conversation.php:121
 #: ../../include/conversation.php:130
 msgid "status"
 msgstr ""
 
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php: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:1670 ../../include/conversation.php:65
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
@@ -2526,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:518 ../../mod/admin.php:694 ../../mod/display.php:29
-#: ../../mod/display.php:134 ../../mod/viewd.php:14
-#: ../../include/items.php:2880
+#: ../../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 ""
 
@@ -2540,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 ""
 
@@ -2557,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:830
+#: ../../mod/item.php:763
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:855
+#: ../../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:857
+#: ../../mod/item.php:790
 #, php-format
 msgid "You may visit them online at %s"
 msgstr ""
 
-#: ../../mod/item.php:858
+#: ../../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:860
+#: ../../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 ""
 
@@ -2668,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:868
-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 ""
 
@@ -2762,23 +2942,23 @@ msgstr ""
 msgid "No friends to display."
 msgstr ""
 
-#: ../../mod/admin.php:71 ../../mod/admin.php:311
+#: ../../mod/admin.php:71 ../../mod/admin.php:356
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:72 ../../mod/admin.php:476 ../../mod/admin.php:488
+#: ../../mod/admin.php:72 ../../mod/admin.php:524 ../../mod/admin.php:536
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:73 ../../mod/admin.php:565 ../../mod/admin.php:602
+#: ../../mod/admin.php:73 ../../mod/admin.php:613 ../../mod/admin.php:653
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:74 ../../mod/admin.php:736 ../../mod/admin.php:768
+#: ../../mod/admin.php:74 ../../mod/admin.php:791 ../../mod/admin.php:825
 msgid "Themes"
 msgstr ""
 
-#: ../../mod/admin.php:89 ../../mod/admin.php:846
+#: ../../mod/admin.php:89 ../../mod/admin.php:905
 msgid "Logs"
 msgstr ""
 
@@ -2786,387 +2966,534 @@ msgstr ""
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:160 ../../mod/admin.php:310 ../../mod/admin.php:475
-#: ../../mod/admin.php:564 ../../mod/admin.php:601 ../../mod/admin.php:735
-#: ../../mod/admin.php:767 ../../mod/admin.php:845
+#: ../../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:161
+#: ../../mod/admin.php:158
 msgid "Summary"
 msgstr ""
 
-#: ../../mod/admin.php:162
+#: ../../mod/admin.php:159
 msgid "Registered users"
 msgstr ""
 
-#: ../../mod/admin.php:164
+#: ../../mod/admin.php:161
 msgid "Pending registrations"
 msgstr ""
 
-#: ../../mod/admin.php:165
+#: ../../mod/admin.php:162
 msgid "Version"
 msgstr ""
 
-#: ../../mod/admin.php:167
+#: ../../mod/admin.php:164
 msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:259
+#: ../../mod/admin.php:298
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:303
+#: ../../mod/admin.php:342
 msgid "Closed"
 msgstr ""
 
-#: ../../mod/admin.php:304
+#: ../../mod/admin.php:343
 msgid "Requires approval"
 msgstr ""
 
-#: ../../mod/admin.php:305
+#: ../../mod/admin.php:344
 msgid "Open"
 msgstr ""
 
-#: ../../mod/admin.php:314
+#: ../../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:315
+#: ../../mod/admin.php:360
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:316
+#: ../../mod/admin.php:361
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:320 ../../addon/statusnet/statusnet.php:523
+#: ../../mod/admin.php:365 ../../addon/statusnet/statusnet.php:538
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:321
+#: ../../mod/admin.php:366
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:322
+#: ../../mod/admin.php:367
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:323
+#: ../../mod/admin.php:368
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:325
+#: ../../mod/admin.php:368
+msgid "Default system theme - may be over-ridden by user profiles"
+msgstr ""
+
+#: ../../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:327
+#: ../../mod/admin.php:370
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr ""
+
+#: ../../mod/admin.php:372
 msgid "Register policy"
 msgstr ""
 
-#: ../../mod/admin.php:328
+#: ../../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:374
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:329
+#: ../../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:330
+#: ../../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: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: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: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:379
 msgid "Global directory update URL"
 msgstr ""
 
-#: ../../mod/admin.php:336
+#: ../../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: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:382
 msgid "OpenID support"
 msgstr ""
 
-#: ../../mod/admin.php:338
+#: ../../mod/admin.php:382
+msgid "OpenID support for registration and logins."
+msgstr ""
+
+#: ../../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: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: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: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: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: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: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: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:391
 msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/admin.php:347
+#: ../../mod/admin.php:392
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:348
+#: ../../mod/admin.php:393
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:369
+#: ../../mod/admin.php:393
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr ""
+
+#: ../../mod/admin.php:414
 #, php-format
-msgid "%s user blocked"
+msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:376
+#: ../../mod/admin.php:421
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:410
+#: ../../mod/admin.php:455
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:462
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:462
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:526
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:527
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:528
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:480 ../../mod/admin.php:489
+#: ../../mod/admin.php:528 ../../mod/admin.php:537
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr ""
 
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:529
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:531
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:537
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:537
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:537
 msgid "Last item"
 msgstr ""
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:537
 msgid "Account"
 msgstr ""
 
-#: ../../mod/admin.php:491
+#: ../../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:492
+#: ../../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:528
+#: ../../mod/admin.php:576
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:532
+#: ../../mod/admin.php:580
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:542 ../../mod/admin.php:718
+#: ../../mod/admin.php:590 ../../mod/admin.php:769
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:544 ../../mod/admin.php:720
+#: ../../mod/admin.php:592 ../../mod/admin.php:771
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:566 ../../mod/admin.php:737
+#: ../../mod/admin.php:614 ../../mod/admin.php:792
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:567 ../../mod/admin.php:738 ../../include/nav.php:130
+#: ../../mod/admin.php:615 ../../mod/admin.php:793 ../../include/nav.php:137
 msgid "Settings"
 msgstr ""
 
-#: ../../mod/admin.php:683
+#: ../../mod/admin.php:622 ../../mod/admin.php:802
+msgid "Author: "
+msgstr ""
+
+#: ../../mod/admin.php:623 ../../mod/admin.php:803
+msgid "Maintainer: "
+msgstr ""
+
+#: ../../mod/admin.php:734
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:795
+#: ../../mod/admin.php:784
+msgid "Screenshot"
+msgstr ""
+
+#: ../../mod/admin.php:830
+msgid "[Experimental]"
+msgstr ""
+
+#: ../../mod/admin.php:831
+msgid "[Unsupported]"
+msgstr ""
+
+#: ../../mod/admin.php:854
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:848
+#: ../../mod/admin.php:907
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:854
+#: ../../mod/admin.php:913
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:855
+#: ../../mod/admin.php:914
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:855
+#: ../../mod/admin.php:914
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: ../../mod/admin.php:856
+#: ../../mod/admin.php:915
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:897
+#: ../../mod/admin.php:956
 msgid "Close"
 msgstr ""
 
-#: ../../mod/admin.php:903
+#: ../../mod/admin.php:962
 msgid "FTP Host"
 msgstr ""
 
-#: ../../mod/admin.php:904
+#: ../../mod/admin.php:963
 msgid "FTP Path"
 msgstr ""
 
-#: ../../mod/admin.php:905
+#: ../../mod/admin.php:964
 msgid "FTP User"
 msgstr ""
 
-#: ../../mod/admin.php:906
+#: ../../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:146
+#: ../../mod/ping.php:175
 msgid "{0} wants to be your friend"
 msgstr ""
 
-#: ../../mod/ping.php:151
+#: ../../mod/ping.php:180
 msgid "{0} sent you a message"
 msgstr ""
 
-#: ../../mod/ping.php:156
+#: ../../mod/ping.php:185
 msgid "{0} requested registration"
 msgstr ""
 
-#: ../../mod/ping.php:162
+#: ../../mod/ping.php:191
 #, php-format
 msgid "{0} commented %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:167
+#: ../../mod/ping.php:196
 #, php-format
 msgid "{0} liked %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:172
+#: ../../mod/ping.php:201
 #, php-format
 msgid "{0} disliked %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:177
+#: ../../mod/ping.php:206
 #, php-format
 msgid "{0} is now friends with %s"
 msgstr ""
 
-#: ../../mod/ping.php:182
+#: ../../mod/ping.php:211
 msgid "{0} posted"
 msgstr ""
 
-#: ../../mod/ping.php:187
+#: ../../mod/ping.php:216
 #, php-format
 msgid "{0} tagged %s's post with #%s"
 msgstr ""
 
-#: ../../mod/ping.php:193
+#: ../../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 ""
 
@@ -3223,7 +3550,7 @@ msgstr ""
 msgid "No friends in common."
 msgstr ""
 
-#: ../../mod/display.php:127
+#: ../../mod/display.php:135
 msgid "Item has been removed."
 msgstr ""
 
@@ -3239,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:29 ../../include/conversation.php:918
+msgid "Save to Folder:"
+msgstr ""
+
+#: ../../mod/filer.php:29
+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"
@@ -3495,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 ""
 
@@ -3509,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 ""
 
@@ -3543,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
@@ -3563,173 +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: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:104
+#: ../../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/dfrn_confirm.php:238
+#: ../../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:242
 msgid "Response from remote site was not understood."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:247
+#: ../../mod/dfrn_confirm.php:251
 msgid "Unexpected response from remote site: "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:255
+#: ../../mod/dfrn_confirm.php:259
 msgid "Confirmation completed successfully."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:257 ../../mod/dfrn_confirm.php:271
-#: ../../mod/dfrn_confirm.php:278
+#: ../../mod/dfrn_confirm.php:261 ../../mod/dfrn_confirm.php:275
+#: ../../mod/dfrn_confirm.php:282
 msgid "Remote site reported: "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:269
+#: ../../mod/dfrn_confirm.php:273
 msgid "Temporary failure. Please wait and try again."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:276
+#: ../../mod/dfrn_confirm.php:280
 msgid "Introduction failed or was revoked."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:421
+#: ../../mod/dfrn_confirm.php:425
 msgid "Unable to set contact photo."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:473 ../../include/diaspora.php:495
+#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507
 #: ../../include/conversation.php:101
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:543
+#: ../../mod/dfrn_confirm.php:548
 #, php-format
 msgid "No user record found for '%s' "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:553
+#: ../../mod/dfrn_confirm.php:558
 msgid "Our site encryption key is apparently messed up."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:564
+#: ../../mod/dfrn_confirm.php:569
 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:585
+#: ../../mod/dfrn_confirm.php:590
 msgid "Contact record was not found for you on our site."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:599
+#: ../../mod/dfrn_confirm.php:604
 #, php-format
 msgid "Site public key not available in contact record for URL %s."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:619
+#: ../../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:630
+#: ../../mod/dfrn_confirm.php:635
 msgid "Unable to set your contact credentials on our system."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:684
+#: ../../mod/dfrn_confirm.php:700
 msgid "Unable to update your contact profile details on our system"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:714
+#: ../../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 "
@@ -3737,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:132
+#: ../../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 ""
 
@@ -3791,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 ""
 
@@ -3831,16 +4288,50 @@ msgstr ""
 msgid "yourls Settings saved."
 msgstr ""
 
+#: ../../addon/ljpost/ljpost.php:39
+msgid "Post to LiveJournal"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:70
+msgid "LiveJournal Post Settings"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:72
+msgid "Enable LiveJournal Post Plugin"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:77
+msgid "LiveJournal username"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:82
+msgid "LiveJournal password"
+msgstr ""
+
+#: ../../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
@@ -3856,33 +4347,46 @@ 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 ../../include/nav.php:62
-#: ../../boot.php:710
+#: ../../addon/communityhome/communityhome.php:34
+#: ../../addon/communityhome/twillingham/communityhome.php:28
+#: ../../addon/communityhome/twillingham/communityhome.php:34
+#: ../../include/nav.php:64 ../../boot.php:766
 msgid "Login"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:29
+#: ../../addon/communityhome/twillingham/communityhome.php:29
 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
+#: ../../addon/communityhome/twillingham/communityhome.php:81
 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
+#: ../../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:1295
 #: ../../include/conversation.php:45 ../../include/conversation.php:118
 msgid "event"
 msgstr ""
@@ -3973,6 +4477,30 @@ msgstr ""
 msgid "Enable Randplace Plugin"
 msgstr ""
 
+#: ../../addon/dwpost/dwpost.php:39
+msgid "Post to Dreamwidth"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:70
+msgid "Dreamwidth Post Settings"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:72
+msgid "Enable dreamwidth Post Plugin"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:77
+msgid "dreamwidth username"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:82
+msgid "dreamwidth password"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:87
+msgid "Post to dreamwidth by default"
+msgstr ""
+
 #: ../../addon/drpost/drpost.php:35
 msgid "Post to Drupal"
 msgstr ""
@@ -4009,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 ""
@@ -4151,10 +4679,16 @@ msgid "Quick Comment Settings"
 msgstr ""
 
 #: ../../addon/qcomment/qcomment.php:56
+msgid ""
+"Quick comments are found near comment boxes, sometimes hidden. Click them to "
+"provide simple replies."
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:57
 msgid "Enter quick comments, one per line"
 msgstr ""
 
-#: ../../addon/qcomment/qcomment.php:74
+#: ../../addon/qcomment/qcomment.php:75
 msgid "Quick Comment settings saved."
 msgstr ""
 
@@ -4188,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 ""
 
@@ -4204,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 "
@@ -4246,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 "
@@ -4266,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 "
@@ -4305,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 ""
 
@@ -4357,6 +4919,29 @@ msgstr ""
 msgid "How many contacts to display on profile sidebar"
 msgstr ""
 
+#: ../../addon/gnot/gnot.php:48
+msgid "Gnot settings updated."
+msgstr ""
+
+#: ../../addon/gnot/gnot.php:79
+msgid "Gnot Settings"
+msgstr ""
+
+#: ../../addon/gnot/gnot.php:81
+msgid ""
+"Allows threading of email comment notifications on Gmail and anonymising the "
+"subject line."
+msgstr ""
+
+#: ../../addon/gnot/gnot.php:82
+msgid "Enable this plugin/addon?"
+msgstr ""
+
+#: ../../addon/gnot/gnot.php:97
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d"
+msgstr ""
+
 #: ../../addon/wppost/wppost.php:42
 msgid "Post to Wordpress"
 msgstr ""
@@ -4401,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
@@ -4445,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 "
@@ -4468,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 "
@@ -4491,22 +5077,34 @@ 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:25
+msgid "IRC Chatroom"
+msgstr ""
+
+#: ../../addon/irc/irc.php:46
+msgid "Popular Channels"
+msgstr ""
+
 #: ../../addon/posterous/posterous.php:36
 msgid "Post to Posterous"
 msgstr ""
@@ -4531,7 +5129,183 @@ msgstr ""
 msgid "Post to Posterous by default"
 msgstr ""
 
-#: ../../include/profile_advanced.php:17 ../../boot.php:982
+#: ../../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/config.php:24
+msgid "Alignment"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:24
+msgid "Left"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:24
+msgid "Center"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:25
+msgid "Color scheme"
+msgstr ""
+
+#: ../../include/profile_advanced.php:17 ../../boot.php:1044
 msgid "Gender:"
 msgstr ""
 
@@ -4544,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 ""
 
@@ -4552,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 ""
 
@@ -4892,160 +5666,200 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/event.php:17 ../../include/bb2diaspora.php:274
+#: ../../include/event.php:17 ../../include/bb2diaspora.php:244
 msgid "Starts:"
 msgstr ""
 
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:282
+#: ../../include/event.php:27 ../../include/bb2diaspora.php:252
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/delivery.php:424 ../../include/notifier.php:637
+#: ../../include/delivery.php:434 ../../include/notifier.php:651
 msgid "(no subject)"
 msgstr ""
 
-#: ../../include/delivery.php:431 ../../include/enotify.php:16
-#: ../../include/notifier.php:644
+#: ../../include/delivery.php:441 ../../include/enotify.php:23
+#: ../../include/notifier.php:658
 msgid "noreply"
 msgstr ""
 
-#: ../../include/text.php:232
+#: ../../include/text.php:243
 msgid "prev"
 msgstr ""
 
-#: ../../include/text.php:234
+#: ../../include/text.php:245
 msgid "first"
 msgstr ""
 
-#: ../../include/text.php:263
+#: ../../include/text.php:274
 msgid "last"
 msgstr ""
 
-#: ../../include/text.php:266
+#: ../../include/text.php:277
 msgid "next"
 msgstr ""
 
-#: ../../include/text.php:557
+#: ../../include/text.php:568
 msgid "No contacts"
 msgstr ""
 
-#: ../../include/text.php:566
+#: ../../include/text.php:577
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:637 ../../include/nav.php:87
+#: ../../include/text.php:650 ../../include/nav.php:91
 msgid "Search"
 msgstr ""
 
-#: ../../include/text.php:813
+#: ../../include/text.php:831
 msgid "Monday"
 msgstr ""
 
-#: ../../include/text.php:813
+#: ../../include/text.php:831
 msgid "Tuesday"
 msgstr ""
 
-#: ../../include/text.php:813
+#: ../../include/text.php:831
 msgid "Wednesday"
 msgstr ""
 
-#: ../../include/text.php:813
+#: ../../include/text.php:831
 msgid "Thursday"
 msgstr ""
 
-#: ../../include/text.php:813
+#: ../../include/text.php:831
 msgid "Friday"
 msgstr ""
 
-#: ../../include/text.php:813
+#: ../../include/text.php:831
 msgid "Saturday"
 msgstr ""
 
-#: ../../include/text.php:813
+#: ../../include/text.php:831
 msgid "Sunday"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:817
+#: ../../include/text.php:835
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:887
+#: ../../include/text.php:919
 msgid "bytes"
 msgstr ""
 
-#: ../../include/text.php:982
+#: ../../include/text.php:936
+msgid "Categories:"
+msgstr ""
+
+#: ../../include/text.php:948
+msgid "remove"
+msgstr ""
+
+#: ../../include/text.php:948
+msgid "[remove]"
+msgstr ""
+
+#: ../../include/text.php:951
+msgid "Filed under:"
+msgstr ""
+
+#: ../../include/text.php:967 ../../include/text.php:979
+msgid "Click to open/close"
+msgstr ""
+
+#: ../../include/text.php:1071
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:994
+#: ../../include/text.php:1083
 msgid "default"
 msgstr ""
 
-#: ../../include/diaspora.php:570
+#: ../../include/text.php:1299
+msgid "activity"
+msgstr ""
+
+#: ../../include/text.php:1301
+msgid "comment"
+msgstr ""
+
+#: ../../include/text.php:1302
+msgid "post"
+msgstr ""
+
+#: ../../include/text.php:1457
+msgid "Item filed"
+msgstr ""
+
+#: ../../include/diaspora.php:582
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/diaspora.php:1911
+#: ../../include/diaspora.php:1969
 msgid "Attachments:"
 msgstr ""
 
-#: ../../include/diaspora.php:2094
+#: ../../include/diaspora.php:2152
 #, php-format
 msgid "[Relayed] Comment authored by %s from network %s"
 msgstr ""
 
-#: ../../include/oembed.php:128
+#: ../../include/network.php:817
+msgid "view full size"
+msgstr ""
+
+#: ../../include/oembed.php:132
 msgid "Embedded content"
 msgstr ""
 
-#: ../../include/oembed.php:137
+#: ../../include/oembed.php:141
 msgid "Embedding disabled"
 msgstr ""
 
@@ -5076,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 ""
 
@@ -5220,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 ""
@@ -5336,252 +6144,277 @@ msgstr ""
 msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/poller.php:474
+#: ../../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:279
+#: ../../include/acl_selectors.php:286
 msgid "Visible to everybody"
 msgstr ""
 
-#: ../../include/acl_selectors.php:280
+#: ../../include/acl_selectors.php:287
 msgid "show"
 msgstr ""
 
-#: ../../include/acl_selectors.php:281
+#: ../../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:28
+#: ../../include/enotify.php:35
+#, php-format
+msgid "%s <!item_type!>"
+msgstr ""
+
+#: ../../include/enotify.php:39
 #, php-format
-msgid "New mail received at %s"
+msgid "[Friendica:Notify] New mail received at %s"
 msgstr ""
 
-#: ../../include/enotify.php:30
+#: ../../include/enotify.php:41
 #, php-format
 msgid "%s sent you a new private message at %s."
 msgstr ""
 
-#: ../../include/enotify.php:31
+#: ../../include/enotify.php:42
 #, php-format
 msgid "%s sent you %s."
 msgstr ""
 
-#: ../../include/enotify.php:31
+#: ../../include/enotify.php:42
 msgid "a private message"
 msgstr ""
 
-#: ../../include/enotify.php:32
+#: ../../include/enotify.php:43
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: ../../include/enotify.php:40
+#: ../../include/enotify.php:73
 #, php-format
-msgid "%s commented on an item at %s"
+msgid "%s's"
 msgstr ""
 
-#: ../../include/enotify.php:41
+#: ../../include/enotify.php:77
+msgid "your"
+msgstr ""
+
+#: ../../include/enotify.php:84
 #, php-format
-msgid "%s commented on an item/conversation you have been following."
+msgid "[Friendica:Notify] Comment to conversation #%d by %s"
 msgstr ""
 
-#: ../../include/enotify.php:42
+#: ../../include/enotify.php:85
 #, php-format
-msgid "%s commented in %s."
+msgid "%s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../include/enotify.php:42
-msgid "a watched conversation"
+#: ../../include/enotify.php:86
+#, php-format
+msgid "%s commented on %s."
 msgstr ""
 
-#: ../../include/enotify.php:44 ../../include/enotify.php:54
-#: ../../include/enotify.php:64 ../../include/enotify.php:74
+#: ../../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:51
+#: ../../include/enotify.php:95
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
+msgstr ""
+
+#: ../../include/enotify.php:97
 #, php-format
 msgid "%s posted to your profile wall at %s"
 msgstr ""
 
-#: ../../include/enotify.php:52
+#: ../../include/enotify.php:99
 #, php-format
 msgid "%s posted to %s"
 msgstr ""
 
-#: ../../include/enotify.php:52
+#: ../../include/enotify.php:99
 msgid "your profile wall."
 msgstr ""
 
-#: ../../include/enotify.php:61
+#: ../../include/enotify.php:108
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
+msgstr ""
+
+#: ../../include/enotify.php:109
 #, php-format
 msgid "%s tagged you at %s"
 msgstr ""
 
-#: ../../include/enotify.php:62
+#: ../../include/enotify.php:110
 #, php-format
 msgid "%s %s."
 msgstr ""
 
-#: ../../include/enotify.php:62
+#: ../../include/enotify.php:110
 msgid "tagged you"
 msgstr ""
 
-#: ../../include/enotify.php:71
+#: ../../include/enotify.php:119
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
+msgstr ""
+
+#: ../../include/enotify.php:120
 #, php-format
 msgid "%s tagged your post at %s"
 msgstr ""
 
-#: ../../include/enotify.php:72
+#: ../../include/enotify.php:121
 #, php-format
 msgid "%s tagged %s"
 msgstr ""
 
-#: ../../include/enotify.php:72
+#: ../../include/enotify.php:121
 msgid "your post"
 msgstr ""
 
-#: ../../include/enotify.php:81
-#, php-format
-msgid "Introduction received at %s"
+#: ../../include/enotify.php:130
+msgid "[Friendica:Notify] Introduction received"
 msgstr ""
 
-#: ../../include/enotify.php:82
+#: ../../include/enotify.php:131
 #, php-format
 msgid "You've received an introduction from '%s' at %s"
 msgstr ""
 
-#: ../../include/enotify.php:83
+#: ../../include/enotify.php:132
 #, php-format
 msgid "You've received %s from %s."
 msgstr ""
 
-#: ../../include/enotify.php:83
+#: ../../include/enotify.php:132
 msgid "an introduction"
 msgstr ""
 
-#: ../../include/enotify.php:84 ../../include/enotify.php:101
+#: ../../include/enotify.php:133 ../../include/enotify.php:150
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr ""
 
-#: ../../include/enotify.php:86
+#: ../../include/enotify.php:135
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr ""
 
-#: ../../include/enotify.php:93
-#, php-format
-msgid "Friend suggestion received at %s"
+#: ../../include/enotify.php:142
+msgid "[Friendica:Notify] Friend suggestion received"
 msgstr ""
 
-#: ../../include/enotify.php:94
+#: ../../include/enotify.php:143
 #, php-format
 msgid "You've received a friend suggestion from '%s' at %s"
 msgstr ""
 
-#: ../../include/enotify.php:95
+#: ../../include/enotify.php:144
 #, php-format
 msgid "You've received %s for %s from %s."
 msgstr ""
 
-#: ../../include/enotify.php:96
+#: ../../include/enotify.php:145
 msgid "a friend suggestion"
 msgstr ""
 
-#: ../../include/enotify.php:99
+#: ../../include/enotify.php:148
 msgid "Name:"
 msgstr ""
 
-#: ../../include/enotify.php:100
+#: ../../include/enotify.php:149
 msgid "Photo:"
 msgstr ""
 
-#: ../../include/enotify.php:103
+#: ../../include/enotify.php:152
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/items.php:2511
+#: ../../include/items.php:2656
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:2511
+#: ../../include/items.php:2656
 msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/bb2diaspora.php:83
-msgid "view full size"
-msgstr ""
-
-#: ../../include/bb2diaspora.php:132 ../../include/bb2diaspora.php:142
-#: ../../include/bb2diaspora.php:143
+#: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112
+#: ../../include/bb2diaspora.php:113
 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:769
+#: ../../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:770
+#: ../../include/Contact.php:138 ../../include/conversation.php:814
 msgid "View profile"
 msgstr ""
 
-#: ../../include/Contact.php:133 ../../include/conversation.php:771
+#: ../../include/Contact.php:139 ../../include/conversation.php:815
 msgid "View photos"
 msgstr ""
 
-#: ../../include/Contact.php:134 ../../include/Contact.php:147
-#: ../../include/conversation.php:772
+#: ../../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:774
+#: ../../include/Contact.php:142 ../../include/Contact.php:153
+#: ../../include/conversation.php:818
 msgid "Send PM"
 msgstr ""
 
@@ -5594,251 +6427,251 @@ msgstr ""
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:301 ../../include/conversation.php:562
+#: ../../include/conversation.php:317 ../../include/conversation.php:575
 msgid "Select"
 msgstr ""
 
-#: ../../include/conversation.php:316 ../../include/conversation.php:648
-#: ../../include/conversation.php:649
+#: ../../include/conversation.php:334 ../../include/conversation.php:672
+#: ../../include/conversation.php:673
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/conversation.php:325 ../../include/conversation.php:660
+#: ../../include/conversation.php:344 ../../include/conversation.php:684
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../../include/conversation.php:341
+#: ../../include/conversation.php:360
 msgid "View in context"
 msgstr ""
 
-#: ../../include/conversation.php:456
+#: ../../include/conversation.php:465
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:459 ../../boot.php:448
-msgid "show more"
-msgstr ""
-
-#: ../../include/conversation.php:519
+#: ../../include/conversation.php:529
 msgid "like"
 msgstr ""
 
-#: ../../include/conversation.php:520
+#: ../../include/conversation.php:530
 msgid "dislike"
 msgstr ""
 
-#: ../../include/conversation.php:522
+#: ../../include/conversation.php:532
 msgid "Share this"
 msgstr ""
 
-#: ../../include/conversation.php:522
+#: ../../include/conversation.php:532
 msgid "share"
 msgstr ""
 
-#: ../../include/conversation.php:572
+#: ../../include/conversation.php:588
 msgid "add star"
 msgstr ""
 
-#: ../../include/conversation.php:573
+#: ../../include/conversation.php:589
 msgid "remove star"
 msgstr ""
 
-#: ../../include/conversation.php:574
+#: ../../include/conversation.php:590
 msgid "toggle star status"
 msgstr ""
 
-#: ../../include/conversation.php:577
+#: ../../include/conversation.php:593
 msgid "starred"
 msgstr ""
 
-#: ../../include/conversation.php:578
+#: ../../include/conversation.php:594
 msgid "add tag"
 msgstr ""
 
-#: ../../include/conversation.php:650
+#: ../../include/conversation.php:598
+msgid "save to folder"
+msgstr ""
+
+#: ../../include/conversation.php:674
 msgid "to"
 msgstr ""
 
-#: ../../include/conversation.php:651
+#: ../../include/conversation.php:675
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../include/conversation.php:652
+#: ../../include/conversation.php:676
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/conversation.php:694
+#: ../../include/conversation.php:721
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:826
+#: ../../include/conversation.php:872
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:826
+#: ../../include/conversation.php:872
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:830
+#: ../../include/conversation.php:876
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:832
+#: ../../include/conversation.php:878
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:838
+#: ../../include/conversation.php:884
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:841
+#: ../../include/conversation.php:887
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:842
+#: ../../include/conversation.php:888
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:842
+#: ../../include/conversation.php:888
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:867
+#: ../../include/conversation.php:913
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:869
+#: ../../include/conversation.php:915
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:870
+#: ../../include/conversation.php:916
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:871
+#: ../../include/conversation.php:917
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:919
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:873
-msgid "Enter a title for this item"
-msgstr ""
-
-#: ../../include/conversation.php:916
+#: ../../include/conversation.php:962
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:918
+#: ../../include/conversation.php:964
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:920
+#: ../../include/conversation.php:966
 msgid "web link"
 msgstr ""
 
-#: ../../include/conversation.php:921
+#: ../../include/conversation.php:967
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:922
+#: ../../include/conversation.php:968
 msgid "video link"
 msgstr ""
 
-#: ../../include/conversation.php:923
+#: ../../include/conversation.php:969
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:924
+#: ../../include/conversation.php:970
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:926
+#: ../../include/conversation.php:972
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:928
+#: ../../include/conversation.php:974
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:933
+#: ../../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/acl_selector.tpl b/view/acl_selector.tpl
index 3f8a9e7d2..655ea8980 100755..100644
--- a/view/acl_selector.tpl
+++ b/view/acl_selector.tpl
@@ -19,7 +19,7 @@ $(document).ready(function() {
 	if(typeof acl=="undefined"){
 		acl = new ACL(
 			baseurl+"/acl",
-			[$allowcid,$allowgid,$denycid,$denygid]
+			[ $allowcid,$allowgid,$denycid,$denygid ]
 		);
 	}
 });
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 d7147b20b..cbaef2d66 100755..100644
--- a/view/admin_plugins_details.tpl
+++ b/view/admin_plugins_details.tpl
@@ -4,12 +4,21 @@
 	<p><span class='toggleplugin icon $status'></span> $info.name - $info.version : <a href="$baseurl/admin/$function/$plugin/?a=t">$action</a></p>
 	<p>$info.description</p>
 	
-	<p class="author">
+	<p class="author">$str_author
 	{{ for $info.author as $a }}
 		{{ if $a.link }}<a href="$a.link">$a.name</a>{{ else }}$a.name{{ endif }},
 	{{ endfor }}
 	</p>
+
+	<p class="maintainer">$str_maintainer
+	{{ for $info.maintainer as $a }}
+		{{ if $a.link }}<a href="$a.link">$a.name</a>{{ else }}$a.name{{ endif }},
+	{{ 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>
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 9a1229845..01fe893c6 100755..100644
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
@@ -7,6 +7,7 @@
 	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
 	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
 	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
 	
 	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
 	
diff --git a/view/admin_summary.tpl b/view/admin_summary.tpl
index 59428986a..eed71fbe0 100755..100644
--- a/view/admin_summary.tpl
+++ b/view/admin_summary.tpl
@@ -13,7 +13,7 @@
 	{{ for $accounts as $p }}
 		<dl>
 			<dt>$p.0</dt>
-			<dd>$p.1</dd>
+			<dd>{{ if $p.1 }}$p.1{{ else }}0{{ endif }}</dd>
 		</dl>
 	{{ endfor }}
 
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_test_xml.tpl b/view/api_test_xml.tpl
new file mode 100644
index 000000000..7509a2dc1
--- /dev/null
+++ b/view/api_test_xml.tpl
@@ -0,0 +1 @@
+<ok>$ok</ok>
diff --git a/view/api_timeline_atom.tpl b/view/api_timeline_atom.tpl
index fb4f51f59..fb4f51f59 100755..100644
--- a/view/api_timeline_atom.tpl
+++ b/view/api_timeline_atom.tpl
diff --git a/view/api_timeline_rss.tpl b/view/api_timeline_rss.tpl
index 40239273c..40239273c 100755..100644
--- a/view/api_timeline_rss.tpl
+++ b/view/api_timeline_rss.tpl
diff --git a/view/api_timeline_xml.tpl b/view/api_timeline_xml.tpl
index 17860ca61..551439682 100755..100644
--- a/view/api_timeline_xml.tpl
+++ b/view/api_timeline_xml.tpl
@@ -1,22 +1,19 @@
-<statuses type="array">
-  {{ for $statuses as $status }}
-  <status>
-    <created_at>$status.created_at</created_at>
-    <id>$status.id</id>
-    <text>$status.text</text>
-	<statusnet_html>$status.statusnet_html</statusnet_html>
-    <source>$status.source</source>
-    <truncated>$status.truncated</truncated>
-    <url>$status.url</url>
-    <in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id>
-    <in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id>
-    <favorited>$status.favorited</favorited>
-    <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name>
-    <geo>$status.geo</geo>
-    <coordinates>$status.coordinates</coordinates>
-    <place>$status.place</place>
-    <contributors>$status.contributors</contributors>
-  	{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }}
-  </status>
-  {{ endfor }}
-</statuses>
\ No newline at end of file
+<statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/">
+{{ for $statuses as $status }} <status>
+  <text>$status.text</text>
+  <truncated>$status.truncated</truncated>
+  <created_at>$status.created_at</created_at>
+  <in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id>
+  <source>$status.source</source>
+  <id>$status.id</id>
+  <in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id>
+  <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name>
+  <geo>$status.geo</geo>
+  <favorited>$status.favorited</favorited>
+{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }}  <statusnet:html>$status.statusnet_html</statusnet:html>
+  <url>$status.url</url>
+  <coordinates>$status.coordinates</coordinates>
+  <place>$status.place</place>
+  <contributors>$status.contributors</contributors>
+ </status>
+{{ endfor }}</statuses>
diff --git a/view/api_user_xml.tpl b/view/api_user_xml.tpl
index 78cc1f530..d286652c0 100755..100644
--- a/view/api_user_xml.tpl
+++ b/view/api_user_xml.tpl
@@ -1,34 +1,34 @@
-<user>
-  <id>$user.id</id>
-  <name>$user.name</name>
-  <screen_name>$user.screen_name</screen_name>
-  <location>$user.location</location>
-  <description>$user.description</description>
-  <profile_image_url>$user.profile_image_url</profile_image_url>
-  <url>$user.url</url>
-  <protected>$user.protected</protected>
-  <followers_count>$user.followers_count</followers_count>
-  <profile_background_color>$user.profile_background_color</profile_background_color>
-  <profile_text_color>$user.profile_text_color</profile_text_color>
-  <profile_link_color>$user.profile_link_color</profile_link_color>
-  <profile_sidebar_fill_color>$user.profile_sidebar_fill_color</profile_sidebar_fill_color>
-  <profile_sidebar_border_color>$user.profile_sidebar_border_color</profile_sidebar_border_color>
-  <friends_count>$user.friends_count</friends_count>
-  <created_at>$user.created_at</created_at>
-  <favourites_count>$user.favourites_count</favourites_count>
-  <utc_offset>$user.utc_offset</utc_offset>
-  <time_zone>$user.time_zone</time_zone>
-  <profile_background_image_url>$user.profile_background_image_url</profile_background_image_url>
-  <profile_background_tile>$user.profile_background_tile</profile_background_tile>
-  <profile_use_background_image>$user.profile_use_background_image</profile_use_background_image>
-  <notifications>$user.notifications</notifications>
-  <geo_enabled>$user.geo_enabled</geo_enabled>
-  <verified>$user.verified</verified>
-  <following>$user.following</following>
-  <statuses_count>$user.statuses_count</statuses_count>
-  <lang>$user.lang</lang>
-  <contributors_enabled>$user.contributors_enabled</contributors_enabled>
-  <status>{{ if $user.status }}
+  <user>
+   <id>$user.id</id>
+   <name>$user.name</name>
+   <screen_name>$user.screen_name</screen_name>
+   <location>$user.location</location>
+   <description>$user.description</description>
+   <profile_image_url>$user.profile_image_url</profile_image_url>
+   <url>$user.url</url>
+   <protected>$user.protected</protected>
+   <followers_count>$user.followers_count</followers_count>
+   <friends_count>$user.friends_count</friends_count>
+   <created_at>$user.created_at</created_at>
+   <favourites_count>$user.favourites_count</favourites_count>
+   <utc_offset>$user.utc_offset</utc_offset>
+   <time_zone>$user.time_zone</time_zone>
+   <statuses_count>$user.statuses_count</statuses_count>
+   <following>$user.following</following>
+   <profile_background_color>$user.profile_background_color</profile_background_color>
+   <profile_text_color>$user.profile_text_color</profile_text_color>
+   <profile_link_color>$user.profile_link_color</profile_link_color>
+   <profile_sidebar_fill_color>$user.profile_sidebar_fill_color</profile_sidebar_fill_color>
+   <profile_sidebar_border_color>$user.profile_sidebar_border_color</profile_sidebar_border_color>
+   <profile_background_image_url>$user.profile_background_image_url</profile_background_image_url>
+   <profile_background_tile>$user.profile_background_tile</profile_background_tile>
+   <profile_use_background_image>$user.profile_use_background_image</profile_use_background_image>
+   <notifications>$user.notifications</notifications>
+   <geo_enabled>$user.geo_enabled</geo_enabled>
+   <verified>$user.verified</verified>
+   <lang>$user.lang</lang>
+   <contributors_enabled>$user.contributors_enabled</contributors_enabled>
+   <status>{{ if $user.status }}
     <created_at>$user.status.created_at</created_at>
     <id>$user.status.id</id>
     <text>$user.status.text</text>
@@ -43,4 +43,4 @@
     <place>$user.status.place</place>
     <contributors>$user.status.contributors</contributors>
   {{ endif }}</status>
-</user>
\ 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 72cf8e4fd..2feb547ee 100755..100644
--- a/view/atom_feed.tpl
+++ b/view/atom_feed.tpl
@@ -16,6 +16,7 @@
   <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
   $hub
   $salmon
+  $community
 
   <updated>$feed_updated</updated>
 
diff --git a/view/atom_feed_dfrn.tpl b/view/atom_feed_dfrn.tpl
index 3d6bcc5b5..0bae62b52 100755..100644
--- a/view/atom_feed_dfrn.tpl
+++ b/view/atom_feed_dfrn.tpl
@@ -12,10 +12,11 @@
 
   <id>$feed_id</id>
   <title>$feed_title</title>
-  <generator uri="http://friendika.com" version="$version">Friendika</generator>
+  <generator uri="http://friendica.com" version="$version">Friendica</generator>
   <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
   $hub
   $salmon
+  $community
 
   <updated>$feed_updated</updated>
 
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 204fcf247..2958397c9 100755..100644
--- a/view/auto_request.tpl
+++ b/view/auto_request.tpl
@@ -7,8 +7,15 @@ $page_desc<br />
 <li><a href="http://friendica.com" title="$friendica">$friendica</a></li>
 <li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li>
 <li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li>
+<li>$emailnet</li>
 </ul>
 </p>
+<p>
+$invite_desc
+</p>
+<p>
+$desc
+</p>
 
 <form action="dfrn_request/$nickname" method="post" />
 
diff --git a/view/ca/cmnt_received_eml.tpl b/view/ca/cmnt_received_eml.tpl
new file mode 100644
index 000000000..ca61ca492
--- /dev/null
+++ b/view/ca/cmnt_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Apreciat/da $username,
+
+	'$from' ha comentat un element/conversació que estàs seguint.
+
+-----
+$body
+-----
+
+Accedeix a $siteurl per a veure la conversa completa:
+
+$display
+
+
+	$sitename
+
+ 
+
diff --git a/view/ca/follow_notify_eml.tpl b/view/ca/follow_notify_eml.tpl
new file mode 100644
index 000000000..ab5a4b371
--- /dev/null
+++ b/view/ca/follow_notify_eml.tpl
@@ -0,0 +1,13 @@
+
+Apreciat/da $myname,
+
+Tens un nou seguidor en $sitename -  '$requestor'.
+
+Pots visitar el seu perfil en $url.
+
+Iniciï sessió en el seu lloc per a aprovar o rebutjar/cancelar la sol·licitud.
+
+$siteurl
+
+
+	$sitename 
diff --git a/view/ca/friend_complete_eml.tpl b/view/ca/friend_complete_eml.tpl
new file mode 100644
index 000000000..539d9ff3d
--- /dev/null
+++ b/view/ca/friend_complete_eml.tpl
@@ -0,0 +1,19 @@
+
+Apreciat/da $username,
+
+	Grans noticies... '$fn' a '$dfrn_url' ha acceptat la teva sol·licitud de connexió en '$sitename'.
+
+Ara sous amics mutus i podreu intercanviar actualizacions de estatus, fotos, i correu electrónic
+sense cap restricció.
+
+Visita la teva pàgina de 'Contactes' en $sitename si desitja realizar qualsevol canvi en aquesta relació.
+
+$siteurl
+
+[Per exemple, pots crear un perfil independent amb informació que no esta disponible al públic en general 
+- i assignar drets de visualització a '$fn'].
+
+
+	$sitename
+
+ 
diff --git a/view/ca/htconfig.tpl b/view/ca/htconfig.tpl
new file mode 100644
index 000000000..28446f3df
--- /dev/null
+++ b/view/ca/htconfig.tpl
@@ -0,0 +1,68 @@
+<?php
+
+// Set the following for your MySQL installation
+// Copy or rename this file to .htconfig.php
+
+$db_host = '$dbhost';
+$db_user = '$dbuser';
+$db_pass = '$dbpass';
+$db_data = '$dbdata';
+
+// If you are using a subdirectory of your domain you will need to put the
+// relative path (from the root of your domain) here.
+// For instance if your URL is 'http://example.com/directory/subdirectory',
+// set $a->path to 'directory/subdirectory'. 
+
+$a->path = '$urlpath';
+ 
+// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
+// It can be changed later and only applies to timestamps for anonymous viewers.
+
+$default_timezone = '$timezone';
+
+// What is your site name?
+
+$a->config['sitename'] = "La Meva Xarxa d'Amics";
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting 
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['register_text'] = '';
+$a->config['admin_email'] = '$adminmail';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['php_path'] = '$phpath';
+
+// Location of global directory submission page.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+
+// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
+
+$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
+
+// Server-to-server private message encryption (RINO) is allowed by default. 
+// Encryption will only be provided if this setting is true and the
+// PHP mcrypt extension is installed on both systems 
+
+$a->config['system']['rino_encrypt'] = true;
+
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
diff --git a/view/ca/intro_complete_eml.tpl b/view/ca/intro_complete_eml.tpl
new file mode 100644
index 000000000..70507d71d
--- /dev/null
+++ b/view/ca/intro_complete_eml.tpl
@@ -0,0 +1,21 @@
+
+Apreciat/da $username,
+
+	'$fn' en '$dfrn_url' ha acceptat la teva petició
+connexió a '$sitename'.
+
+	'$fn' ha optat per acceptar-te com a "fan", que restringeix certes 
+formes de comunicació, com missatges privats i algunes interaccions 
+amb el perfil. Si ets una "celebritat" o una pàgina de comunitat, 
+aquests ajustos s'aplican automàticament 
+
+	'$fn' pot optar per extendre aixó en una relació més permisiva
+en el futur.
+
+	Començaràs a rebre les actualizacions públiques de estatus de '$fn', 
+que apareixeran a la teva pàgina "Xarxa" en
+
+$siteurl
+
+
+	$sitename
diff --git a/view/ca/lostpass_eml.tpl b/view/ca/lostpass_eml.tpl
new file mode 100644
index 000000000..eccf2050a
--- /dev/null
+++ b/view/ca/lostpass_eml.tpl
@@ -0,0 +1,35 @@
+
+Apreciat/da $username,
+	
+	S'ha rebut una sol·licitud en $sitename recentment per restablir
+la teva contrasenya. Per confirmar aquesta sol·licitud, per favor seleccioni l'enllaç de
+verificació sota o copia-ho i pega-ho en la barra d'adreces del teu navegador.
+
+Si NO has sol·licitat aquest canvi, per favor NO segueixis l'enllaç indicat i ignora
+i/o elimina aquest missatge.
+
+La teva contrasenya no es canviarà tret que puguem verificar que ets la teva qui
+va emetre aquesta sol·licitud.
+
+Segueix aquest enllaç per verificar la teva identitat:
+
+$reset_link
+
+A continuació rebràs un missatge amb la nova contrasenya.
+
+Després de accedir, podràs canviar la contrasenya del teu compte a la pàgina de
+configuració.
+
+Les dades d'accés són els següents:
+
+
+Lloc:	$siteurl
+Nom:	$email
+
+
+
+
+Salutacions,
+	L'administració de $sitename
+
+ 
diff --git a/view/ca/mail_received_html_body_eml.tpl b/view/ca/mail_received_html_body_eml.tpl
new file mode 100644
index 000000000..64eee0bf1
--- /dev/null
+++ b/view/ca/mail_received_html_body_eml.tpl
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+	<title>Mensaje de Friendica</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+<body>
+<table style="border:1px solid #ccc">
+	<tbody>
+	<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendika-32.png'><span style="padding:7px;">Friendica</span></td></tr>
+
+	<tr><td style="padding-top:22px;" colspan="2">Has rebut un nou missatge privat de '$from' en $siteName.</td></tr>
+
+
+	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
+		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
+	<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
+	<tr><td style="padding-right:22px;">$htmlversion</td></tr>
+	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Accedeix a <a href="$siteurl">$siteurl</a> per a llegir i respondre als teus missatges privats.</td></tr>
+	<tr><td></td><td>$siteName</td></tr>
+	</tbody>
+</table>
+</body>
+</html>
diff --git a/view/ca/mail_received_text_body_eml.tpl b/view/ca/mail_received_text_body_eml.tpl
new file mode 100644
index 000000000..b343c4e6d
--- /dev/null
+++ b/view/ca/mail_received_text_body_eml.tpl
@@ -0,0 +1,9 @@
+Has rebut un nou missatge privat de '$from' en $siteName.
+	
+$title
+
+$textversion
+				
+Accedeix a $siteurl per a llegir i respondre als teus missatges privats.
+
+	$siteName
diff --git a/view/ca/messages.po b/view/ca/messages.po
new file mode 100644
index 000000000..8463ceb12
--- /dev/null
+++ b/view/ca/messages.po
@@ -0,0 +1,6127 @@
+# FRIENDICA Distributed Social Network
+# Copyright (C) 2010, 2011 the Friendica Project
+# This file is distributed under the same license as the Friendica package.
+# 
+# Translators:
+# Rafael GARAU ESPINÓS <transifex@macadamia.es>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
+"POT-Creation-Date: 2012-03-06 15:09-0800\n"
+"PO-Revision-Date: 2012-03-08 21:58+0000\n"
+"Last-Translator: Rafael GARAU ESPINÓS <transifex@macadamia.es>\n"
+"Language-Team: Catalan (http://www.transifex.net/projects/p/friendica/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../../mod/oexchange.php:25
+msgid "Post successful."
+msgstr "Publicat amb éxit."
+
+#: ../../mod/update_notes.php:41 ../../mod/update_community.php:18
+#: ../../mod/update_network.php:22 ../../mod/update_profile.php:41
+msgid "[Embedded content - reload page to view]"
+msgstr "[Contingut embegut - recarrega la pàgina per a veure-ho]"
+
+#: ../../mod/crepair.php:102
+msgid "Contact settings applied."
+msgstr "Ajustos de Contacte aplicats."
+
+#: ../../mod/crepair.php:104
+msgid "Contact update failed."
+msgstr "Fracassà l'actualització de Contacte"
+
+#: ../../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/editpost.php:10 ../../mod/install.php:171
+#: ../../mod/notifications.php:62 ../../mod/contacts.php:125
+#: ../../mod/settings.php:49 ../../mod/settings.php:411
+#: ../../mod/settings.php:416 ../../mod/manage.php:86 ../../mod/network.php:6
+#: ../../mod/notes.php:20 ../../mod/attach.php:33 ../../mod/group.php:19
+#: ../../mod/viewcontacts.php:22 ../../mod/register.php:36
+#: ../../mod/regmod.php:111 ../../mod/item.php:124 ../../mod/item.php:140
+#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:137
+#: ../../mod/profile_photo.php:148 ../../mod/profile_photo.php:159
+#: ../../mod/message.php:9 ../../mod/message.php:46 ../../mod/allfriends.php:9
+#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9
+#: ../../mod/display.php:133 ../../mod/profiles.php:7
+#: ../../mod/profiles.php:229 ../../mod/delegate.php:6
+#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
+#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:332
+#: ../../include/items.php:3030 ../../index.php:288
+msgid "Permission denied."
+msgstr "Permís denegat."
+
+#: ../../mod/crepair.php:129 ../../mod/fsuggest.php:20
+#: ../../mod/fsuggest.php:92 ../../mod/dfrn_confirm.php:118
+msgid "Contact not found."
+msgstr "Contacte no trobat"
+
+#: ../../mod/crepair.php:135
+msgid "Repair Contact Settings"
+msgstr "Reposar els ajustos de Contacte"
+
+#: ../../mod/crepair.php:137
+msgid ""
+"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
+" information your communications with this contact may stop working."
+msgstr "<strong>ADVERTÈNCIA: Això és molt avançat </strong> i si s'introdueix informació incorrecta la seva comunicació amb aquest contacte pot deixar de funcionar."
+
+#: ../../mod/crepair.php:138
+msgid ""
+"Please use your browser 'Back' button <strong>now</strong> if you are "
+"uncertain what to do on this page."
+msgstr "Si us plau, prem el botó 'Tornar' <strong>ara</strong> si no saps segur que has de fer aqui."
+
+#: ../../mod/crepair.php:144
+msgid "Return to contact editor"
+msgstr "Tornar al editor de contactes"
+
+#: ../../mod/crepair.php:148 ../../mod/settings.php:462
+#: ../../mod/settings.php:488 ../../mod/admin.php:484 ../../mod/admin.php:493
+msgid "Name"
+msgstr "Nom"
+
+#: ../../mod/crepair.php:149
+msgid "Account Nickname"
+msgstr "Malnom de Compte"
+
+#: ../../mod/crepair.php:150
+msgid "@Tagname - overrides Name/Nickname"
+msgstr "@Tagname - té prel·lació sobre Nom/Malnom"
+
+#: ../../mod/crepair.php:151
+msgid "Account URL"
+msgstr "Adreça URL del Compte"
+
+#: ../../mod/crepair.php:152
+msgid "Friend Request URL"
+msgstr "Adreça URL de sol·licitud d'Amistat"
+
+#: ../../mod/crepair.php:153
+msgid "Friend Confirm URL"
+msgstr "Adreça URL de confirmació d'Amic"
+
+#: ../../mod/crepair.php:154
+msgid "Notification Endpoint URL"
+msgstr "Adreça URL de Notificació"
+
+#: ../../mod/crepair.php:155
+msgid "Poll/Feed URL"
+msgstr "Adreça de Enquesta/Alimentador"
+
+#: ../../mod/crepair.php:156
+msgid "New photo from this URL"
+msgstr "Nova foto d'aquesta URL"
+
+#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
+#: ../../mod/events.php:400 ../../mod/photos.php:900 ../../mod/photos.php:958
+#: ../../mod/photos.php:1182 ../../mod/photos.php:1222
+#: ../../mod/photos.php:1262 ../../mod/photos.php:1293
+#: ../../mod/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
+#: ../../addon/uhremotestorage/uhremotestorage.php:89
+#: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:92
+#: ../../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/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/posterous/posterous.php:90
+#: ../../view/theme/quattro/theme.php:15 ../../include/conversation.php:552
+msgid "Submit"
+msgstr "Enviar"
+
+#: ../../mod/help.php:30
+msgid "Help:"
+msgstr "Ajuda:"
+
+#: ../../mod/help.php:34 ../../include/nav.php:82
+msgid "Help"
+msgstr "Ajuda"
+
+#: ../../mod/help.php:38 ../../index.php:221
+msgid "Not Found"
+msgstr "No trobat"
+
+#: ../../mod/help.php:41 ../../index.php:224
+msgid "Page not found."
+msgstr "Pàgina no trobada."
+
+#: ../../mod/wall_attach.php:57
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "L'arxiu excedeix la mida límit de %d"
+
+#: ../../mod/wall_attach.php:85 ../../mod/wall_attach.php:96
+msgid "File upload failed."
+msgstr "La càrrega de fitxers ha fallat."
+
+#: ../../mod/fsuggest.php:63
+msgid "Friend suggestion sent."
+msgstr "Enviat suggeriment d'amic."
+
+#: ../../mod/fsuggest.php:97
+msgid "Suggest Friends"
+msgstr "Suggerir Amics"
+
+#: ../../mod/fsuggest.php:99
+#, php-format
+msgid "Suggest a friend for %s"
+msgstr "Suggerir una amic per a %s"
+
+#: ../../mod/events.php:62
+msgid "Event description and start time are required."
+msgstr "Es requereix descripció de l'esdeveniment i l'hora d'inici."
+
+#: ../../mod/events.php:230
+msgid "l, F j"
+msgstr "l, F j"
+
+#: ../../mod/events.php:252
+msgid "Edit event"
+msgstr "Editar esdeveniment"
+
+#: ../../mod/events.php:272 ../../include/text.php:982
+msgid "link to source"
+msgstr "Enllaç al origen"
+
+#: ../../mod/events.php:296 ../../include/nav.php:50 ../../boot.php:1349
+msgid "Events"
+msgstr "Esdeveniments"
+
+#: ../../mod/events.php:297
+msgid "Create New Event"
+msgstr "Crear un nou esdeveniment"
+
+#: ../../mod/events.php:298
+msgid "Previous"
+msgstr "Previ"
+
+#: ../../mod/events.php:299 ../../mod/install.php:210
+msgid "Next"
+msgstr "Proper"
+
+#: ../../mod/events.php:371
+msgid "hour:minute"
+msgstr "hora:minut"
+
+#: ../../mod/events.php:380
+msgid "Event details"
+msgstr "Detalls del esdeveniment"
+
+#: ../../mod/events.php:381
+#, php-format
+msgid "Format is %s %s. Starting date and Description are required."
+msgstr "El format és %s %s. Es requereix Data d'inici i Descripció."
+
+#: ../../mod/events.php:383
+msgid "Event Starts:"
+msgstr "Inici d'Esdeveniment:"
+
+#: ../../mod/events.php:386
+msgid "Finish date/time is not known or not relevant"
+msgstr "La data/hora de finalització no es coneixen o no són relevants"
+
+#: ../../mod/events.php:388
+msgid "Event Finishes:"
+msgstr "L'esdeveniment Finalitza:"
+
+#: ../../mod/events.php:391
+msgid "Adjust for viewer timezone"
+msgstr "Ajustar a la zona horaria de l'espectador"
+
+#: ../../mod/events.php:393
+msgid "Description:"
+msgstr "Descripció:"
+
+#: ../../mod/events.php:395 ../../include/event.php:37
+#: ../../include/bb2diaspora.php:260 ../../boot.php:980
+msgid "Location:"
+msgstr "Ubicació:"
+
+#: ../../mod/events.php:397
+msgid "Share this event"
+msgstr "Compartir aquest esdeveniment"
+
+#: ../../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
+msgid "Cancel"
+msgstr "Cancel·lar"
+
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
+msgstr "Etiqueta eliminada"
+
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
+msgstr "Esborrar etiqueta del element"
+
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
+msgstr "Selecciona etiqueta a esborrar:"
+
+#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130
+msgid "Remove"
+msgstr "Esborrar"
+
+#: ../../mod/dfrn_poll.php:91 ../../mod/dfrn_poll.php:517
+#, php-format
+msgid "%s welcomes %s"
+msgstr "%s Benvingut %s"
+
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
+msgstr "Autoritzi la connexió de aplicacions"
+
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Torni a la seva aplicació i inserti aquest Codi de Seguretat:"
+
+#: ../../mod/api.php:89
+msgid "Please login to continue."
+msgstr "Per favor, accedeixi per a continuar."
+
+#: ../../mod/api.php:104
+msgid ""
+"Do you want to authorize this application to access your posts and contacts,"
+" and/or create new posts for you?"
+msgstr "Vol autoritzar a aquesta aplicació per accedir als teus missatges i contactes, i/o crear nous enviaments per a vostè?"
+
+#: ../../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
+msgid "Yes"
+msgstr "Si"
+
+#: ../../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
+msgid "No"
+msgstr "No"
+
+#: ../../mod/photos.php:42
+msgid "Photo Albums"
+msgstr "Àlbum de Fotos"
+
+#: ../../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
+msgid "Contact Photos"
+msgstr "Fotos de Contacte"
+
+#: ../../mod/photos.php:57 ../../mod/photos.php:975 ../../mod/photos.php:1413
+msgid "Upload New Photos"
+msgstr "Actualitzar Noves Fotos"
+
+#: ../../mod/photos.php:68 ../../mod/settings.php:11
+msgid "everybody"
+msgstr "tothom"
+
+#: ../../mod/photos.php:139
+msgid "Contact information unavailable"
+msgstr "Informació del Contacte no disponible"
+
+#: ../../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
+#: ../../addon/communityhome/communityhome.php:111
+msgid "Profile Photos"
+msgstr "Fotos del Perfil"
+
+#: ../../mod/photos.php:160
+msgid "Album not found."
+msgstr "Àlbum no trobat."
+
+#: ../../mod/photos.php:178 ../../mod/photos.php:959
+msgid "Delete Album"
+msgstr "Eliminar Àlbum"
+
+#: ../../mod/photos.php:241 ../../mod/photos.php:1183
+msgid "Delete Photo"
+msgstr "Eliminar Foto"
+
+#: ../../mod/photos.php:528
+msgid "was tagged in a"
+msgstr "Fou etiquetat a un"
+
+#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
+#: ../../addon/communityhome/communityhome.php:163 ../../include/text.php:1226
+#: ../../include/diaspora.php:1600 ../../include/conversation.php:53
+#: ../../include/conversation.php:126
+msgid "photo"
+msgstr "foto"
+
+#: ../../mod/photos.php:528
+msgid "by"
+msgstr "per"
+
+#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:315
+msgid "Image exceeds size limit of "
+msgstr "La imatge excedeix el límit de "
+
+#: ../../mod/photos.php:639
+msgid "Image file is empty."
+msgstr "El fitxer de imatge és buit."
+
+#: ../../mod/photos.php:653 ../../mod/profile_photo.php:122
+#: ../../mod/wall_upload.php:65
+msgid "Unable to process image."
+msgstr "Incapaç de processar la imatge."
+
+#: ../../mod/photos.php:673 ../../mod/profile_photo.php:251
+#: ../../mod/wall_upload.php:84
+msgid "Image upload failed."
+msgstr "Actualització de la imatge fracassada."
+
+#: ../../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
+msgid "Public access denied."
+msgstr "Accés públic denegat."
+
+#: ../../mod/photos.php:769
+msgid "No photos selected"
+msgstr "No s'han seleccionat fotos"
+
+#: ../../mod/photos.php:846
+msgid "Access to this item is restricted."
+msgstr "L'accés a aquest element està restringit."
+
+#: ../../mod/photos.php:907
+msgid "Upload Photos"
+msgstr "Carregar Fotos"
+
+#: ../../mod/photos.php:910 ../../mod/photos.php:954
+msgid "New album name: "
+msgstr "Nou nom d'àlbum:"
+
+#: ../../mod/photos.php:911
+msgid "or existing album name: "
+msgstr "o nom d'àlbum existent:"
+
+#: ../../mod/photos.php:912
+msgid "Do not show a status post for this upload"
+msgstr "No tornis a mostrar un missatge d'estat d'aquesta pujada"
+
+#: ../../mod/photos.php:914 ../../mod/photos.php:1178
+msgid "Permissions"
+msgstr "Permisos"
+
+#: ../../mod/photos.php:969
+msgid "Edit Album"
+msgstr "Editar Àlbum"
+
+#: ../../mod/photos.php:984 ../../mod/photos.php:1396
+msgid "View Photo"
+msgstr "Veure Foto"
+
+#: ../../mod/photos.php:1019
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Permís denegat. L'accés a aquest element pot estar restringit."
+
+#: ../../mod/photos.php:1021
+msgid "Photo not available"
+msgstr "Foto no disponible"
+
+#: ../../mod/photos.php:1071
+msgid "View photo"
+msgstr "Veure foto"
+
+#: ../../mod/photos.php:1071
+msgid "Edit photo"
+msgstr "Editar foto"
+
+#: ../../mod/photos.php:1072
+msgid "Use as profile photo"
+msgstr "Emprar com a foto del perfil"
+
+#: ../../mod/photos.php:1078 ../../include/conversation.php:482
+msgid "Private Message"
+msgstr "Missatge Privat"
+
+#: ../../mod/photos.php:1089
+msgid "View Full Size"
+msgstr "Veure'l a Mida Completa"
+
+#: ../../mod/photos.php:1157
+msgid "Tags: "
+msgstr "Etiquetes:"
+
+#: ../../mod/photos.php:1160
+msgid "[Remove any tag]"
+msgstr "Treure etiquetes"
+
+#: ../../mod/photos.php:1171
+msgid "New album name"
+msgstr "Nou nom d'àlbum"
+
+#: ../../mod/photos.php:1174
+msgid "Caption"
+msgstr "Títol"
+
+#: ../../mod/photos.php:1176
+msgid "Add a Tag"
+msgstr "Afegir una etiqueta"
+
+#: ../../mod/photos.php:1180
+msgid ""
+"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr "Exemple: @bob, @Barbara_jensen, @jim@example.com,  #California, #camping"
+
+#: ../../mod/photos.php:1200 ../../include/conversation.php:529
+msgid "I like this (toggle)"
+msgstr "M'agrada això (canviar)"
+
+#: ../../mod/photos.php:1201 ../../include/conversation.php:530
+msgid "I don't like this (toggle)"
+msgstr "No m'agrada això (canviar)"
+
+#: ../../mod/photos.php:1202 ../../include/conversation.php:933
+msgid "Share"
+msgstr "Compartir"
+
+#: ../../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
+msgid "Please wait"
+msgstr "Si us plau esperi"
+
+#: ../../mod/photos.php:1219 ../../mod/photos.php:1259
+#: ../../mod/photos.php:1290 ../../include/conversation.php:549
+msgid "This is you"
+msgstr "Aquest ets tu"
+
+#: ../../mod/photos.php:1221 ../../mod/photos.php:1261
+#: ../../mod/photos.php:1292 ../../include/conversation.php:551
+#: ../../boot.php:447
+msgid "Comment"
+msgstr "Comentari"
+
+#: ../../mod/photos.php:1223 ../../mod/editpost.php:123
+#: ../../include/conversation.php:553 ../../include/conversation.php:968
+msgid "Preview"
+msgstr "Vista prèvia"
+
+#: ../../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
+msgid "Delete"
+msgstr "Esborrar"
+
+#: ../../mod/photos.php:1402
+msgid "View Album"
+msgstr "Veure Àlbum"
+
+#: ../../mod/photos.php:1411
+msgid "Recent Photos"
+msgstr "Fotos Recents"
+
+#: ../../mod/community.php:21
+msgid "Not available."
+msgstr "No disponible."
+
+#: ../../mod/community.php:30 ../../include/nav.php:97
+msgid "Community"
+msgstr "Comunitat"
+
+#: ../../mod/community.php:60 ../../mod/search.php:118
+msgid "No results."
+msgstr "Sense resultats."
+
+#: ../../mod/friendica.php:43
+msgid "This is Friendica, version"
+msgstr "Això és Friendica, versió"
+
+#: ../../mod/friendica.php:44
+msgid "running at web location"
+msgstr "funcionant en la ubicació web"
+
+#: ../../mod/friendica.php:46
+msgid ""
+"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
+"more about the Friendica project."
+msgstr "Si us plau, visiteu <a href=\"http://friendica.com\">Friendica.com</a> per obtenir més informació sobre el projecte Friendica."
+
+#: ../../mod/friendica.php:48
+msgid "Bug reports and issues: please visit"
+msgstr "Pels informes d'error i problemes: si us plau, visiteu"
+
+#: ../../mod/friendica.php:49
+msgid ""
+"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
+"dot com"
+msgstr "Suggeriments, elogis, donacions, etc si us plau escrigui a \"Info\" en Friendica - dot com"
+
+#: ../../mod/friendica.php:54
+msgid "Installed plugins/addons/apps"
+msgstr "plugins/addons/apps instal·lats"
+
+#: ../../mod/friendica.php:62
+msgid "No installed plugins/addons/apps"
+msgstr "plugins/addons/apps no instal·lats"
+
+#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
+msgid "Item not found"
+msgstr "Element no trobat"
+
+#: ../../mod/editpost.php:36
+msgid "Edit post"
+msgstr "Editar Enviament"
+
+#: ../../mod/editpost.php:80 ../../include/conversation.php:919
+msgid "Post to Email"
+msgstr "Correu per enviar"
+
+#: ../../mod/editpost.php:95 ../../mod/settings.php:519
+#: ../../include/conversation.php:560
+msgid "Edit"
+msgstr "Editar"
+
+#: ../../mod/editpost.php:96 ../../mod/message.php:153
+#: ../../mod/message.php:294 ../../include/conversation.php:934
+msgid "Upload photo"
+msgstr "Carregar foto"
+
+#: ../../mod/editpost.php:97 ../../include/conversation.php:936
+msgid "Attach file"
+msgstr "Adjunta fitxer"
+
+#: ../../mod/editpost.php:98 ../../mod/message.php:154
+#: ../../mod/message.php:295 ../../include/conversation.php:938
+msgid "Insert web link"
+msgstr "Inserir enllaç web"
+
+#: ../../mod/editpost.php:99
+msgid "Insert YouTube video"
+msgstr "Serà mostrat de forma preeminent a la pagina durant el procés de registre."
+
+#: ../../mod/editpost.php:100
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Inserir video Vorbis [.ogg]"
+
+#: ../../mod/editpost.php:101
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Inserir audio Vorbis [.ogg]"
+
+#: ../../mod/editpost.php:102 ../../include/conversation.php:944
+msgid "Set your location"
+msgstr "Canvia la teva ubicació"
+
+#: ../../mod/editpost.php:103 ../../include/conversation.php:946
+msgid "Clear browser location"
+msgstr "neteja adreçes del navegador"
+
+#: ../../mod/editpost.php:105 ../../include/conversation.php:951
+msgid "Permission settings"
+msgstr "Configuració de permisos"
+
+#: ../../mod/editpost.php:113 ../../include/conversation.php:960
+msgid "CC: email addresses"
+msgstr "CC: Adreça de correu"
+
+#: ../../mod/editpost.php:114 ../../include/conversation.php:961
+msgid "Public post"
+msgstr "Enviament públic"
+
+#: ../../mod/editpost.php:117 ../../include/conversation.php:949
+msgid "Set title"
+msgstr "Canviar títol"
+
+#: ../../mod/editpost.php:118 ../../include/conversation.php:963
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Exemple: bob@example.com, mary@example.com"
+
+#: ../../mod/dfrn_request.php:92
+msgid "This introduction has already been accepted."
+msgstr "Aquesta presentació ha estat acceptada."
+
+#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:381
+msgid "Profile location is not valid or does not contain profile information."
+msgstr "El perfil de situació no és vàlid o no contè informació de perfil"
+
+#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:386
+msgid "Warning: profile location has no identifiable owner name."
+msgstr "Atenció: El perfil de situació no te nom de propietari identificable."
+
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:388
+msgid "Warning: profile location has no profile photo."
+msgstr "Atenció: El perfil de situació no te foto de perfil"
+
+#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:391
+#, php-format
+msgid "%d required parameter was not found at the given location"
+msgid_plural "%d required parameters were not found at the given location"
+msgstr[0] "%d el paràmetre requerit no es va trobar al lloc indicat"
+msgstr[1] "%d els paràmetres requerits no es van trobar allloc indicat"
+
+#: ../../mod/dfrn_request.php:167
+msgid "Introduction complete."
+msgstr "Completada la presentació."
+
+#: ../../mod/dfrn_request.php:191
+msgid "Unrecoverable protocol error."
+msgstr "Error de protocol irrecuperable."
+
+#: ../../mod/dfrn_request.php:219
+msgid "Profile unavailable."
+msgstr "Perfil no disponible"
+
+#: ../../mod/dfrn_request.php:244
+#, php-format
+msgid "%s has received too many connection requests today."
+msgstr "%s avui ha rebut excesives peticions de connexió. "
+
+#: ../../mod/dfrn_request.php:245
+msgid "Spam protection measures have been invoked."
+msgstr "Mesures de protecció contra spam han estat invocades."
+
+#: ../../mod/dfrn_request.php:246
+msgid "Friends are advised to please try again in 24 hours."
+msgstr "S'aconsellà els amics que probin pasades 24 hores."
+
+#: ../../mod/dfrn_request.php:306
+msgid "Invalid locator"
+msgstr "Localitzador no vàlid"
+
+#: ../../mod/dfrn_request.php:326
+msgid "Unable to resolve your name at the provided location."
+msgstr "Incapaç de resoldre el teu nom al lloc facilitat."
+
+#: ../../mod/dfrn_request.php:339
+msgid "You have already introduced yourself here."
+msgstr "Has fer la teva presentació aquí."
+
+#: ../../mod/dfrn_request.php:343
+#, php-format
+msgid "Apparently you are already friends with %s."
+msgstr "Aparentment, ja tens amistat amb %s"
+
+#: ../../mod/dfrn_request.php:364
+msgid "Invalid profile URL."
+msgstr "Perfil URL no vàlid."
+
+#: ../../mod/dfrn_request.php:370 ../../mod/follow.php:20
+msgid "Disallowed profile URL."
+msgstr "Perfil URL no permès."
+
+#: ../../mod/dfrn_request.php:439 ../../mod/contacts.php:102
+msgid "Failed to update contact record."
+msgstr "Error en actualitzar registre de contacte."
+
+#: ../../mod/dfrn_request.php:460
+msgid "Your introduction has been sent."
+msgstr "La teva presentació ha estat enviada."
+
+#: ../../mod/dfrn_request.php:513
+msgid "Please login to confirm introduction."
+msgstr "Si us plau, entri per confirmar la presentació."
+
+#: ../../mod/dfrn_request.php:527
+msgid ""
+"Incorrect identity currently logged in. Please login to "
+"<strong>this</strong> profile."
+msgstr "Sesió iniciada amb la identificació incorrecta. Entra en <strong>aquest</strong> perfil."
+
+#: ../../mod/dfrn_request.php:539
+#, php-format
+msgid "Welcome home %s."
+msgstr "Benvingut de nou %s"
+
+#: ../../mod/dfrn_request.php:540
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
+msgstr "Si us plau, confirmi la seva sol·licitud de Presentació/Amistat a %s."
+
+#: ../../mod/dfrn_request.php:541
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: ../../mod/dfrn_request.php:582 ../../include/items.php:2566
+msgid "[Name Withheld]"
+msgstr "[Nom Amagat]"
+
+#: ../../mod/dfrn_request.php:666
+#, php-format
+msgid ""
+"Diaspora members: Please do not use this form. Instead, enter \"%s\" into "
+"your Diaspora search bar."
+msgstr "Membres de Diàspora: Si us plau, no utilitzi aquest formulari. Pel contrari, escriviu \"%s\" a la barra de cerca de Diàspora."
+
+#: ../../mod/dfrn_request.php:669
+msgid ""
+"Please enter your 'Identity Address' from one of the following supported "
+"social networks:"
+msgstr "Si us plau, introdueixi la seva \"Adreça Identificativa\" d'una de les següents xarxes socials suportades:"
+
+#: ../../mod/dfrn_request.php:672
+msgid "Friend/Connection Request"
+msgstr "Sol·licitud d'Amistat"
+
+#: ../../mod/dfrn_request.php:673
+msgid ""
+"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
+"testuser@identi.ca"
+msgstr "Exemples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"
+
+#: ../../mod/dfrn_request.php:674
+msgid "Please answer the following:"
+msgstr "Si us plau, contesti les següents preguntes:"
+
+#: ../../mod/dfrn_request.php:675
+#, php-format
+msgid "Does %s know you?"
+msgstr "%s et coneix?"
+
+#: ../../mod/dfrn_request.php:678
+msgid "Add a personal note:"
+msgstr "Afegir una nota personal:"
+
+#: ../../mod/dfrn_request.php:680 ../../include/contact_selectors.php:76
+msgid "Friendica"
+msgstr "Friendica"
+
+#: ../../mod/dfrn_request.php:681
+msgid "StatusNet/Federated Social Web"
+msgstr "Web Social StatusNet/Federated "
+
+#: ../../mod/dfrn_request.php:682 ../../mod/settings.php:555
+#: ../../include/contact_selectors.php:80
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: ../../mod/dfrn_request.php:683
+msgid "- please share from your own site as noted above"
+msgstr "- si us plau, Comparteix des del teu propi lloc tal com s'ha dit abans."
+
+#: ../../mod/dfrn_request.php:684
+msgid "Your Identity Address:"
+msgstr "La Teva Adreça Identificativa:"
+
+#: ../../mod/dfrn_request.php:685
+msgid "Submit Request"
+msgstr "Sol·licitud Enviada"
+
+#: ../../mod/install.php:111
+msgid "Friendica Social Communications Server - Setup"
+msgstr "Friendica Social Communications Server - Ajustos"
+
+#: ../../mod/install.php:117 ../../mod/install.php:157
+#: ../../mod/install.php:230
+msgid "Database connection"
+msgstr "Conexió a la base de dades"
+
+#: ../../mod/install.php:124
+msgid "Could not connect to database."
+msgstr "No puc connectar a la base de dades."
+
+#: ../../mod/install.php:128
+msgid "Could not create table."
+msgstr "No puc creat taula."
+
+#: ../../mod/install.php:133
+msgid "Your Friendica site database has been installed."
+msgstr "La base de dades del teu lloc Friendica ha estat instal·lada."
+
+#: ../../mod/install.php:134
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "IMPORTANT: necessitarà configurar [manualment] el programar una tasca pel sondejador (poller.php)"
+
+#: ../../mod/install.php:135 ../../mod/install.php:151
+#: ../../mod/install.php:209
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "Per favor, consulti l'arxiu \"INSTALL.txt\"."
+
+#: ../../mod/install.php:137
+msgid "Proceed to registration"
+msgstr "Procedir a la inscripció"
+
+#: ../../mod/install.php:143
+msgid "Proceed with Installation"
+msgstr "Procedeixi amb la Instal·lació"
+
+#: ../../mod/install.php:150
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr "Pot ser que hagi d'importar l'arxiu \"database.sql\" manualment amb phpmyadmin o mysql."
+
+#: ../../mod/install.php:158
+msgid "Database import failed."
+msgstr "La importació de base de dades ha fallat."
+
+#: ../../mod/install.php:206
+msgid "System check"
+msgstr "Comprovació del Sistema"
+
+#: ../../mod/install.php:211
+msgid "Check again"
+msgstr "Comprovi de nou"
+
+#: ../../mod/install.php:231
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
+msgstr "Per a instal·lar Friendica necessitem conèixer com connectar amb la deva base de dades."
+
+#: ../../mod/install.php:232
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Per favor, posi's en contacte amb el seu proveïdor de hosting o administrador del lloc si té alguna pregunta sobre aquestes opcions."
+
+#: ../../mod/install.php:233
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "La base de dades que especifiques ja hauria d'existir. Si no és així, crea-la abans de continuar."
+
+#: ../../mod/install.php:237
+msgid "Database Server Name"
+msgstr "Nom del Servidor de base de Dades"
+
+#: ../../mod/install.php:238
+msgid "Database Login Name"
+msgstr "Nom d'Usuari de la base de Dades"
+
+#: ../../mod/install.php:239
+msgid "Database Login Password"
+msgstr "Contrasenya d'Usuari de la base de Dades"
+
+#: ../../mod/install.php:240
+msgid "Database Name"
+msgstr "Nom de la base de Dades"
+
+#: ../../mod/install.php:241 ../../mod/install.php:280
+msgid "Site administrator email address"
+msgstr "Adreça de correu del administrador del lloc"
+
+#: ../../mod/install.php:241 ../../mod/install.php:280
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "El seu compte d'adreça electrònica ha de coincidir per tal d'utilitzar el panell d'administració web."
+
+#: ../../mod/install.php:245 ../../mod/install.php:283
+msgid "Please select a default timezone for your website"
+msgstr "Per favor, seleccioni una zona horària per defecte per al seu lloc web"
+
+#: ../../mod/install.php:270
+msgid "Site settings"
+msgstr "Configuracions del lloc"
+
+#: ../../mod/install.php:323
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "No es va poder trobar una versió de línia de comandos de PHP en la ruta del servidor web."
+
+#: ../../mod/install.php:326
+msgid "PHP executable path"
+msgstr "Direcció del executable PHP"
+
+#: ../../mod/install.php:326
+msgid "Enter full path to php executable"
+msgstr "Introdueixi el camí complet del executable php"
+
+#: ../../mod/install.php:331
+msgid "Command line PHP"
+msgstr "Linia de comandos PHP"
+
+#: ../../mod/install.php:340
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "La versió de línia de comandos de PHP en el seu sistema no té \"register_argc_argv\" habilitat."
+
+#: ../../mod/install.php:341
+msgid "This is required for message delivery to work."
+msgstr "Això és necessari perquè funcioni el lliurament de missatges."
+
+#: ../../mod/install.php:343
+msgid "PHP \"register_argc_argv\""
+msgstr "PHP \"register_argc_argv\""
+
+#: ../../mod/install.php:364
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Error: la funció \"openssl_pkey_new\" en aquest sistema no és capaç de generar claus de xifrat"
+
+#: ../../mod/install.php:365
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Si s'executa en Windows, per favor consulti la secció \"http://www.php.net/manual/en/openssl.installation.php\"."
+
+#: ../../mod/install.php:367
+msgid "Generate encryption keys"
+msgstr "Generar claus d'encripció"
+
+#: ../../mod/install.php:374
+msgid "libCurl PHP module"
+msgstr "Mòdul libCurl de PHP"
+
+#: ../../mod/install.php:375
+msgid "GD graphics PHP module"
+msgstr "Mòdul GD de gràfics de PHP"
+
+#: ../../mod/install.php:376
+msgid "OpenSSL PHP module"
+msgstr "Mòdul OpenSSl de PHP"
+
+#: ../../mod/install.php:377
+msgid "mysqli PHP module"
+msgstr "Mòdul mysqli de PHP"
+
+#: ../../mod/install.php:378
+msgid "mb_string PHP module"
+msgstr "Mòdul mb_string de PHP"
+
+#: ../../mod/install.php:383 ../../mod/install.php:385
+msgid "Apace mod_rewrite module"
+msgstr "Mòdul mod_rewrite de Apache"
+
+#: ../../mod/install.php:383
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Error: el mòdul mod-rewrite del servidor web Apache és necessari però no està instal·lat."
+
+#: ../../mod/install.php:390
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Error: El mòdul libCURL de PHP és necessari però no està instal·lat."
+
+#: ../../mod/install.php:394
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Error: el mòdul gràfic GD de PHP amb support per JPEG és necessari però no està instal·lat."
+
+#: ../../mod/install.php:398
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Error: El mòdul enssl de PHP és necessari però no està instal·lat."
+
+#: ../../mod/install.php:402
+msgid "Error: mysqli PHP module required but not installed."
+msgstr "Error: El mòdul mysqli de PHP és necessari però no està instal·lat."
+
+#: ../../mod/install.php:406
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Error: mòdul mb_string de PHP requerit però no instal·lat."
+
+#: ../../mod/install.php:423
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\""
+" in the top folder of your web server and it is unable to do so."
+msgstr "L'instal·lador web necessita crear un arxiu anomenat \".htconfig.php\" en la carpeta superior del seu servidor web però alguna cosa ho va impedir."
+
+#: ../../mod/install.php:424
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr "Això freqüentment és a causa d'una configuració de permisos; el servidor web no pot escriure arxius en la carpeta - encara que sigui possible."
+
+#: ../../mod/install.php:425
+msgid ""
+"Please check with your site documentation or support people to see if this "
+"situation can be corrected."
+msgstr "Per favor, consulti amb la documentació del seu lloc o persones de suport per veure si aquesta situació es pot corregir."
+
+#: ../../mod/install.php:426
+msgid ""
+"If not, you may be required to perform a manual installation. Please see the"
+" file \"INSTALL.txt\" for instructions."
+msgstr "Si no, vostè pot ser requerit per realitzar una instal·lació manual. Per favor, consulti l'arxiu \"INSTALL.txt\" per obtenir instruccions."
+
+#: ../../mod/install.php:429
+msgid ".htconfig.php is writable"
+msgstr ".htconfig.php és escribible"
+
+#: ../../mod/install.php:436
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr "L'arxiu per a la configuració de la base de dades \".htconfig.php\" no es pot escriure. Per favor, usi el text adjunt per crear un arxiu de configuració en l'arrel del servidor web."
+
+#: ../../mod/install.php:461
+msgid "Errors encountered creating database tables."
+msgstr "Trobats errors durant la creació de les taules de la base de dades."
+
+#: ../../mod/localtime.php:12 ../../include/event.php:11
+#: ../../include/bb2diaspora.php:238
+msgid "l F d, Y \\@ g:i A"
+msgstr "l F d, Y \\@ g:i A"
+
+#: ../../mod/localtime.php:24
+msgid "Time Conversion"
+msgstr "Temps de Conversió"
+
+#: ../../mod/localtime.php:26
+msgid ""
+"Friendika provides this service for sharing events with other networks and "
+"friends in unknown timezones."
+msgstr "Friendica ofereix aquest servei per compartir esdeveniments amb altres xarxes i amics a les zones horàries desconegudes."
+
+#: ../../mod/localtime.php:30
+#, php-format
+msgid "UTC time: %s"
+msgstr "hora UTC: %s"
+
+#: ../../mod/localtime.php:33
+#, php-format
+msgid "Current timezone: %s"
+msgstr "Zona horària actual: %s"
+
+#: ../../mod/localtime.php:36
+#, php-format
+msgid "Converted localtime: %s"
+msgstr "Conversión de hora local: %s"
+
+#: ../../mod/localtime.php:41
+msgid "Please select your timezone:"
+msgstr "Si us plau, seleccioneu la vostra zona horària:"
+
+#: ../../mod/match.php:12
+msgid "Profile Match"
+msgstr "Perfil Aconseguit"
+
+#: ../../mod/match.php:20
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "No hi ha paraules clau que coincideixin. Si us plau, afegeixi paraules clau al teu perfil predeterminat."
+
+#: ../../mod/match.php:57
+msgid "is interested in:"
+msgstr "està interessat en:"
+
+#: ../../mod/match.php:58 ../../mod/suggest.php:59
+#: ../../include/contact_widgets.php:9 ../../boot.php:930
+msgid "Connect"
+msgstr "Connexió"
+
+#: ../../mod/match.php:65 ../../mod/dirfind.php:57
+msgid "No matches"
+msgstr "No hi ha coincidències"
+
+#: ../../mod/lockview.php:39
+msgid "Remote privacy information not available."
+msgstr "Informació de privacitat remota no disponible."
+
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
+msgstr "Visible per a:"
+
+#: ../../mod/home.php:26 ../../addon/communityhome/communityhome.php:179
+#, php-format
+msgid "Welcome to %s"
+msgstr "Benvingut a %s"
+
+#: ../../mod/notifications.php:26
+msgid "Invalid request identifier."
+msgstr "Sol·licitud d'identificació no vàlida."
+
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:157
+#: ../../mod/notifications.php:203
+msgid "Discard"
+msgstr "Descartar"
+
+#: ../../mod/notifications.php:47 ../../mod/notifications.php:156
+#: ../../mod/notifications.php:202 ../../mod/contacts.php:302
+#: ../../mod/contacts.php:345
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: ../../mod/notifications.php:71
+msgid "System"
+msgstr "Sistema"
+
+#: ../../mod/notifications.php:76 ../../include/nav.php:109
+msgid "Network"
+msgstr "Xarxa"
+
+#: ../../mod/notifications.php:81 ../../mod/network.php:177
+msgid "Personal"
+msgstr "Personal"
+
+#: ../../mod/notifications.php:86 ../../include/nav.php:73
+#: ../../include/nav.php:111
+msgid "Home"
+msgstr "Inici"
+
+#: ../../mod/notifications.php:91 ../../include/nav.php:117
+msgid "Introductions"
+msgstr "Presentacions"
+
+#: ../../mod/notifications.php:96 ../../mod/message.php:76
+#: ../../include/nav.php:124
+msgid "Messages"
+msgstr "Missatges"
+
+#: ../../mod/notifications.php:115
+msgid "Show Ignored Requests"
+msgstr "Mostra les Sol·licituds Ignorades"
+
+#: ../../mod/notifications.php:115
+msgid "Hide Ignored Requests"
+msgstr "Amaga les Sol·licituds Ignorades"
+
+#: ../../mod/notifications.php:141 ../../mod/notifications.php:187
+msgid "Notification type: "
+msgstr "Tipus de Notificació:"
+
+#: ../../mod/notifications.php:142
+msgid "Friend Suggestion"
+msgstr "Amics Suggerits "
+
+#: ../../mod/notifications.php:144
+#, php-format
+msgid "suggested by %s"
+msgstr "sugerit per %s"
+
+#: ../../mod/notifications.php:149 ../../mod/notifications.php:196
+#: ../../mod/contacts.php:350
+msgid "Hide this contact from others"
+msgstr "Amaga aquest contacte dels altres"
+
+#: ../../mod/notifications.php:150 ../../mod/notifications.php:197
+msgid "Post a new friend activity"
+msgstr "Publica una activitat  d'amic nova"
+
+#: ../../mod/notifications.php:150 ../../mod/notifications.php:197
+msgid "if applicable"
+msgstr "si es pot aplicar"
+
+#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
+#: ../../mod/admin.php:486
+msgid "Approve"
+msgstr "Aprovar"
+
+#: ../../mod/notifications.php:173
+msgid "Claims to be known to you: "
+msgstr "Diu que et coneix:"
+
+#: ../../mod/notifications.php:173
+msgid "yes"
+msgstr "sí"
+
+#: ../../mod/notifications.php:173
+msgid "no"
+msgstr "no"
+
+#: ../../mod/notifications.php:180
+msgid "Approve as: "
+msgstr "Aprovat com:"
+
+#: ../../mod/notifications.php:181
+msgid "Friend"
+msgstr "Amic"
+
+#: ../../mod/notifications.php:182
+msgid "Sharer"
+msgstr "Partícip"
+
+#: ../../mod/notifications.php:182
+msgid "Fan/Admirer"
+msgstr "Fan/Admirador"
+
+#: ../../mod/notifications.php:188
+msgid "Friend/Connect Request"
+msgstr "Sol·licitud d'Amistat/Connexió"
+
+#: ../../mod/notifications.php:188
+msgid "New Follower"
+msgstr "Nou Seguidor"
+
+#: ../../mod/notifications.php:209
+msgid "No introductions."
+msgstr "Sense presentacions."
+
+#: ../../mod/notifications.php:212 ../../include/nav.php:118
+msgid "Notifications"
+msgstr "Notificacions"
+
+#: ../../mod/notifications.php:249 ../../mod/notifications.php:374
+#: ../../mod/notifications.php:461
+#, php-format
+msgid "%s liked %s's post"
+msgstr "A %s li agrada l'enviament de %s"
+
+#: ../../mod/notifications.php:258 ../../mod/notifications.php:383
+#: ../../mod/notifications.php:470
+#, php-format
+msgid "%s disliked %s's post"
+msgstr "A %s no li agrada l'enviament de %s"
+
+#: ../../mod/notifications.php:272 ../../mod/notifications.php:397
+#: ../../mod/notifications.php:484
+#, php-format
+msgid "%s is now friends with %s"
+msgstr "%s es ara amic de %s"
+
+#: ../../mod/notifications.php:279 ../../mod/notifications.php:404
+#, php-format
+msgid "%s created a new post"
+msgstr "%s ha creat un enviament nou"
+
+#: ../../mod/notifications.php:280 ../../mod/notifications.php:405
+#: ../../mod/notifications.php:493
+#, php-format
+msgid "%s commented on %s's post"
+msgstr "%s va comentar en l'enviament de %s"
+
+#: ../../mod/notifications.php:294
+msgid "No more network notifications."
+msgstr "No més notificacions de xarxa."
+
+#: ../../mod/notifications.php:298
+msgid "Network Notifications"
+msgstr "Notificacions de la Xarxa"
+
+#: ../../mod/notifications.php:324 ../../mod/notify.php:61
+msgid "No more system notifications."
+msgstr "No més notificacions del sistema."
+
+#: ../../mod/notifications.php:328 ../../mod/notify.php:65
+msgid "System Notifications"
+msgstr "Notificacions del Sistema"
+
+#: ../../mod/notifications.php:419
+msgid "No more personal notifications."
+msgstr "No més notificacions personals."
+
+#: ../../mod/notifications.php:423
+msgid "Personal Notifications"
+msgstr "Notificacions Personals"
+
+#: ../../mod/notifications.php:500
+msgid "No more home notifications."
+msgstr "No més notificacions d'inici."
+
+#: ../../mod/notifications.php:504
+msgid "Home Notifications"
+msgstr "Notificacions d'Inici"
+
+#: ../../mod/contacts.php:63 ../../mod/contacts.php:143
+msgid "Could not access contact record."
+msgstr "No puc accedir al registre del contacte."
+
+#: ../../mod/contacts.php:77
+msgid "Could not locate selected profile."
+msgstr "No puc localitzar el perfil seleccionat."
+
+#: ../../mod/contacts.php:100
+msgid "Contact updated."
+msgstr "Contacte actualitzat."
+
+#: ../../mod/contacts.php:165
+msgid "Contact has been blocked"
+msgstr "Elcontacte ha estat bloquejat"
+
+#: ../../mod/contacts.php:165
+msgid "Contact has been unblocked"
+msgstr "El contacte ha estat desbloquejat"
+
+#: ../../mod/contacts.php:179
+msgid "Contact has been ignored"
+msgstr "El contacte ha estat ignorat"
+
+#: ../../mod/contacts.php:179
+msgid "Contact has been unignored"
+msgstr "El contacte ha estat recordat"
+
+#: ../../mod/contacts.php:200
+msgid "stopped following"
+msgstr "Deixar de seguir"
+
+#: ../../mod/contacts.php:221
+msgid "Contact has been removed."
+msgstr "El contacte ha estat tret"
+
+#: ../../mod/contacts.php:245
+#, php-format
+msgid "You are mutual friends with %s"
+msgstr "Ara te una amistat mutua amb %s"
+
+#: ../../mod/contacts.php:249
+#, php-format
+msgid "You are sharing with %s"
+msgstr "Estas compartint amb %s"
+
+#: ../../mod/contacts.php:254
+#, php-format
+msgid "%s is sharing with you"
+msgstr "%s esta compartint amb tú"
+
+#: ../../mod/contacts.php:271
+msgid "Private communications are not available for this contact."
+msgstr "Comunicacions privades no disponibles per aquest contacte."
+
+#: ../../mod/contacts.php:274
+msgid "Never"
+msgstr "Mai"
+
+#: ../../mod/contacts.php:278
+msgid "(Update was successful)"
+msgstr "(L'actualització fou exitosa)"
+
+#: ../../mod/contacts.php:278
+msgid "(Update was not successful)"
+msgstr "(L'actualització fracassà)"
+
+#: ../../mod/contacts.php:280
+msgid "Suggest friends"
+msgstr "Suggerir amics"
+
+#: ../../mod/contacts.php:284
+#, php-format
+msgid "Network type: %s"
+msgstr "Xarxa tipus: %s"
+
+#: ../../mod/contacts.php:287
+#, php-format
+msgid "%d contact in common"
+msgid_plural "%d contacts in common"
+msgstr[0] "%d contacte en comú"
+msgstr[1] "%d contactes en comú"
+
+#: ../../mod/contacts.php:292
+msgid "View all contacts"
+msgstr "Veure tots els contactes"
+
+#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
+#: ../../mod/admin.php:490
+msgid "Unblock"
+msgstr "Desbloquejar"
+
+#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
+#: ../../mod/admin.php:489
+msgid "Block"
+msgstr "Bloquejar"
+
+#: ../../mod/contacts.php:302 ../../mod/contacts.php:345
+msgid "Unignore"
+msgstr "Treure d'Ignorats"
+
+#: ../../mod/contacts.php:307
+msgid "Repair"
+msgstr "Reparar"
+
+#: ../../mod/contacts.php:317
+msgid "Contact Editor"
+msgstr "Editor de Contactes"
+
+#: ../../mod/contacts.php:320
+msgid "Profile Visibility"
+msgstr "Perfil de Visibilitat"
+
+#: ../../mod/contacts.php:321
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Si us plau triï el perfil que voleu mostrar a %s quan estigui veient el teu de forma segura."
+
+#: ../../mod/contacts.php:322
+msgid "Contact Information / Notes"
+msgstr "Informació/Notes del contacte"
+
+#: ../../mod/contacts.php:323
+msgid "Edit contact notes"
+msgstr "Editar notes de contactes"
+
+#: ../../mod/contacts.php:328 ../../mod/contacts.php:497
+#: ../../mod/viewcontacts.php:60
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "Visitar perfil de %s [%s]"
+
+#: ../../mod/contacts.php:329
+msgid "Block/Unblock contact"
+msgstr "Bloquejar/Alliberar contacte"
+
+#: ../../mod/contacts.php:330
+msgid "Ignore contact"
+msgstr "Ignore contacte"
+
+#: ../../mod/contacts.php:331
+msgid "Repair URL settings"
+msgstr "Restablir configuració de URL"
+
+#: ../../mod/contacts.php:332
+msgid "View conversations"
+msgstr "Veient conversacions"
+
+#: ../../mod/contacts.php:334
+msgid "Delete contact"
+msgstr "Esborrar contacte"
+
+#: ../../mod/contacts.php:338
+msgid "Last update:"
+msgstr "Última actualització:"
+
+#: ../../mod/contacts.php:339
+msgid "Update public posts"
+msgstr "Actualitzar enviament públic"
+
+#: ../../mod/contacts.php:341 ../../mod/admin.php:905
+msgid "Update now"
+msgstr "Actualitza ara"
+
+#: ../../mod/contacts.php:348
+msgid "Currently blocked"
+msgstr "Bloquejat actualment"
+
+#: ../../mod/contacts.php:349
+msgid "Currently ignored"
+msgstr "Ignorat actualment"
+
+#: ../../mod/contacts.php:350
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
+msgstr "Répliques/agraiments per als teus missatges públics <strong>poden</strong> romandre visibles"
+
+#: ../../mod/contacts.php:399 ../../mod/group.php:179
+msgid "All Contacts"
+msgstr "Tots els Contactes"
+
+#: ../../mod/contacts.php:404
+msgid "Unblocked Contacts"
+msgstr "Contactes Desbloquejats"
+
+#: ../../mod/contacts.php:410
+msgid "Blocked Contacts"
+msgstr "Contactes Bloquejats"
+
+#: ../../mod/contacts.php:416
+msgid "Ignored Contacts"
+msgstr "Contactes Ignorats"
+
+#: ../../mod/contacts.php:422
+msgid "Hidden Contacts"
+msgstr "Contactes Amagats"
+
+#: ../../mod/contacts.php:473
+msgid "Mutual Friendship"
+msgstr "Amistat Mutua"
+
+#: ../../mod/contacts.php:477
+msgid "is a fan of yours"
+msgstr "Es un fan teu"
+
+#: ../../mod/contacts.php:481
+msgid "you are a fan of"
+msgstr "ets fan de"
+
+#: ../../mod/contacts.php:498 ../../include/Contact.php:135
+#: ../../include/conversation.php:792
+msgid "Edit contact"
+msgstr "Editar contacte"
+
+#: ../../mod/contacts.php:519 ../../include/nav.php:132
+msgid "Contacts"
+msgstr "Contactes"
+
+#: ../../mod/contacts.php:523
+msgid "Search your contacts"
+msgstr "Cercant el seus contactes"
+
+#: ../../mod/contacts.php:524 ../../mod/directory.php:67
+msgid "Finding: "
+msgstr "Cercant:"
+
+#: ../../mod/contacts.php:525 ../../mod/directory.php:69
+#: ../../include/contact_widgets.php:34
+msgid "Find"
+msgstr "Cercar"
+
+#: ../../mod/lostpass.php:16
+msgid "No valid account found."
+msgstr "compte no vàlid trobat."
+
+#: ../../mod/lostpass.php:31
+msgid "Password reset request issued. Check your email."
+msgstr "Sol·licitut de restabliment de contrasenya enviat. Comprovi el seu correu."
+
+#: ../../mod/lostpass.php:42
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Contrasenya restablerta enviada a %s"
+
+#: ../../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
+msgid "Administrator"
+msgstr "Administrador"
+
+#: ../../mod/lostpass.php:64
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "La sol·licitut no pot ser verificada. (Hauries de presentar-la abans). Restabliment de contrasenya fracassat."
+
+#: ../../mod/lostpass.php:82 ../../boot.php:723
+msgid "Password Reset"
+msgstr "Restabliment de Contrasenya"
+
+#: ../../mod/lostpass.php:83
+msgid "Your password has been reset as requested."
+msgstr "La teva contrasenya fou restablerta com vas demanar."
+
+#: ../../mod/lostpass.php:84
+msgid "Your new password is"
+msgstr "La teva nova contrasenya es"
+
+#: ../../mod/lostpass.php:85
+msgid "Save or copy your new password - and then"
+msgstr "Guarda o copia la nova contrasenya - i llavors"
+
+#: ../../mod/lostpass.php:86
+msgid "click here to login"
+msgstr "clica aquí per identificarte"
+
+#: ../../mod/lostpass.php:87
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Pots camviar la contrasenya des de la pàgina de <em>Configuración</em> desprès d'accedir amb èxit."
+
+#: ../../mod/lostpass.php:118
+msgid "Forgot your Password?"
+msgstr "Has Oblidat la Contrasenya?"
+
+#: ../../mod/lostpass.php:119
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Introdueixi la seva adreça de correu i enivii-la per restablir la seva contrasenya. Llavors comprovi el seu correu per a les següents instruccións. "
+
+#: ../../mod/lostpass.php:120
+msgid "Nickname or Email: "
+msgstr "Malnom o Correu:"
+
+#: ../../mod/lostpass.php:121
+msgid "Reset"
+msgstr "Restablir"
+
+#: ../../mod/settings.php:72
+msgid "Missing some important data!"
+msgstr "Perdudes algunes dades importants!"
+
+#: ../../mod/settings.php:75 ../../mod/settings.php:486 ../../mod/admin.php:75
+msgid "Update"
+msgstr "Actualitzar"
+
+#: ../../mod/settings.php:175
+msgid "Failed to connect with email account using the settings provided."
+msgstr "Connexió fracassada amb el compte de correu emprant la configuració proveïda."
+
+#: ../../mod/settings.php:180
+msgid "Email settings updated."
+msgstr "Configuració del correu electrònic actualitzada."
+
+#: ../../mod/settings.php:198
+msgid "Passwords do not match. Password unchanged."
+msgstr "Les contrasenyes no coincideixen. Contrasenya no canviada."
+
+#: ../../mod/settings.php:203
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "No es permeten contasenyes buides. Contrasenya no canviada"
+
+#: ../../mod/settings.php:214
+msgid "Password changed."
+msgstr "Contrasenya canviada."
+
+#: ../../mod/settings.php:216
+msgid "Password update failed. Please try again."
+msgstr "Ha fallat l'actualització de la Contrasenya. Per favor, intenti-ho de nou."
+
+#: ../../mod/settings.php:280
+msgid " Please use a shorter name."
+msgstr "Si us plau, faci servir un nom més curt."
+
+#: ../../mod/settings.php:282
+msgid " Name too short."
+msgstr "Nom massa curt."
+
+#: ../../mod/settings.php:288
+msgid " Not valid email."
+msgstr "Correu no vàlid."
+
+#: ../../mod/settings.php:290
+msgid " Cannot change to that email."
+msgstr "No puc canviar a aquest correu."
+
+#: ../../mod/settings.php:358 ../../addon/facebook/facebook.php:321
+#: ../../addon/impressum/impressum.php:64
+#: ../../addon/openstreetmap/openstreetmap.php:80
+#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:350
+msgid "Settings updated."
+msgstr "Ajustos actualitzats."
+
+#: ../../mod/settings.php:422 ../../include/nav.php:130
+msgid "Account settings"
+msgstr "Configuració del compte"
+
+#: ../../mod/settings.php:427
+msgid "Connector settings"
+msgstr "Configuració dels connectors"
+
+#: ../../mod/settings.php:432
+msgid "Plugin settings"
+msgstr "Configuració del plugin"
+
+#: ../../mod/settings.php:437
+msgid "Connections"
+msgstr "Connexions"
+
+#: ../../mod/settings.php:442
+msgid "Export personal data"
+msgstr "Exportar dades personals"
+
+#: ../../mod/settings.php:459 ../../mod/settings.php:485
+#: ../../mod/settings.php:518
+msgid "Add application"
+msgstr "Afegir aplicació"
+
+#: ../../mod/settings.php:463 ../../mod/settings.php:489
+#: ../../addon/statusnet/statusnet.php:526
+msgid "Consumer Key"
+msgstr "Consumer Key"
+
+#: ../../mod/settings.php:464 ../../mod/settings.php:490
+#: ../../addon/statusnet/statusnet.php:525
+msgid "Consumer Secret"
+msgstr "Consumer Secret"
+
+#: ../../mod/settings.php:465 ../../mod/settings.php:491
+msgid "Redirect"
+msgstr "Redirigir"
+
+#: ../../mod/settings.php:466 ../../mod/settings.php:492
+msgid "Icon url"
+msgstr "icona de url"
+
+#: ../../mod/settings.php:477
+msgid "You can't edit this application."
+msgstr "No pots editar aquesta aplicació."
+
+#: ../../mod/settings.php:517
+msgid "Connected Apps"
+msgstr "Aplicacions conectades"
+
+#: ../../mod/settings.php:521
+msgid "Client key starts with"
+msgstr "Les claus de client comançen amb"
+
+#: ../../mod/settings.php:522
+msgid "No name"
+msgstr "Sense nom"
+
+#: ../../mod/settings.php:523
+msgid "Remove authorization"
+msgstr "retirar l'autorització"
+
+#: ../../mod/settings.php:535
+msgid "No Plugin settings configured"
+msgstr "No s'han configurat ajustos de Plugin"
+
+#: ../../mod/settings.php:542 ../../addon/widgets/widgets.php:122
+msgid "Plugin Settings"
+msgstr "Ajustos de Plugin"
+
+#: ../../mod/settings.php:555 ../../mod/settings.php:556
+#, php-format
+msgid "Built-in support for %s connectivity is %s"
+msgstr "El suport integrat per a la connectivitat de %s és %s"
+
+#: ../../mod/settings.php:555 ../../mod/settings.php:556
+msgid "enabled"
+msgstr "habilitat"
+
+#: ../../mod/settings.php:555 ../../mod/settings.php:556
+msgid "disabled"
+msgstr "deshabilitat"
+
+#: ../../mod/settings.php:556
+msgid "StatusNet"
+msgstr "StatusNet"
+
+#: ../../mod/settings.php:584
+msgid "Connector Settings"
+msgstr "Configuració de connectors"
+
+#: ../../mod/settings.php:590
+msgid "Email/Mailbox Setup"
+msgstr "Preparació de Correu/Bústia"
+
+#: ../../mod/settings.php:591
+msgid ""
+"If you wish to communicate with email contacts using this service "
+"(optional), please specify how to connect to your mailbox."
+msgstr "Si vol comunicar-se amb els contactes de correu emprant aquest servei (opcional), Si us plau, especifiqui com connectar amb la seva bústia."
+
+#: ../../mod/settings.php:592
+msgid "Last successful email check:"
+msgstr "Última comprovació de correu amb èxit:"
+
+#: ../../mod/settings.php:593
+msgid "Email access is disabled on this site."
+msgstr "L'accés al correu està deshabilitat en aquest lloc."
+
+#: ../../mod/settings.php:594
+msgid "IMAP server name:"
+msgstr "Nom del servidor IMAP:"
+
+#: ../../mod/settings.php:595
+msgid "IMAP port:"
+msgstr "Port IMAP:"
+
+#: ../../mod/settings.php:596
+msgid "Security:"
+msgstr "Seguretat:"
+
+#: ../../mod/settings.php:596 ../../mod/settings.php:601
+msgid "None"
+msgstr "Cap"
+
+#: ../../mod/settings.php:597
+msgid "Email login name:"
+msgstr "Nom d'usuari del correu"
+
+#: ../../mod/settings.php:598
+msgid "Email password:"
+msgstr "Contrasenya del correu:"
+
+#: ../../mod/settings.php:599
+msgid "Reply-to address:"
+msgstr "Adreça de resposta:"
+
+#: ../../mod/settings.php:600
+msgid "Send public posts to all email contacts:"
+msgstr "Enviar correu públic a tots els contactes del correu:"
+
+#: ../../mod/settings.php:601
+msgid "Action after import:"
+msgstr "Acció després d'importar:"
+
+#: ../../mod/settings.php:601
+msgid "Mark as seen"
+msgstr "Marcar com a vist"
+
+#: ../../mod/settings.php:601
+msgid "Move to folder"
+msgstr "Moure a la carpeta"
+
+#: ../../mod/settings.php:602
+msgid "Move to folder:"
+msgstr "Moure a la carpeta:"
+
+#: ../../mod/settings.php:659 ../../mod/admin.php:142 ../../mod/admin.php:462
+msgid "Normal Account"
+msgstr "Compte Normal"
+
+#: ../../mod/settings.php:660
+msgid "This account is a normal personal profile"
+msgstr "Aques compte es un compte personal normal"
+
+#: ../../mod/settings.php:663 ../../mod/admin.php:143 ../../mod/admin.php:463
+msgid "Soapbox Account"
+msgstr "Compte Tribuna"
+
+#: ../../mod/settings.php:664
+msgid "Automatically approve all connection/friend requests as read-only fans"
+msgstr "Aprova automàticament totes les sol·licituds de amistat/connexió com a fans de només lectura."
+
+#: ../../mod/settings.php:667 ../../mod/admin.php:144 ../../mod/admin.php:464
+msgid "Community/Celebrity Account"
+msgstr "Compte de Comunitat/Celebritat"
+
+#: ../../mod/settings.php:668
+msgid ""
+"Automatically approve all connection/friend requests as read-write fans"
+msgstr "Aprova automàticament totes les sol·licituds de amistat/connexió com a fans de lectura-escriptura"
+
+#: ../../mod/settings.php:671 ../../mod/admin.php:145 ../../mod/admin.php:465
+msgid "Automatic Friend Account"
+msgstr "Compte d'Amistat Automàtic"
+
+#: ../../mod/settings.php:672
+msgid "Automatically approve all connection/friend requests as friends"
+msgstr "Aprova totes les sol·licituds de amistat/connexió com a amic automàticament"
+
+#: ../../mod/settings.php:682
+msgid "OpenID:"
+msgstr "OpenID:"
+
+#: ../../mod/settings.php:682
+msgid "(Optional) Allow this OpenID to login to this account."
+msgstr "(Opcional) Permetre a aquest OpenID iniciar sessió en aquest compte."
+
+#: ../../mod/settings.php:692
+msgid "Publish your default profile in your local site directory?"
+msgstr "Publicar el teu perfil predeterminat en el directori del lloc local?"
+
+#: ../../mod/settings.php:698
+msgid "Publish your default profile in the global social directory?"
+msgstr "Publicar el teu perfil predeterminat al directori social global?"
+
+#: ../../mod/settings.php:706
+msgid "Hide your contact/friend list from viewers of your default profile?"
+msgstr "Amaga la teva llista de contactes/amics dels espectadors del seu perfil per defecte?"
+
+#: ../../mod/settings.php:710
+msgid "Hide your profile details from unknown viewers?"
+msgstr "Amagar els detalls del seu perfil a espectadors desconeguts?"
+
+#: ../../mod/settings.php:715
+msgid "Allow friends to post to your profile page?"
+msgstr "Permet als amics publicar en la seva pàgina de perfil?"
+
+#: ../../mod/settings.php:721
+msgid "Allow friends to tag your posts?"
+msgstr "Permet als amics d'etiquetar els teus missatges?"
+
+#: ../../mod/settings.php:727
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "Permeteu-nos suggerir-li com un amic potencial dels nous membres?"
+
+#: ../../mod/settings.php:736
+msgid "Profile is <strong>not published</strong>."
+msgstr "El  Perfil <strong>no està publicat</strong>."
+
+#: ../../mod/settings.php:768 ../../mod/profile_photo.php:206
+msgid "or"
+msgstr "o"
+
+#: ../../mod/settings.php:773
+msgid "Your Identity Address is"
+msgstr "La seva Adreça d'Identitat és"
+
+#: ../../mod/settings.php:784
+msgid "Automatically expire posts after this many days:"
+msgstr "Després de aquests nombre de dies, els missatges caduquen automàticament:"
+
+#: ../../mod/settings.php:784
+msgid "If empty, posts will not expire. Expired posts will be deleted"
+msgstr "Si està buit, els missatges no caducarà. Missatges caducats s'eliminaran"
+
+#: ../../mod/settings.php:785
+msgid "Advanced expiration settings"
+msgstr "Configuració avançada d'expiració"
+
+#: ../../mod/settings.php:786
+msgid "Advanced Expiration"
+msgstr "Expiració Avançada"
+
+#: ../../mod/settings.php:787
+msgid "Expire posts:"
+msgstr "Expiració d'enviaments"
+
+#: ../../mod/settings.php:788
+msgid "Expire personal notes:"
+msgstr "Expiració de notes personals"
+
+#: ../../mod/settings.php:789
+msgid "Expire starred posts:"
+msgstr "Expiració de enviaments de favorits"
+
+#: ../../mod/settings.php:790
+msgid "Expire photos:"
+msgstr "Expiració de fotos"
+
+#: ../../mod/settings.php:795
+msgid "Account Settings"
+msgstr "Ajustos de Compte"
+
+#: ../../mod/settings.php:803
+msgid "Password Settings"
+msgstr "Ajustos de Contrasenya"
+
+#: ../../mod/settings.php:804
+msgid "New Password:"
+msgstr "Nova Contrasenya:"
+
+#: ../../mod/settings.php:805
+msgid "Confirm:"
+msgstr "Confirmar:"
+
+#: ../../mod/settings.php:805
+msgid "Leave password fields blank unless changing"
+msgstr "Deixi els camps de contrasenya buits per a no fer canvis"
+
+#: ../../mod/settings.php:809
+msgid "Basic Settings"
+msgstr "Ajustos Basics"
+
+#: ../../mod/settings.php:810 ../../include/profile_advanced.php:15
+msgid "Full Name:"
+msgstr "Nom Complet:"
+
+#: ../../mod/settings.php:811
+msgid "Email Address:"
+msgstr "Adreça de Correu:"
+
+#: ../../mod/settings.php:812
+msgid "Your Timezone:"
+msgstr "La teva zona Horària:"
+
+#: ../../mod/settings.php:813
+msgid "Default Post Location:"
+msgstr "Localització per Defecte del Missatge:"
+
+#: ../../mod/settings.php:814
+msgid "Use Browser Location:"
+msgstr "Ubicar-se amb el Navegador:"
+
+#: ../../mod/settings.php:815
+msgid "Display Theme:"
+msgstr "Visualitzar el Tema:"
+
+#: ../../mod/settings.php:816
+msgid "Update browser every xx seconds"
+msgstr "Actualitzar navegador cada xx segons"
+
+#: ../../mod/settings.php:816
+msgid "Minimum of 10 seconds, no maximum"
+msgstr "Mínim cada 10 segons, no hi ha màxim"
+
+#: ../../mod/settings.php:818
+msgid "Security and Privacy Settings"
+msgstr "Ajustos de Seguretat i Privacitat"
+
+#: ../../mod/settings.php:820
+msgid "Maximum Friend Requests/Day:"
+msgstr "Nombre Màxim de Sol·licituds per Dia"
+
+#: ../../mod/settings.php:820
+msgid "(to prevent spam abuse)"
+msgstr "(per a prevenir abusos de spam)"
+
+#: ../../mod/settings.php:821
+msgid "Default Post Permissions"
+msgstr "Permisos de Correu per Defecte"
+
+#: ../../mod/settings.php:822
+msgid "(click to open/close)"
+msgstr "(clicar per a obrir/tancar)"
+
+#: ../../mod/settings.php:837
+msgid "Notification Settings"
+msgstr "Ajustos de Notificació"
+
+#: ../../mod/settings.php:838
+msgid "Send a notification email when:"
+msgstr "Envia un correu notificant quan:"
+
+#: ../../mod/settings.php:839
+msgid "You receive an introduction"
+msgstr "Has rebut una presentació"
+
+#: ../../mod/settings.php:840
+msgid "Your introductions are confirmed"
+msgstr "La teva presentació està confirmada"
+
+#: ../../mod/settings.php:841
+msgid "Someone writes on your profile wall"
+msgstr "Algú ha escrit en el teu mur de perfil"
+
+#: ../../mod/settings.php:842
+msgid "Someone writes a followup comment"
+msgstr "Algú ha escrit un comentari de seguiment"
+
+#: ../../mod/settings.php:843
+msgid "You receive a private message"
+msgstr "Has rebut un missatge privat"
+
+#: ../../mod/settings.php:844
+msgid "You receive a friend suggestion"
+msgstr "Has rebut una suggerencia d'un amic"
+
+#: ../../mod/settings.php:845
+msgid "You are tagged in a post"
+msgstr "Estàs etiquetat en un enviament"
+
+#: ../../mod/settings.php:848
+msgid "Advanced Page Settings"
+msgstr "Ajustos Avançats de Pàgina"
+
+#: ../../mod/manage.php:90
+msgid "Manage Identities and/or Pages"
+msgstr "Administrar Identitats i/o  Pàgines"
+
+#: ../../mod/manage.php:93
+msgid ""
+"Toggle between different identities or community/group pages which share "
+"your account details or which you have been granted \"manage\" permissions"
+msgstr "Alternar entre les diferents identitats o les pàgines de comunitats/grups que comparteixen les dades del seu compte o que se li ha concedit els permisos de \"administrar\""
+
+#: ../../mod/manage.php:95
+msgid "Select an identity to manage: "
+msgstr "Seleccionar identitat a administrar:"
+
+#: ../../mod/network.php:43
+msgid "Search Results For:"
+msgstr "Resultats de la Cerca Per a:"
+
+#: ../../mod/network.php:77 ../../mod/search.php:16
+msgid "Remove term"
+msgstr "Traieu termini"
+
+#: ../../mod/network.php:86 ../../mod/search.php:13
+msgid "Saved Searches"
+msgstr "Cerques Guardades"
+
+#: ../../mod/network.php:87 ../../include/group.php:216
+msgid "add"
+msgstr "afegir"
+
+#: ../../mod/network.php:166
+msgid "Commented Order"
+msgstr "Ordre dels Comentaris"
+
+#: ../../mod/network.php:171
+msgid "Posted Order"
+msgstr "Ordre dels Enviaments"
+
+#: ../../mod/network.php:182
+msgid "New"
+msgstr "Nou"
+
+#: ../../mod/network.php:187
+msgid "Starred"
+msgstr "Favorits"
+
+#: ../../mod/network.php:192
+msgid "Bookmarks"
+msgstr "Marcadors"
+
+#: ../../mod/network.php:250
+#, php-format
+msgid "Warning: This group contains %s member from an insecure network."
+msgid_plural ""
+"Warning: This group contains %s members from an insecure network."
+msgstr[0] "Advertència: Aquest grup conté el membre %s en una xarxa insegura."
+msgstr[1] "Advertència: Aquest grup conté %s membres d'una xarxa insegura."
+
+#: ../../mod/network.php:253
+msgid "Private messages to this group are at risk of public disclosure."
+msgstr "Els missatges privats a aquest grup es troben en risc de divulgació pública."
+
+#: ../../mod/network.php:298
+msgid "No such group"
+msgstr "Cap grup com"
+
+#: ../../mod/network.php:309
+msgid "Group is empty"
+msgstr "El Grup es buit"
+
+#: ../../mod/network.php:313
+msgid "Group: "
+msgstr "Grup:"
+
+#: ../../mod/network.php:323
+msgid "Contact: "
+msgstr "Contacte:"
+
+#: ../../mod/network.php:325
+msgid "Private messages to this person are at risk of public disclosure."
+msgstr "Els missatges privats a aquesta persona es troben en risc de divulgació pública."
+
+#: ../../mod/network.php:330
+msgid "Invalid contact."
+msgstr "Contacte no vàlid."
+
+#: ../../mod/notes.php:44 ../../boot.php:1354
+msgid "Personal Notes"
+msgstr "Notes Personals"
+
+#: ../../mod/notes.php:63 ../../include/text.php:645
+msgid "Save"
+msgstr "Guardar"
+
+#: ../../mod/newmember.php:6
+msgid "Welcome to Friendica"
+msgstr "Benvingut a Friendica"
+
+#: ../../mod/newmember.php:8
+msgid "New Member Checklist"
+msgstr "Llista de Verificació dels Nous Membres"
+
+#: ../../mod/newmember.php:12
+msgid ""
+"We would like to offer some tips and links to help make your experience "
+"enjoyable. Click any item to visit the relevant page. A link to this page "
+"will be visible from your home page for two weeks after your initial "
+"registration and then will quietly disappear."
+msgstr "Ens agradaria oferir alguns consells i enllaços per ajudar a fer la seva experiència agradable. Feu clic a qualsevol element per visitar la pàgina corresponent. Un enllaç a aquesta pàgina serà visible des de la pàgina d'inici durant dues setmanes després de la seva inscripció inicial i després desapareixerà en silenci."
+
+#: ../../mod/newmember.php:16
+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 "En la  de la seva <em>configuració</em> de la pàgina - canviï la contrasenya inicial. També prengui nota de la Adreça d'Identitat. Això s'assembla a una adreça de correu electrònic - i serà útil per fer amics a la xarxa social lliure."
+
+#: ../../mod/newmember.php:18
+msgid ""
+"Review the other settings, particularly the privacy settings. An unpublished"
+" directory listing is like having an unlisted phone number. In general, you "
+"should probably publish your listing - unless all of your friends and "
+"potential friends know exactly how to find you."
+msgstr "Reviseu les altres configuracions, en particular la configuració de privadesa. Una llista de directoris no publicada és com tenir un número de telèfon no llistat. Normalment, hauria de publicar la seva llista - a menys que tots els seus amics i els amics potencials sàpiguen exactament com trobar-li."
+
+#: ../../mod/newmember.php:20
+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 "Puji una foto del seu perfil si encara no ho ha fet. Els estudis han demostrat que les persones amb fotos reals de ells mateixos tenen deu vegades més probabilitats de fer amics que les persones que no ho fan."
+
+#: ../../mod/newmember.php:23
+msgid ""
+"Authorise the Facebook Connector if you currently have a Facebook account "
+"and we will (optionally) import all your Facebook friends and conversations."
+msgstr "Autoritzi el connector de Facebook si vostè té un compte al Facebook i nosaltres (opcionalment) importarem tots els teus amics de Facebook i les converses."
+
+#: ../../mod/newmember.php:25
+msgid ""
+"<em>If</em> this is your own personal server, installing the Facebook addon "
+"may ease your transition to the free social web."
+msgstr "<em>Si </em> aquesta és el seu servidor personal, la instal·lació del complement de Facebook pot facilitar la transició a la web social lliure."
+
+#: ../../mod/newmember.php:30
+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 "Introduïu les dades d'accés al correu electrònic a la seva pàgina de configuració de connector, si es desitja importar i relacionar-se amb amics o llistes de correu de la seva bústia d'email"
+
+#: ../../mod/newmember.php:32
+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 "Editi  el perfil per <strong>defecte</strong> al seu gust. Reviseu la configuració per ocultar la seva llista d'amics i ocultar el perfil dels visitants desconeguts."
+
+#: ../../mod/newmember.php:34
+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 "Estableix algunes paraules clau públiques al teu perfil predeterminat que descriguin els teus interessos. Podem ser capaços de trobar altres persones amb interessos similars i suggerir amistats."
+
+#: ../../mod/newmember.php:36
+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 "La seva pàgina de Contactes és la seva porta d'entrada a la gestió de l'amistat i la connexió amb amics d'altres xarxes. Normalment, vostè entrar en la seva direcció o URL del lloc al  diàleg <em>Afegir Nou Contacte</em>."
+
+#: ../../mod/newmember.php:38
+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 "La pàgina del Directori li permet trobar altres persones en aquesta xarxa o altres llocs federats. Busqui un enllaç <em>Connectar</em> o <em>Seguir</em> a la seva pàgina de perfil. Proporcioni la seva pròpia Adreça de Identitat si així ho sol·licita."
+
+#: ../../mod/newmember.php:40
+msgid ""
+"On the side panel of the Contacts page are several tools to find new "
+"friends. We can match people by interest, look up people by name or "
+"interest, and provide suggestions based on network relationships. On a brand"
+" new site, friend suggestions will usually begin to be populated within 24 "
+"hours."
+msgstr "Al tauler lateral de la pàgina de contacte Hi ha diverses eines per trobar nous amics. Podem coincidir amb les persones per interesos, buscar persones pel nom o per interès, i oferir suggeriments basats en les relacions de la xarxa. En un nou lloc, els suggeriments d'amics, en general comencen a poblar el lloc a les 24 hores."
+
+#: ../../mod/newmember.php:42
+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 "Una vegada que s'han fet alguns amics, organitzi'ls en grups de conversa privada a la barra lateral de la seva pàgina de contactes i després pot interactuar amb cada grup de forma privada a la pàgina de la xarxa."
+
+#: ../../mod/newmember.php:44
+msgid ""
+"Our <strong>help</strong> pages may be consulted for detail on other program"
+" features and resources."
+msgstr "A les nostres pàgines <strong>d'ajuda</strong> es poden consultar detalls sobre les característiques d'altres programes i recursos."
+
+#: ../../mod/attach.php:8
+msgid "Item not available."
+msgstr "Element no disponible"
+
+#: ../../mod/attach.php:20
+msgid "Item was not found."
+msgstr "Element no trobat."
+
+#: ../../mod/group.php:27
+msgid "Group created."
+msgstr "Grup creat."
+
+#: ../../mod/group.php:33
+msgid "Could not create group."
+msgstr "No puc crear grup."
+
+#: ../../mod/group.php:43 ../../mod/group.php:127
+msgid "Group not found."
+msgstr "Grup no trobat"
+
+#: ../../mod/group.php:56
+msgid "Group name changed."
+msgstr "Nom de Grup canviat."
+
+#: ../../mod/group.php:67 ../../mod/profperm.php:19 ../../index.php:287
+msgid "Permission denied"
+msgstr "Permís denegat"
+
+#: ../../mod/group.php:85
+msgid "Create a group of contacts/friends."
+msgstr "Crear un grup de contactes/amics."
+
+#: ../../mod/group.php:86 ../../mod/group.php:166
+msgid "Group Name: "
+msgstr "Nom del Grup:"
+
+#: ../../mod/group.php:102
+msgid "Group removed."
+msgstr "Grup esborrat."
+
+#: ../../mod/group.php:104
+msgid "Unable to remove group."
+msgstr "Incapaç de esborrar Grup."
+
+#: ../../mod/group.php:165
+msgid "Group Editor"
+msgstr "Editor de Grup:"
+
+#: ../../mod/group.php:177
+msgid "Members"
+msgstr "Membres"
+
+#: ../../mod/group.php:209 ../../mod/profperm.php:105
+msgid "Click on a contact to add or remove."
+msgstr "Clicar sobre el contacte per afegir o esborrar."
+
+#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
+msgid "Invalid profile identifier."
+msgstr "Identificador del perfil no vàlid."
+
+#: ../../mod/profperm.php:101
+msgid "Profile Visibility Editor"
+msgstr "Editor de Visibilitat del Perfil"
+
+#: ../../mod/profperm.php:103 ../../include/profile_advanced.php:7
+#: ../../include/profile_advanced.php:76 ../../include/nav.php:48
+#: ../../boot.php:1336
+msgid "Profile"
+msgstr "Perfil"
+
+#: ../../mod/profperm.php:114
+msgid "Visible To"
+msgstr "Visible Per"
+
+#: ../../mod/profperm.php:130
+msgid "All Contacts (with secure profile access)"
+msgstr "Tots els Contactes (amb accés segur al perfil)"
+
+#: ../../mod/viewcontacts.php:39
+msgid "No contacts."
+msgstr "Sense Contactes"
+
+#: ../../mod/viewcontacts.php:74 ../../include/text.php:584
+msgid "View Contacts"
+msgstr "Veure Contactes"
+
+#: ../../mod/register.php:62
+msgid "An invitation is required."
+msgstr "Es requereix invitació."
+
+#: ../../mod/register.php:67
+msgid "Invitation could not be verified."
+msgstr "La invitació no ha pogut ser verificada."
+
+#: ../../mod/register.php:75
+msgid "Invalid OpenID url"
+msgstr "OpenID url no vàlid"
+
+#: ../../mod/register.php:90
+msgid "Please enter the required information."
+msgstr "Per favor, introdueixi la informació requerida."
+
+#: ../../mod/register.php:104
+msgid "Please use a shorter name."
+msgstr "Per favor, empri un nom més curt."
+
+#: ../../mod/register.php:106
+msgid "Name too short."
+msgstr "Nom massa curt."
+
+#: ../../mod/register.php:121
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr "Això no sembla ser el teu nom complet."
+
+#: ../../mod/register.php:126
+msgid "Your email domain is not among those allowed on this site."
+msgstr "El seu domini de correu electrònic no es troba entre els permesos en aquest lloc."
+
+#: ../../mod/register.php:129
+msgid "Not a valid email address."
+msgstr "Adreça de correu no vàlida."
+
+#: ../../mod/register.php:139
+msgid "Cannot use that email."
+msgstr "No es pot utilitzar aquest correu electrònic."
+
+#: ../../mod/register.php:145
+msgid ""
+"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
+"must also begin with a letter."
+msgstr "El teu sobrenom nomes pot contenir \"a-z\", \"0-9\", \"-\", i \"_\", i començar amb lletra."
+
+#: ../../mod/register.php:151 ../../mod/register.php:252
+msgid "Nickname is already registered. Please choose another."
+msgstr "malnom ja registrat. Tria un altre."
+
+#: ../../mod/register.php:170
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr "ERROR IMPORTANT: La generació de claus de seguretat ha fallat."
+
+#: ../../mod/register.php:238
+msgid "An error occurred during registration. Please try again."
+msgstr "Un error ha succeït durant el registre. Intenta-ho de nou."
+
+#: ../../mod/register.php:274
+msgid "An error occurred creating your default profile. Please try again."
+msgstr "Un error ha succeit durant la creació del teu perfil per defecte. Intenta-ho de nou."
+
+#: ../../mod/register.php:378 ../../mod/regmod.php:52
+#, php-format
+msgid "Registration details for %s"
+msgstr "Detalls del registre per a %s"
+
+#: ../../mod/register.php:386
+msgid ""
+"Registration successful. Please check your email for further instructions."
+msgstr "Registrat amb èxit. Per favor, comprovi el seu correu per a posteriors instruccions."
+
+#: ../../mod/register.php:390
+msgid "Failed to send email message. Here is the message that failed."
+msgstr "Error en enviar missatge de correu electrònic. Aquí està el missatge que ha fallat."
+
+#: ../../mod/register.php:395
+msgid "Your registration can not be processed."
+msgstr "El seu registre no pot ser processat."
+
+#: ../../mod/register.php:432
+#, php-format
+msgid "Registration request at %s"
+msgstr "Sol·licitud de registre a %s"
+
+#: ../../mod/register.php:441
+msgid "Your registration is pending approval by the site owner."
+msgstr "El seu registre està pendent d'aprovació pel propietari del lloc."
+
+#: ../../mod/register.php:479
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr "Aquest lloc excedeix el nombre diari de registres de comptes. Per favor, provi de nou demà."
+
+#: ../../mod/register.php:505
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
+msgstr "Vostè pot (opcionalment), omplir aquest formulari a través de OpenID mitjançant el subministrament de la seva OpenID i fent clic a 'Registrar'."
+
+#: ../../mod/register.php:506
+msgid ""
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
+msgstr "Si vostè no està familiaritzat amb Twitter, si us plau deixi aquest camp en blanc i completi la resta dels elements."
+
+#: ../../mod/register.php:507
+msgid "Your OpenID (optional): "
+msgstr "El seu OpenID (opcional):"
+
+#: ../../mod/register.php:521
+msgid "Include your profile in member directory?"
+msgstr "Incloc el seu perfil al directori de membres?"
+
+#: ../../mod/register.php:536
+msgid "Membership on this site is by invitation only."
+msgstr "Lloc accesible mitjançant invitació."
+
+#: ../../mod/register.php:537
+msgid "Your invitation ID: "
+msgstr "El teu ID de invitació:"
+
+#: ../../mod/register.php:540 ../../mod/admin.php:314
+msgid "Registration"
+msgstr "Procés de Registre"
+
+#: ../../mod/register.php:548
+msgid "Your Full Name (e.g. Joe Smith): "
+msgstr "El seu nom complet (per exemple, Joan Ningú):"
+
+#: ../../mod/register.php:549
+msgid "Your Email Address: "
+msgstr "La Seva Adreça de Correu:"
+
+#: ../../mod/register.php:550
+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 "Tria un nom de perfil. Això ha de començar amb un caràcter de text. La seva adreça de perfil en aquest lloc serà '<strong>malnom@$sitename</strong>'."
+
+#: ../../mod/register.php:551
+msgid "Choose a nickname: "
+msgstr "Tria un malnom:"
+
+#: ../../mod/register.php:554 ../../include/nav.php:77 ../../boot.php:693
+msgid "Register"
+msgstr "Registrar"
+
+#: ../../mod/dirfind.php:23
+msgid "People Search"
+msgstr "Cercant Gent"
+
+#: ../../mod/like.php:127 ../../mod/tagger.php:70
+#: ../../addon/facebook/facebook.php:1092
+#: ../../addon/communityhome/communityhome.php:158
+#: ../../addon/communityhome/communityhome.php:167
+#: ../../include/diaspora.php:1600 ../../include/conversation.php:48
+#: ../../include/conversation.php:57 ../../include/conversation.php:121
+#: ../../include/conversation.php:130
+msgid "status"
+msgstr "estatus"
+
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1096
+#: ../../addon/communityhome/communityhome.php:172
+#: ../../include/diaspora.php:1616 ../../include/conversation.php:65
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "a %1$s agrada %2$s de %3$s"
+
+#: ../../mod/like.php:146 ../../include/conversation.php:68
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr "a %1$s no agrada %2$s de %3$s"
+
+#: ../../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
+msgid "Item not found."
+msgstr "Article no trobat."
+
+#: ../../mod/viewsrc.php:7 ../../mod/viewd.php:6
+msgid "Access denied."
+msgstr "Accés denegat."
+
+#: ../../mod/regmod.php:61
+msgid "Account approved."
+msgstr "Compte aprovat."
+
+#: ../../mod/regmod.php:93
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Procés de Registre revocat per a %s"
+
+#: ../../mod/regmod.php:105
+msgid "Please login."
+msgstr "Si us plau, ingressa."
+
+#: ../../mod/item.php:89
+msgid "Unable to locate original post."
+msgstr "No es pot localitzar post original."
+
+#: ../../mod/item.php:249
+msgid "Empty post discarded."
+msgstr "Buidat després de rebutjar."
+
+#: ../../mod/item.php:351 ../../mod/wall_upload.php:81
+#: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97
+#: ../../include/message.php:143
+msgid "Wall Photos"
+msgstr "Fotos del Mur"
+
+#: ../../mod/item.php:833
+msgid "System error. Post not saved."
+msgstr "Error del sistema. Publicació no guardada."
+
+#: ../../mod/item.php:858
+#, php-format
+msgid ""
+"This message was sent to you by %s, a member of the Friendica social "
+"network."
+msgstr "Aquest missatge va ser enviat a vostè per %s, un membre de la xarxa social Friendica."
+
+#: ../../mod/item.php:860
+#, php-format
+msgid "You may visit them online at %s"
+msgstr "El pot visitar en línia a %s"
+
+#: ../../mod/item.php:861
+msgid ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
+msgstr "Si us plau, poseu-vos en contacte amb el remitent responent a aquest missatge si no voleu rebre aquests missatges."
+
+#: ../../mod/item.php:863
+#, php-format
+msgid "%s posted an update."
+msgstr "%s ha publicat una actualització."
+
+#: ../../mod/profile_photo.php:28
+msgid "Image uploaded but image cropping failed."
+msgstr "Imatge pujada però no es va poder retallar."
+
+#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
+#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:258
+#, php-format
+msgid "Image size reduction [%s] failed."
+msgstr "La reducció de la imatge [%s] va fracassar."
+
+#: ../../mod/profile_photo.php:89
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Recarregui la pàgina o netegi la caché del navegador si la nova foto no apareix immediatament."
+
+#: ../../mod/profile_photo.php:99
+msgid "Unable to process image"
+msgstr "No es pot processar la imatge"
+
+#: ../../mod/profile_photo.php:113 ../../mod/wall_upload.php:56
+#, php-format
+msgid "Image exceeds size limit of %d"
+msgstr "La imatge sobrepassa el límit de mida de %d"
+
+#: ../../mod/profile_photo.php:203
+msgid "Upload File:"
+msgstr "Pujar arxiu:"
+
+#: ../../mod/profile_photo.php:204
+msgid "Upload Profile Photo"
+msgstr "Pujar Foto del Perfil"
+
+#: ../../mod/profile_photo.php:205
+msgid "Upload"
+msgstr "Pujar"
+
+#: ../../mod/profile_photo.php:206
+msgid "skip this step"
+msgstr "saltar aquest pas"
+
+#: ../../mod/profile_photo.php:206
+msgid "select a photo from your photo albums"
+msgstr "tria una foto dels teus àlbums"
+
+#: ../../mod/profile_photo.php:219
+msgid "Crop Image"
+msgstr "retallar imatge"
+
+#: ../../mod/profile_photo.php:220
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Per favor, ajusta la retallada d'imatge per a una optima visualització."
+
+#: ../../mod/profile_photo.php:221
+msgid "Done Editing"
+msgstr "Edició Feta"
+
+#: ../../mod/profile_photo.php:249
+msgid "Image uploaded successfully."
+msgstr "Carregada de la imatge amb èxit."
+
+#: ../../mod/hcard.php:10
+msgid "No profile"
+msgstr "Sense perfil"
+
+#: ../../mod/removeme.php:45 ../../mod/removeme.php:48
+msgid "Remove My Account"
+msgstr "Eliminar el Meu Compte"
+
+#: ../../mod/removeme.php:46
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
+msgstr "Això eliminarà per complet el seu compte. Quan s'hagi fet això, no serà recuperable."
+
+#: ../../mod/removeme.php:47
+msgid "Please enter your password for verification:"
+msgstr "Si us plau, introduïu la contrasenya per a la verificació:"
+
+#: ../../mod/message.php:23
+msgid "No recipient selected."
+msgstr "No s'ha seleccionat destinatari."
+
+#: ../../mod/message.php:26
+msgid "Unable to locate contact information."
+msgstr "No es pot trobar informació de contacte."
+
+#: ../../mod/message.php:29
+msgid "Message could not be sent."
+msgstr "El Missatge no ha estat enviat."
+
+#: ../../mod/message.php:32
+msgid "Message collection failure."
+msgstr "Ha fallat la recollida del missatge."
+
+#: ../../mod/message.php:35
+msgid "Message sent."
+msgstr "Missatge enviat."
+
+#: ../../mod/message.php:55
+msgid "Inbox"
+msgstr "Safata d'entrada"
+
+#: ../../mod/message.php:60
+msgid "Outbox"
+msgstr "Safata de sortida"
+
+#: ../../mod/message.php:65
+msgid "New Message"
+msgstr "Nou Missatge"
+
+#: ../../mod/message.php:91
+msgid "Message deleted."
+msgstr "Missatge eliminat."
+
+#: ../../mod/message.php:121
+msgid "Conversation removed."
+msgstr "Conversació esborrada."
+
+#: ../../mod/message.php:137 ../../include/conversation.php:887
+msgid "Please enter a link URL:"
+msgstr "Sius plau, entri l'enllaç URL:"
+
+#: ../../mod/message.php:145
+msgid "Send Private Message"
+msgstr "Enviant Missatge Privat"
+
+#: ../../mod/message.php:146 ../../mod/message.php:287
+msgid "To:"
+msgstr "Per a:"
+
+#: ../../mod/message.php:147 ../../mod/message.php:288
+msgid "Subject:"
+msgstr "Assumpte::"
+
+#: ../../mod/message.php:150 ../../mod/message.php:291
+#: ../../mod/invite.php:101
+msgid "Your message:"
+msgstr "El teu missatge:"
+
+#: ../../mod/message.php:188
+msgid "No messages."
+msgstr "Sense missatges."
+
+#: ../../mod/message.php:201
+msgid "Delete conversation"
+msgstr "Esborrar conversació"
+
+#: ../../mod/message.php:204
+msgid "D, d M Y - g:i A"
+msgstr "D, d M Y - g:i A"
+
+#: ../../mod/message.php:239
+msgid "Message not available."
+msgstr "Missatge no disponible."
+
+#: ../../mod/message.php:276
+msgid "Delete message"
+msgstr "Esborra missatge"
+
+#: ../../mod/message.php:286
+msgid "Send Reply"
+msgstr "Enviar Resposta"
+
+#: ../../mod/allfriends.php:34
+#, php-format
+msgid "Friends of %s"
+msgstr "Amics de %s"
+
+#: ../../mod/allfriends.php:40
+msgid "No friends to display."
+msgstr "No hi ha amics que mostrar"
+
+#: ../../mod/admin.php:71 ../../mod/admin.php:312
+msgid "Site"
+msgstr "Lloc"
+
+#: ../../mod/admin.php:72 ../../mod/admin.php:480 ../../mod/admin.php:492
+msgid "Users"
+msgstr "Usuaris"
+
+#: ../../mod/admin.php:73 ../../mod/admin.php:569 ../../mod/admin.php:608
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../../mod/admin.php:74 ../../mod/admin.php:742 ../../mod/admin.php:775
+msgid "Themes"
+msgstr "Temes"
+
+#: ../../mod/admin.php:89 ../../mod/admin.php:855
+msgid "Logs"
+msgstr "Transcripcions"
+
+#: ../../mod/admin.php:94
+msgid "User registrations waiting for confirmation"
+msgstr "Registre d'usuari a l'espera de confirmació"
+
+#: ../../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
+msgid "Administration"
+msgstr "Administració"
+
+#: ../../mod/admin.php:162
+msgid "Summary"
+msgstr "Sumari"
+
+#: ../../mod/admin.php:163
+msgid "Registered users"
+msgstr "Usuaris registrats"
+
+#: ../../mod/admin.php:165
+msgid "Pending registrations"
+msgstr "Registres d'usuari pendents"
+
+#: ../../mod/admin.php:166
+msgid "Version"
+msgstr "Versió"
+
+#: ../../mod/admin.php:168
+msgid "Active plugins"
+msgstr "Plugins actius"
+
+#: ../../mod/admin.php:260
+msgid "Site settings updated."
+msgstr "Ajustos del lloc actualitzats."
+
+#: ../../mod/admin.php:304
+msgid "Closed"
+msgstr "Tancat"
+
+#: ../../mod/admin.php:305
+msgid "Requires approval"
+msgstr "Requereix aprovació"
+
+#: ../../mod/admin.php:306
+msgid "Open"
+msgstr "Obert"
+
+#: ../../mod/admin.php:315
+msgid "File upload"
+msgstr "Fitxer carregat"
+
+#: ../../mod/admin.php:316
+msgid "Policies"
+msgstr "Polítiques"
+
+#: ../../mod/admin.php:317
+msgid "Advanced"
+msgstr "Avançat"
+
+#: ../../mod/admin.php:321 ../../addon/statusnet/statusnet.php:523
+msgid "Site name"
+msgstr "Nom del lloc"
+
+#: ../../mod/admin.php:322
+msgid "Banner/Logo"
+msgstr "Senyera/Logo"
+
+#: ../../mod/admin.php:323
+msgid "System language"
+msgstr "Idioma del Systema"
+
+#: ../../mod/admin.php:324
+msgid "System theme"
+msgstr "Tema del sistema"
+
+#: ../../mod/admin.php:324
+msgid "Default system theme - may be over-ridden by user profiles"
+msgstr "Tema per defecte del sitema - pot ser canviat als perfils dels usuaris"
+
+#: ../../mod/admin.php:326
+msgid "Maximum image size"
+msgstr "Mida màxima de les imatges"
+
+#: ../../mod/admin.php:326
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr "Mida màxima en bytes de les imatges a pujar. Per defecte es 0, que vol dir sense límits."
+
+#: ../../mod/admin.php:328
+msgid "Register policy"
+msgstr "Política per a registrar"
+
+#: ../../mod/admin.php:329
+msgid "Register text"
+msgstr "Text al registrar"
+
+#: ../../mod/admin.php:329
+msgid "Will be displayed prominently on the registration page."
+msgstr "Sea mostrat de forma peminent a la pagina durant el procés de registre."
+
+#: ../../mod/admin.php:330
+msgid "Accounts abandoned after x days"
+msgstr "Comptes abandonats després de x dies"
+
+#: ../../mod/admin.php:330
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal."
+
+#: ../../mod/admin.php:331
+msgid "Allowed friend domains"
+msgstr "Dominis amics permesos"
+
+#: ../../mod/admin.php:331
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr "Llista de dominis separada per comes, de adreçes de correu que són permeses per establir amistats. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis."
+
+#: ../../mod/admin.php:332
+msgid "Allowed email domains"
+msgstr "Dominis de correu permesos"
+
+#: ../../mod/admin.php:332
+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 "Llista de dominis separada per comes, de adreçes de correu que són permeses per registrtar-se. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis."
+
+#: ../../mod/admin.php:333
+msgid "Block public"
+msgstr "Bloqueig públic"
+
+#: ../../mod/admin.php:333
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
+msgstr "Bloqueija l'accés públic a qualsevol pàgina del lloc fins que t'hagis identificat."
+
+#: ../../mod/admin.php:334
+msgid "Force publish"
+msgstr "Forçar publicació"
+
+#: ../../mod/admin.php:334
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr "Obliga a que tots el perfils en aquest lloc siguin mostrats en el directori del lloc."
+
+#: ../../mod/admin.php:335
+msgid "Global directory update URL"
+msgstr "Actualitzar URL del directori global"
+
+#: ../../mod/admin.php:335
+msgid ""
+"URL to update the global directory. If this is not set, the global directory"
+" is completely unavailable to the application."
+msgstr "URL per actualitzar el directori global. Si no es configura, el directori global serà completament inaccesible per a l'aplicació. "
+
+#: ../../mod/admin.php:337
+msgid "Block multiple registrations"
+msgstr "Bloquejar multiples registracions"
+
+#: ../../mod/admin.php:337
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr "Inhabilita als usuaris el crear comptes adicionals per a usar com a pàgines."
+
+#: ../../mod/admin.php:338
+msgid "OpenID support"
+msgstr "Suport per a OpenID"
+
+#: ../../mod/admin.php:338
+msgid "OpenID support for registration and logins."
+msgstr "Suport per a registre i validació a OpenID."
+
+#: ../../mod/admin.php:339
+msgid "Gravatar support"
+msgstr "Suport per a gravatar"
+
+#: ../../mod/admin.php:339
+msgid "Search new user's photo on Gravatar."
+msgstr "Cerca la nova foto d'usuari a Gravatar."
+
+#: ../../mod/admin.php:340
+msgid "Fullname check"
+msgstr "Comprobació de nom complet"
+
+#: ../../mod/admin.php:340
+msgid ""
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
+msgstr "Obliga els usuaris a col·locar un espai en blanc entre nom i cognoms, com a mesura antifemater"
+
+#: ../../mod/admin.php:341
+msgid "UTF-8 Regular expressions"
+msgstr "expresions regulars UTF-8"
+
+#: ../../mod/admin.php:341
+msgid "Use PHP UTF8 regular expressions"
+msgstr "Empri expresions regulars de PHP amb format UTF8"
+
+#: ../../mod/admin.php:342
+msgid "Show Community Page"
+msgstr "Mostra la Pàgina de Comunitat"
+
+#: ../../mod/admin.php:342
+msgid ""
+"Display a Community page showing all recent public postings on this site."
+msgstr "Mostra a la pàgina de comunitat tots els missatges públics recents, d'aquest lloc."
+
+#: ../../mod/admin.php:343
+msgid "Enable OStatus support"
+msgstr "Activa el suport per a OStatus"
+
+#: ../../mod/admin.php:343
+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 "Proveeix de compatibilitat integrada amb OStatus (identi.ca, status.net, etc). Totes les comunicacions a OStatus són públiques amb el que ocasionalment pots veure advertències."
+
+#: ../../mod/admin.php:344
+msgid "Enable Diaspora support"
+msgstr "Habilitar suport per Diaspora"
+
+#: ../../mod/admin.php:344
+msgid "Provide built-in Diaspora network compatibility."
+msgstr "Proveeix compatibilitat integrada amb la xarxa Diaspora"
+
+#: ../../mod/admin.php:345
+msgid "Only allow Friendica contacts"
+msgstr "Només permetre contactes de Friendica"
+
+#: ../../mod/admin.php:345
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
+msgstr "Tots els contactes "
+
+#: ../../mod/admin.php:346
+msgid "Verify SSL"
+msgstr "Verificar SSL"
+
+#: ../../mod/admin.php:346
+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 "Si ho vols, pots comprovar el certificat estrictament. Això farà que no puguis connectar (de cap manera) amb llocs amb certificats SSL autosignats."
+
+#: ../../mod/admin.php:347
+msgid "Proxy user"
+msgstr "proxy d'usuari"
+
+#: ../../mod/admin.php:348
+msgid "Proxy URL"
+msgstr "URL del proxy"
+
+#: ../../mod/admin.php:349
+msgid "Network timeout"
+msgstr "Temps excedit a la xarxa"
+
+#: ../../mod/admin.php:349
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr "Valor en segons. Canviat a 0 es sense límits (no recomenat)"
+
+#: ../../mod/admin.php:370
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] "%s usuari bloquejar/desbloquejar"
+msgstr[1] "%s usuaris bloquejar/desbloquejar"
+
+#: ../../mod/admin.php:377
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] "%s usuari esborrat"
+msgstr[1] "%s usuaris esborrats"
+
+#: ../../mod/admin.php:411
+#, php-format
+msgid "User '%s' deleted"
+msgstr "Usuari %s' esborrat"
+
+#: ../../mod/admin.php:418
+#, php-format
+msgid "User '%s' unblocked"
+msgstr "Usuari %s' desbloquejat"
+
+#: ../../mod/admin.php:418
+#, php-format
+msgid "User '%s' blocked"
+msgstr "L'usuari '%s' és bloquejat"
+
+#: ../../mod/admin.php:482
+msgid "select all"
+msgstr "Seleccionar tot"
+
+#: ../../mod/admin.php:483
+msgid "User registrations waiting for confirm"
+msgstr "Registre d'usuari esperant confirmació"
+
+#: ../../mod/admin.php:484
+msgid "Request date"
+msgstr "Data de sol·licitud"
+
+#: ../../mod/admin.php:484 ../../mod/admin.php:493
+#: ../../include/contact_selectors.php:79
+msgid "Email"
+msgstr "Correu"
+
+#: ../../mod/admin.php:485
+msgid "No registrations."
+msgstr "Sense registres."
+
+#: ../../mod/admin.php:487
+msgid "Deny"
+msgstr "Denegar"
+
+#: ../../mod/admin.php:493
+msgid "Register date"
+msgstr "Data de registre"
+
+#: ../../mod/admin.php:493
+msgid "Last login"
+msgstr "Últim accés"
+
+#: ../../mod/admin.php:493
+msgid "Last item"
+msgstr "Últim element"
+
+#: ../../mod/admin.php:493
+msgid "Account"
+msgstr "Compte"
+
+#: ../../mod/admin.php:495
+msgid ""
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Els usuaris seleccionats seran esborrats!\\n\\nqualsevol cosa que aquests usuaris hagin publicat en aquest lloc s'esborrarà!\\n\\nEsteu segur?"
+
+#: ../../mod/admin.php:496
+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 "L'usuari {0} s'eliminarà!\\n\\nQualsevol cosa que aquest usuari hagi publicat en aquest lloc s'esborrarà!\\n\\nEsteu segur?"
+
+#: ../../mod/admin.php:532
+#, php-format
+msgid "Plugin %s disabled."
+msgstr "Plugin %s deshabilitat."
+
+#: ../../mod/admin.php:536
+#, php-format
+msgid "Plugin %s enabled."
+msgstr "Plugin %s habilitat."
+
+#: ../../mod/admin.php:546 ../../mod/admin.php:724
+msgid "Disable"
+msgstr "Deshabilitar"
+
+#: ../../mod/admin.php:548 ../../mod/admin.php:726
+msgid "Enable"
+msgstr "Habilitar"
+
+#: ../../mod/admin.php:570 ../../mod/admin.php:743
+msgid "Toggle"
+msgstr "Canviar"
+
+#: ../../mod/admin.php:571 ../../mod/admin.php:744 ../../include/nav.php:130
+msgid "Settings"
+msgstr "Ajustos"
+
+#: ../../mod/admin.php:578 ../../mod/admin.php:753
+msgid "Author: "
+msgstr "Autor:"
+
+#: ../../mod/admin.php:579 ../../mod/admin.php:754
+msgid "Maintainer: "
+msgstr "Encarregat:"
+
+#: ../../mod/admin.php:689
+msgid "No themes found."
+msgstr "No s'ha trobat temes."
+
+#: ../../mod/admin.php:780
+msgid "[Experimental]"
+msgstr "[Experimental]"
+
+#: ../../mod/admin.php:781
+msgid "[Unsupported]"
+msgstr "[No soportat]"
+
+#: ../../mod/admin.php:804
+msgid "Log settings updated."
+msgstr "Configuració del transcriptor actualitzada."
+
+#: ../../mod/admin.php:857
+msgid "Clear"
+msgstr "Netejar"
+
+#: ../../mod/admin.php:863
+msgid "Debugging"
+msgstr "Esplugar"
+
+#: ../../mod/admin.php:864
+msgid "Log file"
+msgstr "Arxiu de transcripció"
+
+#: ../../mod/admin.php:864
+msgid ""
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
+msgstr "Ha de tenir permisos d'escriptura pel servidor web. En relació amb el seu directori Friendica de nivell superior."
+
+#: ../../mod/admin.php:865
+msgid "Log level"
+msgstr "Nivell de transcripció"
+
+#: ../../mod/admin.php:906
+msgid "Close"
+msgstr "Tancar"
+
+#: ../../mod/admin.php:912
+msgid "FTP Host"
+msgstr "Amfitrió FTP"
+
+#: ../../mod/admin.php:913
+msgid "FTP Path"
+msgstr "Direcció FTP"
+
+#: ../../mod/admin.php:914
+msgid "FTP User"
+msgstr "Usuari FTP"
+
+#: ../../mod/admin.php:915
+msgid "FTP Password"
+msgstr "Contrasenya FTP"
+
+#: ../../mod/profile.php:15 ../../boot.php:845
+msgid "Requested profile is not available."
+msgstr "El perfil sol·licitat no està disponible."
+
+#: ../../mod/profile.php:111 ../../mod/display.php:67
+msgid "Access to this profile has been restricted."
+msgstr "L'accés a aquest perfil ha estat restringit."
+
+#: ../../mod/profile.php:131
+msgid "Tips for New Members"
+msgstr "Consells per a nous membres"
+
+#: ../../mod/ping.php:174
+msgid "{0} wants to be your friend"
+msgstr "{0} vol ser el teu amic"
+
+#: ../../mod/ping.php:179
+msgid "{0} sent you a message"
+msgstr "{0} t'ha enviat un missatge de"
+
+#: ../../mod/ping.php:184
+msgid "{0} requested registration"
+msgstr "{0} solicituts de registre"
+
+#: ../../mod/ping.php:190
+#, php-format
+msgid "{0} commented %s's post"
+msgstr "{0} va comentar l'enviament de %s"
+
+#: ../../mod/ping.php:195
+#, php-format
+msgid "{0} liked %s's post"
+msgstr "A {0} l'ha agradat l'enviament de %s"
+
+#: ../../mod/ping.php:200
+#, php-format
+msgid "{0} disliked %s's post"
+msgstr "A {0} no l'ha agradat l'enviament de %s"
+
+#: ../../mod/ping.php:205
+#, php-format
+msgid "{0} is now friends with %s"
+msgstr "{0} ara és amic de %s"
+
+#: ../../mod/ping.php:210
+msgid "{0} posted"
+msgstr "{0} publicat"
+
+#: ../../mod/ping.php:215
+#, php-format
+msgid "{0} tagged %s's post with #%s"
+msgstr "{0} va etiquetar la publicació de %s com #%s"
+
+#: ../../mod/ping.php:221
+msgid "{0} mentioned you in a post"
+msgstr "{0} et menciona en un missatge"
+
+#: ../../mod/openid.php:63 ../../mod/openid.php:77 ../../include/auth.php:90
+#: ../../include/auth.php:115 ../../include/auth.php:169
+msgid "Login failed."
+msgstr "Error d'accés."
+
+#: ../../mod/follow.php:27
+msgid "Connect URL missing."
+msgstr "URL del connector perduda."
+
+#: ../../mod/follow.php:47
+msgid ""
+"This site is not configured to allow communications with other networks."
+msgstr "Aquest lloc no està configurat per permetre les comunicacions amb altres xarxes."
+
+#: ../../mod/follow.php:48 ../../mod/follow.php:63
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr "Protocol de comunnicació no compatible o alimentador descobert."
+
+#: ../../mod/follow.php:61
+msgid "The profile address specified does not provide adequate information."
+msgstr "L'adreça de perfil especificada no proveeix informació adient."
+
+#: ../../mod/follow.php:65
+msgid "An author or name was not found."
+msgstr "Un autor o nom no va ser trobat"
+
+#: ../../mod/follow.php:67
+msgid "No browser URL could be matched to this address."
+msgstr "Cap direcció URL del navegador coincideix amb aquesta adreça."
+
+#: ../../mod/follow.php:74
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr "La direcció del perfil especificat pertany a una xarxa que ha estat desactivada en aquest lloc."
+
+#: ../../mod/follow.php:79
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr "Perfil limitat. Aquesta persona no podrà rebre notificacions personals/directes de tu."
+
+#: ../../mod/follow.php:149
+msgid "Unable to retrieve contact information."
+msgstr "No es pot recuperar la informació de contacte."
+
+#: ../../mod/follow.php:195
+msgid "following"
+msgstr "seguint"
+
+#: ../../mod/common.php:34
+msgid "Common Friends"
+msgstr "Amics Comuns"
+
+#: ../../mod/common.php:42
+msgid "No friends in common."
+msgstr "No hi ha amics en comú."
+
+#: ../../mod/display.php:130
+msgid "Item has been removed."
+msgstr "El element ha estat esborrat."
+
+#: ../../mod/apps.php:4
+msgid "Applications"
+msgstr "Aplicacions"
+
+#: ../../mod/apps.php:7
+msgid "No installed applications."
+msgstr "Aplicacions no instal·lades."
+
+#: ../../mod/search.php:83
+msgid "Search This Site"
+msgstr "Cerca en Aquest Lloc"
+
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:239
+#: ../../mod/profiles.php:344 ../../mod/dfrn_confirm.php:62
+msgid "Profile not found."
+msgstr "Perfil no trobat."
+
+#: ../../mod/profiles.php:28
+msgid "Profile Name is required."
+msgstr "Nom de perfil requerit."
+
+#: ../../mod/profiles.php:198
+msgid "Profile updated."
+msgstr "Perfil actualitzat."
+
+#: ../../mod/profiles.php:256
+msgid "Profile deleted."
+msgstr "Perfil esborrat."
+
+#: ../../mod/profiles.php:272 ../../mod/profiles.php:303
+msgid "Profile-"
+msgstr "Perfil-"
+
+#: ../../mod/profiles.php:291 ../../mod/profiles.php:330
+msgid "New profile created."
+msgstr "Nou perfil creat."
+
+#: ../../mod/profiles.php:309
+msgid "Profile unavailable to clone."
+msgstr "No es pot clonar el perfil."
+
+#: ../../mod/profiles.php:356
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr "Amaga la llista de contactes/amics en la vista d'aquest perfil?"
+
+#: ../../mod/profiles.php:374
+msgid "Edit Profile Details"
+msgstr "Editor de Detalls del Perfil"
+
+#: ../../mod/profiles.php:376
+msgid "View this profile"
+msgstr "Veure aquest perfil"
+
+#: ../../mod/profiles.php:377
+msgid "Create a new profile using these settings"
+msgstr "Crear un nou perfil amb aquests ajustos"
+
+#: ../../mod/profiles.php:378
+msgid "Clone this profile"
+msgstr "Clonar aquest perfil"
+
+#: ../../mod/profiles.php:379
+msgid "Delete this profile"
+msgstr "Esborrar aquest perfil"
+
+#: ../../mod/profiles.php:380
+msgid "Profile Name:"
+msgstr "Nom de Perfil:"
+
+#: ../../mod/profiles.php:381
+msgid "Your Full Name:"
+msgstr "El Teu Nom Complet."
+
+#: ../../mod/profiles.php:382
+msgid "Title/Description:"
+msgstr "Títol/Descripció:"
+
+#: ../../mod/profiles.php:383
+msgid "Your Gender:"
+msgstr "Gènere:"
+
+#: ../../mod/profiles.php:384
+#, php-format
+msgid "Birthday (%s):"
+msgstr "Aniversari (%s)"
+
+#: ../../mod/profiles.php:385
+msgid "Street Address:"
+msgstr "Direcció:"
+
+#: ../../mod/profiles.php:386
+msgid "Locality/City:"
+msgstr "Localitat/Ciutat:"
+
+#: ../../mod/profiles.php:387
+msgid "Postal/Zip Code:"
+msgstr "Codi Postal:"
+
+#: ../../mod/profiles.php:388
+msgid "Country:"
+msgstr "País"
+
+#: ../../mod/profiles.php:389
+msgid "Region/State:"
+msgstr "Región/Estat:"
+
+#: ../../mod/profiles.php:390
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+msgstr "<span class=\"heart\">&hearts;</span> Estat Civil:"
+
+#: ../../mod/profiles.php:391
+msgid "Who: (if applicable)"
+msgstr "Qui? (si és aplicable)"
+
+#: ../../mod/profiles.php:392
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Exemples: cathy123, Cathy Williams, cathy@example.com"
+
+#: ../../mod/profiles.php:393 ../../include/profile_advanced.php:43
+msgid "Sexual Preference:"
+msgstr "Preferència Sexual:"
+
+#: ../../mod/profiles.php:394
+msgid "Homepage URL:"
+msgstr "Pàgina web URL:"
+
+#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:49
+msgid "Political Views:"
+msgstr "Idees Polítiques:"
+
+#: ../../mod/profiles.php:396
+msgid "Religious Views:"
+msgstr "Creencies Religioses:"
+
+#: ../../mod/profiles.php:397
+msgid "Public Keywords:"
+msgstr "Paraules Clau Públiques"
+
+#: ../../mod/profiles.php:398
+msgid "Private Keywords:"
+msgstr "Paraules Clau Privades:"
+
+#: ../../mod/profiles.php:399
+msgid "Example: fishing photography software"
+msgstr "Exemple: pesca fotografia programari"
+
+#: ../../mod/profiles.php:400
+msgid "(Used for suggesting potential friends, can be seen by others)"
+msgstr "(Emprat per suggerir potencials amics, Altres poden veure-ho)"
+
+#: ../../mod/profiles.php:401
+msgid "(Used for searching profiles, never shown to others)"
+msgstr "(Emprat durant la cerca de perfils, mai mostrat a ningú)"
+
+#: ../../mod/profiles.php:402
+msgid "Tell us about yourself..."
+msgstr "Parla'ns de tú....."
+
+#: ../../mod/profiles.php:403
+msgid "Hobbies/Interests"
+msgstr "Aficions/Interessos"
+
+#: ../../mod/profiles.php:404
+msgid "Contact information and Social Networks"
+msgstr "Informació de contacte i Xarxes Socials"
+
+#: ../../mod/profiles.php:405
+msgid "Musical interests"
+msgstr "Gustos musicals"
+
+#: ../../mod/profiles.php:406
+msgid "Books, literature"
+msgstr "Llibres, Literatura"
+
+#: ../../mod/profiles.php:407
+msgid "Television"
+msgstr "Televisió"
+
+#: ../../mod/profiles.php:408
+msgid "Film/dance/culture/entertainment"
+msgstr "Cinema/ball/cultura/entreteniments"
+
+#: ../../mod/profiles.php:409
+msgid "Love/romance"
+msgstr "Amor/sentiments"
+
+#: ../../mod/profiles.php:410
+msgid "Work/employment"
+msgstr "Treball/ocupació"
+
+#: ../../mod/profiles.php:411
+msgid "School/education"
+msgstr "Ensenyament/estudis"
+
+#: ../../mod/profiles.php:416
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
+msgstr "Aquest és el teu perfil <strong>públic</strong>.<br />El qual <strong>pot</strong> ser visible per qualsevol qui faci servir Internet."
+
+#: ../../mod/profiles.php:426 ../../mod/directory.php:124
+msgid "Age: "
+msgstr "Edat:"
+
+#: ../../mod/profiles.php:461
+msgid "Edit/Manage Profiles"
+msgstr "Editar/Gestionar Perfils"
+
+#: ../../mod/profiles.php:462 ../../boot.php:946
+msgid "Change profile photo"
+msgstr "Canviar la foto del perfil"
+
+#: ../../mod/profiles.php:463 ../../boot.php:947
+msgid "Create New Profile"
+msgstr "Crear un Nou Perfil"
+
+#: ../../mod/profiles.php:473 ../../boot.php:957
+msgid "Profile Image"
+msgstr "Imatge del Perfil"
+
+#: ../../mod/profiles.php:475 ../../boot.php:960
+msgid "visible to everybody"
+msgstr "Visible per tothom"
+
+#: ../../mod/profiles.php:476 ../../boot.php:961
+msgid "Edit visibility"
+msgstr "Editar visibilitat"
+
+#: ../../mod/tagger.php:103 ../../include/conversation.php:138
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s etiquetats %2$s %3$s amb %4$s"
+
+#: ../../mod/delegate.php:95
+msgid "No potential page delegates located."
+msgstr "No es troben pàgines potencialment delegades."
+
+#: ../../mod/delegate.php:121
+msgid "Delegate Page Management"
+msgstr "Gestió de les Pàgines Delegades"
+
+#: ../../mod/delegate.php:123
+msgid ""
+"Delegates are able to manage all aspects of this account/page except for "
+"basic account settings. Please do not delegate your personal account to "
+"anybody that you do not trust completely."
+msgstr "Els delegats poden gestionar tots els aspectes d'aquest compte/pàgina, excepte per als ajustaments bàsics del compte. Si us plau, no deleguin el seu compte personal a ningú que no confiïn completament."
+
+#: ../../mod/delegate.php:124
+msgid "Existing Page Managers"
+msgstr "Actuals Administradors de Pàgina"
+
+#: ../../mod/delegate.php:126
+msgid "Existing Page Delegates"
+msgstr "Actuals Delegats de Pàgina"
+
+#: ../../mod/delegate.php:128
+msgid "Potential Delegates"
+msgstr "Delegats Potencials"
+
+#: ../../mod/delegate.php:131
+msgid "Add"
+msgstr "Afegir"
+
+#: ../../mod/delegate.php:132
+msgid "No entries."
+msgstr "Sense entrades"
+
+#: ../../mod/suggest.php:38 ../../include/contact_widgets.php:35
+msgid "Friend Suggestions"
+msgstr "Amics Suggerits"
+
+#: ../../mod/suggest.php:44
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "Cap suggeriment disponible. Si això és un nou lloc, si us plau torna a intentar en 24 hores."
+
+#: ../../mod/suggest.php:61
+msgid "Ignore/Hide"
+msgstr "Ignorar/Amagar"
+
+#: ../../mod/directory.php:51
+msgid "Global Directory"
+msgstr "Directori Global"
+
+#: ../../mod/directory.php:57
+msgid "Normal site view"
+msgstr "Vista normal del lloc"
+
+#: ../../mod/directory.php:59
+msgid "Admin - View all site entries"
+msgstr "Admin- Veure totes les entrades del lloc"
+
+#: ../../mod/directory.php:65
+msgid "Find on this site"
+msgstr "Trobat en aquest lloc"
+
+#: ../../mod/directory.php:68
+msgid "Site Directory"
+msgstr "Directori Local"
+
+#: ../../mod/directory.php:127
+msgid "Gender: "
+msgstr "Gènere:"
+
+#: ../../mod/directory.php:153
+msgid "No entries (some entries may be hidden)."
+msgstr "No hi ha entrades (algunes de les entrades poden estar amagades)."
+
+#: ../../mod/invite.php:35
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s : No es una adreça de correu vàlida"
+
+#: ../../mod/invite.php:59
+#, php-format
+msgid "Please join my network on %s"
+msgstr "Si us plau, uneix-te a la meva xarxa en %s"
+
+#: ../../mod/invite.php:69
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s : Ha fallat l'entrega del missatge."
+
+#: ../../mod/invite.php:73
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d missatge enviat"
+msgstr[1] "%d missatges enviats."
+
+#: ../../mod/invite.php:92
+msgid "You have no more invitations available"
+msgstr "No te més invitacions disponibles"
+
+#: ../../mod/invite.php:99
+msgid "Send invitations"
+msgstr "Enviant Invitacions"
+
+#: ../../mod/invite.php:100
+msgid "Enter email addresses, one per line:"
+msgstr "Entri adreçes de correu, una per línia:"
+
+#: ../../mod/invite.php:102
+#, php-format
+msgid "Please join my social network on %s"
+msgstr "Per favor, uneix-te a la meva xarxa social en %s"
+
+#: ../../mod/invite.php:103
+msgid "To accept this invitation, please visit:"
+msgstr "Per acceptar aquesta invitació, si us plau, visiti:"
+
+#: ../../mod/invite.php:104
+msgid "You will need to supply this invitation code: $invite_code"
+msgstr "Vostè haurà de proporcionar aquest codi d'invitació: $invite_code"
+
+#: ../../mod/invite.php:104
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
+msgstr "Un cop registrat, si us plau contactar amb mi a través de la meva pàgina de perfil a:"
+
+#: ../../mod/dfrn_confirm.php:119
+msgid ""
+"This may occasionally happen if contact was requested by both persons and it"
+" has already been approved."
+msgstr "Això pot ocorre ocasionalment si el contacte fa una petició per ambdues persones i ja han estat aprovades."
+
+#: ../../mod/dfrn_confirm.php:239
+msgid "Response from remote site was not understood."
+msgstr "La resposta des del lloc remot no s'entenia."
+
+#: ../../mod/dfrn_confirm.php:248
+msgid "Unexpected response from remote site: "
+msgstr "Resposta inesperada de lloc remot:"
+
+#: ../../mod/dfrn_confirm.php:256
+msgid "Confirmation completed successfully."
+msgstr "La confirmació s'ha completat correctament."
+
+#: ../../mod/dfrn_confirm.php:258 ../../mod/dfrn_confirm.php:272
+#: ../../mod/dfrn_confirm.php:279
+msgid "Remote site reported: "
+msgstr "El lloc remot informa:"
+
+#: ../../mod/dfrn_confirm.php:270
+msgid "Temporary failure. Please wait and try again."
+msgstr "Fallada temporal. Si us plau, espereu i torneu a intentar."
+
+#: ../../mod/dfrn_confirm.php:277
+msgid "Introduction failed or was revoked."
+msgstr "La presentació va fallar o va ser revocada."
+
+#: ../../mod/dfrn_confirm.php:422
+msgid "Unable to set contact photo."
+msgstr "No es pot canviar la foto de contacte."
+
+#: ../../mod/dfrn_confirm.php:474 ../../include/diaspora.php:495
+#: ../../include/conversation.php:101
+#, php-format
+msgid "%1$s is now friends with %2$s"
+msgstr "%1$s és ara amic amb %2$s"
+
+#: ../../mod/dfrn_confirm.php:544
+#, php-format
+msgid "No user record found for '%s' "
+msgstr "No es troben registres d'usuari per a '%s'"
+
+#: ../../mod/dfrn_confirm.php:554
+msgid "Our site encryption key is apparently messed up."
+msgstr "La nostra clau de xifrat del lloc pel que sembla en mal estat."
+
+#: ../../mod/dfrn_confirm.php:565
+msgid "Empty site URL was provided or URL could not be decrypted by us."
+msgstr "Es va proporcionar una URL del lloc buida o la URL no va poder ser desxifrada per nosaltres."
+
+#: ../../mod/dfrn_confirm.php:586
+msgid "Contact record was not found for you on our site."
+msgstr "No s'han trobat registres del contacte al nostre lloc."
+
+#: ../../mod/dfrn_confirm.php:600
+#, php-format
+msgid "Site public key not available in contact record for URL %s."
+msgstr "la clau pública del lloc no disponible en les dades del contacte per URL %s."
+
+#: ../../mod/dfrn_confirm.php:620
+msgid ""
+"The ID provided by your system is a duplicate on our system. It should work "
+"if you try again."
+msgstr "La ID proporcionada pel seu sistema és un duplicat en el nostre sistema. Hauria de treballar si intenta de nou."
+
+#: ../../mod/dfrn_confirm.php:631
+msgid "Unable to set your contact credentials on our system."
+msgstr "No es pot canviar les seves credencials de contacte en el nostre sistema."
+
+#: ../../mod/dfrn_confirm.php:694
+msgid "Unable to update your contact profile details on our system"
+msgstr "No es pot actualitzar els detalls del seu perfil de contacte en el nostre sistema"
+
+#: ../../mod/dfrn_confirm.php:724
+#, php-format
+msgid "Connection accepted at %s"
+msgstr "Connexió acceptada en %s"
+
+#: ../../addon/facebook/facebook.php:338
+msgid "Facebook disabled"
+msgstr "Facebook deshabilitat"
+
+#: ../../addon/facebook/facebook.php:343
+msgid "Updating contacts"
+msgstr "Actualitzant contactes"
+
+#: ../../addon/facebook/facebook.php:352
+msgid "Facebook API key is missing."
+msgstr "La clau del API de Facebook s'ha perdut."
+
+#: ../../addon/facebook/facebook.php:359
+msgid "Facebook Connect"
+msgstr "Facebook Connectat"
+
+#: ../../addon/facebook/facebook.php:365
+msgid "Install Facebook connector for this account."
+msgstr "Instal·lar el connector de Facebook per aquest compte."
+
+#: ../../addon/facebook/facebook.php:372
+msgid "Remove Facebook connector"
+msgstr "Eliminar el connector de Faceboook"
+
+#: ../../addon/facebook/facebook.php:377
+msgid ""
+"Re-authenticate [This is necessary whenever your Facebook password is "
+"changed.]"
+msgstr "Re-autentificar [Això és necessari cada vegada que la contrasenya de Facebook canvia.]"
+
+#: ../../addon/facebook/facebook.php:384
+msgid "Post to Facebook by default"
+msgstr "Enviar a Facebook per defecte"
+
+#: ../../addon/facebook/facebook.php:388
+msgid "Link all your Facebook friends and conversations on this website"
+msgstr "Enllaça tots els teus amics i les converses de Facebook en aquest lloc web"
+
+#: ../../addon/facebook/facebook.php:390
+msgid ""
+"Facebook conversations consist of your <em>profile wall</em> and your friend"
+" <em>stream</em>."
+msgstr "Les converses de Facebook consisteixen en el <em>perfil del mur</em> i en el<em> stream </em> del seu amic."
+
+#: ../../addon/facebook/facebook.php:391
+msgid "On this website, your Facebook friend stream is only visible to you."
+msgstr "En aquesta pàgina web, el stream del seu amic a Facebook només és visible per a vostè."
+
+#: ../../addon/facebook/facebook.php:392
+msgid ""
+"The following settings determine the privacy of your Facebook profile wall "
+"on this website."
+msgstr "Les següents opcions determinen la privacitat del mur del seu perfil de Facebook en aquest lloc web."
+
+#: ../../addon/facebook/facebook.php:396
+msgid ""
+"On this website your Facebook profile wall conversations will only be "
+"visible to you"
+msgstr "En aquesta pàgina web les seves converses al mur del perfil de Facebook només seran visible per a vostè"
+
+#: ../../addon/facebook/facebook.php:401
+msgid "Do not import your Facebook profile wall conversations"
+msgstr "No importi les seves converses del mur del perfil de Facebook"
+
+#: ../../addon/facebook/facebook.php:403
+msgid ""
+"If you choose to link conversations and leave both of these boxes unchecked,"
+" your Facebook profile wall will be merged with your profile wall on this "
+"website and your privacy settings on this website will be used to determine "
+"who may see the conversations."
+msgstr "Si opta per vincular les converses i deixar ambdues caselles sense marcar, el mur del seu perfil de Facebook es fusionarà amb el mur del seu perfil en aquest lloc web i la seva configuració de privacitat en aquest website serà utilitzada per determinar qui pot veure les converses."
+
+#: ../../addon/facebook/facebook.php:408
+msgid "Comma separated applications to ignore"
+msgstr "Separats per comes les aplicacions a ignorar"
+
+#: ../../addon/facebook/facebook.php:476
+#: ../../include/contact_selectors.php:81
+msgid "Facebook"
+msgstr "Facebook"
+
+#: ../../addon/facebook/facebook.php:477
+msgid "Facebook Connector Settings"
+msgstr "Ajustos del Connector de Facebook"
+
+#: ../../addon/facebook/facebook.php:491
+msgid "Post to Facebook"
+msgstr "Enviament a Facebook"
+
+#: ../../addon/facebook/facebook.php:582
+msgid ""
+"Post to Facebook cancelled because of multi-network access permission "
+"conflict."
+msgstr "Enviament a Facebook cancel·lat perque hi ha un conflicte de permisos d'accés multi-xarxa."
+
+#: ../../addon/facebook/facebook.php:651
+msgid "Image: "
+msgstr "Imatge:"
+
+#: ../../addon/facebook/facebook.php:728
+msgid "View on Friendica"
+msgstr "Vist en Friendica"
+
+#: ../../addon/facebook/facebook.php:752
+msgid "Facebook post failed. Queued for retry."
+msgstr "Enviament a Facebook fracassat. En cua per a reintent."
+
+#: ../../addon/facebook/facebook.php:877 ../../addon/facebook/facebook.php:886
+#: ../../include/bb2diaspora.php:102
+msgid "link"
+msgstr "enllaç"
+
+#: ../../addon/widgets/widget_like.php:58
+#, php-format
+msgid "%d person likes this"
+msgid_plural "%d people like this"
+msgstr[0] "%d persona li agrada això"
+msgstr[1] "%d persones els agrada això"
+
+#: ../../addon/widgets/widget_like.php:61
+#, php-format
+msgid "%d person doesn't like this"
+msgid_plural "%d people don't like this"
+msgstr[0] "%d persona no li agrada això"
+msgstr[1] "%d persones no els agrada això"
+
+#: ../../addon/widgets/widgets.php:55
+msgid "Generate new key"
+msgstr "Generar nova clau"
+
+#: ../../addon/widgets/widgets.php:58
+msgid "Widgets key"
+msgstr "Ginys clau"
+
+#: ../../addon/widgets/widgets.php:60
+msgid "Widgets available"
+msgstr "Ginys disponibles"
+
+#: ../../addon/widgets/widget_friends.php:40
+msgid "Connect on Friendica!"
+msgstr "Connectar en Friendica"
+
+#: ../../addon/yourls/yourls.php:55
+msgid "YourLS Settings"
+msgstr "La Teva Configuració de LS"
+
+#: ../../addon/yourls/yourls.php:57
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: ../../addon/yourls/yourls.php:62
+msgid "Username:"
+msgstr "Nom d'usuari:"
+
+#: ../../addon/yourls/yourls.php:67
+msgid "Password:"
+msgstr "Contrasenya:"
+
+#: ../../addon/yourls/yourls.php:72
+msgid "Use SSL "
+msgstr "Emprar SSL"
+
+#: ../../addon/yourls/yourls.php:92
+msgid "yourls Settings saved."
+msgstr "Guardar la seva configuració."
+
+#: ../../addon/ljpost/ljpost.php:38
+msgid "Post to LiveJournal"
+msgstr "Missatge a Livejournal"
+
+#: ../../addon/ljpost/ljpost.php:69
+msgid "LiveJournal Post Settings"
+msgstr "Configuració d'enviaments a Livejournal"
+
+#: ../../addon/ljpost/ljpost.php:71
+msgid "Enable LiveJournal Post Plugin"
+msgstr "Habilitat el plugin d'enviaments a Livejournal"
+
+#: ../../addon/ljpost/ljpost.php:76
+msgid "LiveJournal username"
+msgstr "Nom d'usuari a Livejournal"
+
+#: ../../addon/ljpost/ljpost.php:81
+msgid "LiveJournal password"
+msgstr "Contrasenya a Livejournal"
+
+#: ../../addon/ljpost/ljpost.php:86
+msgid "Post to LiveJournal by default"
+msgstr "Enviar per defecte a Livejournal"
+
+#: ../../addon/nsfw/nsfw.php:47
+msgid "\"Not Safe For Work\" Settings"
+msgstr "Configuració de \"Not Safe For Work\""
+
+#: ../../addon/nsfw/nsfw.php:50
+msgid "Enable NSFW filter"
+msgstr "Habilitar el filtre NSFW"
+
+#: ../../addon/nsfw/nsfw.php:53
+msgid "Comma separated words to treat as NSFW"
+msgstr "Tractar com NSFW les paraules separades per comes  "
+
+#: ../../addon/nsfw/nsfw.php:58
+msgid "Use /expression/ to provide regular expressions"
+msgstr "Emprar /expressió/  per a proporcionar expressions regulars"
+
+#: ../../addon/nsfw/nsfw.php:74
+msgid "NSFW Settings saved."
+msgstr "Configuració NSFW guardada."
+
+#: ../../addon/nsfw/nsfw.php:120
+#, php-format
+msgid "%s - Click to open/close"
+msgstr "%s - Clicar per obrir/tancar"
+
+#: ../../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
+msgid "Login"
+msgstr "Identifica't"
+
+#: ../../addon/communityhome/communityhome.php:29
+#: ../../addon/communityhome/twillingham/communityhome.php:29
+msgid "OpenID"
+msgstr "OpenID"
+
+#: ../../addon/communityhome/communityhome.php:38
+msgid "Last users"
+msgstr "Últims usuaris"
+
+#: ../../addon/communityhome/communityhome.php:81
+#: ../../addon/communityhome/twillingham/communityhome.php:81
+msgid "Most active users"
+msgstr "Usuaris més actius"
+
+#: ../../addon/communityhome/communityhome.php:98
+msgid "Last photos"
+msgstr "Últimes fotos"
+
+#: ../../addon/communityhome/communityhome.php:133
+msgid "Last likes"
+msgstr "Últims \"m'agrada\""
+
+#: ../../addon/communityhome/communityhome.php:155 ../../include/text.php:1224
+#: ../../include/conversation.php:45 ../../include/conversation.php:118
+msgid "event"
+msgstr "esdeveniment"
+
+#: ../../addon/communityhome/twillingham/communityhome.php:38
+msgid "Latest users"
+msgstr "Últims usuaris"
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:84
+#, php-format
+msgid ""
+"Allow to use your friendica id (%s) to connecto to external unhosted-enabled"
+" storage (like ownCloud). See <a "
+"href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage"
+" WebFinger</a>"
+msgstr "Permetre l'ús del seu ID de friendica (%s) per Connectar a l'emmagatzematge extern (com ownCloud). Veure <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\"> WebFinger RemoteStorage </a>"
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:85
+msgid "Template URL (with {category})"
+msgstr "Plantilles de URL (amb {categoria})"
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:86
+msgid "OAuth end-point"
+msgstr "OAuth end-point"
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:87
+msgid "Api"
+msgstr "Api"
+
+#: ../../addon/membersince/membersince.php:18
+msgid "Member since:"
+msgstr "Membre des de:"
+
+#: ../../addon/tictac/tictac.php:20
+msgid "Three Dimensional Tic-Tac-Toe"
+msgstr "Tres en línia Tridimensional"
+
+#: ../../addon/tictac/tictac.php:53
+msgid "3D Tic-Tac-Toe"
+msgstr "Tres en línia 3D"
+
+#: ../../addon/tictac/tictac.php:58
+msgid "New game"
+msgstr "Nou joc"
+
+#: ../../addon/tictac/tictac.php:59
+msgid "New game with handicap"
+msgstr "Nou joc modificat"
+
+#: ../../addon/tictac/tictac.php:60
+msgid ""
+"Three dimensional tic-tac-toe is just like the traditional game except that "
+"it is played on multiple levels simultaneously. "
+msgstr "El joc del tres en línia tridimensional és com el joc tradicional, excepte que es juga en diversos nivells simultàniament."
+
+#: ../../addon/tictac/tictac.php:61
+msgid ""
+"In this case there are three levels. You win by getting three in a row on "
+"any level, as well as up, down, and diagonally across the different levels."
+msgstr "En aquest cas hi ha tres nivells. Vostè guanya per aconseguir tres en una fila en qualsevol nivell, així com dalt, baix i en diagonal a través dels diferents nivells."
+
+#: ../../addon/tictac/tictac.php:63
+msgid ""
+"The handicap game disables the center position on the middle level because "
+"the player claiming this square often has an unfair advantage."
+msgstr "El joc modificat desactiva la posició central en el nivell mitjà perquè el jugador en aquesta posició té sovint un avantatge injust."
+
+#: ../../addon/tictac/tictac.php:182
+msgid "You go first..."
+msgstr "Vostè va primer ..."
+
+#: ../../addon/tictac/tictac.php:187
+msgid "I'm going first this time..."
+msgstr "Vaig primer aquesta vegada ..."
+
+#: ../../addon/tictac/tictac.php:193
+msgid "You won!"
+msgstr "Has guanyat!"
+
+#: ../../addon/tictac/tictac.php:199 ../../addon/tictac/tictac.php:224
+msgid "\"Cat\" game!"
+msgstr "Empat!"
+
+#: ../../addon/tictac/tictac.php:222
+msgid "I won!"
+msgstr "Vaig guanyar!"
+
+#: ../../addon/randplace/randplace.php:171
+msgid "Randplace Settings"
+msgstr "Configuració de Randplace"
+
+#: ../../addon/randplace/randplace.php:173
+msgid "Enable Randplace Plugin"
+msgstr "Habilitar el Plugin de Randplace"
+
+#: ../../addon/dwpost/dwpost.php:38
+msgid "Post to Dreamwidth"
+msgstr "Missatge a Dreamwidth"
+
+#: ../../addon/dwpost/dwpost.php:69
+msgid "Dreamwidth Post Settings"
+msgstr "Configuració d'enviaments a Dreamwidth"
+
+#: ../../addon/dwpost/dwpost.php:71
+msgid "Enable dreamwidth Post Plugin"
+msgstr "Habilitat el plugin d'enviaments a Dreamwidth"
+
+#: ../../addon/dwpost/dwpost.php:76
+msgid "dreamwidth username"
+msgstr "Nom d'usuari a Dreamwidth"
+
+#: ../../addon/dwpost/dwpost.php:81
+msgid "dreamwidth password"
+msgstr "Contrasenya a Dreamwidth"
+
+#: ../../addon/dwpost/dwpost.php:86
+msgid "Post to dreamwidth by default"
+msgstr "Enviar per defecte a Dreamwidth"
+
+#: ../../addon/drpost/drpost.php:35
+msgid "Post to Drupal"
+msgstr "Missatge a Drupal"
+
+#: ../../addon/drpost/drpost.php:72
+msgid "Drupal Post Settings"
+msgstr "Configuració d'enviaments a Drupal"
+
+#: ../../addon/drpost/drpost.php:74
+msgid "Enable Drupal Post Plugin"
+msgstr "Habilitar el Plugin d'Enviaments de Drupal"
+
+#: ../../addon/drpost/drpost.php:79
+msgid "Drupal username"
+msgstr "Nom d'usuari de Drupal"
+
+#: ../../addon/drpost/drpost.php:84
+msgid "Drupal password"
+msgstr "Contrasenya de Drupal"
+
+#: ../../addon/drpost/drpost.php:89
+msgid "Post Type - article,page,or blog"
+msgstr "Tipus d'Enviament- article,pàgina, o blog"
+
+#: ../../addon/drpost/drpost.php:94
+msgid "Drupal site URL"
+msgstr "URL del lloc Drupal"
+
+#: ../../addon/drpost/drpost.php:99
+msgid "Drupal site uses clean URLS"
+msgstr "el Lloc Drupal empra URLS netes"
+
+#: ../../addon/drpost/drpost.php:104
+msgid "Post to Drupal by default"
+msgstr "Enviar a Drupal per defecte"
+
+#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:172
+#: ../../addon/posterous/posterous.php:173
+msgid "Post from Friendica"
+msgstr "Enviament des de Friendica"
+
+#: ../../addon/geonames/geonames.php:143
+msgid "Geonames settings updated."
+msgstr "Actualitzada la configuració de Geonames."
+
+#: ../../addon/geonames/geonames.php:179
+msgid "Geonames Settings"
+msgstr "Configuració de Geonames"
+
+#: ../../addon/geonames/geonames.php:181
+msgid "Enable Geonames Plugin"
+msgstr "Habilitar Plugin de Geonames"
+
+#: ../../addon/js_upload/js_upload.php:43
+msgid "Upload a file"
+msgstr "Carrega un arxiu"
+
+#: ../../addon/js_upload/js_upload.php:44
+msgid "Drop files here to upload"
+msgstr "Deixa aquí el arxiu a carregar"
+
+#: ../../addon/js_upload/js_upload.php:46
+msgid "Failed"
+msgstr "Fracassar"
+
+#: ../../addon/js_upload/js_upload.php:297
+msgid "No files were uploaded."
+msgstr "No hi ha arxius carregats."
+
+#: ../../addon/js_upload/js_upload.php:303
+msgid "Uploaded file is empty"
+msgstr "L'arxiu carregat està buit"
+
+#: ../../addon/js_upload/js_upload.php:326
+msgid "File has an invalid extension, it should be one of "
+msgstr "Arxiu té una extensió no vàlida, ha de ser una de"
+
+#: ../../addon/js_upload/js_upload.php:337
+msgid "Upload was cancelled, or server error encountered"
+msgstr "La pujada va ser cancel.lada, o es va trobar un error de servidor"
+
+#: ../../addon/oembed.old/oembed.php:30
+msgid "OEmbed settings updated"
+msgstr "Actualitzar la configuració OEmbed"
+
+#: ../../addon/oembed.old/oembed.php:43
+msgid "Use OEmbed for YouTube videos"
+msgstr "Empreu OEmbed per videos YouTube"
+
+#: ../../addon/oembed.old/oembed.php:71
+msgid "URL to embed:"
+msgstr "Adreça URL del recurs"
+
+#: ../../addon/impressum/impressum.php:25
+msgid "Impressum"
+msgstr "Impressum"
+
+#: ../../addon/impressum/impressum.php:38
+#: ../../addon/impressum/impressum.php:40
+#: ../../addon/impressum/impressum.php:70
+msgid "Site Owner"
+msgstr "Propietari del lloc"
+
+#: ../../addon/impressum/impressum.php:38
+#: ../../addon/impressum/impressum.php:74
+msgid "Email Address"
+msgstr "Adreça de correu"
+
+#: ../../addon/impressum/impressum.php:43
+#: ../../addon/impressum/impressum.php:72
+msgid "Postal Address"
+msgstr "Adreça postal"
+
+#: ../../addon/impressum/impressum.php:49
+msgid ""
+"The impressum addon needs to be configured!<br />Please add at least the "
+"<tt>owner</tt> variable to your config file. For other variables please "
+"refer to the README file of the addon."
+msgstr "El complement impressum s'ha de configurar!<br />Si us plau afegiu almenys la variable <tt>propietari </tt> al fitxer de configuració. Per a les altres variables, consulteu el fitxer README del complement."
+
+#: ../../addon/impressum/impressum.php:71
+msgid "Site Owners Profile"
+msgstr "Perfil del Propietari del Lloc"
+
+#: ../../addon/impressum/impressum.php:73
+msgid "Notes"
+msgstr "Notes"
+
+#: ../../addon/buglink/buglink.php:15
+msgid "Report Bug"
+msgstr "Informar de problema"
+
+#: ../../addon/blockem/blockem.php:51
+msgid "\"Blockem\" Settings"
+msgstr "Configuració de \"Bloqueig\""
+
+#: ../../addon/blockem/blockem.php:53
+msgid "Comma separated profile URLS to block"
+msgstr "URLS dels perfils a bloquejar, separats per comes"
+
+#: ../../addon/blockem/blockem.php:70
+msgid "BLOCKEM Settings saved."
+msgstr "Guardada la configuració de BLOQUEIG."
+
+#: ../../addon/blockem/blockem.php:105
+#, php-format
+msgid "Blocked %s - Click to open/close"
+msgstr "Bloquejar %s - Clica per obrir/tancar"
+
+#: ../../addon/blockem/blockem.php:160
+msgid "Unblock Author"
+msgstr "Desbloquejar Autor"
+
+#: ../../addon/blockem/blockem.php:162
+msgid "Block Author"
+msgstr "Bloquejar Autor"
+
+#: ../../addon/blockem/blockem.php:194
+msgid "blockem settings updated"
+msgstr "Actualitzar la Configuració de bloqueig"
+
+#: ../../addon/qcomment/qcomment.php:51
+msgid ":-)"
+msgstr ":-)"
+
+#: ../../addon/qcomment/qcomment.php:51
+msgid ":-("
+msgstr ":-("
+
+#: ../../addon/qcomment/qcomment.php:51
+msgid "lol"
+msgstr "lol"
+
+#: ../../addon/qcomment/qcomment.php:54
+msgid "Quick Comment Settings"
+msgstr "Configuració Ràpida dels Comentaris"
+
+#: ../../addon/qcomment/qcomment.php:56
+msgid ""
+"Quick comments are found near comment boxes, sometimes hidden. Click them to"
+" provide simple replies."
+msgstr "Comentaris ràpids es troben prop de les caixes de comentaris, de vegades ocults. Feu clic a ells per donar respostes simples."
+
+#: ../../addon/qcomment/qcomment.php:57
+msgid "Enter quick comments, one per line"
+msgstr "Introduïu els comentaris ràpids, un per línia"
+
+#: ../../addon/qcomment/qcomment.php:75
+msgid "Quick Comment settings saved."
+msgstr "Guardada la configuració de comentaris ràpids."
+
+#: ../../addon/openstreetmap/openstreetmap.php:71
+msgid "Tile Server URL"
+msgstr "URL del servidor, del mosaico de servidores"
+
+#: ../../addon/openstreetmap/openstreetmap.php:71
+msgid ""
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
+"target=\"_blank\">public tile servers</a>"
+msgstr "Una llista de  <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\"> un mosaic de servidors públics</a>"
+
+#: ../../addon/openstreetmap/openstreetmap.php:72
+msgid "Default zoom"
+msgstr "Zoom per defecte"
+
+#: ../../addon/openstreetmap/openstreetmap.php:72
+msgid "The default zoom level. (1:world, 18:highest)"
+msgstr "Nivell de zoom per defecte. (1: el món, 18: el més alt)"
+
+#: ../../addon/editplain/editplain.php:46
+msgid "Editplain settings updated."
+msgstr "Actualitzar la configuració de Editplain."
+
+#: ../../addon/editplain/editplain.php:76
+msgid "Editplain Settings"
+msgstr "Configuració de Editplain"
+
+#: ../../addon/editplain/editplain.php:78
+msgid "Disable richtext status editor"
+msgstr "Deshabilitar l'editor d'estatus de texte enriquit"
+
+#: ../../addon/pageheader/pageheader.php:47
+msgid "\"pageheader\" Settings"
+msgstr "Configuració de la capçalera de pàgina."
+
+#: ../../addon/pageheader/pageheader.php:65
+msgid "pageheader Settings saved."
+msgstr "guardada la configuració de la capçalera de pàgina."
+
+#: ../../addon/viewsrc/viewsrc.php:25
+msgid "View Source"
+msgstr "Veure les Fonts"
+
+#: ../../addon/statusnet/statusnet.php:134
+msgid "Post to StatusNet"
+msgstr "Publica-ho a StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:175
+msgid ""
+"Please contact your site administrator.<br />The provided API URL is not "
+"valid."
+msgstr "Si us plau, poseu-vos en contacte amb l'administrador del lloc. <br /> L'adreça URL de l'API proporcionada no és vàlida."
+
+#: ../../addon/statusnet/statusnet.php:203
+msgid "We could not contact the StatusNet API with the Path you entered."
+msgstr "No hem pogut posar-nos en contacte amb l'API StatusNet amb la ruta que has introduït."
+
+#: ../../addon/statusnet/statusnet.php:229
+msgid "StatusNet settings updated."
+msgstr "La configuració StatusNet actualitzada."
+
+#: ../../addon/statusnet/statusnet.php:252
+msgid "StatusNet Posting Settings"
+msgstr "Configuració d'Enviaments per a StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:266
+msgid "Globally Available StatusNet OAuthKeys"
+msgstr "OAuthKeys de StatusNet Globalment Disponible"
+
+#: ../../addon/statusnet/statusnet.php:267
+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 "Hi ha preconfigurats parells clau OAuth per a alguns servidors StatusNet disponibles. Si està emprant un d'ells, utilitzi aquestes credencials. Si no és així no dubteu a connectar-se a qualsevol altra instància StatusNet (veure a baix)."
+
+#: ../../addon/statusnet/statusnet.php:275
+msgid "Provide your own OAuth Credentials"
+msgstr "Proporcioneu les vostres credencials de OAuth"
+
+#: ../../addon/statusnet/statusnet.php:276
+msgid ""
+"No consumer key pair for StatusNet found. Register your Friendica Account as"
+" an desktop client on your StatusNet account, copy the consumer key pair "
+"here and enter the API base root.<br />Before you register your own OAuth "
+"key pair ask the administrator if there is already a key pair for this "
+"Friendica installation at your favorited StatusNet installation."
+msgstr "no s'ha trobat cap parell \"consumer key\" per StatusNet. Registra el teu compte Friendica com un client d'escriptori en el seu compte StatusNet, copieu el parell de \"consumer key\" aquí i entri a l'arrel de la base de l'API. <br /> Abans de registrar el seu parell de claus OAuth demani a l'administrador si ja hi ha un parell de claus per a aquesta instal·lació de Friendica en la instal·lació del teu favorit StatusNet."
+
+#: ../../addon/statusnet/statusnet.php:278
+msgid "OAuth Consumer Key"
+msgstr "OAuth Consumer Key"
+
+#: ../../addon/statusnet/statusnet.php:281
+msgid "OAuth Consumer Secret"
+msgstr "OAuth Consumer Secret"
+
+#: ../../addon/statusnet/statusnet.php:284
+msgid "Base API Path (remember the trailing /)"
+msgstr "Base API Path (recorda deixar / al final)"
+
+#: ../../addon/statusnet/statusnet.php:305
+msgid ""
+"To connect to your StatusNet account click the button below to get a "
+"security code from StatusNet which you have to copy into the input box below"
+" and submit the form. Only your <strong>public</strong> posts will be posted"
+" to StatusNet."
+msgstr "Per connectar al seu compte StatusNet, feu clic al botó de sota per obtenir un codi de seguretat StatusNet, que has de copiar a la casella de sota, i enviar el formulari. Només els missatges <strong> públics </strong> es publicaran en StatusNet."
+
+#: ../../addon/statusnet/statusnet.php:306
+msgid "Log in with StatusNet"
+msgstr "Accedeixi com en  StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:308
+msgid "Copy the security code from StatusNet here"
+msgstr "Copieu el codi de seguretat StatusNet aquí"
+
+#: ../../addon/statusnet/statusnet.php:314
+msgid "Cancel Connection Process"
+msgstr "Cancel·lar el procés de connexió"
+
+#: ../../addon/statusnet/statusnet.php:316
+msgid "Current StatusNet API is"
+msgstr "L'Actual StatusNet API és"
+
+#: ../../addon/statusnet/statusnet.php:317
+msgid "Cancel StatusNet Connection"
+msgstr "Cancel·lar la connexió amb StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:328 ../../addon/twitter/twitter.php:184
+msgid "Currently connected to: "
+msgstr "Actualment connectat a: "
+
+#: ../../addon/statusnet/statusnet.php:329
+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 "Si està activat, tots els seus anuncis <strong>públics</strong> poden ser publicats en el compte StatusNet associat. Vostè pot optar per fer-ho per defecte (en aquest cas) o per cada missatge per separat en les opcions de comptabilització en escriure l'entrada."
+
+#: ../../addon/statusnet/statusnet.php:331
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to StatusNet will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
+msgstr "<strong>Nota</strong>: A causa de les seves opcions de privacitat (<em>Amaga els detalls del teu perfil dels espectadors desconeguts? </em>)  el vincle potencialment inclòs en anuncis públics transmesos a StatusNet conduirà el visitant a una pàgina en blanc en la que informarà al visitants que l'accés al seu perfil s'ha restringit."
+
+#: ../../addon/statusnet/statusnet.php:334
+msgid "Allow posting to StatusNet"
+msgstr "Permetre enviaments a StatusNet"
+
+#: ../../addon/statusnet/statusnet.php:337
+msgid "Send public postings to StatusNet by default"
+msgstr "Enviar missatges públics a StatusNet per defecte"
+
+#: ../../addon/statusnet/statusnet.php:342 ../../addon/twitter/twitter.php:198
+msgid "Clear OAuth configuration"
+msgstr "Esborrar configuració de OAuth"
+
+#: ../../addon/statusnet/statusnet.php:524
+msgid "API URL"
+msgstr "API URL"
+
+#: ../../addon/tumblr/tumblr.php:36
+msgid "Post to Tumblr"
+msgstr "Publica-ho al Tumblr"
+
+#: ../../addon/tumblr/tumblr.php:67
+msgid "Tumblr Post Settings"
+msgstr "Configuració d'Enviaments de Tumblr"
+
+#: ../../addon/tumblr/tumblr.php:69
+msgid "Enable Tumblr Post Plugin"
+msgstr "Habilita el plugin de enviaments de Tumblr"
+
+#: ../../addon/tumblr/tumblr.php:74
+msgid "Tumblr login"
+msgstr "Inici de sessió de Tumblr"
+
+#: ../../addon/tumblr/tumblr.php:79
+msgid "Tumblr password"
+msgstr "Caontrasenya de Tumblr"
+
+#: ../../addon/tumblr/tumblr.php:84
+msgid "Post to Tumblr by default"
+msgstr "Enviar a Tumblr per defecte"
+
+#: ../../addon/numfriends/numfriends.php:46
+msgid "Numfriends settings updated."
+msgstr "Actualitzar la configuració de Numfriends."
+
+#: ../../addon/numfriends/numfriends.php:77
+msgid "Numfriends Settings"
+msgstr "Configuració de Numfriends"
+
+#: ../../addon/numfriends/numfriends.php:79
+msgid "How many contacts to display on profile sidebar"
+msgstr "Quants contactes per mostrar a la barra lateral el perfil"
+
+#: ../../addon/gnot/gnot.php:48
+msgid "Gnot settings updated."
+msgstr "Configuració de Gnot actualitzada"
+
+#: ../../addon/gnot/gnot.php:79
+msgid "Gnot Settings"
+msgstr "Configuració de Gnot"
+
+#: ../../addon/gnot/gnot.php:81
+msgid ""
+"Allows threading of email comment notifications on Gmail and anonymising the"
+" subject line."
+msgstr "Permet crear fils de les notificacions de comentaris de correu electrònic a Gmail i anonimat de la línia d'assumpte."
+
+#: ../../addon/gnot/gnot.php:82
+msgid "Enable this plugin/addon?"
+msgstr "Activar aquest plugin/aplicació?"
+
+#: ../../addon/gnot/gnot.php:97
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d"
+msgstr "[Friendica: Notifica] Conversació comentada #%d"
+
+#: ../../addon/wppost/wppost.php:42
+msgid "Post to Wordpress"
+msgstr "Publica-ho al Wordpress"
+
+#: ../../addon/wppost/wppost.php:74
+msgid "WordPress Post Settings"
+msgstr "Configuració d'enviaments a WordPress"
+
+#: ../../addon/wppost/wppost.php:76
+msgid "Enable WordPress Post Plugin"
+msgstr "Habilitar Configuració d'Enviaments a WordPress"
+
+#: ../../addon/wppost/wppost.php:81
+msgid "WordPress username"
+msgstr "Nom d'usuari de WordPress"
+
+#: ../../addon/wppost/wppost.php:86
+msgid "WordPress password"
+msgstr "Contrasenya de WordPress"
+
+#: ../../addon/wppost/wppost.php:91
+msgid "WordPress API URL"
+msgstr "WordPress API URL"
+
+#: ../../addon/wppost/wppost.php:96
+msgid "Post to WordPress by default"
+msgstr "Enviar a WordPress per defecte"
+
+#: ../../addon/showmore/showmore.php:38
+msgid "\"Show more\" Settings"
+msgstr "Configuració de \"Mostrar més\""
+
+#: ../../addon/showmore/showmore.php:41
+msgid "Enable Show More"
+msgstr "Habilita Mostrar Més"
+
+#: ../../addon/showmore/showmore.php:44
+msgid "Cutting posts after how much characters"
+msgstr "Tallar els missatges després de quants caràcters"
+
+#: ../../addon/showmore/showmore.php:64
+msgid "Show More Settings saved."
+msgstr "Guardada la configuració de \"Mostra Més\"."
+
+#: ../../addon/showmore/showmore.php:86
+msgid "Show More"
+msgstr "Mostra Més"
+
+#: ../../addon/piwik/piwik.php:79
+msgid ""
+"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
+"analytics tool."
+msgstr "Aquest lloc web realitza un seguiment mitjançant la eina d'anàlisi <a href='http://www.piwik.org'>Piwik</a>."
+
+#: ../../addon/piwik/piwik.php:82
+#, php-format
+msgid ""
+"If you do not want that your visits are logged this way you <a href='%s'>can"
+" set a cookie to prevent Piwik from tracking further visits of the site</a> "
+"(opt-out)."
+msgstr "Si no vol que les seves visites es transcribin d'aquesta manera vostè <a href='%s'> pot establir una cookie per evitar a Piwik a partir de noves visites del lloc web </a> (opt-out)."
+
+#: ../../addon/piwik/piwik.php:90
+msgid "Piwik Base URL"
+msgstr "URL Piwik Base"
+
+#: ../../addon/piwik/piwik.php:90
+msgid ""
+"Absolute path to your Piwik installation. (without protocol (http/s), with "
+"trailing slash)"
+msgstr "Trajectoria absoluta per a la instal·lació de Piwik (sense el protocol (http/s), amb la barra final )"
+
+#: ../../addon/piwik/piwik.php:91
+msgid "Site ID"
+msgstr "Lloc ID"
+
+#: ../../addon/piwik/piwik.php:92
+msgid "Show opt-out cookie link?"
+msgstr "Mostra l'enllaç cookie opt-out?"
+
+#: ../../addon/piwik/piwik.php:93
+msgid "Asynchronous tracking"
+msgstr "Seguiment asíncrono"
+
+#: ../../addon/twitter/twitter.php:73
+msgid "Post to Twitter"
+msgstr "Publica-ho al Twitter"
+
+#: ../../addon/twitter/twitter.php:119
+msgid "Twitter settings updated."
+msgstr "La configuració de Twitter actualitzada."
+
+#: ../../addon/twitter/twitter.php:141
+msgid "Twitter Posting Settings"
+msgstr "Configuració d'Enviaments per a Twitter"
+
+#: ../../addon/twitter/twitter.php:148
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr "No s'ha pogut emparellar cap clau \"consumer key\" per a Twitter. Si us plau, poseu-vos en contacte amb l'administrador del lloc."
+
+#: ../../addon/twitter/twitter.php:167
+msgid ""
+"At this Friendica instance the Twitter plugin was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input"
+" box below and submit the form. Only your <strong>public</strong> posts will"
+" be posted to Twitter."
+msgstr "En aquesta instància Friendica el plugin Twitter va ser habilitat, però encara no ha connectat el compte al seu compte de Twitter. Per a això feu clic al botó de sota per obtenir un PIN de Twitter que ha de copiar a la casella de sota i enviar el formulari. Només els missatges <strong> públics </strong> es publicaran a Twitter."
+
+#: ../../addon/twitter/twitter.php:168
+msgid "Log in with Twitter"
+msgstr "Accedeixi com en  Twitter"
+
+#: ../../addon/twitter/twitter.php:170
+msgid "Copy the PIN from Twitter here"
+msgstr "Copieu el codi PIN de Twitter aquí"
+
+#: ../../addon/twitter/twitter.php:185
+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 "Si està activat, tots els seus anuncis <strong> públics </strong> poden ser publicats en el corresponent compte de Twitter. Vostè pot optar per fer-ho per defecte (en aquest cas) o per cada missatge per separat en les opcions de comptabilització en escriure l'entrada."
+
+#: ../../addon/twitter/twitter.php:187
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr "<strong>Nota</strong>: donada la seva configuració de privacitat (<em> Amaga els detalls del teu perfil dels espectadors desconeguts? </em>) el vincle potencialment inclòs en anuncis públics retransmesos a Twitter conduirà al visitant a una pàgina en blanc informar als visitants que l'accés al seu perfil s'ha restringit."
+
+#: ../../addon/twitter/twitter.php:190
+msgid "Allow posting to Twitter"
+msgstr "Permetre anunci a Twitter"
+
+#: ../../addon/twitter/twitter.php:193
+msgid "Send public postings to Twitter by default"
+msgstr "Enviar anuncis públics a Twitter per defecte"
+
+#: ../../addon/twitter/twitter.php:357
+msgid "Consumer key"
+msgstr "Consumer key"
+
+#: ../../addon/twitter/twitter.php:358
+msgid "Consumer secret"
+msgstr "Consumer secret"
+
+#: ../../addon/irc/irc.php:20
+msgid "irc Chatroom"
+msgstr "irc Chatroom"
+
+#: ../../addon/posterous/posterous.php:36
+msgid "Post to Posterous"
+msgstr "enviament a Posterous"
+
+#: ../../addon/posterous/posterous.php:67
+msgid "Posterous Post Settings"
+msgstr "Configuració d'Enviaments a Posterous"
+
+#: ../../addon/posterous/posterous.php:69
+msgid "Enable Posterous Post Plugin"
+msgstr "Habilitar plugin d'Enviament de Posterous"
+
+#: ../../addon/posterous/posterous.php:74
+msgid "Posterous login"
+msgstr "Inici de sessió a Posterous"
+
+#: ../../addon/posterous/posterous.php:79
+msgid "Posterous password"
+msgstr "Contrasenya a Posterous"
+
+#: ../../addon/posterous/posterous.php:84
+msgid "Post to Posterous by default"
+msgstr "Enviar a Posterous per defecte"
+
+#: ../../view/theme/quattro/theme.php:17
+msgid "Theme settings"
+msgstr "Configuració de Temes"
+
+#: ../../view/theme/quattro/theme.php:18
+msgid "Alignment"
+msgstr "Adaptació"
+
+#: ../../view/theme/quattro/theme.php:18
+msgid "Left"
+msgstr "Esquerra"
+
+#: ../../view/theme/quattro/theme.php:18
+msgid "Center"
+msgstr "Centre"
+
+#: ../../include/profile_advanced.php:17 ../../boot.php:982
+msgid "Gender:"
+msgstr "Gènere:"
+
+#: ../../include/profile_advanced.php:22
+msgid "j F, Y"
+msgstr "j F, Y"
+
+#: ../../include/profile_advanced.php:23
+msgid "j F"
+msgstr "j F"
+
+#: ../../include/profile_advanced.php:30 ../../include/datetime.php:438
+#: ../../include/items.php:1349
+msgid "Birthday:"
+msgstr "Aniversari:"
+
+#: ../../include/profile_advanced.php:34
+msgid "Age:"
+msgstr "Edat:"
+
+#: ../../include/profile_advanced.php:37 ../../boot.php:985
+msgid "Status:"
+msgstr "Estatus:"
+
+#: ../../include/profile_advanced.php:45 ../../boot.php:987
+msgid "Homepage:"
+msgstr "Pàgina web:"
+
+#: ../../include/profile_advanced.php:47
+msgid "Tags:"
+msgstr "Etiquetes:"
+
+#: ../../include/profile_advanced.php:51
+msgid "Religion:"
+msgstr "Religió:"
+
+#: ../../include/profile_advanced.php:53
+msgid "About:"
+msgstr "Acerca de:"
+
+#: ../../include/profile_advanced.php:55
+msgid "Hobbies/Interests:"
+msgstr "Aficiones/Intereses:"
+
+#: ../../include/profile_advanced.php:57
+msgid "Contact information and Social Networks:"
+msgstr "Informació de contacte i Xarxes Socials:"
+
+#: ../../include/profile_advanced.php:59
+msgid "Musical interests:"
+msgstr "Gustos musicals:"
+
+#: ../../include/profile_advanced.php:61
+msgid "Books, literature:"
+msgstr "Llibres, literatura:"
+
+#: ../../include/profile_advanced.php:63
+msgid "Television:"
+msgstr "Televisió:"
+
+#: ../../include/profile_advanced.php:65
+msgid "Film/dance/culture/entertainment:"
+msgstr "Cinema/ball/cultura/entreteniments:"
+
+#: ../../include/profile_advanced.php:67
+msgid "Love/Romance:"
+msgstr "Amor/sentiments:"
+
+#: ../../include/profile_advanced.php:69
+msgid "Work/employment:"
+msgstr "Treball/ocupació:"
+
+#: ../../include/profile_advanced.php:71
+msgid "School/education:"
+msgstr "Escola/formació"
+
+#: ../../include/contact_selectors.php:32
+msgid "Unknown | Not categorised"
+msgstr "Desconegut/No categoritzat"
+
+#: ../../include/contact_selectors.php:33
+msgid "Block immediately"
+msgstr "Bloquejar immediatament"
+
+#: ../../include/contact_selectors.php:34
+msgid "Shady, spammer, self-marketer"
+msgstr "Sospitós, Femater, auto-publicitat"
+
+#: ../../include/contact_selectors.php:35
+msgid "Known to me, but no opinion"
+msgstr "Conegut per mi, però sense opinió"
+
+#: ../../include/contact_selectors.php:36
+msgid "OK, probably harmless"
+msgstr "Bé, probablement inofensiu"
+
+#: ../../include/contact_selectors.php:37
+msgid "Reputable, has my trust"
+msgstr "Bona reputació, té la meva confiança"
+
+#: ../../include/contact_selectors.php:56
+msgid "Frequently"
+msgstr "Freqüentment"
+
+#: ../../include/contact_selectors.php:57
+msgid "Hourly"
+msgstr "Cada hora"
+
+#: ../../include/contact_selectors.php:58
+msgid "Twice daily"
+msgstr "Dues vegades al dia"
+
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
+msgstr "Diari"
+
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
+msgstr "Setmanal"
+
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
+msgstr "Mensual"
+
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
+msgstr "OStatus"
+
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: ../../include/contact_selectors.php:82
+msgid "Zot!"
+msgstr "Zot!"
+
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
+
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
+msgstr "MySpace"
+
+#: ../../include/profile_selectors.php:6
+msgid "Male"
+msgstr "Home"
+
+#: ../../include/profile_selectors.php:6
+msgid "Female"
+msgstr "Dona"
+
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
+msgstr "Actualment Home"
+
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
+msgstr "Actualment Dona"
+
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
+msgstr "Habitualment Home"
+
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
+msgstr "Habitualment Dona"
+
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
+msgstr "Transgènere"
+
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
+msgstr "Bisexual"
+
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
+msgstr "Transexual"
+
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
+msgstr "Hermafrodita"
+
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
+msgstr "Neutre"
+
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
+msgstr "No específicat"
+
+#: ../../include/profile_selectors.php:6
+msgid "Other"
+msgstr "Altres"
+
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
+msgstr "No Decidit"
+
+#: ../../include/profile_selectors.php:19
+msgid "Males"
+msgstr "Home"
+
+#: ../../include/profile_selectors.php:19
+msgid "Females"
+msgstr "Dona"
+
+#: ../../include/profile_selectors.php:19
+msgid "Gay"
+msgstr "Gay"
+
+#: ../../include/profile_selectors.php:19
+msgid "Lesbian"
+msgstr "Lesbiana"
+
+#: ../../include/profile_selectors.php:19
+msgid "No Preference"
+msgstr "Sense Preferències"
+
+#: ../../include/profile_selectors.php:19
+msgid "Bisexual"
+msgstr "Bisexual"
+
+#: ../../include/profile_selectors.php:19
+msgid "Autosexual"
+msgstr "Autosexual"
+
+#: ../../include/profile_selectors.php:19
+msgid "Abstinent"
+msgstr "Abstinent/a"
+
+#: ../../include/profile_selectors.php:19
+msgid "Virgin"
+msgstr "Verge"
+
+#: ../../include/profile_selectors.php:19
+msgid "Deviant"
+msgstr "Desviat/da"
+
+#: ../../include/profile_selectors.php:19
+msgid "Fetish"
+msgstr "Fetixiste"
+
+#: ../../include/profile_selectors.php:19
+msgid "Oodles"
+msgstr "Orgies"
+
+#: ../../include/profile_selectors.php:19
+msgid "Nonsexual"
+msgstr "Asexual"
+
+#: ../../include/profile_selectors.php:33
+msgid "Single"
+msgstr "Solter/a"
+
+#: ../../include/profile_selectors.php:33
+msgid "Lonely"
+msgstr "Solitari"
+
+#: ../../include/profile_selectors.php:33
+msgid "Available"
+msgstr "Disponible"
+
+#: ../../include/profile_selectors.php:33
+msgid "Unavailable"
+msgstr "No Disponible"
+
+#: ../../include/profile_selectors.php:33
+msgid "Dating"
+msgstr "De cites"
+
+#: ../../include/profile_selectors.php:33
+msgid "Unfaithful"
+msgstr "Infidel"
+
+#: ../../include/profile_selectors.php:33
+msgid "Sex Addict"
+msgstr "Adicte al sexe"
+
+#: ../../include/profile_selectors.php:33
+msgid "Friends"
+msgstr "Amics/Amigues"
+
+#: ../../include/profile_selectors.php:33
+msgid "Friends/Benefits"
+msgstr "Amics íntims"
+
+#: ../../include/profile_selectors.php:33
+msgid "Casual"
+msgstr "Oportunista"
+
+#: ../../include/profile_selectors.php:33
+msgid "Engaged"
+msgstr "Promès"
+
+#: ../../include/profile_selectors.php:33
+msgid "Married"
+msgstr "Casat"
+
+#: ../../include/profile_selectors.php:33
+msgid "Partners"
+msgstr "Socis"
+
+#: ../../include/profile_selectors.php:33
+msgid "Cohabiting"
+msgstr "Cohabitant"
+
+#: ../../include/profile_selectors.php:33
+msgid "Happy"
+msgstr "Feliç"
+
+#: ../../include/profile_selectors.php:33
+msgid "Not Looking"
+msgstr "No Cerco"
+
+#: ../../include/profile_selectors.php:33
+msgid "Swinger"
+msgstr "Parella Liberal"
+
+#: ../../include/profile_selectors.php:33
+msgid "Betrayed"
+msgstr "Traït/da"
+
+#: ../../include/profile_selectors.php:33
+msgid "Separated"
+msgstr "Separat/da"
+
+#: ../../include/profile_selectors.php:33
+msgid "Unstable"
+msgstr "Inestable"
+
+#: ../../include/profile_selectors.php:33
+msgid "Divorced"
+msgstr "Divorciat/da"
+
+#: ../../include/profile_selectors.php:33
+msgid "Widowed"
+msgstr "Vidu/a"
+
+#: ../../include/profile_selectors.php:33
+msgid "Uncertain"
+msgstr "Incert"
+
+#: ../../include/profile_selectors.php:33
+msgid "Complicated"
+msgstr "Complicat"
+
+#: ../../include/profile_selectors.php:33
+msgid "Don't care"
+msgstr "No t'interessa"
+
+#: ../../include/profile_selectors.php:33
+msgid "Ask me"
+msgstr "Pregunta'm"
+
+#: ../../include/event.php:17 ../../include/bb2diaspora.php:244
+msgid "Starts:"
+msgstr "Inici:"
+
+#: ../../include/event.php:27 ../../include/bb2diaspora.php:252
+msgid "Finishes:"
+msgstr "Acaba:"
+
+#: ../../include/delivery.php:425 ../../include/notifier.php:638
+msgid "(no subject)"
+msgstr "(sense assumpte)"
+
+#: ../../include/delivery.php:432 ../../include/enotify.php:17
+#: ../../include/notifier.php:645
+msgid "noreply"
+msgstr "no contestar"
+
+#: ../../include/text.php:238
+msgid "prev"
+msgstr "Prev"
+
+#: ../../include/text.php:240
+msgid "first"
+msgstr "primer"
+
+#: ../../include/text.php:269
+msgid "last"
+msgstr "Últim"
+
+#: ../../include/text.php:272
+msgid "next"
+msgstr "Proper"
+
+#: ../../include/text.php:563
+msgid "No contacts"
+msgstr "Sense contactes"
+
+#: ../../include/text.php:572
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] "%d Contacte"
+msgstr[1] "%d Contactes"
+
+#: ../../include/text.php:643 ../../include/nav.php:87
+msgid "Search"
+msgstr "Cercar"
+
+#: ../../include/text.php:831
+msgid "Monday"
+msgstr "Dilluns"
+
+#: ../../include/text.php:831
+msgid "Tuesday"
+msgstr "Dimarts"
+
+#: ../../include/text.php:831
+msgid "Wednesday"
+msgstr "Dimecres"
+
+#: ../../include/text.php:831
+msgid "Thursday"
+msgstr "Dijous"
+
+#: ../../include/text.php:831
+msgid "Friday"
+msgstr "Divendres"
+
+#: ../../include/text.php:831
+msgid "Saturday"
+msgstr "Dissabte"
+
+#: ../../include/text.php:831
+msgid "Sunday"
+msgstr "Diumenge"
+
+#: ../../include/text.php:835
+msgid "January"
+msgstr "Gener"
+
+#: ../../include/text.php:835
+msgid "February"
+msgstr "Febrer"
+
+#: ../../include/text.php:835
+msgid "March"
+msgstr "Març"
+
+#: ../../include/text.php:835
+msgid "April"
+msgstr "Abril"
+
+#: ../../include/text.php:835
+msgid "May"
+msgstr "Maig"
+
+#: ../../include/text.php:835
+msgid "June"
+msgstr "Juny"
+
+#: ../../include/text.php:835
+msgid "July"
+msgstr "Juliol"
+
+#: ../../include/text.php:835
+msgid "August"
+msgstr "Agost"
+
+#: ../../include/text.php:835
+msgid "September"
+msgstr "Setembre"
+
+#: ../../include/text.php:835
+msgid "October"
+msgstr "Octubre"
+
+#: ../../include/text.php:835
+msgid "November"
+msgstr "Novembre"
+
+#: ../../include/text.php:835
+msgid "December"
+msgstr "Desembre"
+
+#: ../../include/text.php:905
+msgid "bytes"
+msgstr "bytes"
+
+#: ../../include/text.php:1000
+msgid "Select an alternate language"
+msgstr "Sel·lecciona un idioma alternatiu"
+
+#: ../../include/text.php:1012
+msgid "default"
+msgstr "per defecte"
+
+#: ../../include/text.php:1228
+msgid "activity"
+msgstr "activitat"
+
+#: ../../include/text.php:1230
+msgid "comment"
+msgstr "comentari"
+
+#: ../../include/text.php:1231
+msgid "post"
+msgstr "missatge"
+
+#: ../../include/diaspora.php:570
+msgid "Sharing notification from Diaspora network"
+msgstr "Compartint la notificació de la xarxa Diàspora"
+
+#: ../../include/diaspora.php:1911
+msgid "Attachments:"
+msgstr "Adjunts:"
+
+#: ../../include/diaspora.php:2094
+#, php-format
+msgid "[Relayed] Comment authored by %s from network %s"
+msgstr "[Retransmès] Comentari escrit per %s  des de la xarxa %s"
+
+#: ../../include/network.php:814
+msgid "view full size"
+msgstr "Veure a mida completa"
+
+#: ../../include/oembed.php:128
+msgid "Embedded content"
+msgstr "Contingut incrustat"
+
+#: ../../include/oembed.php:137
+msgid "Embedding disabled"
+msgstr "Incrustacions deshabilitades"
+
+#: ../../include/group.php:25
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr "Un grup eliminat amb aquest nom va ser restablert. Els permisos dels elements existents <strong>poden</strong> aplicar-se a aquest grup i tots els futurs membres. Si això no és el que pretén, si us plau, crei un altre grup amb un nom diferent."
+
+#: ../../include/group.php:168
+msgid "Everybody"
+msgstr "Tothom"
+
+#: ../../include/group.php:191
+msgid "edit"
+msgstr "editar"
+
+#: ../../include/group.php:212
+msgid "Groups"
+msgstr "Grups"
+
+#: ../../include/group.php:213
+msgid "Edit group"
+msgstr "Editar grup"
+
+#: ../../include/group.php:214
+msgid "Create a new group"
+msgstr "Crear un nou grup"
+
+#: ../../include/nav.php:44 ../../boot.php:709
+msgid "Logout"
+msgstr "Sortir"
+
+#: ../../include/nav.php:44
+msgid "End this session"
+msgstr "Termina sessió"
+
+#: ../../include/nav.php:47 ../../boot.php:1331
+msgid "Status"
+msgstr "Estatus"
+
+#: ../../include/nav.php:47 ../../include/nav.php:111
+msgid "Your posts and conversations"
+msgstr "Els teus anuncis i converses"
+
+#: ../../include/nav.php:48
+msgid "Your profile page"
+msgstr "La seva pàgina de perfil"
+
+#: ../../include/nav.php:49 ../../boot.php:1341
+msgid "Photos"
+msgstr "Fotos"
+
+#: ../../include/nav.php:49
+msgid "Your photos"
+msgstr "Les seves fotos"
+
+#: ../../include/nav.php:50
+msgid "Your events"
+msgstr "Els seus esdeveniments"
+
+#: ../../include/nav.php:51
+msgid "Personal notes"
+msgstr "Notes personals"
+
+#: ../../include/nav.php:51
+msgid "Your personal photos"
+msgstr "Les seves fotos personals"
+
+#: ../../include/nav.php:62
+msgid "Sign in"
+msgstr "Accedeix"
+
+#: ../../include/nav.php:73
+msgid "Home Page"
+msgstr "Pàgina d'Inici"
+
+#: ../../include/nav.php:77
+msgid "Create an account"
+msgstr "Crear un compte"
+
+#: ../../include/nav.php:82
+msgid "Help and documentation"
+msgstr "Ajuda i documentació"
+
+#: ../../include/nav.php:85
+msgid "Apps"
+msgstr "Aplicacions"
+
+#: ../../include/nav.php:85
+msgid "Addon applications, utilities, games"
+msgstr "Afegits: aplicacions, utilitats, jocs"
+
+#: ../../include/nav.php:87
+msgid "Search site content"
+msgstr "Busca contingut en el lloc"
+
+#: ../../include/nav.php:97
+msgid "Conversations on this site"
+msgstr "Converses en aquest lloc"
+
+#: ../../include/nav.php:99
+msgid "Directory"
+msgstr "Directori"
+
+#: ../../include/nav.php:99
+msgid "People directory"
+msgstr "Directori de gent"
+
+#: ../../include/nav.php:109
+msgid "Conversations from your friends"
+msgstr "Converses dels teus amics"
+
+#: ../../include/nav.php:117
+msgid "Friend Requests"
+msgstr "Sol·licitud d'Amistat"
+
+#: ../../include/nav.php:119
+msgid "See all notifications"
+msgstr "Veure totes les notificacions"
+
+#: ../../include/nav.php:120
+msgid "Mark all system notifications seen"
+msgstr "Marcar totes les notificacions del sistema com a vistes"
+
+#: ../../include/nav.php:124
+msgid "Private mail"
+msgstr "Correu privat"
+
+#: ../../include/nav.php:127
+msgid "Manage"
+msgstr "Gestionar"
+
+#: ../../include/nav.php:127
+msgid "Manage other pages"
+msgstr "Gestiona altres pàgines"
+
+#: ../../include/nav.php:131 ../../boot.php:940
+msgid "Profiles"
+msgstr "Perfils"
+
+#: ../../include/nav.php:131 ../../boot.php:940
+msgid "Manage/edit profiles"
+msgstr "Gestiona/edita perfils"
+
+#: ../../include/nav.php:132
+msgid "Manage/edit friends and contacts"
+msgstr "Gestiona/edita amics i contactes"
+
+#: ../../include/nav.php:139
+msgid "Admin"
+msgstr "Admin"
+
+#: ../../include/nav.php:139
+msgid "Site setup and configuration"
+msgstr "Ajustos i configuració del lloc"
+
+#: ../../include/nav.php:162
+msgid "Nothing new here"
+msgstr "Res nou aquí"
+
+#: ../../include/contact_widgets.php:6
+msgid "Add New Contact"
+msgstr "Afegir Nou Contacte"
+
+#: ../../include/contact_widgets.php:7
+msgid "Enter address or web location"
+msgstr "Introdueixi adreça o ubicació web"
+
+#: ../../include/contact_widgets.php:8
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Exemple: bob@example.com, http://example.com/barbara"
+
+#: ../../include/contact_widgets.php:18
+msgid "Invite Friends"
+msgstr "Invita Amics"
+
+#: ../../include/contact_widgets.php:24
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d invitació disponible"
+msgstr[1] "%d invitacions disponibles"
+
+#: ../../include/contact_widgets.php:30
+msgid "Find People"
+msgstr "Trobar Gent"
+
+#: ../../include/contact_widgets.php:31
+msgid "Enter name or interest"
+msgstr "Introdueixi nom o aficions"
+
+#: ../../include/contact_widgets.php:32
+msgid "Connect/Follow"
+msgstr "Connectar/Seguir"
+
+#: ../../include/contact_widgets.php:33
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Exemples: Robert Morgenstein, Pescar"
+
+#: ../../include/contact_widgets.php:36
+msgid "Similar Interests"
+msgstr "Aficions Similars"
+
+#: ../../include/contact_widgets.php:68
+msgid "Networks"
+msgstr "Xarxes"
+
+#: ../../include/contact_widgets.php:71
+msgid "All Networks"
+msgstr "totes les Xarxes"
+
+#: ../../include/auth.php:29
+msgid "Logged out."
+msgstr "Has sortit"
+
+#: ../../include/datetime.php:43 ../../include/datetime.php:45
+msgid "Miscellaneous"
+msgstr "Miscel·lania"
+
+#: ../../include/datetime.php:121 ../../include/datetime.php:253
+msgid "year"
+msgstr "any"
+
+#: ../../include/datetime.php:126 ../../include/datetime.php:254
+msgid "month"
+msgstr "mes"
+
+#: ../../include/datetime.php:131 ../../include/datetime.php:256
+msgid "day"
+msgstr "dia"
+
+#: ../../include/datetime.php:244
+msgid "never"
+msgstr "mai"
+
+#: ../../include/datetime.php:250
+msgid "less than a second ago"
+msgstr "Fa menys d'un segon"
+
+#: ../../include/datetime.php:253
+msgid "years"
+msgstr "anys"
+
+#: ../../include/datetime.php:254
+msgid "months"
+msgstr "mesos"
+
+#: ../../include/datetime.php:255
+msgid "week"
+msgstr "setmana"
+
+#: ../../include/datetime.php:255
+msgid "weeks"
+msgstr "setmanes"
+
+#: ../../include/datetime.php:256
+msgid "days"
+msgstr "dies"
+
+#: ../../include/datetime.php:257
+msgid "hour"
+msgstr "hora"
+
+#: ../../include/datetime.php:257
+msgid "hours"
+msgstr "hores"
+
+#: ../../include/datetime.php:258
+msgid "minute"
+msgstr "minut"
+
+#: ../../include/datetime.php:258
+msgid "minutes"
+msgstr "minuts"
+
+#: ../../include/datetime.php:259
+msgid "second"
+msgstr "segon"
+
+#: ../../include/datetime.php:259
+msgid "seconds"
+msgstr "segons"
+
+#: ../../include/datetime.php:267
+#, php-format
+msgid "%1$d %2$s ago"
+msgstr " fa %1$d %2$s"
+
+#: ../../include/poller.php:513
+msgid "From: "
+msgstr "Des de:"
+
+#: ../../include/bbcode.php:202
+msgid "$1 wrote:"
+msgstr "$1 va escrivir:"
+
+#: ../../include/bbcode.php:216 ../../include/bbcode.php:282
+msgid "Image/photo"
+msgstr "Imatge/foto"
+
+#: ../../include/dba.php:39
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
+msgstr "No put trobar informació de DNS  del servidor de base de dades '%s'"
+
+#: ../../include/message.php:14
+msgid "[no subject]"
+msgstr "[Sense assumpte]"
+
+#: ../../include/acl_selectors.php:284
+msgid "Visible to everybody"
+msgstr "Visible per tothom"
+
+#: ../../include/acl_selectors.php:285
+msgid "show"
+msgstr "mostra"
+
+#: ../../include/acl_selectors.php:286
+msgid "don't show"
+msgstr "no mostris"
+
+#: ../../include/enotify.php:8
+msgid "Friendica Notification"
+msgstr "Notificacions de Friendica"
+
+#: ../../include/enotify.php:11
+msgid "Thank You,"
+msgstr "Gràcies,"
+
+#: ../../include/enotify.php:13
+#, php-format
+msgid "%s Administrator"
+msgstr "%s Administrador"
+
+#: ../../include/enotify.php:29
+#, php-format
+msgid "%s <!item_type!>"
+msgstr "%s <!item_type!>"
+
+#: ../../include/enotify.php:33
+#, php-format
+msgid "[Friendica:Notify] New mail received at %s"
+msgstr "[Friendica: Notifica] nou correu rebut a %s"
+
+#: ../../include/enotify.php:35
+#, php-format
+msgid "%s sent you a new private message at %s."
+msgstr "%s t'ha enviat un nou missatge privat en %s"
+
+#: ../../include/enotify.php:36
+#, php-format
+msgid "%s sent you %s."
+msgstr "%s t'ha enviat %s."
+
+#: ../../include/enotify.php:36
+msgid "a private message"
+msgstr "un missatge privat"
+
+#: ../../include/enotify.php:37
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Per favor, visiteu %s per a veure i/o respondre els teus missatges privats."
+
+#: ../../include/enotify.php:67
+#, php-format
+msgid "%s's"
+msgstr "%s's"
+
+#: ../../include/enotify.php:71
+msgid "your"
+msgstr "tu"
+
+#: ../../include/enotify.php:78
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d by %s"
+msgstr "[Friendica:Notifica] Conversació comentada #%d per %s"
+
+#: ../../include/enotify.php:79
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
+msgstr "%s ha comentat un element/conversació que estas seguint."
+
+#: ../../include/enotify.php:80
+#, php-format
+msgid "%s commented on %s."
+msgstr "%s comentat a %s."
+
+#: ../../include/enotify.php:82 ../../include/enotify.php:95
+#: ../../include/enotify.php:106 ../../include/enotify.php:117
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Si us pau, visiteu %s per a veure i/o respondre la conversació."
+
+#: ../../include/enotify.php:89
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
+msgstr "[Friendica:Notifica] %s enviat al teu mur del perfil"
+
+#: ../../include/enotify.php:91
+#, php-format
+msgid "%s posted to your profile wall at %s"
+msgstr "%s enviat al teu mur de perfil %s"
+
+#: ../../include/enotify.php:93
+#, php-format
+msgid "%s posted to %s"
+msgstr "%s enviat a %s"
+
+#: ../../include/enotify.php:93
+msgid "your profile wall."
+msgstr "El teu perfil del mur."
+
+#: ../../include/enotify.php:102
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
+msgstr "[Friendica:Notifica] %s t'ha etiquetat"
+
+#: ../../include/enotify.php:103
+#, php-format
+msgid "%s tagged you at %s"
+msgstr "%s t'ha etiquetat en %s"
+
+#: ../../include/enotify.php:104
+#, php-format
+msgid "%s %s."
+msgstr "%s %s."
+
+#: ../../include/enotify.php:104
+msgid "tagged you"
+msgstr "Etiquetat"
+
+#: ../../include/enotify.php:113
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
+msgstr "[Friendica:Notifica] %s ha etiquetat el teu missatge"
+
+#: ../../include/enotify.php:114
+#, php-format
+msgid "%s tagged your post at %s"
+msgstr "%s Ha etiquetat un missatge teu en %s"
+
+#: ../../include/enotify.php:115
+#, php-format
+msgid "%s tagged %s"
+msgstr "%s etiquetat %s"
+
+#: ../../include/enotify.php:115
+msgid "your post"
+msgstr "El teu missatge"
+
+#: ../../include/enotify.php:124
+msgid "[Friendica:Notify] Introduction received"
+msgstr "[Friendica:Notifica] Presentacio rebuda"
+
+#: ../../include/enotify.php:125
+#, php-format
+msgid "You've received an introduction from '%s' at %s"
+msgstr "Has rebut una presentació de %s en %s"
+
+#: ../../include/enotify.php:126
+#, php-format
+msgid "You've received %s from %s."
+msgstr "Has rebut %s de %s"
+
+#: ../../include/enotify.php:126
+msgid "an introduction"
+msgstr "Una presentació"
+
+#: ../../include/enotify.php:127 ../../include/enotify.php:144
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Pot visitar el seu perfil en %s"
+
+#: ../../include/enotify.php:129
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr "Si us plau visiteu %s per aprovar o rebutjar la presentació."
+
+#: ../../include/enotify.php:136
+msgid "[Friendica:Notify] Friend suggestion received"
+msgstr "[Friendica:Notifica] Suggerencia d'amistat rebuda"
+
+#: ../../include/enotify.php:137
+#, php-format
+msgid "You've received a friend suggestion from '%s' at %s"
+msgstr "Has rebut una suggerencia d'amistat de %s en %s"
+
+#: ../../include/enotify.php:138
+#, php-format
+msgid "You've received %s for %s from %s."
+msgstr "Has rebut %s per %s de %s."
+
+#: ../../include/enotify.php:139
+msgid "a friend suggestion"
+msgstr "Un suggerencia d'amistat"
+
+#: ../../include/enotify.php:142
+msgid "Name:"
+msgstr "Nom:"
+
+#: ../../include/enotify.php:143
+msgid "Photo:"
+msgstr "Foto:"
+
+#: ../../include/enotify.php:146
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Si us plau, visiteu %s per aprovar o rebutjar la suggerencia."
+
+#: ../../include/items.php:2573
+msgid "A new person is sharing with you at "
+msgstr "Una persona nova està compartint amb tú en"
+
+#: ../../include/items.php:2573
+msgid "You have a new follower at "
+msgstr "Tens un nou seguidor a "
+
+#: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112
+#: ../../include/bb2diaspora.php:113
+msgid "image/photo"
+msgstr "Imatge/foto"
+
+#: ../../include/security.php:20
+msgid "Welcome "
+msgstr "Benvingut"
+
+#: ../../include/security.php:21
+msgid "Please upload a profile photo."
+msgstr "Per favor, carrega una foto per al perfil"
+
+#: ../../include/security.php:24
+msgid "Welcome back "
+msgstr "Benvingut de nou "
+
+#: ../../include/Contact.php:131 ../../include/conversation.php:788
+msgid "View status"
+msgstr "Veure estatus"
+
+#: ../../include/Contact.php:132 ../../include/conversation.php:789
+msgid "View profile"
+msgstr "Veure perfil"
+
+#: ../../include/Contact.php:133 ../../include/conversation.php:790
+msgid "View photos"
+msgstr "Veure fotos"
+
+#: ../../include/Contact.php:134 ../../include/Contact.php:147
+#: ../../include/conversation.php:791
+msgid "View recent"
+msgstr "Veure recent"
+
+#: ../../include/Contact.php:136 ../../include/Contact.php:147
+#: ../../include/conversation.php:793
+msgid "Send PM"
+msgstr "Enviar Missatge Privat"
+
+#: ../../include/conversation.php:163
+msgid "post/item"
+msgstr "anunci/element"
+
+#: ../../include/conversation.php:164
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
+msgstr "%1$s marcat %2$s's %3$s com favorit"
+
+#: ../../include/conversation.php:303 ../../include/conversation.php:572
+msgid "Select"
+msgstr "Selecionar"
+
+#: ../../include/conversation.php:320 ../../include/conversation.php:665
+#: ../../include/conversation.php:666
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Veure perfil de %s @ %s"
+
+#: ../../include/conversation.php:330 ../../include/conversation.php:677
+#, php-format
+msgid "%s from %s"
+msgstr "%s des de %s"
+
+#: ../../include/conversation.php:346
+msgid "View in context"
+msgstr "Veure en context"
+
+#: ../../include/conversation.php:467
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d comentari"
+msgstr[1] "%d comentaris"
+
+#: ../../include/conversation.php:468 ../../boot.php:448
+msgid "show more"
+msgstr "Mostrar més"
+
+#: ../../include/conversation.php:529
+msgid "like"
+msgstr "Agrada"
+
+#: ../../include/conversation.php:530
+msgid "dislike"
+msgstr "Desagrada"
+
+#: ../../include/conversation.php:532
+msgid "Share this"
+msgstr "Compartir això"
+
+#: ../../include/conversation.php:532
+msgid "share"
+msgstr "Compartir"
+
+#: ../../include/conversation.php:582
+msgid "add star"
+msgstr "Afegir a favorits"
+
+#: ../../include/conversation.php:583
+msgid "remove star"
+msgstr "Esborrar favorit"
+
+#: ../../include/conversation.php:584
+msgid "toggle star status"
+msgstr "Canviar estatus de favorit"
+
+#: ../../include/conversation.php:587
+msgid "starred"
+msgstr "favorit"
+
+#: ../../include/conversation.php:588
+msgid "add tag"
+msgstr "afegir etiqueta"
+
+#: ../../include/conversation.php:667
+msgid "to"
+msgstr "a"
+
+#: ../../include/conversation.php:668
+msgid "Wall-to-Wall"
+msgstr "Mur-a-Mur"
+
+#: ../../include/conversation.php:669
+msgid "via Wall-To-Wall:"
+msgstr "via Mur-a-Mur"
+
+#: ../../include/conversation.php:713
+msgid "Delete Selected Items"
+msgstr "Esborra els Elements Seleccionats"
+
+#: ../../include/conversation.php:845
+#, php-format
+msgid "%s likes this."
+msgstr "a %s agrada això."
+
+#: ../../include/conversation.php:845
+#, php-format
+msgid "%s doesn't like this."
+msgstr "a %s desagrada això."
+
+#: ../../include/conversation.php:849
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgstr "Li agrada a<span  %1$s>%2$d persones</span> ."
+
+#: ../../include/conversation.php:851
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgstr "No li agrada<span  %1$s>%2$d persones</span> ."
+
+#: ../../include/conversation.php:857
+msgid "and"
+msgstr "i"
+
+#: ../../include/conversation.php:860
+#, php-format
+msgid ", and %d other people"
+msgstr ", i altres %d persones"
+
+#: ../../include/conversation.php:861
+#, php-format
+msgid "%s like this."
+msgstr "a %s le gusta esto."
+
+#: ../../include/conversation.php:861
+#, php-format
+msgid "%s don't like this."
+msgstr "a %s no le gusta esto."
+
+#: ../../include/conversation.php:886
+msgid "Visible to <strong>everybody</strong>"
+msgstr "Visible per a <strong>tothom</strong>"
+
+#: ../../include/conversation.php:888
+msgid "Please enter a video link/URL:"
+msgstr "Per favor , introdueixi el enllaç/URL del video"
+
+#: ../../include/conversation.php:889
+msgid "Please enter an audio link/URL:"
+msgstr "Per favor , introdueixi el enllaç/URL del audio:"
+
+#: ../../include/conversation.php:890
+msgid "Tag term:"
+msgstr "Terminis de l'etiqueta:"
+
+#: ../../include/conversation.php:891
+msgid "Where are you right now?"
+msgstr "On ets ara?"
+
+#: ../../include/conversation.php:892
+msgid "Enter a title for this item"
+msgstr "Escriviu un títol per a aquest article"
+
+#: ../../include/conversation.php:935
+msgid "upload photo"
+msgstr "carregar fotos"
+
+#: ../../include/conversation.php:937
+msgid "attach file"
+msgstr "adjuntar arxiu"
+
+#: ../../include/conversation.php:939
+msgid "web link"
+msgstr "enllaç de web"
+
+#: ../../include/conversation.php:940
+msgid "Insert video link"
+msgstr "Insertar enllaç de video"
+
+#: ../../include/conversation.php:941
+msgid "video link"
+msgstr "enllaç de video"
+
+#: ../../include/conversation.php:942
+msgid "Insert audio link"
+msgstr "Insertar enllaç de audio"
+
+#: ../../include/conversation.php:943
+msgid "audio link"
+msgstr "enllaç de audio"
+
+#: ../../include/conversation.php:945
+msgid "set location"
+msgstr "establir la ubicació"
+
+#: ../../include/conversation.php:947
+msgid "clear location"
+msgstr "netejar ubicació"
+
+#: ../../include/conversation.php:952
+msgid "permissions"
+msgstr "Permissos"
+
+#: ../../boot.php:446
+msgid "Delete this item?"
+msgstr "Esborrar aquest element?"
+
+#: ../../boot.php:449
+msgid "show fewer"
+msgstr "Mostrar menys"
+
+#: ../../boot.php:692
+msgid "Create a New Account"
+msgstr "Crear un Nou Compte"
+
+#: ../../boot.php:712
+msgid "Nickname or Email address: "
+msgstr "Malnom o Adreça de correu:"
+
+#: ../../boot.php:713
+msgid "Password: "
+msgstr "Contrasenya:"
+
+#: ../../boot.php:716
+msgid "Or login using OpenID: "
+msgstr "O accedixi emprant OpenID:"
+
+#: ../../boot.php:722
+msgid "Forgot your password?"
+msgstr "Oblidà la contrasenya?"
+
+#: ../../boot.php:879
+msgid "Edit profile"
+msgstr "Editar perfil"
+
+#: ../../boot.php:1046 ../../boot.php:1117
+msgid "g A l F d"
+msgstr "g A l F d"
+
+#: ../../boot.php:1047 ../../boot.php:1118
+msgid "F d"
+msgstr "F d"
+
+#: ../../boot.php:1072
+msgid "Birthday Reminders"
+msgstr "Recordatori d'Aniversaris"
+
+#: ../../boot.php:1073
+msgid "Birthdays this week:"
+msgstr "Aniversari aquesta setmana"
+
+#: ../../boot.php:1096 ../../boot.php:1160
+msgid "[today]"
+msgstr "[avui]"
+
+#: ../../boot.php:1141
+msgid "Event Reminders"
+msgstr "Recordatori d'Esdeveniments"
+
+#: ../../boot.php:1142
+msgid "Events this week:"
+msgstr "Esdeveniments aquesta setmana"
+
+#: ../../boot.php:1154
+msgid "[No description]"
+msgstr "[sense descripció]"
diff --git a/view/ca/passchanged_eml.tpl b/view/ca/passchanged_eml.tpl
new file mode 100644
index 000000000..22e54b8c0
--- /dev/null
+++ b/view/ca/passchanged_eml.tpl
@@ -0,0 +1,19 @@
+
+Apreciat/da $username,
+
+    La teva contrasenya ha estat modificada com has sol·licitat. Pren nota d'aquesta informació
+(o canvía immediatament la contrasenya amb quelcom que recordis).
+
+
+Les teves dades d'accés son les següents:
+
+Lloc:	$siteurl
+Nom:	$email
+Contrasenya:	$new_password
+
+Després d'accedir pots canviar la contrasenya des de la pàgina de configuració del teu perfil.
+
+
+	$sitename
+
+ 
diff --git a/view/ca/register_open_eml.tpl b/view/ca/register_open_eml.tpl
new file mode 100644
index 000000000..0170c98e3
--- /dev/null
+++ b/view/ca/register_open_eml.tpl
@@ -0,0 +1,22 @@
+
+Apreciat/da $username,
+
+	Gràcies per registrar-te en $sitename. El teu compte ha estat creat.
+
+
+Les dades d'accés són les següents:
+
+
+Lloc:	$siteurl
+Nom:	$email
+Contrasenya:	$password
+
+
+Després d'accedir pots canviar la teva contrasenya a la pàgina de "Configuració".
+
+Pren un moment per revisar les altres configuracions del compte en aquesta pàgina.
+
+
+Gràcies i benvingut/da $sitename.
+
+ 
diff --git a/view/ca/register_verify_eml.tpl b/view/ca/register_verify_eml.tpl
new file mode 100644
index 000000000..3dd966e0a
--- /dev/null
+++ b/view/ca/register_verify_eml.tpl
@@ -0,0 +1,23 @@
+
+S'ha rebut la sol·licitud de registre d'un nou usuari en
+$sitename que requereix la teva aprovació.
+
+Les dades d'accés són els següents:
+
+Nom Complet: $username
+Lloc: $siteurl
+Nom: $email
+
+
+Per aprovar aquesta sol·licitud, visita el següent enllaç:
+
+$siteurl/regmod/allow/$hash
+
+Per denegar la sol·licitud i eliminar el compte, per favor visita:
+
+$siteurl/regmod/deny/$hash
+
+
+Gràcies.
+
+
diff --git a/view/ca/request_notify_eml.tpl b/view/ca/request_notify_eml.tpl
new file mode 100644
index 000000000..276624aae
--- /dev/null
+++ b/view/ca/request_notify_eml.tpl
@@ -0,0 +1,13 @@
+
+Apreciat/da $myname,
+
+Acabes de rebre una sol·licitud de connexió de '$requestor' en $sitename.
+
+Pots visitar el seu perfil en $url.
+
+Accedeix al teu lloc per a veure la presentació completa i acceptar o ignorar/cancel·lar la sol·licitud.
+
+$siteurl
+
+
+	$sitename
diff --git a/view/ca/strings.php b/view/ca/strings.php
new file mode 100644
index 000000000..e5aed8be6
--- /dev/null
+++ b/view/ca/strings.php
@@ -0,0 +1,1425 @@
+<?php
+
+function string_plural_select_ca($n){
+	return ($n != 1);
+}
+;
+$a->strings["Post successful."] = "Publicat amb éxit.";
+$a->strings["[Embedded content - reload page to view]"] = "[Contingut embegut - recarrega la pàgina per a veure-ho]";
+$a->strings["Contact settings applied."] = "Ajustos de Contacte aplicats.";
+$a->strings["Contact update failed."] = "Fracassà l'actualització de Contacte";
+$a->strings["Permission denied."] = "Permís denegat.";
+$a->strings["Contact not found."] = "Contacte no trobat";
+$a->strings["Repair Contact Settings"] = "Reposar els ajustos de Contacte";
+$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ADVERTÈNCIA: Això és molt avançat </strong> i si s'introdueix informació incorrecta la seva comunicació amb aquest contacte pot deixar de funcionar.";
+$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Si us plau, prem el botó 'Tornar' <strong>ara</strong> si no saps segur que has de fer aqui.";
+$a->strings["Return to contact editor"] = "Tornar al editor de contactes";
+$a->strings["Name"] = "Nom";
+$a->strings["Account Nickname"] = "Malnom de Compte";
+$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - té prel·lació sobre Nom/Malnom";
+$a->strings["Account URL"] = "Adreça URL del Compte";
+$a->strings["Friend Request URL"] = "Adreça URL de sol·licitud d'Amistat";
+$a->strings["Friend Confirm URL"] = "Adreça URL de confirmació d'Amic";
+$a->strings["Notification Endpoint URL"] = "Adreça URL de Notificació";
+$a->strings["Poll/Feed URL"] = "Adreça de Enquesta/Alimentador";
+$a->strings["New photo from this URL"] = "Nova foto d'aquesta URL";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Help:"] = "Ajuda:";
+$a->strings["Help"] = "Ajuda";
+$a->strings["Not Found"] = "No trobat";
+$a->strings["Page not found."] = "Pàgina no trobada.";
+$a->strings["File exceeds size limit of %d"] = "L'arxiu excedeix la mida límit de %d";
+$a->strings["File upload failed."] = "La càrrega de fitxers ha fallat.";
+$a->strings["Friend suggestion sent."] = "Enviat suggeriment d'amic.";
+$a->strings["Suggest Friends"] = "Suggerir Amics";
+$a->strings["Suggest a friend for %s"] = "Suggerir una amic per a %s";
+$a->strings["Event description and start time are required."] = "Es requereix descripció de l'esdeveniment i l'hora d'inici.";
+$a->strings["l, F j"] = "l, F j";
+$a->strings["Edit event"] = "Editar esdeveniment";
+$a->strings["link to source"] = "Enllaç al origen";
+$a->strings["Events"] = "Esdeveniments";
+$a->strings["Create New Event"] = "Crear un nou esdeveniment";
+$a->strings["Previous"] = "Previ";
+$a->strings["Next"] = "Proper";
+$a->strings["hour:minute"] = "hora:minut";
+$a->strings["Event details"] = "Detalls del esdeveniment";
+$a->strings["Format is %s %s. Starting date and Description are required."] = "El format és %s %s. Es requereix Data d'inici i Descripció.";
+$a->strings["Event Starts:"] = "Inici d'Esdeveniment:";
+$a->strings["Finish date/time is not known or not relevant"] = "La data/hora de finalització no es coneixen o no són relevants";
+$a->strings["Event Finishes:"] = "L'esdeveniment Finalitza:";
+$a->strings["Adjust for viewer timezone"] = "Ajustar a la zona horaria de l'espectador";
+$a->strings["Description:"] = "Descripció:";
+$a->strings["Location:"] = "Ubicació:";
+$a->strings["Share this event"] = "Compartir aquest esdeveniment";
+$a->strings["Cancel"] = "Cancel·lar";
+$a->strings["Tag removed"] = "Etiqueta eliminada";
+$a->strings["Remove Item Tag"] = "Esborrar etiqueta del element";
+$a->strings["Select a tag to remove: "] = "Selecciona etiqueta a esborrar:";
+$a->strings["Remove"] = "Esborrar";
+$a->strings["%s welcomes %s"] = "%s Benvingut %s";
+$a->strings["Authorize application connection"] = "Autoritzi la connexió de aplicacions";
+$a->strings["Return to your app and insert this Securty Code:"] = "Torni a la seva aplicació i inserti aquest Codi de Seguretat:";
+$a->strings["Please login to continue."] = "Per favor, accedeixi per a continuar.";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Vol autoritzar a aquesta aplicació per accedir als teus missatges i contactes, i/o crear nous enviaments per a vostè?";
+$a->strings["Yes"] = "Si";
+$a->strings["No"] = "No";
+$a->strings["Photo Albums"] = "Àlbum de Fotos";
+$a->strings["Contact Photos"] = "Fotos de Contacte";
+$a->strings["Upload New Photos"] = "Actualitzar Noves Fotos";
+$a->strings["everybody"] = "tothom";
+$a->strings["Contact information unavailable"] = "Informació del Contacte no disponible";
+$a->strings["Profile Photos"] = "Fotos del Perfil";
+$a->strings["Album not found."] = "Àlbum no trobat.";
+$a->strings["Delete Album"] = "Eliminar Àlbum";
+$a->strings["Delete Photo"] = "Eliminar Foto";
+$a->strings["was tagged in a"] = "Fou etiquetat a un";
+$a->strings["photo"] = "foto";
+$a->strings["by"] = "per";
+$a->strings["Image exceeds size limit of "] = "La imatge excedeix el límit de ";
+$a->strings["Image file is empty."] = "El fitxer de imatge és buit.";
+$a->strings["Unable to process image."] = "Incapaç de processar la imatge.";
+$a->strings["Image upload failed."] = "Actualització de la imatge fracassada.";
+$a->strings["Public access denied."] = "Accés públic denegat.";
+$a->strings["No photos selected"] = "No s'han seleccionat fotos";
+$a->strings["Access to this item is restricted."] = "L'accés a aquest element està restringit.";
+$a->strings["Upload Photos"] = "Carregar Fotos";
+$a->strings["New album name: "] = "Nou nom d'àlbum:";
+$a->strings["or existing album name: "] = "o nom d'àlbum existent:";
+$a->strings["Do not show a status post for this upload"] = "No tornis a mostrar un missatge d'estat d'aquesta pujada";
+$a->strings["Permissions"] = "Permisos";
+$a->strings["Edit Album"] = "Editar Àlbum";
+$a->strings["View Photo"] = "Veure Foto";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Permís denegat. L'accés a aquest element pot estar restringit.";
+$a->strings["Photo not available"] = "Foto no disponible";
+$a->strings["View photo"] = "Veure foto";
+$a->strings["Edit photo"] = "Editar foto";
+$a->strings["Use as profile photo"] = "Emprar com a foto del perfil";
+$a->strings["Private Message"] = "Missatge Privat";
+$a->strings["View Full Size"] = "Veure'l a Mida Completa";
+$a->strings["Tags: "] = "Etiquetes:";
+$a->strings["[Remove any tag]"] = "Treure etiquetes";
+$a->strings["New album name"] = "Nou nom d'àlbum";
+$a->strings["Caption"] = "Títol";
+$a->strings["Add a Tag"] = "Afegir una etiqueta";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Exemple: @bob, @Barbara_jensen, @jim@example.com,  #California, #camping";
+$a->strings["I like this (toggle)"] = "M'agrada això (canviar)";
+$a->strings["I don't like this (toggle)"] = "No m'agrada això (canviar)";
+$a->strings["Share"] = "Compartir";
+$a->strings["Please wait"] = "Si us plau esperi";
+$a->strings["This is you"] = "Aquest ets tu";
+$a->strings["Comment"] = "Comentari";
+$a->strings["Preview"] = "Vista prèvia";
+$a->strings["Delete"] = "Esborrar";
+$a->strings["View Album"] = "Veure Àlbum";
+$a->strings["Recent Photos"] = "Fotos Recents";
+$a->strings["Not available."] = "No disponible.";
+$a->strings["Community"] = "Comunitat";
+$a->strings["No results."] = "Sense resultats.";
+$a->strings["This is Friendica, version"] = "Això és Friendica, versió";
+$a->strings["running at web location"] = "funcionant en la ubicació web";
+$a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Si us plau, visiteu <a href=\"http://friendica.com\">Friendica.com</a> per obtenir més informació sobre el projecte Friendica.";
+$a->strings["Bug reports and issues: please visit"] = "Pels informes d'error i problemes: si us plau, visiteu";
+$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Suggeriments, elogis, donacions, etc si us plau escrigui a \"Info\" en Friendica - dot com";
+$a->strings["Installed plugins/addons/apps"] = "plugins/addons/apps instal·lats";
+$a->strings["No installed plugins/addons/apps"] = "plugins/addons/apps no instal·lats";
+$a->strings["Item not found"] = "Element no trobat";
+$a->strings["Edit post"] = "Editar Enviament";
+$a->strings["Post to Email"] = "Correu per enviar";
+$a->strings["Edit"] = "Editar";
+$a->strings["Upload photo"] = "Carregar foto";
+$a->strings["Attach file"] = "Adjunta fitxer";
+$a->strings["Insert web link"] = "Inserir enllaç web";
+$a->strings["Insert YouTube video"] = "Serà mostrat de forma preeminent a la pagina durant el procés de registre.";
+$a->strings["Insert Vorbis [.ogg] video"] = "Inserir video Vorbis [.ogg]";
+$a->strings["Insert Vorbis [.ogg] audio"] = "Inserir audio Vorbis [.ogg]";
+$a->strings["Set your location"] = "Canvia la teva ubicació";
+$a->strings["Clear browser location"] = "neteja adreçes del navegador";
+$a->strings["Permission settings"] = "Configuració de permisos";
+$a->strings["CC: email addresses"] = "CC: Adreça de correu";
+$a->strings["Public post"] = "Enviament públic";
+$a->strings["Set title"] = "Canviar títol";
+$a->strings["Example: bob@example.com, mary@example.com"] = "Exemple: bob@example.com, mary@example.com";
+$a->strings["This introduction has already been accepted."] = "Aquesta presentació ha estat acceptada.";
+$a->strings["Profile location is not valid or does not contain profile information."] = "El perfil de situació no és vàlid o no contè informació de perfil";
+$a->strings["Warning: profile location has no identifiable owner name."] = "Atenció: El perfil de situació no te nom de propietari identificable.";
+$a->strings["Warning: profile location has no profile photo."] = "Atenció: El perfil de situació no te foto de perfil";
+$a->strings["%d required parameter was not found at the given location"] = array(
+	0 => "%d el paràmetre requerit no es va trobar al lloc indicat",
+	1 => "%d els paràmetres requerits no es van trobar allloc indicat",
+);
+$a->strings["Introduction complete."] = "Completada la presentació.";
+$a->strings["Unrecoverable protocol error."] = "Error de protocol irrecuperable.";
+$a->strings["Profile unavailable."] = "Perfil no disponible";
+$a->strings["%s has received too many connection requests today."] = "%s avui ha rebut excesives peticions de connexió. ";
+$a->strings["Spam protection measures have been invoked."] = "Mesures de protecció contra spam han estat invocades.";
+$a->strings["Friends are advised to please try again in 24 hours."] = "S'aconsellà els amics que probin pasades 24 hores.";
+$a->strings["Invalid locator"] = "Localitzador no vàlid";
+$a->strings["Unable to resolve your name at the provided location."] = "Incapaç de resoldre el teu nom al lloc facilitat.";
+$a->strings["You have already introduced yourself here."] = "Has fer la teva presentació aquí.";
+$a->strings["Apparently you are already friends with %s."] = "Aparentment, ja tens amistat amb %s";
+$a->strings["Invalid profile URL."] = "Perfil URL no vàlid.";
+$a->strings["Disallowed profile URL."] = "Perfil URL no permès.";
+$a->strings["Failed to update contact record."] = "Error en actualitzar registre de contacte.";
+$a->strings["Your introduction has been sent."] = "La teva presentació ha estat enviada.";
+$a->strings["Please login to confirm introduction."] = "Si us plau, entri per confirmar la presentació.";
+$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Sesió iniciada amb la identificació incorrecta. Entra en <strong>aquest</strong> perfil.";
+$a->strings["Welcome home %s."] = "Benvingut de nou %s";
+$a->strings["Please confirm your introduction/connection request to %s."] = "Si us plau, confirmi la seva sol·licitud de Presentació/Amistat a %s.";
+$a->strings["Confirm"] = "Confirmar";
+$a->strings["[Name Withheld]"] = "[Nom Amagat]";
+$a->strings["Diaspora members: Please do not use this form. Instead, enter \"%s\" into your Diaspora search bar."] = "Membres de Diàspora: Si us plau, no utilitzi aquest formulari. Pel contrari, escriviu \"%s\" a la barra de cerca de Diàspora.";
+$a->strings["Please enter your 'Identity Address' from one of the following supported social networks:"] = "Si us plau, introdueixi la seva \"Adreça Identificativa\" d'una de les següents xarxes socials suportades:";
+$a->strings["Friend/Connection Request"] = "Sol·licitud d'Amistat";
+$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Exemples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
+$a->strings["Please answer the following:"] = "Si us plau, contesti les següents preguntes:";
+$a->strings["Does %s know you?"] = "%s et coneix?";
+$a->strings["Add a personal note:"] = "Afegir una nota personal:";
+$a->strings["Friendica"] = "Friendica";
+$a->strings["StatusNet/Federated Social Web"] = "Web Social StatusNet/Federated ";
+$a->strings["Diaspora"] = "Diaspora";
+$a->strings["- please share from your own site as noted above"] = "- si us plau, Comparteix des del teu propi lloc tal com s'ha dit abans.";
+$a->strings["Your Identity Address:"] = "La Teva Adreça Identificativa:";
+$a->strings["Submit Request"] = "Sol·licitud Enviada";
+$a->strings["Friendica Social Communications Server - Setup"] = "Friendica Social Communications Server - Ajustos";
+$a->strings["Database connection"] = "Conexió a la base de dades";
+$a->strings["Could not connect to database."] = "No puc connectar a la base de dades.";
+$a->strings["Could not create table."] = "No puc creat taula.";
+$a->strings["Your Friendica site database has been installed."] = "La base de dades del teu lloc Friendica ha estat instal·lada.";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: necessitarà configurar [manualment] el programar una tasca pel sondejador (poller.php)";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "Per favor, consulti l'arxiu \"INSTALL.txt\".";
+$a->strings["Proceed to registration"] = "Procedir a la inscripció";
+$a->strings["Proceed with Installation"] = "Procedeixi amb la Instal·lació";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Pot ser que hagi d'importar l'arxiu \"database.sql\" manualment amb phpmyadmin o mysql.";
+$a->strings["Database import failed."] = "La importació de base de dades ha fallat.";
+$a->strings["System check"] = "Comprovació del Sistema";
+$a->strings["Check again"] = "Comprovi de nou";
+$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Per a instal·lar Friendica necessitem conèixer com connectar amb la deva base de dades.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Per favor, posi's en contacte amb el seu proveïdor de hosting o administrador del lloc si té alguna pregunta sobre aquestes opcions.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "La base de dades que especifiques ja hauria d'existir. Si no és així, crea-la abans de continuar.";
+$a->strings["Database Server Name"] = "Nom del Servidor de base de Dades";
+$a->strings["Database Login Name"] = "Nom d'Usuari de la base de Dades";
+$a->strings["Database Login Password"] = "Contrasenya d'Usuari de la base de Dades";
+$a->strings["Database Name"] = "Nom de la base de Dades";
+$a->strings["Site administrator email address"] = "Adreça de correu del administrador del lloc";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "El seu compte d'adreça electrònica ha de coincidir per tal d'utilitzar el panell d'administració web.";
+$a->strings["Please select a default timezone for your website"] = "Per favor, seleccioni una zona horària per defecte per al seu lloc web";
+$a->strings["Site settings"] = "Configuracions del lloc";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "No es va poder trobar una versió de línia de comandos de PHP en la ruta del servidor web.";
+$a->strings["PHP executable path"] = "Direcció del executable PHP";
+$a->strings["Enter full path to php executable"] = "Introdueixi el camí complet del executable php";
+$a->strings["Command line PHP"] = "Linia de comandos PHP";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La versió de línia de comandos de PHP en el seu sistema no té \"register_argc_argv\" habilitat.";
+$a->strings["This is required for message delivery to work."] = "Això és necessari perquè funcioni el lliurament de missatges.";
+$a->strings["PHP \"register_argc_argv\""] = "PHP \"register_argc_argv\"";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error: la funció \"openssl_pkey_new\" en aquest sistema no és capaç de generar claus de xifrat";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si s'executa en Windows, per favor consulti la secció \"http://www.php.net/manual/en/openssl.installation.php\".";
+$a->strings["Generate encryption keys"] = "Generar claus d'encripció";
+$a->strings["libCurl PHP module"] = "Mòdul libCurl de PHP";
+$a->strings["GD graphics PHP module"] = "Mòdul GD de gràfics de PHP";
+$a->strings["OpenSSL PHP module"] = "Mòdul OpenSSl de PHP";
+$a->strings["mysqli PHP module"] = "Mòdul mysqli de PHP";
+$a->strings["mb_string PHP module"] = "Mòdul mb_string de PHP";
+$a->strings["Apace mod_rewrite module"] = "Mòdul mod_rewrite de Apache";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: el mòdul mod-rewrite del servidor web Apache és necessari però no està instal·lat.";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Error: El mòdul libCURL de PHP és necessari però no està instal·lat.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: el mòdul gràfic GD de PHP amb support per JPEG és necessari però no està instal·lat.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Error: El mòdul enssl de PHP és necessari però no està instal·lat.";
+$a->strings["Error: mysqli PHP module required but not installed."] = "Error: El mòdul mysqli de PHP és necessari però no està instal·lat.";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Error: mòdul mb_string de PHP requerit però no instal·lat.";
+$a->strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "L'instal·lador web necessita crear un arxiu anomenat \".htconfig.php\" en la carpeta superior del seu servidor web però alguna cosa ho va impedir.";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Això freqüentment és a causa d'una configuració de permisos; el servidor web no pot escriure arxius en la carpeta - encara que sigui possible.";
+$a->strings["Please check with your site documentation or support people to see if this situation can be corrected."] = "Per favor, consulti amb la documentació del seu lloc o persones de suport per veure si aquesta situació es pot corregir.";
+$a->strings["If not, you may be required to perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Si no, vostè pot ser requerit per realitzar una instal·lació manual. Per favor, consulti l'arxiu \"INSTALL.txt\" per obtenir instruccions.";
+$a->strings[".htconfig.php is writable"] = ".htconfig.php és escribible";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "L'arxiu per a la configuració de la base de dades \".htconfig.php\" no es pot escriure. Per favor, usi el text adjunt per crear un arxiu de configuració en l'arrel del servidor web.";
+$a->strings["Errors encountered creating database tables."] = "Trobats errors durant la creació de les taules de la base de dades.";
+$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
+$a->strings["Time Conversion"] = "Temps de Conversió";
+$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica ofereix aquest servei per compartir esdeveniments amb altres xarxes i amics a les zones horàries desconegudes.";
+$a->strings["UTC time: %s"] = "hora UTC: %s";
+$a->strings["Current timezone: %s"] = "Zona horària actual: %s";
+$a->strings["Converted localtime: %s"] = "Conversión de hora local: %s";
+$a->strings["Please select your timezone:"] = "Si us plau, seleccioneu la vostra zona horària:";
+$a->strings["Profile Match"] = "Perfil Aconseguit";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "No hi ha paraules clau que coincideixin. Si us plau, afegeixi paraules clau al teu perfil predeterminat.";
+$a->strings["is interested in:"] = "està interessat en:";
+$a->strings["Connect"] = "Connexió";
+$a->strings["No matches"] = "No hi ha coincidències";
+$a->strings["Remote privacy information not available."] = "Informació de privacitat remota no disponible.";
+$a->strings["Visible to:"] = "Visible per a:";
+$a->strings["Welcome to %s"] = "Benvingut a %s";
+$a->strings["Invalid request identifier."] = "Sol·licitud d'identificació no vàlida.";
+$a->strings["Discard"] = "Descartar";
+$a->strings["Ignore"] = "Ignorar";
+$a->strings["System"] = "Sistema";
+$a->strings["Network"] = "Xarxa";
+$a->strings["Personal"] = "Personal";
+$a->strings["Home"] = "Inici";
+$a->strings["Introductions"] = "Presentacions";
+$a->strings["Messages"] = "Missatges";
+$a->strings["Show Ignored Requests"] = "Mostra les Sol·licituds Ignorades";
+$a->strings["Hide Ignored Requests"] = "Amaga les Sol·licituds Ignorades";
+$a->strings["Notification type: "] = "Tipus de Notificació:";
+$a->strings["Friend Suggestion"] = "Amics Suggerits ";
+$a->strings["suggested by %s"] = "sugerit per %s";
+$a->strings["Hide this contact from others"] = "Amaga aquest contacte dels altres";
+$a->strings["Post a new friend activity"] = "Publica una activitat  d'amic nova";
+$a->strings["if applicable"] = "si es pot aplicar";
+$a->strings["Approve"] = "Aprovar";
+$a->strings["Claims to be known to you: "] = "Diu que et coneix:";
+$a->strings["yes"] = "sí";
+$a->strings["no"] = "no";
+$a->strings["Approve as: "] = "Aprovat com:";
+$a->strings["Friend"] = "Amic";
+$a->strings["Sharer"] = "Partícip";
+$a->strings["Fan/Admirer"] = "Fan/Admirador";
+$a->strings["Friend/Connect Request"] = "Sol·licitud d'Amistat/Connexió";
+$a->strings["New Follower"] = "Nou Seguidor";
+$a->strings["No introductions."] = "Sense presentacions.";
+$a->strings["Notifications"] = "Notificacions";
+$a->strings["%s liked %s's post"] = "A %s li agrada l'enviament de %s";
+$a->strings["%s disliked %s's post"] = "A %s no li agrada l'enviament de %s";
+$a->strings["%s is now friends with %s"] = "%s es ara amic de %s";
+$a->strings["%s created a new post"] = "%s ha creat un enviament nou";
+$a->strings["%s commented on %s's post"] = "%s va comentar en l'enviament de %s";
+$a->strings["No more network notifications."] = "No més notificacions de xarxa.";
+$a->strings["Network Notifications"] = "Notificacions de la Xarxa";
+$a->strings["No more system notifications."] = "No més notificacions del sistema.";
+$a->strings["System Notifications"] = "Notificacions del Sistema";
+$a->strings["No more personal notifications."] = "No més notificacions personals.";
+$a->strings["Personal Notifications"] = "Notificacions Personals";
+$a->strings["No more home notifications."] = "No més notificacions d'inici.";
+$a->strings["Home Notifications"] = "Notificacions d'Inici";
+$a->strings["Could not access contact record."] = "No puc accedir al registre del contacte.";
+$a->strings["Could not locate selected profile."] = "No puc localitzar el perfil seleccionat.";
+$a->strings["Contact updated."] = "Contacte actualitzat.";
+$a->strings["Contact has been blocked"] = "Elcontacte ha estat bloquejat";
+$a->strings["Contact has been unblocked"] = "El contacte ha estat desbloquejat";
+$a->strings["Contact has been ignored"] = "El contacte ha estat ignorat";
+$a->strings["Contact has been unignored"] = "El contacte ha estat recordat";
+$a->strings["stopped following"] = "Deixar de seguir";
+$a->strings["Contact has been removed."] = "El contacte ha estat tret";
+$a->strings["You are mutual friends with %s"] = "Ara te una amistat mutua amb %s";
+$a->strings["You are sharing with %s"] = "Estas compartint amb %s";
+$a->strings["%s is sharing with you"] = "%s esta compartint amb tú";
+$a->strings["Private communications are not available for this contact."] = "Comunicacions privades no disponibles per aquest contacte.";
+$a->strings["Never"] = "Mai";
+$a->strings["(Update was successful)"] = "(L'actualització fou exitosa)";
+$a->strings["(Update was not successful)"] = "(L'actualització fracassà)";
+$a->strings["Suggest friends"] = "Suggerir amics";
+$a->strings["Network type: %s"] = "Xarxa tipus: %s";
+$a->strings["%d contact in common"] = array(
+	0 => "%d contacte en comú",
+	1 => "%d contactes en comú",
+);
+$a->strings["View all contacts"] = "Veure tots els contactes";
+$a->strings["Unblock"] = "Desbloquejar";
+$a->strings["Block"] = "Bloquejar";
+$a->strings["Unignore"] = "Treure d'Ignorats";
+$a->strings["Repair"] = "Reparar";
+$a->strings["Contact Editor"] = "Editor de Contactes";
+$a->strings["Profile Visibility"] = "Perfil de Visibilitat";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Si us plau triï el perfil que voleu mostrar a %s quan estigui veient el teu de forma segura.";
+$a->strings["Contact Information / Notes"] = "Informació/Notes del contacte";
+$a->strings["Edit contact notes"] = "Editar notes de contactes";
+$a->strings["Visit %s's profile [%s]"] = "Visitar perfil de %s [%s]";
+$a->strings["Block/Unblock contact"] = "Bloquejar/Alliberar contacte";
+$a->strings["Ignore contact"] = "Ignore contacte";
+$a->strings["Repair URL settings"] = "Restablir configuració de URL";
+$a->strings["View conversations"] = "Veient conversacions";
+$a->strings["Delete contact"] = "Esborrar contacte";
+$a->strings["Last update:"] = "Última actualització:";
+$a->strings["Update public posts"] = "Actualitzar enviament públic";
+$a->strings["Update now"] = "Actualitza ara";
+$a->strings["Currently blocked"] = "Bloquejat actualment";
+$a->strings["Currently ignored"] = "Ignorat actualment";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Répliques/agraiments per als teus missatges públics <strong>poden</strong> romandre visibles";
+$a->strings["All Contacts"] = "Tots els Contactes";
+$a->strings["Unblocked Contacts"] = "Contactes Desbloquejats";
+$a->strings["Blocked Contacts"] = "Contactes Bloquejats";
+$a->strings["Ignored Contacts"] = "Contactes Ignorats";
+$a->strings["Hidden Contacts"] = "Contactes Amagats";
+$a->strings["Mutual Friendship"] = "Amistat Mutua";
+$a->strings["is a fan of yours"] = "Es un fan teu";
+$a->strings["you are a fan of"] = "ets fan de";
+$a->strings["Edit contact"] = "Editar contacte";
+$a->strings["Contacts"] = "Contactes";
+$a->strings["Search your contacts"] = "Cercant el seus contactes";
+$a->strings["Finding: "] = "Cercant:";
+$a->strings["Find"] = "Cercar";
+$a->strings["No valid account found."] = "compte no vàlid trobat.";
+$a->strings["Password reset request issued. Check your email."] = "Sol·licitut de restabliment de contrasenya enviat. Comprovi el seu correu.";
+$a->strings["Password reset requested at %s"] = "Contrasenya restablerta enviada a %s";
+$a->strings["Administrator"] = "Administrador";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La sol·licitut no pot ser verificada. (Hauries de presentar-la abans). Restabliment de contrasenya fracassat.";
+$a->strings["Password Reset"] = "Restabliment de Contrasenya";
+$a->strings["Your password has been reset as requested."] = "La teva contrasenya fou restablerta com vas demanar.";
+$a->strings["Your new password is"] = "La teva nova contrasenya es";
+$a->strings["Save or copy your new password - and then"] = "Guarda o copia la nova contrasenya - i llavors";
+$a->strings["click here to login"] = "clica aquí per identificarte";
+$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Pots camviar la contrasenya des de la pàgina de <em>Configuración</em> desprès d'accedir amb èxit.";
+$a->strings["Forgot your Password?"] = "Has Oblidat la Contrasenya?";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Introdueixi la seva adreça de correu i enivii-la per restablir la seva contrasenya. Llavors comprovi el seu correu per a les següents instruccións. ";
+$a->strings["Nickname or Email: "] = "Malnom o Correu:";
+$a->strings["Reset"] = "Restablir";
+$a->strings["Missing some important data!"] = "Perdudes algunes dades importants!";
+$a->strings["Update"] = "Actualitzar";
+$a->strings["Failed to connect with email account using the settings provided."] = "Connexió fracassada amb el compte de correu emprant la configuració proveïda.";
+$a->strings["Email settings updated."] = "Configuració del correu electrònic actualitzada.";
+$a->strings["Passwords do not match. Password unchanged."] = "Les contrasenyes no coincideixen. Contrasenya no canviada.";
+$a->strings["Empty passwords are not allowed. Password unchanged."] = "No es permeten contasenyes buides. Contrasenya no canviada";
+$a->strings["Password changed."] = "Contrasenya canviada.";
+$a->strings["Password update failed. Please try again."] = "Ha fallat l'actualització de la Contrasenya. Per favor, intenti-ho de nou.";
+$a->strings[" Please use a shorter name."] = "Si us plau, faci servir un nom més curt.";
+$a->strings[" Name too short."] = "Nom massa curt.";
+$a->strings[" Not valid email."] = "Correu no vàlid.";
+$a->strings[" Cannot change to that email."] = "No puc canviar a aquest correu.";
+$a->strings["Settings updated."] = "Ajustos actualitzats.";
+$a->strings["Account settings"] = "Configuració del compte";
+$a->strings["Connector settings"] = "Configuració dels connectors";
+$a->strings["Plugin settings"] = "Configuració del plugin";
+$a->strings["Connections"] = "Connexions";
+$a->strings["Export personal data"] = "Exportar dades personals";
+$a->strings["Add application"] = "Afegir aplicació";
+$a->strings["Consumer Key"] = "Consumer Key";
+$a->strings["Consumer Secret"] = "Consumer Secret";
+$a->strings["Redirect"] = "Redirigir";
+$a->strings["Icon url"] = "icona de url";
+$a->strings["You can't edit this application."] = "No pots editar aquesta aplicació.";
+$a->strings["Connected Apps"] = "Aplicacions conectades";
+$a->strings["Client key starts with"] = "Les claus de client comançen amb";
+$a->strings["No name"] = "Sense nom";
+$a->strings["Remove authorization"] = "retirar l'autorització";
+$a->strings["No Plugin settings configured"] = "No s'han configurat ajustos de Plugin";
+$a->strings["Plugin Settings"] = "Ajustos de Plugin";
+$a->strings["Built-in support for %s connectivity is %s"] = "El suport integrat per a la connectivitat de %s és %s";
+$a->strings["enabled"] = "habilitat";
+$a->strings["disabled"] = "deshabilitat";
+$a->strings["StatusNet"] = "StatusNet";
+$a->strings["Connector Settings"] = "Configuració de connectors";
+$a->strings["Email/Mailbox Setup"] = "Preparació de Correu/Bústia";
+$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Si vol comunicar-se amb els contactes de correu emprant aquest servei (opcional), Si us plau, especifiqui com connectar amb la seva bústia.";
+$a->strings["Last successful email check:"] = "Última comprovació de correu amb èxit:";
+$a->strings["Email access is disabled on this site."] = "L'accés al correu està deshabilitat en aquest lloc.";
+$a->strings["IMAP server name:"] = "Nom del servidor IMAP:";
+$a->strings["IMAP port:"] = "Port IMAP:";
+$a->strings["Security:"] = "Seguretat:";
+$a->strings["None"] = "Cap";
+$a->strings["Email login name:"] = "Nom d'usuari del correu";
+$a->strings["Email password:"] = "Contrasenya del correu:";
+$a->strings["Reply-to address:"] = "Adreça de resposta:";
+$a->strings["Send public posts to all email contacts:"] = "Enviar correu públic a tots els contactes del correu:";
+$a->strings["Action after import:"] = "Acció després d'importar:";
+$a->strings["Mark as seen"] = "Marcar com a vist";
+$a->strings["Move to folder"] = "Moure a la carpeta";
+$a->strings["Move to folder:"] = "Moure a la carpeta:";
+$a->strings["Normal Account"] = "Compte Normal";
+$a->strings["This account is a normal personal profile"] = "Aques compte es un compte personal normal";
+$a->strings["Soapbox Account"] = "Compte Tribuna";
+$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Aprova automàticament totes les sol·licituds de amistat/connexió com a fans de només lectura.";
+$a->strings["Community/Celebrity Account"] = "Compte de Comunitat/Celebritat";
+$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Aprova automàticament totes les sol·licituds de amistat/connexió com a fans de lectura-escriptura";
+$a->strings["Automatic Friend Account"] = "Compte d'Amistat Automàtic";
+$a->strings["Automatically approve all connection/friend requests as friends"] = "Aprova totes les sol·licituds de amistat/connexió com a amic automàticament";
+$a->strings["OpenID:"] = "OpenID:";
+$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Opcional) Permetre a aquest OpenID iniciar sessió en aquest compte.";
+$a->strings["Publish your default profile in your local site directory?"] = "Publicar el teu perfil predeterminat en el directori del lloc local?";
+$a->strings["Publish your default profile in the global social directory?"] = "Publicar el teu perfil predeterminat al directori social global?";
+$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Amaga la teva llista de contactes/amics dels espectadors del seu perfil per defecte?";
+$a->strings["Hide your profile details from unknown viewers?"] = "Amagar els detalls del seu perfil a espectadors desconeguts?";
+$a->strings["Allow friends to post to your profile page?"] = "Permet als amics publicar en la seva pàgina de perfil?";
+$a->strings["Allow friends to tag your posts?"] = "Permet als amics d'etiquetar els teus missatges?";
+$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Permeteu-nos suggerir-li com un amic potencial dels nous membres?";
+$a->strings["Profile is <strong>not published</strong>."] = "El  Perfil <strong>no està publicat</strong>.";
+$a->strings["or"] = "o";
+$a->strings["Your Identity Address is"] = "La seva Adreça d'Identitat és";
+$a->strings["Automatically expire posts after this many days:"] = "Després de aquests nombre de dies, els missatges caduquen automàticament:";
+$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Si està buit, els missatges no caducarà. Missatges caducats s'eliminaran";
+$a->strings["Advanced expiration settings"] = "Configuració avançada d'expiració";
+$a->strings["Advanced Expiration"] = "Expiració Avançada";
+$a->strings["Expire posts:"] = "Expiració d'enviaments";
+$a->strings["Expire personal notes:"] = "Expiració de notes personals";
+$a->strings["Expire starred posts:"] = "Expiració de enviaments de favorits";
+$a->strings["Expire photos:"] = "Expiració de fotos";
+$a->strings["Account Settings"] = "Ajustos de Compte";
+$a->strings["Password Settings"] = "Ajustos de Contrasenya";
+$a->strings["New Password:"] = "Nova Contrasenya:";
+$a->strings["Confirm:"] = "Confirmar:";
+$a->strings["Leave password fields blank unless changing"] = "Deixi els camps de contrasenya buits per a no fer canvis";
+$a->strings["Basic Settings"] = "Ajustos Basics";
+$a->strings["Full Name:"] = "Nom Complet:";
+$a->strings["Email Address:"] = "Adreça de Correu:";
+$a->strings["Your Timezone:"] = "La teva zona Horària:";
+$a->strings["Default Post Location:"] = "Localització per Defecte del Missatge:";
+$a->strings["Use Browser Location:"] = "Ubicar-se amb el Navegador:";
+$a->strings["Display Theme:"] = "Visualitzar el Tema:";
+$a->strings["Update browser every xx seconds"] = "Actualitzar navegador cada xx segons";
+$a->strings["Minimum of 10 seconds, no maximum"] = "Mínim cada 10 segons, no hi ha màxim";
+$a->strings["Security and Privacy Settings"] = "Ajustos de Seguretat i Privacitat";
+$a->strings["Maximum Friend Requests/Day:"] = "Nombre Màxim de Sol·licituds per Dia";
+$a->strings["(to prevent spam abuse)"] = "(per a prevenir abusos de spam)";
+$a->strings["Default Post Permissions"] = "Permisos de Correu per Defecte";
+$a->strings["(click to open/close)"] = "(clicar per a obrir/tancar)";
+$a->strings["Notification Settings"] = "Ajustos de Notificació";
+$a->strings["Send a notification email when:"] = "Envia un correu notificant quan:";
+$a->strings["You receive an introduction"] = "Has rebut una presentació";
+$a->strings["Your introductions are confirmed"] = "La teva presentació està confirmada";
+$a->strings["Someone writes on your profile wall"] = "Algú ha escrit en el teu mur de perfil";
+$a->strings["Someone writes a followup comment"] = "Algú ha escrit un comentari de seguiment";
+$a->strings["You receive a private message"] = "Has rebut un missatge privat";
+$a->strings["You receive a friend suggestion"] = "Has rebut una suggerencia d'un amic";
+$a->strings["You are tagged in a post"] = "Estàs etiquetat en un enviament";
+$a->strings["Advanced Page Settings"] = "Ajustos Avançats de Pàgina";
+$a->strings["Manage Identities and/or Pages"] = "Administrar Identitats i/o  Pàgines";
+$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Alternar entre les diferents identitats o les pàgines de comunitats/grups que comparteixen les dades del seu compte o que se li ha concedit els permisos de \"administrar\"";
+$a->strings["Select an identity to manage: "] = "Seleccionar identitat a administrar:";
+$a->strings["Search Results For:"] = "Resultats de la Cerca Per a:";
+$a->strings["Remove term"] = "Traieu termini";
+$a->strings["Saved Searches"] = "Cerques Guardades";
+$a->strings["add"] = "afegir";
+$a->strings["Commented Order"] = "Ordre dels Comentaris";
+$a->strings["Posted Order"] = "Ordre dels Enviaments";
+$a->strings["New"] = "Nou";
+$a->strings["Starred"] = "Favorits";
+$a->strings["Bookmarks"] = "Marcadors";
+$a->strings["Warning: This group contains %s member from an insecure network."] = array(
+	0 => "Advertència: Aquest grup conté el membre %s en una xarxa insegura.",
+	1 => "Advertència: Aquest grup conté %s membres d'una xarxa insegura.",
+);
+$a->strings["Private messages to this group are at risk of public disclosure."] = "Els missatges privats a aquest grup es troben en risc de divulgació pública.";
+$a->strings["No such group"] = "Cap grup com";
+$a->strings["Group is empty"] = "El Grup es buit";
+$a->strings["Group: "] = "Grup:";
+$a->strings["Contact: "] = "Contacte:";
+$a->strings["Private messages to this person are at risk of public disclosure."] = "Els missatges privats a aquesta persona es troben en risc de divulgació pública.";
+$a->strings["Invalid contact."] = "Contacte no vàlid.";
+$a->strings["Personal Notes"] = "Notes Personals";
+$a->strings["Save"] = "Guardar";
+$a->strings["Welcome to Friendica"] = "Benvingut a Friendica";
+$a->strings["New Member Checklist"] = "Llista de Verificació dels Nous Membres";
+$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Ens agradaria oferir alguns consells i enllaços per ajudar a fer la seva experiència agradable. Feu clic a qualsevol element per visitar la pàgina corresponent. Un enllaç a aquesta pàgina serà visible des de la pàgina d'inici durant dues setmanes després de la seva inscripció inicial i després desapareixerà en silenci.";
+$a->strings["On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "En la  de la seva <em>configuració</em> de la pàgina - canviï la contrasenya inicial. També prengui nota de la Adreça d'Identitat. Això s'assembla a una adreça de correu electrònic - i serà útil per fer amics a la xarxa social lliure.";
+$a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Reviseu les altres configuracions, en particular la configuració de privadesa. Una llista de directoris no publicada és com tenir un número de telèfon no llistat. Normalment, hauria de publicar la seva llista - a menys que tots els seus amics i els amics potencials sàpiguen exactament com trobar-li.";
+$a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Puji una foto del seu perfil si encara no ho ha fet. Els estudis han demostrat que les persones amb fotos reals de ells mateixos tenen deu vegades més probabilitats de fer amics que les persones que no ho fan.";
+$a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Autoritzi el connector de Facebook si vostè té un compte al Facebook i nosaltres (opcionalment) importarem tots els teus amics de Facebook i les converses.";
+$a->strings["<em>If</em> this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "<em>Si </em> aquesta és el seu servidor personal, la instal·lació del complement de Facebook pot facilitar la transició a la web social lliure.";
+$a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Introduïu les dades d'accés al correu electrònic a la seva pàgina de configuració de connector, si es desitja importar i relacionar-se amb amics o llistes de correu de la seva bústia d'email";
+$a->strings["Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Editi  el perfil per <strong>defecte</strong> al seu gust. Reviseu la configuració per ocultar la seva llista d'amics i ocultar el perfil dels visitants desconeguts.";
+$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Estableix algunes paraules clau públiques al teu perfil predeterminat que descriguin els teus interessos. Podem ser capaços de trobar altres persones amb interessos similars i suggerir amistats.";
+$a->strings["Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Add New Contact</em> dialog."] = "La seva pàgina de Contactes és la seva porta d'entrada a la gestió de l'amistat i la connexió amb amics d'altres xarxes. Normalment, vostè entrar en la seva direcció o URL del lloc al  diàleg <em>Afegir Nou Contacte</em>.";
+$a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested."] = "La pàgina del Directori li permet trobar altres persones en aquesta xarxa o altres llocs federats. Busqui un enllaç <em>Connectar</em> o <em>Seguir</em> a la seva pàgina de perfil. Proporcioni la seva pròpia Adreça de Identitat si així ho sol·licita.";
+$a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "Al tauler lateral de la pàgina de contacte Hi ha diverses eines per trobar nous amics. Podem coincidir amb les persones per interesos, buscar persones pel nom o per interès, i oferir suggeriments basats en les relacions de la xarxa. En un nou lloc, els suggeriments d'amics, en general comencen a poblar el lloc a les 24 hores.";
+$a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Una vegada que s'han fet alguns amics, organitzi'ls en grups de conversa privada a la barra lateral de la seva pàgina de contactes i després pot interactuar amb cada grup de forma privada a la pàgina de la xarxa.";
+$a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "A les nostres pàgines <strong>d'ajuda</strong> es poden consultar detalls sobre les característiques d'altres programes i recursos.";
+$a->strings["Item not available."] = "Element no disponible";
+$a->strings["Item was not found."] = "Element no trobat.";
+$a->strings["Group created."] = "Grup creat.";
+$a->strings["Could not create group."] = "No puc crear grup.";
+$a->strings["Group not found."] = "Grup no trobat";
+$a->strings["Group name changed."] = "Nom de Grup canviat.";
+$a->strings["Permission denied"] = "Permís denegat";
+$a->strings["Create a group of contacts/friends."] = "Crear un grup de contactes/amics.";
+$a->strings["Group Name: "] = "Nom del Grup:";
+$a->strings["Group removed."] = "Grup esborrat.";
+$a->strings["Unable to remove group."] = "Incapaç de esborrar Grup.";
+$a->strings["Group Editor"] = "Editor de Grup:";
+$a->strings["Members"] = "Membres";
+$a->strings["Click on a contact to add or remove."] = "Clicar sobre el contacte per afegir o esborrar.";
+$a->strings["Invalid profile identifier."] = "Identificador del perfil no vàlid.";
+$a->strings["Profile Visibility Editor"] = "Editor de Visibilitat del Perfil";
+$a->strings["Profile"] = "Perfil";
+$a->strings["Visible To"] = "Visible Per";
+$a->strings["All Contacts (with secure profile access)"] = "Tots els Contactes (amb accés segur al perfil)";
+$a->strings["No contacts."] = "Sense Contactes";
+$a->strings["View Contacts"] = "Veure Contactes";
+$a->strings["An invitation is required."] = "Es requereix invitació.";
+$a->strings["Invitation could not be verified."] = "La invitació no ha pogut ser verificada.";
+$a->strings["Invalid OpenID url"] = "OpenID url no vàlid";
+$a->strings["Please enter the required information."] = "Per favor, introdueixi la informació requerida.";
+$a->strings["Please use a shorter name."] = "Per favor, empri un nom més curt.";
+$a->strings["Name too short."] = "Nom massa curt.";
+$a->strings["That doesn't appear to be your full (First Last) name."] = "Això no sembla ser el teu nom complet.";
+$a->strings["Your email domain is not among those allowed on this site."] = "El seu domini de correu electrònic no es troba entre els permesos en aquest lloc.";
+$a->strings["Not a valid email address."] = "Adreça de correu no vàlida.";
+$a->strings["Cannot use that email."] = "No es pot utilitzar aquest correu electrònic.";
+$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "El teu sobrenom nomes pot contenir \"a-z\", \"0-9\", \"-\", i \"_\", i començar amb lletra.";
+$a->strings["Nickname is already registered. Please choose another."] = "malnom ja registrat. Tria un altre.";
+$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "ERROR IMPORTANT: La generació de claus de seguretat ha fallat.";
+$a->strings["An error occurred during registration. Please try again."] = "Un error ha succeït durant el registre. Intenta-ho de nou.";
+$a->strings["An error occurred creating your default profile. Please try again."] = "Un error ha succeit durant la creació del teu perfil per defecte. Intenta-ho de nou.";
+$a->strings["Registration details for %s"] = "Detalls del registre per a %s";
+$a->strings["Registration successful. Please check your email for further instructions."] = "Registrat amb èxit. Per favor, comprovi el seu correu per a posteriors instruccions.";
+$a->strings["Failed to send email message. Here is the message that failed."] = "Error en enviar missatge de correu electrònic. Aquí està el missatge que ha fallat.";
+$a->strings["Your registration can not be processed."] = "El seu registre no pot ser processat.";
+$a->strings["Registration request at %s"] = "Sol·licitud de registre a %s";
+$a->strings["Your registration is pending approval by the site owner."] = "El seu registre està pendent d'aprovació pel propietari del lloc.";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Aquest lloc excedeix el nombre diari de registres de comptes. Per favor, provi de nou demà.";
+$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Vostè pot (opcionalment), omplir aquest formulari a través de OpenID mitjançant el subministrament de la seva OpenID i fent clic a 'Registrar'.";
+$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Si vostè no està familiaritzat amb Twitter, si us plau deixi aquest camp en blanc i completi la resta dels elements.";
+$a->strings["Your OpenID (optional): "] = "El seu OpenID (opcional):";
+$a->strings["Include your profile in member directory?"] = "Incloc el seu perfil al directori de membres?";
+$a->strings["Membership on this site is by invitation only."] = "Lloc accesible mitjançant invitació.";
+$a->strings["Your invitation ID: "] = "El teu ID de invitació:";
+$a->strings["Registration"] = "Procés de Registre";
+$a->strings["Your Full Name (e.g. Joe Smith): "] = "El seu nom complet (per exemple, Joan Ningú):";
+$a->strings["Your Email Address: "] = "La Seva Adreça de Correu:";
+$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Tria un nom de perfil. Això ha de començar amb un caràcter de text. La seva adreça de perfil en aquest lloc serà '<strong>malnom@\$sitename</strong>'.";
+$a->strings["Choose a nickname: "] = "Tria un malnom:";
+$a->strings["Register"] = "Registrar";
+$a->strings["People Search"] = "Cercant Gent";
+$a->strings["status"] = "estatus";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "a %1\$s agrada %2\$s de %3\$s";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "a %1\$s no agrada %2\$s de %3\$s";
+$a->strings["Item not found."] = "Article no trobat.";
+$a->strings["Access denied."] = "Accés denegat.";
+$a->strings["Account approved."] = "Compte aprovat.";
+$a->strings["Registration revoked for %s"] = "Procés de Registre revocat per a %s";
+$a->strings["Please login."] = "Si us plau, ingressa.";
+$a->strings["Unable to locate original post."] = "No es pot localitzar post original.";
+$a->strings["Empty post discarded."] = "Buidat després de rebutjar.";
+$a->strings["Wall Photos"] = "Fotos del Mur";
+$a->strings["System error. Post not saved."] = "Error del sistema. Publicació no guardada.";
+$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Aquest missatge va ser enviat a vostè per %s, un membre de la xarxa social Friendica.";
+$a->strings["You may visit them online at %s"] = "El pot visitar en línia a %s";
+$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Si us plau, poseu-vos en contacte amb el remitent responent a aquest missatge si no voleu rebre aquests missatges.";
+$a->strings["%s posted an update."] = "%s ha publicat una actualització.";
+$a->strings["Image uploaded but image cropping failed."] = "Imatge pujada però no es va poder retallar.";
+$a->strings["Image size reduction [%s] failed."] = "La reducció de la imatge [%s] va fracassar.";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Recarregui la pàgina o netegi la caché del navegador si la nova foto no apareix immediatament.";
+$a->strings["Unable to process image"] = "No es pot processar la imatge";
+$a->strings["Image exceeds size limit of %d"] = "La imatge sobrepassa el límit de mida de %d";
+$a->strings["Upload File:"] = "Pujar arxiu:";
+$a->strings["Upload Profile Photo"] = "Pujar Foto del Perfil";
+$a->strings["Upload"] = "Pujar";
+$a->strings["skip this step"] = "saltar aquest pas";
+$a->strings["select a photo from your photo albums"] = "tria una foto dels teus àlbums";
+$a->strings["Crop Image"] = "retallar imatge";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Per favor, ajusta la retallada d'imatge per a una optima visualització.";
+$a->strings["Done Editing"] = "Edició Feta";
+$a->strings["Image uploaded successfully."] = "Carregada de la imatge amb èxit.";
+$a->strings["No profile"] = "Sense perfil";
+$a->strings["Remove My Account"] = "Eliminar el Meu Compte";
+$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Això eliminarà per complet el seu compte. Quan s'hagi fet això, no serà recuperable.";
+$a->strings["Please enter your password for verification:"] = "Si us plau, introduïu la contrasenya per a la verificació:";
+$a->strings["No recipient selected."] = "No s'ha seleccionat destinatari.";
+$a->strings["Unable to locate contact information."] = "No es pot trobar informació de contacte.";
+$a->strings["Message could not be sent."] = "El Missatge no ha estat enviat.";
+$a->strings["Message collection failure."] = "Ha fallat la recollida del missatge.";
+$a->strings["Message sent."] = "Missatge enviat.";
+$a->strings["Inbox"] = "Safata d'entrada";
+$a->strings["Outbox"] = "Safata de sortida";
+$a->strings["New Message"] = "Nou Missatge";
+$a->strings["Message deleted."] = "Missatge eliminat.";
+$a->strings["Conversation removed."] = "Conversació esborrada.";
+$a->strings["Please enter a link URL:"] = "Sius plau, entri l'enllaç URL:";
+$a->strings["Send Private Message"] = "Enviant Missatge Privat";
+$a->strings["To:"] = "Per a:";
+$a->strings["Subject:"] = "Assumpte::";
+$a->strings["Your message:"] = "El teu missatge:";
+$a->strings["No messages."] = "Sense missatges.";
+$a->strings["Delete conversation"] = "Esborrar conversació";
+$a->strings["D, d M Y - g:i A"] = "D, d M Y - g:i A";
+$a->strings["Message not available."] = "Missatge no disponible.";
+$a->strings["Delete message"] = "Esborra missatge";
+$a->strings["Send Reply"] = "Enviar Resposta";
+$a->strings["Friends of %s"] = "Amics de %s";
+$a->strings["No friends to display."] = "No hi ha amics que mostrar";
+$a->strings["Site"] = "Lloc";
+$a->strings["Users"] = "Usuaris";
+$a->strings["Plugins"] = "Plugins";
+$a->strings["Themes"] = "Temes";
+$a->strings["Logs"] = "Transcripcions";
+$a->strings["User registrations waiting for confirmation"] = "Registre d'usuari a l'espera de confirmació";
+$a->strings["Administration"] = "Administració";
+$a->strings["Summary"] = "Sumari";
+$a->strings["Registered users"] = "Usuaris registrats";
+$a->strings["Pending registrations"] = "Registres d'usuari pendents";
+$a->strings["Version"] = "Versió";
+$a->strings["Active plugins"] = "Plugins actius";
+$a->strings["Site settings updated."] = "Ajustos del lloc actualitzats.";
+$a->strings["Closed"] = "Tancat";
+$a->strings["Requires approval"] = "Requereix aprovació";
+$a->strings["Open"] = "Obert";
+$a->strings["File upload"] = "Fitxer carregat";
+$a->strings["Policies"] = "Polítiques";
+$a->strings["Advanced"] = "Avançat";
+$a->strings["Site name"] = "Nom del lloc";
+$a->strings["Banner/Logo"] = "Senyera/Logo";
+$a->strings["System language"] = "Idioma del Systema";
+$a->strings["System theme"] = "Tema del sistema";
+$a->strings["Default system theme - may be over-ridden by user profiles"] = "Tema per defecte del sitema - pot ser canviat als perfils dels usuaris";
+$a->strings["Maximum image size"] = "Mida màxima de les imatges";
+$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Mida màxima en bytes de les imatges a pujar. Per defecte es 0, que vol dir sense límits.";
+$a->strings["Register policy"] = "Política per a registrar";
+$a->strings["Register text"] = "Text al registrar";
+$a->strings["Will be displayed prominently on the registration page."] = "Sea mostrat de forma peminent a la pagina durant el procés de registre.";
+$a->strings["Accounts abandoned after x days"] = "Comptes abandonats després de x dies";
+$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal.";
+$a->strings["Allowed friend domains"] = "Dominis amics permesos";
+$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Llista de dominis separada per comes, de adreçes de correu que són permeses per establir amistats. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis.";
+$a->strings["Allowed email domains"] = "Dominis de correu permesos";
+$a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Llista de dominis separada per comes, de adreçes de correu que són permeses per registrtar-se. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis.";
+$a->strings["Block public"] = "Bloqueig públic";
+$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Bloqueija l'accés públic a qualsevol pàgina del lloc fins que t'hagis identificat.";
+$a->strings["Force publish"] = "Forçar publicació";
+$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Obliga a que tots el perfils en aquest lloc siguin mostrats en el directori del lloc.";
+$a->strings["Global directory update URL"] = "Actualitzar URL del directori global";
+$a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL per actualitzar el directori global. Si no es configura, el directori global serà completament inaccesible per a l'aplicació. ";
+$a->strings["Block multiple registrations"] = "Bloquejar multiples registracions";
+$a->strings["Disallow users to register additional accounts for use as pages."] = "Inhabilita als usuaris el crear comptes adicionals per a usar com a pàgines.";
+$a->strings["OpenID support"] = "Suport per a OpenID";
+$a->strings["OpenID support for registration and logins."] = "Suport per a registre i validació a OpenID.";
+$a->strings["Gravatar support"] = "Suport per a gravatar";
+$a->strings["Search new user's photo on Gravatar."] = "Cerca la nova foto d'usuari a Gravatar.";
+$a->strings["Fullname check"] = "Comprobació de nom complet";
+$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Obliga els usuaris a col·locar un espai en blanc entre nom i cognoms, com a mesura antifemater";
+$a->strings["UTF-8 Regular expressions"] = "expresions regulars UTF-8";
+$a->strings["Use PHP UTF8 regular expressions"] = "Empri expresions regulars de PHP amb format UTF8";
+$a->strings["Show Community Page"] = "Mostra la Pàgina de Comunitat";
+$a->strings["Display a Community page showing all recent public postings on this site."] = "Mostra a la pàgina de comunitat tots els missatges públics recents, d'aquest lloc.";
+$a->strings["Enable OStatus support"] = "Activa el suport per a OStatus";
+$a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Proveeix de compatibilitat integrada amb OStatus (identi.ca, status.net, etc). Totes les comunicacions a OStatus són públiques amb el que ocasionalment pots veure advertències.";
+$a->strings["Enable Diaspora support"] = "Habilitar suport per Diaspora";
+$a->strings["Provide built-in Diaspora network compatibility."] = "Proveeix compatibilitat integrada amb la xarxa Diaspora";
+$a->strings["Only allow Friendica contacts"] = "Només permetre contactes de Friendica";
+$a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Tots els contactes ";
+$a->strings["Verify SSL"] = "Verificar SSL";
+$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Si ho vols, pots comprovar el certificat estrictament. Això farà que no puguis connectar (de cap manera) amb llocs amb certificats SSL autosignats.";
+$a->strings["Proxy user"] = "proxy d'usuari";
+$a->strings["Proxy URL"] = "URL del proxy";
+$a->strings["Network timeout"] = "Temps excedit a la xarxa";
+$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Valor en segons. Canviat a 0 es sense límits (no recomenat)";
+$a->strings["%s user blocked/unblocked"] = array(
+	0 => "%s usuari bloquejar/desbloquejar",
+	1 => "%s usuaris bloquejar/desbloquejar",
+);
+$a->strings["%s user deleted"] = array(
+	0 => "%s usuari esborrat",
+	1 => "%s usuaris esborrats",
+);
+$a->strings["User '%s' deleted"] = "Usuari %s' esborrat";
+$a->strings["User '%s' unblocked"] = "Usuari %s' desbloquejat";
+$a->strings["User '%s' blocked"] = "L'usuari '%s' és bloquejat";
+$a->strings["select all"] = "Seleccionar tot";
+$a->strings["User registrations waiting for confirm"] = "Registre d'usuari esperant confirmació";
+$a->strings["Request date"] = "Data de sol·licitud";
+$a->strings["Email"] = "Correu";
+$a->strings["No registrations."] = "Sense registres.";
+$a->strings["Deny"] = "Denegar";
+$a->strings["Register date"] = "Data de registre";
+$a->strings["Last login"] = "Últim accés";
+$a->strings["Last item"] = "Últim element";
+$a->strings["Account"] = "Compte";
+$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Els usuaris seleccionats seran esborrats!\\n\\nqualsevol cosa que aquests usuaris hagin publicat en aquest lloc s'esborrarà!\\n\\nEsteu segur?";
+$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "L'usuari {0} s'eliminarà!\\n\\nQualsevol cosa que aquest usuari hagi publicat en aquest lloc s'esborrarà!\\n\\nEsteu segur?";
+$a->strings["Plugin %s disabled."] = "Plugin %s deshabilitat.";
+$a->strings["Plugin %s enabled."] = "Plugin %s habilitat.";
+$a->strings["Disable"] = "Deshabilitar";
+$a->strings["Enable"] = "Habilitar";
+$a->strings["Toggle"] = "Canviar";
+$a->strings["Settings"] = "Ajustos";
+$a->strings["Author: "] = "Autor:";
+$a->strings["Maintainer: "] = "Encarregat:";
+$a->strings["No themes found."] = "No s'ha trobat temes.";
+$a->strings["[Experimental]"] = "[Experimental]";
+$a->strings["[Unsupported]"] = "[No soportat]";
+$a->strings["Log settings updated."] = "Configuració del transcriptor actualitzada.";
+$a->strings["Clear"] = "Netejar";
+$a->strings["Debugging"] = "Esplugar";
+$a->strings["Log file"] = "Arxiu de transcripció";
+$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Ha de tenir permisos d'escriptura pel servidor web. En relació amb el seu directori Friendica de nivell superior.";
+$a->strings["Log level"] = "Nivell de transcripció";
+$a->strings["Close"] = "Tancar";
+$a->strings["FTP Host"] = "Amfitrió FTP";
+$a->strings["FTP Path"] = "Direcció FTP";
+$a->strings["FTP User"] = "Usuari FTP";
+$a->strings["FTP Password"] = "Contrasenya FTP";
+$a->strings["Requested profile is not available."] = "El perfil sol·licitat no està disponible.";
+$a->strings["Access to this profile has been restricted."] = "L'accés a aquest perfil ha estat restringit.";
+$a->strings["Tips for New Members"] = "Consells per a nous membres";
+$a->strings["{0} wants to be your friend"] = "{0} vol ser el teu amic";
+$a->strings["{0} sent you a message"] = "{0} t'ha enviat un missatge de";
+$a->strings["{0} requested registration"] = "{0} solicituts de registre";
+$a->strings["{0} commented %s's post"] = "{0} va comentar l'enviament de %s";
+$a->strings["{0} liked %s's post"] = "A {0} l'ha agradat l'enviament de %s";
+$a->strings["{0} disliked %s's post"] = "A {0} no l'ha agradat l'enviament de %s";
+$a->strings["{0} is now friends with %s"] = "{0} ara és amic de %s";
+$a->strings["{0} posted"] = "{0} publicat";
+$a->strings["{0} tagged %s's post with #%s"] = "{0} va etiquetar la publicació de %s com #%s";
+$a->strings["{0} mentioned you in a post"] = "{0} et menciona en un missatge";
+$a->strings["Login failed."] = "Error d'accés.";
+$a->strings["Connect URL missing."] = "URL del connector perduda.";
+$a->strings["This site is not configured to allow communications with other networks."] = "Aquest lloc no està configurat per permetre les comunicacions amb altres xarxes.";
+$a->strings["No compatible communication protocols or feeds were discovered."] = "Protocol de comunnicació no compatible o alimentador descobert.";
+$a->strings["The profile address specified does not provide adequate information."] = "L'adreça de perfil especificada no proveeix informació adient.";
+$a->strings["An author or name was not found."] = "Un autor o nom no va ser trobat";
+$a->strings["No browser URL could be matched to this address."] = "Cap direcció URL del navegador coincideix amb aquesta adreça.";
+$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "La direcció del perfil especificat pertany a una xarxa que ha estat desactivada en aquest lloc.";
+$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Perfil limitat. Aquesta persona no podrà rebre notificacions personals/directes de tu.";
+$a->strings["Unable to retrieve contact information."] = "No es pot recuperar la informació de contacte.";
+$a->strings["following"] = "seguint";
+$a->strings["Common Friends"] = "Amics Comuns";
+$a->strings["No friends in common."] = "No hi ha amics en comú.";
+$a->strings["Item has been removed."] = "El element ha estat esborrat.";
+$a->strings["Applications"] = "Aplicacions";
+$a->strings["No installed applications."] = "Aplicacions no instal·lades.";
+$a->strings["Search This Site"] = "Cerca en Aquest Lloc";
+$a->strings["Profile not found."] = "Perfil no trobat.";
+$a->strings["Profile Name is required."] = "Nom de perfil requerit.";
+$a->strings["Profile updated."] = "Perfil actualitzat.";
+$a->strings["Profile deleted."] = "Perfil esborrat.";
+$a->strings["Profile-"] = "Perfil-";
+$a->strings["New profile created."] = "Nou perfil creat.";
+$a->strings["Profile unavailable to clone."] = "No es pot clonar el perfil.";
+$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Amaga la llista de contactes/amics en la vista d'aquest perfil?";
+$a->strings["Edit Profile Details"] = "Editor de Detalls del Perfil";
+$a->strings["View this profile"] = "Veure aquest perfil";
+$a->strings["Create a new profile using these settings"] = "Crear un nou perfil amb aquests ajustos";
+$a->strings["Clone this profile"] = "Clonar aquest perfil";
+$a->strings["Delete this profile"] = "Esborrar aquest perfil";
+$a->strings["Profile Name:"] = "Nom de Perfil:";
+$a->strings["Your Full Name:"] = "El Teu Nom Complet.";
+$a->strings["Title/Description:"] = "Títol/Descripció:";
+$a->strings["Your Gender:"] = "Gènere:";
+$a->strings["Birthday (%s):"] = "Aniversari (%s)";
+$a->strings["Street Address:"] = "Direcció:";
+$a->strings["Locality/City:"] = "Localitat/Ciutat:";
+$a->strings["Postal/Zip Code:"] = "Codi Postal:";
+$a->strings["Country:"] = "País";
+$a->strings["Region/State:"] = "Región/Estat:";
+$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Estat Civil:";
+$a->strings["Who: (if applicable)"] = "Qui? (si és aplicable)";
+$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Exemples: cathy123, Cathy Williams, cathy@example.com";
+$a->strings["Sexual Preference:"] = "Preferència Sexual:";
+$a->strings["Homepage URL:"] = "Pàgina web URL:";
+$a->strings["Political Views:"] = "Idees Polítiques:";
+$a->strings["Religious Views:"] = "Creencies Religioses:";
+$a->strings["Public Keywords:"] = "Paraules Clau Públiques";
+$a->strings["Private Keywords:"] = "Paraules Clau Privades:";
+$a->strings["Example: fishing photography software"] = "Exemple: pesca fotografia programari";
+$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Emprat per suggerir potencials amics, Altres poden veure-ho)";
+$a->strings["(Used for searching profiles, never shown to others)"] = "(Emprat durant la cerca de perfils, mai mostrat a ningú)";
+$a->strings["Tell us about yourself..."] = "Parla'ns de tú.....";
+$a->strings["Hobbies/Interests"] = "Aficions/Interessos";
+$a->strings["Contact information and Social Networks"] = "Informació de contacte i Xarxes Socials";
+$a->strings["Musical interests"] = "Gustos musicals";
+$a->strings["Books, literature"] = "Llibres, Literatura";
+$a->strings["Television"] = "Televisió";
+$a->strings["Film/dance/culture/entertainment"] = "Cinema/ball/cultura/entreteniments";
+$a->strings["Love/romance"] = "Amor/sentiments";
+$a->strings["Work/employment"] = "Treball/ocupació";
+$a->strings["School/education"] = "Ensenyament/estudis";
+$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Aquest és el teu perfil <strong>públic</strong>.<br />El qual <strong>pot</strong> ser visible per qualsevol qui faci servir Internet.";
+$a->strings["Age: "] = "Edat:";
+$a->strings["Edit/Manage Profiles"] = "Editar/Gestionar Perfils";
+$a->strings["Change profile photo"] = "Canviar la foto del perfil";
+$a->strings["Create New Profile"] = "Crear un Nou Perfil";
+$a->strings["Profile Image"] = "Imatge del Perfil";
+$a->strings["visible to everybody"] = "Visible per tothom";
+$a->strings["Edit visibility"] = "Editar visibilitat";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s etiquetats %2\$s %3\$s amb %4\$s";
+$a->strings["No potential page delegates located."] = "No es troben pàgines potencialment delegades.";
+$a->strings["Delegate Page Management"] = "Gestió de les Pàgines Delegades";
+$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Els delegats poden gestionar tots els aspectes d'aquest compte/pàgina, excepte per als ajustaments bàsics del compte. Si us plau, no deleguin el seu compte personal a ningú que no confiïn completament.";
+$a->strings["Existing Page Managers"] = "Actuals Administradors de Pàgina";
+$a->strings["Existing Page Delegates"] = "Actuals Delegats de Pàgina";
+$a->strings["Potential Delegates"] = "Delegats Potencials";
+$a->strings["Add"] = "Afegir";
+$a->strings["No entries."] = "Sense entrades";
+$a->strings["Friend Suggestions"] = "Amics Suggerits";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Cap suggeriment disponible. Si això és un nou lloc, si us plau torna a intentar en 24 hores.";
+$a->strings["Ignore/Hide"] = "Ignorar/Amagar";
+$a->strings["Global Directory"] = "Directori Global";
+$a->strings["Normal site view"] = "Vista normal del lloc";
+$a->strings["Admin - View all site entries"] = "Admin- Veure totes les entrades del lloc";
+$a->strings["Find on this site"] = "Trobat en aquest lloc";
+$a->strings["Site Directory"] = "Directori Local";
+$a->strings["Gender: "] = "Gènere:";
+$a->strings["No entries (some entries may be hidden)."] = "No hi ha entrades (algunes de les entrades poden estar amagades).";
+$a->strings["%s : Not a valid email address."] = "%s : No es una adreça de correu vàlida";
+$a->strings["Please join my network on %s"] = "Si us plau, uneix-te a la meva xarxa en %s";
+$a->strings["%s : Message delivery failed."] = "%s : Ha fallat l'entrega del missatge.";
+$a->strings["%d message sent."] = array(
+	0 => "%d missatge enviat",
+	1 => "%d missatges enviats.",
+);
+$a->strings["You have no more invitations available"] = "No te més invitacions disponibles";
+$a->strings["Send invitations"] = "Enviant Invitacions";
+$a->strings["Enter email addresses, one per line:"] = "Entri adreçes de correu, una per línia:";
+$a->strings["Please join my social network on %s"] = "Per favor, uneix-te a la meva xarxa social en %s";
+$a->strings["To accept this invitation, please visit:"] = "Per acceptar aquesta invitació, si us plau, visiti:";
+$a->strings["You will need to supply this invitation code: \$invite_code"] = "Vostè haurà de proporcionar aquest codi d'invitació: \$invite_code";
+$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Un cop registrat, si us plau contactar amb mi a través de la meva pàgina de perfil a:";
+$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Això pot ocorre ocasionalment si el contacte fa una petició per ambdues persones i ja han estat aprovades.";
+$a->strings["Response from remote site was not understood."] = "La resposta des del lloc remot no s'entenia.";
+$a->strings["Unexpected response from remote site: "] = "Resposta inesperada de lloc remot:";
+$a->strings["Confirmation completed successfully."] = "La confirmació s'ha completat correctament.";
+$a->strings["Remote site reported: "] = "El lloc remot informa:";
+$a->strings["Temporary failure. Please wait and try again."] = "Fallada temporal. Si us plau, espereu i torneu a intentar.";
+$a->strings["Introduction failed or was revoked."] = "La presentació va fallar o va ser revocada.";
+$a->strings["Unable to set contact photo."] = "No es pot canviar la foto de contacte.";
+$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s és ara amic amb %2\$s";
+$a->strings["No user record found for '%s' "] = "No es troben registres d'usuari per a '%s'";
+$a->strings["Our site encryption key is apparently messed up."] = "La nostra clau de xifrat del lloc pel que sembla en mal estat.";
+$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Es va proporcionar una URL del lloc buida o la URL no va poder ser desxifrada per nosaltres.";
+$a->strings["Contact record was not found for you on our site."] = "No s'han trobat registres del contacte al nostre lloc.";
+$a->strings["Site public key not available in contact record for URL %s."] = "la clau pública del lloc no disponible en les dades del contacte per URL %s.";
+$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "La ID proporcionada pel seu sistema és un duplicat en el nostre sistema. Hauria de treballar si intenta de nou.";
+$a->strings["Unable to set your contact credentials on our system."] = "No es pot canviar les seves credencials de contacte en el nostre sistema.";
+$a->strings["Unable to update your contact profile details on our system"] = "No es pot actualitzar els detalls del seu perfil de contacte en el nostre sistema";
+$a->strings["Connection accepted at %s"] = "Connexió acceptada en %s";
+$a->strings["Facebook disabled"] = "Facebook deshabilitat";
+$a->strings["Updating contacts"] = "Actualitzant contactes";
+$a->strings["Facebook API key is missing."] = "La clau del API de Facebook s'ha perdut.";
+$a->strings["Facebook Connect"] = "Facebook Connectat";
+$a->strings["Install Facebook connector for this account."] = "Instal·lar el connector de Facebook per aquest compte.";
+$a->strings["Remove Facebook connector"] = "Eliminar el connector de Faceboook";
+$a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Re-autentificar [Això és necessari cada vegada que la contrasenya de Facebook canvia.]";
+$a->strings["Post to Facebook by default"] = "Enviar a Facebook per defecte";
+$a->strings["Link all your Facebook friends and conversations on this website"] = "Enllaça tots els teus amics i les converses de Facebook en aquest lloc web";
+$a->strings["Facebook conversations consist of your <em>profile wall</em> and your friend <em>stream</em>."] = "Les converses de Facebook consisteixen en el <em>perfil del mur</em> i en el<em> stream </em> del seu amic.";
+$a->strings["On this website, your Facebook friend stream is only visible to you."] = "En aquesta pàgina web, el stream del seu amic a Facebook només és visible per a vostè.";
+$a->strings["The following settings determine the privacy of your Facebook profile wall on this website."] = "Les següents opcions determinen la privacitat del mur del seu perfil de Facebook en aquest lloc web.";
+$a->strings["On this website your Facebook profile wall conversations will only be visible to you"] = "En aquesta pàgina web les seves converses al mur del perfil de Facebook només seran visible per a vostè";
+$a->strings["Do not import your Facebook profile wall conversations"] = "No importi les seves converses del mur del perfil de Facebook";
+$a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "Si opta per vincular les converses i deixar ambdues caselles sense marcar, el mur del seu perfil de Facebook es fusionarà amb el mur del seu perfil en aquest lloc web i la seva configuració de privacitat en aquest website serà utilitzada per determinar qui pot veure les converses.";
+$a->strings["Comma separated applications to ignore"] = "Separats per comes les aplicacions a ignorar";
+$a->strings["Facebook"] = "Facebook";
+$a->strings["Facebook Connector Settings"] = "Ajustos del Connector de Facebook";
+$a->strings["Post to Facebook"] = "Enviament a Facebook";
+$a->strings["Post to Facebook cancelled because of multi-network access permission conflict."] = "Enviament a Facebook cancel·lat perque hi ha un conflicte de permisos d'accés multi-xarxa.";
+$a->strings["Image: "] = "Imatge:";
+$a->strings["View on Friendica"] = "Vist en Friendica";
+$a->strings["Facebook post failed. Queued for retry."] = "Enviament a Facebook fracassat. En cua per a reintent.";
+$a->strings["link"] = "enllaç";
+$a->strings["%d person likes this"] = array(
+	0 => "%d persona li agrada això",
+	1 => "%d persones els agrada això",
+);
+$a->strings["%d person doesn't like this"] = array(
+	0 => "%d persona no li agrada això",
+	1 => "%d persones no els agrada això",
+);
+$a->strings["Generate new key"] = "Generar nova clau";
+$a->strings["Widgets key"] = "Ginys clau";
+$a->strings["Widgets available"] = "Ginys disponibles";
+$a->strings["Connect on Friendica!"] = "Connectar en Friendica";
+$a->strings["YourLS Settings"] = "La Teva Configuració de LS";
+$a->strings["URL: http://"] = "URL: http://";
+$a->strings["Username:"] = "Nom d'usuari:";
+$a->strings["Password:"] = "Contrasenya:";
+$a->strings["Use SSL "] = "Emprar SSL";
+$a->strings["yourls Settings saved."] = "Guardar la seva configuració.";
+$a->strings["Post to LiveJournal"] = "Missatge a Livejournal";
+$a->strings["LiveJournal Post Settings"] = "Configuració d'enviaments a Livejournal";
+$a->strings["Enable LiveJournal Post Plugin"] = "Habilitat el plugin d'enviaments a Livejournal";
+$a->strings["LiveJournal username"] = "Nom d'usuari a Livejournal";
+$a->strings["LiveJournal password"] = "Contrasenya a Livejournal";
+$a->strings["Post to LiveJournal by default"] = "Enviar per defecte a Livejournal";
+$a->strings["\"Not Safe For Work\" Settings"] = "Configuració de \"Not Safe For Work\"";
+$a->strings["Enable NSFW filter"] = "Habilitar el filtre NSFW";
+$a->strings["Comma separated words to treat as NSFW"] = "Tractar com NSFW les paraules separades per comes  ";
+$a->strings["Use /expression/ to provide regular expressions"] = "Emprar /expressió/  per a proporcionar expressions regulars";
+$a->strings["NSFW Settings saved."] = "Configuració NSFW guardada.";
+$a->strings["%s - Click to open/close"] = "%s - Clicar per obrir/tancar";
+$a->strings["Login"] = "Identifica't";
+$a->strings["OpenID"] = "OpenID";
+$a->strings["Last users"] = "Últims usuaris";
+$a->strings["Most active users"] = "Usuaris més actius";
+$a->strings["Last photos"] = "Últimes fotos";
+$a->strings["Last likes"] = "Últims \"m'agrada\"";
+$a->strings["event"] = "esdeveniment";
+$a->strings["Latest users"] = "Últims usuaris";
+$a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "Permetre l'ús del seu ID de friendica (%s) per Connectar a l'emmagatzematge extern (com ownCloud). Veure <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\"> WebFinger RemoteStorage </a>";
+$a->strings["Template URL (with {category})"] = "Plantilles de URL (amb {categoria})";
+$a->strings["OAuth end-point"] = "OAuth end-point";
+$a->strings["Api"] = "Api";
+$a->strings["Member since:"] = "Membre des de:";
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Tres en línia Tridimensional";
+$a->strings["3D Tic-Tac-Toe"] = "Tres en línia 3D";
+$a->strings["New game"] = "Nou joc";
+$a->strings["New game with handicap"] = "Nou joc modificat";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "El joc del tres en línia tridimensional és com el joc tradicional, excepte que es juga en diversos nivells simultàniament.";
+$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "En aquest cas hi ha tres nivells. Vostè guanya per aconseguir tres en una fila en qualsevol nivell, així com dalt, baix i en diagonal a través dels diferents nivells.";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "El joc modificat desactiva la posició central en el nivell mitjà perquè el jugador en aquesta posició té sovint un avantatge injust.";
+$a->strings["You go first..."] = "Vostè va primer ...";
+$a->strings["I'm going first this time..."] = "Vaig primer aquesta vegada ...";
+$a->strings["You won!"] = "Has guanyat!";
+$a->strings["\"Cat\" game!"] = "Empat!";
+$a->strings["I won!"] = "Vaig guanyar!";
+$a->strings["Randplace Settings"] = "Configuració de Randplace";
+$a->strings["Enable Randplace Plugin"] = "Habilitar el Plugin de Randplace";
+$a->strings["Post to Dreamwidth"] = "Missatge a Dreamwidth";
+$a->strings["Dreamwidth Post Settings"] = "Configuració d'enviaments a Dreamwidth";
+$a->strings["Enable dreamwidth Post Plugin"] = "Habilitat el plugin d'enviaments a Dreamwidth";
+$a->strings["dreamwidth username"] = "Nom d'usuari a Dreamwidth";
+$a->strings["dreamwidth password"] = "Contrasenya a Dreamwidth";
+$a->strings["Post to dreamwidth by default"] = "Enviar per defecte a Dreamwidth";
+$a->strings["Post to Drupal"] = "Missatge a Drupal";
+$a->strings["Drupal Post Settings"] = "Configuració d'enviaments a Drupal";
+$a->strings["Enable Drupal Post Plugin"] = "Habilitar el Plugin d'Enviaments de Drupal";
+$a->strings["Drupal username"] = "Nom d'usuari de Drupal";
+$a->strings["Drupal password"] = "Contrasenya de Drupal";
+$a->strings["Post Type - article,page,or blog"] = "Tipus d'Enviament- article,pàgina, o blog";
+$a->strings["Drupal site URL"] = "URL del lloc Drupal";
+$a->strings["Drupal site uses clean URLS"] = "el Lloc Drupal empra URLS netes";
+$a->strings["Post to Drupal by default"] = "Enviar a Drupal per defecte";
+$a->strings["Post from Friendica"] = "Enviament des de Friendica";
+$a->strings["Geonames settings updated."] = "Actualitzada la configuració de Geonames.";
+$a->strings["Geonames Settings"] = "Configuració de Geonames";
+$a->strings["Enable Geonames Plugin"] = "Habilitar Plugin de Geonames";
+$a->strings["Upload a file"] = "Carrega un arxiu";
+$a->strings["Drop files here to upload"] = "Deixa aquí el arxiu a carregar";
+$a->strings["Failed"] = "Fracassar";
+$a->strings["No files were uploaded."] = "No hi ha arxius carregats.";
+$a->strings["Uploaded file is empty"] = "L'arxiu carregat està buit";
+$a->strings["File has an invalid extension, it should be one of "] = "Arxiu té una extensió no vàlida, ha de ser una de";
+$a->strings["Upload was cancelled, or server error encountered"] = "La pujada va ser cancel.lada, o es va trobar un error de servidor";
+$a->strings["OEmbed settings updated"] = "Actualitzar la configuració OEmbed";
+$a->strings["Use OEmbed for YouTube videos"] = "Empreu OEmbed per videos YouTube";
+$a->strings["URL to embed:"] = "Adreça URL del recurs";
+$a->strings["Impressum"] = "Impressum";
+$a->strings["Site Owner"] = "Propietari del lloc";
+$a->strings["Email Address"] = "Adreça de correu";
+$a->strings["Postal Address"] = "Adreça postal";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "El complement impressum s'ha de configurar!<br />Si us plau afegiu almenys la variable <tt>propietari </tt> al fitxer de configuració. Per a les altres variables, consulteu el fitxer README del complement.";
+$a->strings["Site Owners Profile"] = "Perfil del Propietari del Lloc";
+$a->strings["Notes"] = "Notes";
+$a->strings["Report Bug"] = "Informar de problema";
+$a->strings["\"Blockem\" Settings"] = "Configuració de \"Bloqueig\"";
+$a->strings["Comma separated profile URLS to block"] = "URLS dels perfils a bloquejar, separats per comes";
+$a->strings["BLOCKEM Settings saved."] = "Guardada la configuració de BLOQUEIG.";
+$a->strings["Blocked %s - Click to open/close"] = "Bloquejar %s - Clica per obrir/tancar";
+$a->strings["Unblock Author"] = "Desbloquejar Autor";
+$a->strings["Block Author"] = "Bloquejar Autor";
+$a->strings["blockem settings updated"] = "Actualitzar la Configuració de bloqueig";
+$a->strings[":-)"] = ":-)";
+$a->strings[":-("] = ":-(";
+$a->strings["lol"] = "lol";
+$a->strings["Quick Comment Settings"] = "Configuració Ràpida dels Comentaris";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Comentaris ràpids es troben prop de les caixes de comentaris, de vegades ocults. Feu clic a ells per donar respostes simples.";
+$a->strings["Enter quick comments, one per line"] = "Introduïu els comentaris ràpids, un per línia";
+$a->strings["Quick Comment settings saved."] = "Guardada la configuració de comentaris ràpids.";
+$a->strings["Tile Server URL"] = "URL del servidor, del mosaico de servidores";
+$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Una llista de  <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\"> un mosaic de servidors públics</a>";
+$a->strings["Default zoom"] = "Zoom per defecte";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "Nivell de zoom per defecte. (1: el món, 18: el més alt)";
+$a->strings["Editplain settings updated."] = "Actualitzar la configuració de Editplain.";
+$a->strings["Editplain Settings"] = "Configuració de Editplain";
+$a->strings["Disable richtext status editor"] = "Deshabilitar l'editor d'estatus de texte enriquit";
+$a->strings["\"pageheader\" Settings"] = "Configuració de la capçalera de pàgina.";
+$a->strings["pageheader Settings saved."] = "guardada la configuració de la capçalera de pàgina.";
+$a->strings["View Source"] = "Veure les Fonts";
+$a->strings["Post to StatusNet"] = "Publica-ho a StatusNet";
+$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Si us plau, poseu-vos en contacte amb l'administrador del lloc. <br /> L'adreça URL de l'API proporcionada no és vàlida.";
+$a->strings["We could not contact the StatusNet API with the Path you entered."] = "No hem pogut posar-nos en contacte amb l'API StatusNet amb la ruta que has introduït.";
+$a->strings["StatusNet settings updated."] = "La configuració StatusNet actualitzada.";
+$a->strings["StatusNet Posting Settings"] = "Configuració d'Enviaments per a StatusNet";
+$a->strings["Globally Available StatusNet OAuthKeys"] = "OAuthKeys de StatusNet Globalment Disponible";
+$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Hi ha preconfigurats parells clau OAuth per a alguns servidors StatusNet disponibles. Si està emprant un d'ells, utilitzi aquestes credencials. Si no és així no dubteu a connectar-se a qualsevol altra instància StatusNet (veure a baix).";
+$a->strings["Provide your own OAuth Credentials"] = "Proporcioneu les vostres credencials de OAuth";
+$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "no s'ha trobat cap parell \"consumer key\" per StatusNet. Registra el teu compte Friendica com un client d'escriptori en el seu compte StatusNet, copieu el parell de \"consumer key\" aquí i entri a l'arrel de la base de l'API. <br /> Abans de registrar el seu parell de claus OAuth demani a l'administrador si ja hi ha un parell de claus per a aquesta instal·lació de Friendica en la instal·lació del teu favorit StatusNet.";
+$a->strings["OAuth Consumer Key"] = "OAuth Consumer Key";
+$a->strings["OAuth Consumer Secret"] = "OAuth Consumer Secret";
+$a->strings["Base API Path (remember the trailing /)"] = "Base API Path (recorda deixar / al final)";
+$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet."] = "Per connectar al seu compte StatusNet, feu clic al botó de sota per obtenir un codi de seguretat StatusNet, que has de copiar a la casella de sota, i enviar el formulari. Només els missatges <strong> públics </strong> es publicaran en StatusNet.";
+$a->strings["Log in with StatusNet"] = "Accedeixi com en  StatusNet";
+$a->strings["Copy the security code from StatusNet here"] = "Copieu el codi de seguretat StatusNet aquí";
+$a->strings["Cancel Connection Process"] = "Cancel·lar el procés de connexió";
+$a->strings["Current StatusNet API is"] = "L'Actual StatusNet API és";
+$a->strings["Cancel StatusNet Connection"] = "Cancel·lar la connexió amb StatusNet";
+$a->strings["Currently connected to: "] = "Actualment connectat a: ";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Si està activat, tots els seus anuncis <strong>públics</strong> poden ser publicats en el compte StatusNet associat. Vostè pot optar per fer-ho per defecte (en aquest cas) o per cada missatge per separat en les opcions de comptabilització en escriure l'entrada.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Nota</strong>: A causa de les seves opcions de privacitat (<em>Amaga els detalls del teu perfil dels espectadors desconeguts? </em>)  el vincle potencialment inclòs en anuncis públics transmesos a StatusNet conduirà el visitant a una pàgina en blanc en la que informarà al visitants que l'accés al seu perfil s'ha restringit.";
+$a->strings["Allow posting to StatusNet"] = "Permetre enviaments a StatusNet";
+$a->strings["Send public postings to StatusNet by default"] = "Enviar missatges públics a StatusNet per defecte";
+$a->strings["Clear OAuth configuration"] = "Esborrar configuració de OAuth";
+$a->strings["API URL"] = "API URL";
+$a->strings["Post to Tumblr"] = "Publica-ho al Tumblr";
+$a->strings["Tumblr Post Settings"] = "Configuració d'Enviaments de Tumblr";
+$a->strings["Enable Tumblr Post Plugin"] = "Habilita el plugin de enviaments de Tumblr";
+$a->strings["Tumblr login"] = "Inici de sessió de Tumblr";
+$a->strings["Tumblr password"] = "Caontrasenya de Tumblr";
+$a->strings["Post to Tumblr by default"] = "Enviar a Tumblr per defecte";
+$a->strings["Numfriends settings updated."] = "Actualitzar la configuració de Numfriends.";
+$a->strings["Numfriends Settings"] = "Configuració de Numfriends";
+$a->strings["How many contacts to display on profile sidebar"] = "Quants contactes per mostrar a la barra lateral el perfil";
+$a->strings["Gnot settings updated."] = "Configuració de Gnot actualitzada";
+$a->strings["Gnot Settings"] = "Configuració de Gnot";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permet crear fils de les notificacions de comentaris de correu electrònic a Gmail i anonimat de la línia d'assumpte.";
+$a->strings["Enable this plugin/addon?"] = "Activar aquest plugin/aplicació?";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica: Notifica] Conversació comentada #%d";
+$a->strings["Post to Wordpress"] = "Publica-ho al Wordpress";
+$a->strings["WordPress Post Settings"] = "Configuració d'enviaments a WordPress";
+$a->strings["Enable WordPress Post Plugin"] = "Habilitar Configuració d'Enviaments a WordPress";
+$a->strings["WordPress username"] = "Nom d'usuari de WordPress";
+$a->strings["WordPress password"] = "Contrasenya de WordPress";
+$a->strings["WordPress API URL"] = "WordPress API URL";
+$a->strings["Post to WordPress by default"] = "Enviar a WordPress per defecte";
+$a->strings["\"Show more\" Settings"] = "Configuració de \"Mostrar més\"";
+$a->strings["Enable Show More"] = "Habilita Mostrar Més";
+$a->strings["Cutting posts after how much characters"] = "Tallar els missatges després de quants caràcters";
+$a->strings["Show More Settings saved."] = "Guardada la configuració de \"Mostra Més\".";
+$a->strings["Show More"] = "Mostra Més";
+$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Aquest lloc web realitza un seguiment mitjançant la eina d'anàlisi <a href='http://www.piwik.org'>Piwik</a>.";
+$a->strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Si no vol que les seves visites es transcribin d'aquesta manera vostè <a href='%s'> pot establir una cookie per evitar a Piwik a partir de noves visites del lloc web </a> (opt-out).";
+$a->strings["Piwik Base URL"] = "URL Piwik Base";
+$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Trajectoria absoluta per a la instal·lació de Piwik (sense el protocol (http/s), amb la barra final )";
+$a->strings["Site ID"] = "Lloc ID";
+$a->strings["Show opt-out cookie link?"] = "Mostra l'enllaç cookie opt-out?";
+$a->strings["Asynchronous tracking"] = "Seguiment asíncrono";
+$a->strings["Post to Twitter"] = "Publica-ho al Twitter";
+$a->strings["Twitter settings updated."] = "La configuració de Twitter actualitzada.";
+$a->strings["Twitter Posting Settings"] = "Configuració d'Enviaments per a Twitter";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No s'ha pogut emparellar cap clau \"consumer key\" per a Twitter. Si us plau, poseu-vos en contacte amb l'administrador del lloc.";
+$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "En aquesta instància Friendica el plugin Twitter va ser habilitat, però encara no ha connectat el compte al seu compte de Twitter. Per a això feu clic al botó de sota per obtenir un PIN de Twitter que ha de copiar a la casella de sota i enviar el formulari. Només els missatges <strong> públics </strong> es publicaran a Twitter.";
+$a->strings["Log in with Twitter"] = "Accedeixi com en  Twitter";
+$a->strings["Copy the PIN from Twitter here"] = "Copieu el codi PIN de Twitter aquí";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Si està activat, tots els seus anuncis <strong> públics </strong> poden ser publicats en el corresponent compte de Twitter. Vostè pot optar per fer-ho per defecte (en aquest cas) o per cada missatge per separat en les opcions de comptabilització en escriure l'entrada.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Nota</strong>: donada la seva configuració de privacitat (<em> Amaga els detalls del teu perfil dels espectadors desconeguts? </em>) el vincle potencialment inclòs en anuncis públics retransmesos a Twitter conduirà al visitant a una pàgina en blanc informar als visitants que l'accés al seu perfil s'ha restringit.";
+$a->strings["Allow posting to Twitter"] = "Permetre anunci a Twitter";
+$a->strings["Send public postings to Twitter by default"] = "Enviar anuncis públics a Twitter per defecte";
+$a->strings["Consumer key"] = "Consumer key";
+$a->strings["Consumer secret"] = "Consumer secret";
+$a->strings["irc Chatroom"] = "irc Chatroom";
+$a->strings["Post to Posterous"] = "enviament a Posterous";
+$a->strings["Posterous Post Settings"] = "Configuració d'Enviaments a Posterous";
+$a->strings["Enable Posterous Post Plugin"] = "Habilitar plugin d'Enviament de Posterous";
+$a->strings["Posterous login"] = "Inici de sessió a Posterous";
+$a->strings["Posterous password"] = "Contrasenya a Posterous";
+$a->strings["Post to Posterous by default"] = "Enviar a Posterous per defecte";
+$a->strings["Theme settings"] = "Configuració de Temes";
+$a->strings["Alignment"] = "Adaptació";
+$a->strings["Left"] = "Esquerra";
+$a->strings["Center"] = "Centre";
+$a->strings["Gender:"] = "Gènere:";
+$a->strings["j F, Y"] = "j F, Y";
+$a->strings["j F"] = "j F";
+$a->strings["Birthday:"] = "Aniversari:";
+$a->strings["Age:"] = "Edat:";
+$a->strings["Status:"] = "Estatus:";
+$a->strings["Homepage:"] = "Pàgina web:";
+$a->strings["Tags:"] = "Etiquetes:";
+$a->strings["Religion:"] = "Religió:";
+$a->strings["About:"] = "Acerca de:";
+$a->strings["Hobbies/Interests:"] = "Aficiones/Intereses:";
+$a->strings["Contact information and Social Networks:"] = "Informació de contacte i Xarxes Socials:";
+$a->strings["Musical interests:"] = "Gustos musicals:";
+$a->strings["Books, literature:"] = "Llibres, literatura:";
+$a->strings["Television:"] = "Televisió:";
+$a->strings["Film/dance/culture/entertainment:"] = "Cinema/ball/cultura/entreteniments:";
+$a->strings["Love/Romance:"] = "Amor/sentiments:";
+$a->strings["Work/employment:"] = "Treball/ocupació:";
+$a->strings["School/education:"] = "Escola/formació";
+$a->strings["Unknown | Not categorised"] = "Desconegut/No categoritzat";
+$a->strings["Block immediately"] = "Bloquejar immediatament";
+$a->strings["Shady, spammer, self-marketer"] = "Sospitós, Femater, auto-publicitat";
+$a->strings["Known to me, but no opinion"] = "Conegut per mi, però sense opinió";
+$a->strings["OK, probably harmless"] = "Bé, probablement inofensiu";
+$a->strings["Reputable, has my trust"] = "Bona reputació, té la meva confiança";
+$a->strings["Frequently"] = "Freqüentment";
+$a->strings["Hourly"] = "Cada hora";
+$a->strings["Twice daily"] = "Dues vegades al dia";
+$a->strings["Daily"] = "Diari";
+$a->strings["Weekly"] = "Setmanal";
+$a->strings["Monthly"] = "Mensual";
+$a->strings["OStatus"] = "OStatus";
+$a->strings["RSS/Atom"] = "RSS/Atom";
+$a->strings["Zot!"] = "Zot!";
+$a->strings["LinkedIn"] = "LinkedIn";
+$a->strings["XMPP/IM"] = "XMPP/IM";
+$a->strings["MySpace"] = "MySpace";
+$a->strings["Male"] = "Home";
+$a->strings["Female"] = "Dona";
+$a->strings["Currently Male"] = "Actualment Home";
+$a->strings["Currently Female"] = "Actualment Dona";
+$a->strings["Mostly Male"] = "Habitualment Home";
+$a->strings["Mostly Female"] = "Habitualment Dona";
+$a->strings["Transgender"] = "Transgènere";
+$a->strings["Intersex"] = "Bisexual";
+$a->strings["Transsexual"] = "Transexual";
+$a->strings["Hermaphrodite"] = "Hermafrodita";
+$a->strings["Neuter"] = "Neutre";
+$a->strings["Non-specific"] = "No específicat";
+$a->strings["Other"] = "Altres";
+$a->strings["Undecided"] = "No Decidit";
+$a->strings["Males"] = "Home";
+$a->strings["Females"] = "Dona";
+$a->strings["Gay"] = "Gay";
+$a->strings["Lesbian"] = "Lesbiana";
+$a->strings["No Preference"] = "Sense Preferències";
+$a->strings["Bisexual"] = "Bisexual";
+$a->strings["Autosexual"] = "Autosexual";
+$a->strings["Abstinent"] = "Abstinent/a";
+$a->strings["Virgin"] = "Verge";
+$a->strings["Deviant"] = "Desviat/da";
+$a->strings["Fetish"] = "Fetixiste";
+$a->strings["Oodles"] = "Orgies";
+$a->strings["Nonsexual"] = "Asexual";
+$a->strings["Single"] = "Solter/a";
+$a->strings["Lonely"] = "Solitari";
+$a->strings["Available"] = "Disponible";
+$a->strings["Unavailable"] = "No Disponible";
+$a->strings["Dating"] = "De cites";
+$a->strings["Unfaithful"] = "Infidel";
+$a->strings["Sex Addict"] = "Adicte al sexe";
+$a->strings["Friends"] = "Amics/Amigues";
+$a->strings["Friends/Benefits"] = "Amics íntims";
+$a->strings["Casual"] = "Oportunista";
+$a->strings["Engaged"] = "Promès";
+$a->strings["Married"] = "Casat";
+$a->strings["Partners"] = "Socis";
+$a->strings["Cohabiting"] = "Cohabitant";
+$a->strings["Happy"] = "Feliç";
+$a->strings["Not Looking"] = "No Cerco";
+$a->strings["Swinger"] = "Parella Liberal";
+$a->strings["Betrayed"] = "Traït/da";
+$a->strings["Separated"] = "Separat/da";
+$a->strings["Unstable"] = "Inestable";
+$a->strings["Divorced"] = "Divorciat/da";
+$a->strings["Widowed"] = "Vidu/a";
+$a->strings["Uncertain"] = "Incert";
+$a->strings["Complicated"] = "Complicat";
+$a->strings["Don't care"] = "No t'interessa";
+$a->strings["Ask me"] = "Pregunta'm";
+$a->strings["Starts:"] = "Inici:";
+$a->strings["Finishes:"] = "Acaba:";
+$a->strings["(no subject)"] = "(sense assumpte)";
+$a->strings["noreply"] = "no contestar";
+$a->strings["prev"] = "Prev";
+$a->strings["first"] = "primer";
+$a->strings["last"] = "Últim";
+$a->strings["next"] = "Proper";
+$a->strings["No contacts"] = "Sense contactes";
+$a->strings["%d Contact"] = array(
+	0 => "%d Contacte",
+	1 => "%d Contactes",
+);
+$a->strings["Search"] = "Cercar";
+$a->strings["Monday"] = "Dilluns";
+$a->strings["Tuesday"] = "Dimarts";
+$a->strings["Wednesday"] = "Dimecres";
+$a->strings["Thursday"] = "Dijous";
+$a->strings["Friday"] = "Divendres";
+$a->strings["Saturday"] = "Dissabte";
+$a->strings["Sunday"] = "Diumenge";
+$a->strings["January"] = "Gener";
+$a->strings["February"] = "Febrer";
+$a->strings["March"] = "Març";
+$a->strings["April"] = "Abril";
+$a->strings["May"] = "Maig";
+$a->strings["June"] = "Juny";
+$a->strings["July"] = "Juliol";
+$a->strings["August"] = "Agost";
+$a->strings["September"] = "Setembre";
+$a->strings["October"] = "Octubre";
+$a->strings["November"] = "Novembre";
+$a->strings["December"] = "Desembre";
+$a->strings["bytes"] = "bytes";
+$a->strings["Select an alternate language"] = "Sel·lecciona un idioma alternatiu";
+$a->strings["default"] = "per defecte";
+$a->strings["activity"] = "activitat";
+$a->strings["comment"] = "comentari";
+$a->strings["post"] = "missatge";
+$a->strings["Sharing notification from Diaspora network"] = "Compartint la notificació de la xarxa Diàspora";
+$a->strings["Attachments:"] = "Adjunts:";
+$a->strings["[Relayed] Comment authored by %s from network %s"] = "[Retransmès] Comentari escrit per %s  des de la xarxa %s";
+$a->strings["view full size"] = "Veure a mida completa";
+$a->strings["Embedded content"] = "Contingut incrustat";
+$a->strings["Embedding disabled"] = "Incrustacions deshabilitades";
+$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grup eliminat amb aquest nom va ser restablert. Els permisos dels elements existents <strong>poden</strong> aplicar-se a aquest grup i tots els futurs membres. Si això no és el que pretén, si us plau, crei un altre grup amb un nom diferent.";
+$a->strings["Everybody"] = "Tothom";
+$a->strings["edit"] = "editar";
+$a->strings["Groups"] = "Grups";
+$a->strings["Edit group"] = "Editar grup";
+$a->strings["Create a new group"] = "Crear un nou grup";
+$a->strings["Logout"] = "Sortir";
+$a->strings["End this session"] = "Termina sessió";
+$a->strings["Status"] = "Estatus";
+$a->strings["Your posts and conversations"] = "Els teus anuncis i converses";
+$a->strings["Your profile page"] = "La seva pàgina de perfil";
+$a->strings["Photos"] = "Fotos";
+$a->strings["Your photos"] = "Les seves fotos";
+$a->strings["Your events"] = "Els seus esdeveniments";
+$a->strings["Personal notes"] = "Notes personals";
+$a->strings["Your personal photos"] = "Les seves fotos personals";
+$a->strings["Sign in"] = "Accedeix";
+$a->strings["Home Page"] = "Pàgina d'Inici";
+$a->strings["Create an account"] = "Crear un compte";
+$a->strings["Help and documentation"] = "Ajuda i documentació";
+$a->strings["Apps"] = "Aplicacions";
+$a->strings["Addon applications, utilities, games"] = "Afegits: aplicacions, utilitats, jocs";
+$a->strings["Search site content"] = "Busca contingut en el lloc";
+$a->strings["Conversations on this site"] = "Converses en aquest lloc";
+$a->strings["Directory"] = "Directori";
+$a->strings["People directory"] = "Directori de gent";
+$a->strings["Conversations from your friends"] = "Converses dels teus amics";
+$a->strings["Friend Requests"] = "Sol·licitud d'Amistat";
+$a->strings["See all notifications"] = "Veure totes les notificacions";
+$a->strings["Mark all system notifications seen"] = "Marcar totes les notificacions del sistema com a vistes";
+$a->strings["Private mail"] = "Correu privat";
+$a->strings["Manage"] = "Gestionar";
+$a->strings["Manage other pages"] = "Gestiona altres pàgines";
+$a->strings["Profiles"] = "Perfils";
+$a->strings["Manage/edit profiles"] = "Gestiona/edita perfils";
+$a->strings["Manage/edit friends and contacts"] = "Gestiona/edita amics i contactes";
+$a->strings["Admin"] = "Admin";
+$a->strings["Site setup and configuration"] = "Ajustos i configuració del lloc";
+$a->strings["Nothing new here"] = "Res nou aquí";
+$a->strings["Add New Contact"] = "Afegir Nou Contacte";
+$a->strings["Enter address or web location"] = "Introdueixi adreça o ubicació web";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Exemple: bob@example.com, http://example.com/barbara";
+$a->strings["Invite Friends"] = "Invita Amics";
+$a->strings["%d invitation available"] = array(
+	0 => "%d invitació disponible",
+	1 => "%d invitacions disponibles",
+);
+$a->strings["Find People"] = "Trobar Gent";
+$a->strings["Enter name or interest"] = "Introdueixi nom o aficions";
+$a->strings["Connect/Follow"] = "Connectar/Seguir";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "Exemples: Robert Morgenstein, Pescar";
+$a->strings["Similar Interests"] = "Aficions Similars";
+$a->strings["Networks"] = "Xarxes";
+$a->strings["All Networks"] = "totes les Xarxes";
+$a->strings["Logged out."] = "Has sortit";
+$a->strings["Miscellaneous"] = "Miscel·lania";
+$a->strings["year"] = "any";
+$a->strings["month"] = "mes";
+$a->strings["day"] = "dia";
+$a->strings["never"] = "mai";
+$a->strings["less than a second ago"] = "Fa menys d'un segon";
+$a->strings["years"] = "anys";
+$a->strings["months"] = "mesos";
+$a->strings["week"] = "setmana";
+$a->strings["weeks"] = "setmanes";
+$a->strings["days"] = "dies";
+$a->strings["hour"] = "hora";
+$a->strings["hours"] = "hores";
+$a->strings["minute"] = "minut";
+$a->strings["minutes"] = "minuts";
+$a->strings["second"] = "segon";
+$a->strings["seconds"] = "segons";
+$a->strings["%1\$d %2\$s ago"] = " fa %1\$d %2\$s";
+$a->strings["From: "] = "Des de:";
+$a->strings["$1 wrote:"] = "$1 va escrivir:";
+$a->strings["Image/photo"] = "Imatge/foto";
+$a->strings["Cannot locate DNS info for database server '%s'"] = "No put trobar informació de DNS  del servidor de base de dades '%s'";
+$a->strings["[no subject]"] = "[Sense assumpte]";
+$a->strings["Visible to everybody"] = "Visible per tothom";
+$a->strings["show"] = "mostra";
+$a->strings["don't show"] = "no mostris";
+$a->strings["Friendica Notification"] = "Notificacions de Friendica";
+$a->strings["Thank You,"] = "Gràcies,";
+$a->strings["%s Administrator"] = "%s Administrador";
+$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
+$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica: Notifica] nou correu rebut a %s";
+$a->strings["%s sent you a new private message at %s."] = "%s t'ha enviat un nou missatge privat en %s";
+$a->strings["%s sent you %s."] = "%s t'ha enviat %s.";
+$a->strings["a private message"] = "un missatge privat";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "Per favor, visiteu %s per a veure i/o respondre els teus missatges privats.";
+$a->strings["%s's"] = "%s's";
+$a->strings["your"] = "tu";
+$a->strings["[Friendica:Notify] Comment to conversation #%d by %s"] = "[Friendica:Notifica] Conversació comentada #%d per %s";
+$a->strings["%s commented on an item/conversation you have been following."] = "%s ha comentat un element/conversació que estas seguint.";
+$a->strings["%s commented on %s."] = "%s comentat a %s.";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "Si us pau, visiteu %s per a veure i/o respondre la conversació.";
+$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Notifica] %s enviat al teu mur del perfil";
+$a->strings["%s posted to your profile wall at %s"] = "%s enviat al teu mur de perfil %s";
+$a->strings["%s posted to %s"] = "%s enviat a %s";
+$a->strings["your profile wall."] = "El teu perfil del mur.";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notifica] %s t'ha etiquetat";
+$a->strings["%s tagged you at %s"] = "%s t'ha etiquetat en %s";
+$a->strings["%s %s."] = "%s %s.";
+$a->strings["tagged you"] = "Etiquetat";
+$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica:Notifica] %s ha etiquetat el teu missatge";
+$a->strings["%s tagged your post at %s"] = "%s Ha etiquetat un missatge teu en %s";
+$a->strings["%s tagged %s"] = "%s etiquetat %s";
+$a->strings["your post"] = "El teu missatge";
+$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica:Notifica] Presentacio rebuda";
+$a->strings["You've received an introduction from '%s' at %s"] = "Has rebut una presentació de %s en %s";
+$a->strings["You've received %s from %s."] = "Has rebut %s de %s";
+$a->strings["an introduction"] = "Una presentació";
+$a->strings["You may visit their profile at %s"] = "Pot visitar el seu perfil en %s";
+$a->strings["Please visit %s to approve or reject the introduction."] = "Si us plau visiteu %s per aprovar o rebutjar la presentació.";
+$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica:Notifica] Suggerencia d'amistat rebuda";
+$a->strings["You've received a friend suggestion from '%s' at %s"] = "Has rebut una suggerencia d'amistat de %s en %s";
+$a->strings["You've received %s for %s from %s."] = "Has rebut %s per %s de %s.";
+$a->strings["a friend suggestion"] = "Un suggerencia d'amistat";
+$a->strings["Name:"] = "Nom:";
+$a->strings["Photo:"] = "Foto:";
+$a->strings["Please visit %s to approve or reject the suggestion."] = "Si us plau, visiteu %s per aprovar o rebutjar la suggerencia.";
+$a->strings["A new person is sharing with you at "] = "Una persona nova està compartint amb tú en";
+$a->strings["You have a new follower at "] = "Tens un nou seguidor a ";
+$a->strings["image/photo"] = "Imatge/foto";
+$a->strings["Welcome "] = "Benvingut";
+$a->strings["Please upload a profile photo."] = "Per favor, carrega una foto per al perfil";
+$a->strings["Welcome back "] = "Benvingut de nou ";
+$a->strings["View status"] = "Veure estatus";
+$a->strings["View profile"] = "Veure perfil";
+$a->strings["View photos"] = "Veure fotos";
+$a->strings["View recent"] = "Veure recent";
+$a->strings["Send PM"] = "Enviar Missatge Privat";
+$a->strings["post/item"] = "anunci/element";
+$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s marcat %2\$s's %3\$s com favorit";
+$a->strings["Select"] = "Selecionar";
+$a->strings["View %s's profile @ %s"] = "Veure perfil de %s @ %s";
+$a->strings["%s from %s"] = "%s des de %s";
+$a->strings["View in context"] = "Veure en context";
+$a->strings["%d comment"] = array(
+	0 => "%d comentari",
+	1 => "%d comentaris",
+);
+$a->strings["show more"] = "Mostrar més";
+$a->strings["like"] = "Agrada";
+$a->strings["dislike"] = "Desagrada";
+$a->strings["Share this"] = "Compartir això";
+$a->strings["share"] = "Compartir";
+$a->strings["add star"] = "Afegir a favorits";
+$a->strings["remove star"] = "Esborrar favorit";
+$a->strings["toggle star status"] = "Canviar estatus de favorit";
+$a->strings["starred"] = "favorit";
+$a->strings["add tag"] = "afegir etiqueta";
+$a->strings["to"] = "a";
+$a->strings["Wall-to-Wall"] = "Mur-a-Mur";
+$a->strings["via Wall-To-Wall:"] = "via Mur-a-Mur";
+$a->strings["Delete Selected Items"] = "Esborra els Elements Seleccionats";
+$a->strings["%s likes this."] = "a %s agrada això.";
+$a->strings["%s doesn't like this."] = "a %s desagrada això.";
+$a->strings["<span  %1\$s>%2\$d people</span> like this."] = "Li agrada a<span  %1\$s>%2\$d persones</span> .";
+$a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = "No li agrada<span  %1\$s>%2\$d persones</span> .";
+$a->strings["and"] = "i";
+$a->strings[", and %d other people"] = ", i altres %d persones";
+$a->strings["%s like this."] = "a %s le gusta esto.";
+$a->strings["%s don't like this."] = "a %s no le gusta esto.";
+$a->strings["Visible to <strong>everybody</strong>"] = "Visible per a <strong>tothom</strong>";
+$a->strings["Please enter a video link/URL:"] = "Per favor , introdueixi el enllaç/URL del video";
+$a->strings["Please enter an audio link/URL:"] = "Per favor , introdueixi el enllaç/URL del audio:";
+$a->strings["Tag term:"] = "Terminis de l'etiqueta:";
+$a->strings["Where are you right now?"] = "On ets ara?";
+$a->strings["Enter a title for this item"] = "Escriviu un títol per a aquest article";
+$a->strings["upload photo"] = "carregar fotos";
+$a->strings["attach file"] = "adjuntar arxiu";
+$a->strings["web link"] = "enllaç de web";
+$a->strings["Insert video link"] = "Insertar enllaç de video";
+$a->strings["video link"] = "enllaç de video";
+$a->strings["Insert audio link"] = "Insertar enllaç de audio";
+$a->strings["audio link"] = "enllaç de audio";
+$a->strings["set location"] = "establir la ubicació";
+$a->strings["clear location"] = "netejar ubicació";
+$a->strings["permissions"] = "Permissos";
+$a->strings["Delete this item?"] = "Esborrar aquest element?";
+$a->strings["show fewer"] = "Mostrar menys";
+$a->strings["Create a New Account"] = "Crear un Nou Compte";
+$a->strings["Nickname or Email address: "] = "Malnom o Adreça de correu:";
+$a->strings["Password: "] = "Contrasenya:";
+$a->strings["Or login using OpenID: "] = "O accedixi emprant OpenID:";
+$a->strings["Forgot your password?"] = "Oblidà la contrasenya?";
+$a->strings["Edit profile"] = "Editar perfil";
+$a->strings["g A l F d"] = "g A l F d";
+$a->strings["F d"] = "F d";
+$a->strings["Birthday Reminders"] = "Recordatori d'Aniversaris";
+$a->strings["Birthdays this week:"] = "Aniversari aquesta setmana";
+$a->strings["[today]"] = "[avui]";
+$a->strings["Event Reminders"] = "Recordatori d'Esdeveniments";
+$a->strings["Events this week:"] = "Esdeveniments aquesta setmana";
+$a->strings["[No description]"] = "[sense descripció]";
diff --git a/view/ca/wall_received_eml.tpl b/view/ca/wall_received_eml.tpl
new file mode 100644
index 000000000..0b5c150fd
--- /dev/null
+++ b/view/ca/wall_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Apreciat/da $username,
+
+	'$from' ha escrit quelcom en el mur del teu perfil.
+
+-----
+$body
+-----
+
+Accedeix a  $siteurl per a veure o esborrar l'element:
+
+$display
+
+
+	$sitename
+
+ 
+
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_block.tpl b/view/contact_block.tpl
index eb46c6c43..df5614398 100755..100644
--- a/view/contact_block.tpl
+++ b/view/contact_block.tpl
@@ -1,7 +1,7 @@
 <div id="contact-block">
 <h4 class="contact-block-h4">$contacts</h4>
 {{ if $micropro }}
-		<a class="allcontact-link" href="viewcontacts/$nickname">$viewcontacts</a>
+		<a class="allcontact-link" href="contacts/$nickname">$viewcontacts</a>
 		<div class='contact-block-content'>
 		{{ for $micropro as $m }}
 			$m
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 c9c0f84de..b484d15bf 100755..100644
--- a/view/cropbody.tpl
+++ b/view/cropbody.tpl
@@ -40,6 +40,7 @@ $desc
 </script>
 
 <form action="profile_photo/$resource" id="crop-image-form" method="post" />
+<input type='hidden' name='form_security_token' value='$form_security_token'>
 
 <input type="hidden" name="cropfinal" value="1" />
 <input type="hidden" name="xstart" id="x1" />
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/messages.po b/view/de/messages.po
index 33adc8c76..1036e7b75 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-02-24 22:44-0800\n"
-"PO-Revision-Date: 2012-02-28 20:51+0000\n"
-"Last-Translator: greeneyedred <greeneyedred@googlemail.com>\n"
+"POT-Creation-Date: 2012-04-05 10:00-0700\n"
+"PO-Revision-Date: 2012-04-06 10:40+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,23 +45,26 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
 
 #: ../../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:404
-#: ../../mod/settings.php:409 ../../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:130 ../../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:2968 ../../index.php:288
+#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:456
+#: ../../include/items.php:3118 ../../index.php:294
 msgid "Permission denied."
 msgstr "Zugriff verweigert."
 
@@ -90,8 +93,8 @@ msgstr "Bitte nutze den Zurück-Button deines Browsers <strong>jetzt</strong>, w
 msgid "Return to contact editor"
 msgstr "Zurück zum Kontakteditor"
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:455
-#: ../../mod/settings.php:481 ../../mod/admin.php:480 ../../mod/admin.php:489
+#: ../../mod/crepair.php:148 ../../mod/settings.php:531
+#: ../../mod/settings.php:558 ../../mod/admin.php:528 ../../mod/admin.php:537
 msgid "Name"
 msgstr "Name"
 
@@ -128,37 +131,38 @@ msgid "New photo from this URL"
 msgstr "Neues Foto von dieser URL"
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:400 ../../mod/photos.php:900 ../../mod/photos.php:958
-#: ../../mod/photos.php:1182 ../../mod/photos.php:1222
-#: ../../mod/photos.php:1262 ../../mod/photos.php:1293
+#: ../../mod/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:453 ../../mod/settings.php:592
-#: ../../mod/settings.php:786 ../../mod/manage.php:109 ../../mod/group.php:84
-#: ../../mod/group.php:167 ../../mod/admin.php:312 ../../mod/admin.php:477
-#: ../../mod/admin.php:603 ../../mod/admin.php:769 ../../mod/admin.php:847
-#: ../../mod/profiles.php:375 ../../mod/invite.php:106
-#: ../../addon/facebook/facebook.php:411 ../../addon/yourls/yourls.php:76
-#: ../../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/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:60
+#: ../../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/numfriends/numfriends.php:85 ../../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/posterous/posterous.php:90
-#: ../../include/conversation.php:542
+#: ../../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:180
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:369
+#: ../../addon/posterous/posterous.php:90
+#: ../../view/theme/quattro/config.php:21 ../../include/conversation.php:555
 msgid "Submit"
 msgstr "Senden"
 
@@ -166,15 +170,15 @@ msgstr "Senden"
 msgid "Help:"
 msgstr "Hilfe:"
 
-#: ../../mod/help.php:34 ../../include/nav.php:82
+#: ../../mod/help.php:34 ../../include/nav.php:86
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../../mod/help.php:38 ../../index.php:221
+#: ../../mod/help.php:38 ../../index.php:225
 msgid "Not Found"
 msgstr "Nicht gefunden"
 
-#: ../../mod/help.php:41 ../../index.php:224
+#: ../../mod/help.php:41 ../../index.php:228
 msgid "Page not found."
 msgstr "Seite nicht gefunden."
 
@@ -212,11 +216,15 @@ msgstr "l, F j"
 msgid "Edit event"
 msgstr "Veranstaltung bearbeiten"
 
-#: ../../mod/events.php:272 ../../include/text.php:964
+#: ../../mod/events.php:272 ../../include/text.php:1050
 msgid "link to source"
 msgstr "Link zum Originalbeitrag"
 
-#: ../../mod/events.php:296 ../../include/nav.php:50 ../../boot.php:1349
+#: ../../mod/events.php:296 ../../view/theme/diabook-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 "Veranstaltungen"
 
@@ -266,7 +274,7 @@ msgid "Description:"
 msgstr "Beschreibung"
 
 #: ../../mod/events.php:395 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:290 ../../boot.php:980
+#: ../../include/bb2diaspora.php:260 ../../boot.php:1042
 msgid "Location:"
 msgstr "Ort:"
 
@@ -275,8 +283,8 @@ msgid "Share this event"
 msgstr "Veranstaltung teilen"
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:686 ../../mod/settings.php:454
-#: ../../mod/settings.php:480 ../../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 "Abbrechen"
 
@@ -296,7 +304,7 @@ msgstr "Wähle ein Tag zum Entfernen aus: "
 msgid "Remove"
 msgstr "Entfernen"
 
-#: ../../mod/dfrn_poll.php:91 ../../mod/dfrn_poll.php:517
+#: ../../mod/dfrn_poll.php:94 ../../mod/dfrn_poll.php:520
 #, php-format
 msgid "%s welcomes %s"
 msgstr "%s heißt %s herzlich willkommen"
@@ -319,246 +327,258 @@ msgid ""
 " and/or create new posts for you?"
 msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in deinem Namen gestatten?"
 
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:676
-#: ../../mod/settings.php:681 ../../mod/settings.php:687
-#: ../../mod/settings.php:695 ../../mod/settings.php:699
-#: ../../mod/settings.php:704 ../../mod/settings.php:710
-#: ../../mod/settings.php:716 ../../mod/settings.php:776
-#: ../../mod/settings.php:777 ../../mod/settings.php:778
-#: ../../mod/settings.php:779 ../../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 "Ja"
 
-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:677
-#: ../../mod/settings.php:681 ../../mod/settings.php:687
-#: ../../mod/settings.php:695 ../../mod/settings.php:699
-#: ../../mod/settings.php:704 ../../mod/settings.php:710
-#: ../../mod/settings.php:716 ../../mod/settings.php:776
-#: ../../mod/settings.php:777 ../../mod/settings.php:778
-#: ../../mod/settings.php:779 ../../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 "Nein"
 
-#: ../../mod/photos.php:42
+#: ../../mod/photos.php:43
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
-#: ../../mod/photos.php:50 ../../mod/photos.php:150 ../../mod/photos.php:879
-#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1371
-#: ../../mod/photos.php:1383 ../../addon/communityhome/communityhome.php:110
+#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php: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 "Kontaktbilder"
 
-#: ../../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 "Weitere Fotos hochladen"
 
-#: ../../mod/photos.php:68 ../../mod/settings.php:11
+#: ../../mod/photos.php:69 ../../mod/settings.php:24
 msgid "everybody"
 msgstr "jeder"
 
-#: ../../mod/photos.php:139
+#: ../../mod/photos.php:140
 msgid "Contact information unavailable"
 msgstr "Kontaktinformationen nicht verfügbar"
 
-#: ../../mod/photos.php:150 ../../mod/photos.php:597 ../../mod/photos.php:950
-#: ../../mod/photos.php:965 ../../mod/register.php:327
-#: ../../mod/register.php:334 ../../mod/register.php:341
-#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
-#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:170
-#: ../../mod/profile_photo.php:246 ../../mod/profile_photo.php:255
+#: ../../mod/photos.php:151 ../../mod/photos.php: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 "Profilbilder"
 
-#: ../../mod/photos.php:160
+#: ../../mod/photos.php:161
 msgid "Album not found."
 msgstr "Album nicht gefunden."
 
-#: ../../mod/photos.php:178 ../../mod/photos.php:959
+#: ../../mod/photos.php:179 ../../mod/photos.php:960
 msgid "Delete Album"
 msgstr "Album löschen"
 
-#: ../../mod/photos.php:241 ../../mod/photos.php:1183
+#: ../../mod/photos.php:242 ../../mod/photos.php:1195
 msgid "Delete Photo"
 msgstr "Foto löschen"
 
-#: ../../mod/photos.php:528
+#: ../../mod/photos.php:529
 msgid "was tagged in a"
 msgstr "wurde getaggt in einem"
 
-#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
+#: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70
 #: ../../addon/communityhome/communityhome.php:163
-#: ../../include/diaspora.php:1600 ../../include/conversation.php:53
+#: ../../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:1654 ../../include/conversation.php:53
 #: ../../include/conversation.php:126
 msgid "photo"
 msgstr "Foto"
 
-#: ../../mod/photos.php:528
+#: ../../mod/photos.php:529
 msgid "by"
 msgstr "von"
 
-#: ../../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 "Die Bildgröße übersteigt das Limit von "
 
-#: ../../mod/photos.php:639
+#: ../../mod/photos.php:640
 msgid "Image file is empty."
 msgstr "Bilddatei ist leer."
 
-#: ../../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 "Konnte das Bild nicht bearbeiten."
 
-#: ../../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 "Hochladen des Bildes gescheitert."
 
-#: ../../mod/photos.php:759 ../../mod/community.php:16
-#: ../../mod/dfrn_request.php:625 ../../mod/viewcontacts.php:17
-#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:33
+#: ../../mod/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 "Öffentlicher Zugriff verweigert."
 
-#: ../../mod/photos.php:769
+#: ../../mod/photos.php:770
 msgid "No photos selected"
 msgstr "Keine Bilder ausgewählt"
 
-#: ../../mod/photos.php:846
+#: ../../mod/photos.php:847
 msgid "Access to this item is restricted."
 msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt."
 
-#: ../../mod/photos.php:907
+#: ../../mod/photos.php:908
 msgid "Upload Photos"
 msgstr "Bilder hochladen"
 
-#: ../../mod/photos.php:910 ../../mod/photos.php:954
+#: ../../mod/photos.php:911 ../../mod/photos.php:955
 msgid "New album name: "
 msgstr "Name des neuen Albums: "
 
-#: ../../mod/photos.php:911
+#: ../../mod/photos.php:912
 msgid "or existing album name: "
 msgstr "oder existierender Albumname: "
 
-#: ../../mod/photos.php:912
+#: ../../mod/photos.php:913
 msgid "Do not show a status post for this upload"
 msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen"
 
-#: ../../mod/photos.php:914 ../../mod/photos.php:1178
+#: ../../mod/photos.php:915 ../../mod/photos.php:1190
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: ../../mod/photos.php:969
+#: ../../mod/photos.php:970
 msgid "Edit Album"
 msgstr "Album bearbeiten"
 
-#: ../../mod/photos.php:984 ../../mod/photos.php:1396
+#: ../../mod/photos.php:985 ../../mod/photos.php:1408
 msgid "View Photo"
 msgstr "Fotos betrachten"
 
-#: ../../mod/photos.php:1019
+#: ../../mod/photos.php:1020
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein."
 
-#: ../../mod/photos.php:1021
+#: ../../mod/photos.php:1022
 msgid "Photo not available"
 msgstr "Foto nicht verfügbar"
 
-#: ../../mod/photos.php:1071
+#: ../../mod/photos.php:1072
 msgid "View photo"
 msgstr "Fotos ansehen"
 
-#: ../../mod/photos.php:1071
+#: ../../mod/photos.php:1072
 msgid "Edit photo"
 msgstr "Foto bearbeiten"
 
-#: ../../mod/photos.php:1072
+#: ../../mod/photos.php:1073
 msgid "Use as profile photo"
 msgstr "Als Profilbild verwenden"
 
-#: ../../mod/photos.php:1078 ../../include/conversation.php:472
+#: ../../mod/photos.php:1079 ../../include/conversation.php:480
 msgid "Private Message"
 msgstr "Private Nachricht"
 
-#: ../../mod/photos.php:1089
+#: ../../mod/photos.php:1101
 msgid "View Full Size"
 msgstr "Betrachte Originalgröße"
 
-#: ../../mod/photos.php:1157
+#: ../../mod/photos.php:1169
 msgid "Tags: "
 msgstr "Tags: "
 
-#: ../../mod/photos.php:1160
+#: ../../mod/photos.php:1172
 msgid "[Remove any tag]"
 msgstr "[Tag entfernen]"
 
-#: ../../mod/photos.php:1171
+#: ../../mod/photos.php:1183
 msgid "New album name"
 msgstr "Name des neuen Albums"
 
-#: ../../mod/photos.php:1174
+#: ../../mod/photos.php:1186
 msgid "Caption"
 msgstr "Bildunterschrift"
 
-#: ../../mod/photos.php:1176
+#: ../../mod/photos.php:1188
 msgid "Add a Tag"
 msgstr "Tag hinzufügen"
 
-#: ../../mod/photos.php:1180
+#: ../../mod/photos.php:1192
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: ../../mod/photos.php:1200 ../../include/conversation.php:519
+#: ../../mod/photos.php:1212 ../../include/conversation.php:529
 msgid "I like this (toggle)"
 msgstr "Ich mag das (toggle)"
 
-#: ../../mod/photos.php:1201 ../../include/conversation.php:520
+#: ../../mod/photos.php:1213 ../../include/conversation.php:530
 msgid "I don't like this (toggle)"
 msgstr "Ich mag das nicht (toggle)"
 
-#: ../../mod/photos.php:1202 ../../include/conversation.php:914
+#: ../../mod/photos.php:1214 ../../include/conversation.php:960
 msgid "Share"
 msgstr "Teilen"
 
-#: ../../mod/photos.php:1203 ../../mod/editpost.php:104
-#: ../../mod/message.php:155 ../../mod/message.php:296
-#: ../../include/conversation.php:343 ../../include/conversation.php:677
-#: ../../include/conversation.php:931
+#: ../../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 "Bitte warten"
 
-#: ../../mod/photos.php:1219 ../../mod/photos.php:1259
-#: ../../mod/photos.php:1290 ../../include/conversation.php:539
+#: ../../mod/photos.php:1231 ../../mod/photos.php:1271
+#: ../../mod/photos.php:1302 ../../include/conversation.php:552
 msgid "This is you"
 msgstr "Das bist du"
 
-#: ../../mod/photos.php:1221 ../../mod/photos.php:1261
-#: ../../mod/photos.php:1292 ../../include/conversation.php:541
-#: ../../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 "Kommentar"
 
-#: ../../mod/photos.php:1223 ../../mod/editpost.php:123
-#: ../../include/conversation.php:543 ../../include/conversation.php:949
+#: ../../mod/photos.php:1235 ../../mod/editpost.php:125
+#: ../../include/conversation.php:556 ../../include/conversation.php:997
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../../mod/photos.php:1320 ../../mod/settings.php:513
-#: ../../mod/group.php:154 ../../mod/admin.php:484
-#: ../../include/conversation.php:302 ../../include/conversation.php:563
+#: ../../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 "Löschen"
 
-#: ../../mod/photos.php:1402
+#: ../../mod/photos.php:1414
 msgid "View Album"
 msgstr "Album betrachten"
 
-#: ../../mod/photos.php:1411
+#: ../../mod/photos.php:1423
 msgid "Recent Photos"
 msgstr "Neueste Fotos"
 
@@ -566,43 +586,47 @@ msgstr "Neueste Fotos"
 msgid "Not available."
 msgstr "Nicht verfügbar."
 
-#: ../../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 "Gemeinschaft"
 
-#: ../../mod/community.php:60 ../../mod/search.php:118
+#: ../../mod/community.php:61 ../../mod/search.php:115
 msgid "No results."
 msgstr "Keine Ergebnisse."
 
-#: ../../mod/friendica.php:43
+#: ../../mod/friendica.php:47
 msgid "This is Friendica, version"
 msgstr "Dies ist Friendica, Version"
 
-#: ../../mod/friendica.php:44
+#: ../../mod/friendica.php:48
 msgid "running at web location"
 msgstr "die unter folgender Webadresse zu finden ist"
 
-#: ../../mod/friendica.php:46
+#: ../../mod/friendica.php:50
 msgid ""
 "Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
 "more about the Friendica project."
 msgstr "Bitte besuche <a href=\"http://friendica.com\">Friendica.com</a> um mehr über das Friendica Projekt zu erfahren."
 
-#: ../../mod/friendica.php:48
+#: ../../mod/friendica.php:52
 msgid "Bug reports and issues: please visit"
 msgstr "Probleme oder Fehler gefunden? Bitte besuche"
 
-#: ../../mod/friendica.php:49
+#: ../../mod/friendica.php:53
 msgid ""
 "Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
 "dot com"
 msgstr "Vorschläge, Lob, Spenden usw.: E-Mail an \"Info\" at Friendica - dot com"
 
-#: ../../mod/friendica.php:54
-msgid "Installed plugins/addons/apps"
+#: ../../mod/friendica.php:58
+msgid "Installed plugins/addons/apps:"
 msgstr "Installierte Plugins/Erweiterungen/Apps"
 
-#: ../../mod/friendica.php:62
+#: ../../mod/friendica.php:71
 msgid "No installed plugins/addons/apps"
 msgstr "Keine Plugins/Erweiterungen/Apps installiert"
 
@@ -614,28 +638,30 @@ msgstr "Beitrag nicht gefunden"
 msgid "Edit post"
 msgstr "Beitrag bearbeiten"
 
-#: ../../mod/editpost.php:80 ../../include/conversation.php:900
+#: ../../mod/editpost.php:80 ../../include/conversation.php:946
 msgid "Post to Email"
 msgstr "An E-Mail senden"
 
-#: ../../mod/editpost.php:95 ../../mod/settings.php:512
-#: ../../include/conversation.php:550
+#: ../../mod/editpost.php:95 ../../mod/settings.php:592
+#: ../../include/conversation.php:563
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../../mod/editpost.php:96 ../../mod/message.php:153
-#: ../../mod/message.php:294 ../../include/conversation.php:915
+#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
+#: ../../mod/message.php:187 ../../mod/message.php:356
+#: ../../include/conversation.php:961
 msgid "Upload photo"
 msgstr "Foto hochladen"
 
-#: ../../mod/editpost.php:97 ../../include/conversation.php:917
+#: ../../mod/editpost.php:97 ../../include/conversation.php:963
 msgid "Attach file"
 msgstr "Datei anhängen"
 
-#: ../../mod/editpost.php:98 ../../mod/message.php:154
-#: ../../mod/message.php:295 ../../include/conversation.php:919
+#: ../../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 "Weblink einfügen"
+msgstr "eine Kontaktanfrage"
 
 #: ../../mod/editpost.php:99
 msgid "Insert YouTube video"
@@ -649,201 +675,212 @@ msgstr "Vorbis [.ogg] Video einfügen"
 msgid "Insert Vorbis [.ogg] audio"
 msgstr "Vorbis [.ogg] Audio einfügen"
 
-#: ../../mod/editpost.php:102 ../../include/conversation.php:925
+#: ../../mod/editpost.php:102 ../../include/conversation.php:971
 msgid "Set your location"
 msgstr "Deinen Standort festlegen"
 
-#: ../../mod/editpost.php:103 ../../include/conversation.php:927
+#: ../../mod/editpost.php:103 ../../include/conversation.php:973
 msgid "Clear browser location"
 msgstr "Browser-Standort leeren"
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:932
+#: ../../mod/editpost.php:105 ../../include/conversation.php:980
 msgid "Permission settings"
 msgstr "Berechtigungseinstellungen"
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:941
+#: ../../mod/editpost.php:113 ../../include/conversation.php:989
 msgid "CC: email addresses"
 msgstr "Cc:-E-Mail-Addressen"
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:942
+#: ../../mod/editpost.php:114 ../../include/conversation.php:990
 msgid "Public post"
 msgstr "Öffentlicher Beitrag"
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:930
+#: ../../mod/editpost.php:117 ../../include/conversation.php:976
 msgid "Set title"
 msgstr "Titel setzen"
 
-#: ../../mod/editpost.php:118 ../../include/conversation.php:944
+#: ../../mod/editpost.php:119 ../../include/conversation.php:978
+msgid "Categories (comma-separated list)"
+msgstr "Kategorien (mit Komma separierte Liste)"
+
+#: ../../mod/editpost.php:120 ../../include/conversation.php:992
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Z.B.: bob@example.com, mary@example.com"
 
-#: ../../mod/dfrn_request.php:92
+#: ../../mod/dfrn_request.php:93
 msgid "This introduction has already been accepted."
 msgstr "Diese Kontaktanfrage wurde bereits akzeptiert."
 
-#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:381
+#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:382
 msgid "Profile location is not valid or does not contain profile information."
 msgstr "Profiladresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung."
 
-#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:386
+#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:387
 msgid "Warning: profile location has no identifiable owner name."
 msgstr "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden."
 
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:388
+#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:389
 msgid "Warning: profile location has no profile photo."
 msgstr "Warnung: Es konnte kein Profilbild bei der angegebenen Profiladresse gefunden werden."
 
-#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:391
+#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php: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] "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden"
 msgstr[1] "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden"
 
-#: ../../mod/dfrn_request.php:167
+#: ../../mod/dfrn_request.php:168
 msgid "Introduction complete."
 msgstr "Kontaktanfrage abgeschlossen."
 
-#: ../../mod/dfrn_request.php:191
+#: ../../mod/dfrn_request.php:192
 msgid "Unrecoverable protocol error."
 msgstr "Nicht behebbarer Protokollfehler."
 
-#: ../../mod/dfrn_request.php:219
+#: ../../mod/dfrn_request.php:220
 msgid "Profile unavailable."
 msgstr "Profil nicht verfügbar."
 
-#: ../../mod/dfrn_request.php:244
+#: ../../mod/dfrn_request.php:245
 #, php-format
 msgid "%s has received too many connection requests today."
 msgstr "%s hat heute zu viele Freundschaftsanfragen erhalten."
 
-#: ../../mod/dfrn_request.php:245
+#: ../../mod/dfrn_request.php:246
 msgid "Spam protection measures have been invoked."
 msgstr "Maßnahmen zum Spamschutz wurden ergriffen."
 
-#: ../../mod/dfrn_request.php:246
+#: ../../mod/dfrn_request.php:247
 msgid "Friends are advised to please try again in 24 hours."
 msgstr "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen."
 
-#: ../../mod/dfrn_request.php:306
+#: ../../mod/dfrn_request.php:307
 msgid "Invalid locator"
 msgstr "Ungültiger Locator"
 
-#: ../../mod/dfrn_request.php:326
+#: ../../mod/dfrn_request.php:327
 msgid "Unable to resolve your name at the provided location."
 msgstr "Konnte deinen Namen an der angegebenen Stelle nicht finden."
 
-#: ../../mod/dfrn_request.php:339
+#: ../../mod/dfrn_request.php:340
 msgid "You have already introduced yourself here."
 msgstr "Du hast dich hier bereits vorgestellt."
 
-#: ../../mod/dfrn_request.php:343
+#: ../../mod/dfrn_request.php:344
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr "Es scheint so, als ob du bereits mit %s befreundet bist."
 
-#: ../../mod/dfrn_request.php:364
+#: ../../mod/dfrn_request.php:365
 msgid "Invalid profile URL."
 msgstr "Ungültige Profil-URL."
 
-#: ../../mod/dfrn_request.php:370 ../../mod/follow.php:20
+#: ../../mod/dfrn_request.php:371 ../../mod/follow.php:20
 msgid "Disallowed profile URL."
 msgstr "Nicht erlaubte Profil-URL."
 
-#: ../../mod/dfrn_request.php:439 ../../mod/contacts.php:102
+#: ../../mod/dfrn_request.php:440 ../../mod/contacts.php:102
 msgid "Failed to update contact record."
 msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen."
 
-#: ../../mod/dfrn_request.php:460
+#: ../../mod/dfrn_request.php:461
 msgid "Your introduction has been sent."
 msgstr "Deine Kontaktanfrage wurde gesendet."
 
-#: ../../mod/dfrn_request.php:513
+#: ../../mod/dfrn_request.php:514
 msgid "Please login to confirm introduction."
 msgstr "Bitte melde dich an, um die Kontaktanfrage zu bestätigen."
 
-#: ../../mod/dfrn_request.php:527
+#: ../../mod/dfrn_request.php:528
 msgid ""
 "Incorrect identity currently logged in. Please login to "
 "<strong>this</strong> profile."
 msgstr "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an."
 
-#: ../../mod/dfrn_request.php:539
+#: ../../mod/dfrn_request.php:540
 #, php-format
 msgid "Welcome home %s."
 msgstr "Willkommen zurück %s."
 
-#: ../../mod/dfrn_request.php:540
+#: ../../mod/dfrn_request.php:541
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr "Bitte bestätige deine Kontaktanfrage bei %s."
 
-#: ../../mod/dfrn_request.php:541
+#: ../../mod/dfrn_request.php:542
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: ../../mod/dfrn_request.php:582 ../../include/items.php:2504
+#: ../../mod/dfrn_request.php:583 ../../include/items.php:2649
 msgid "[Name Withheld]"
 msgstr "[Name unterdrückt]"
 
-#: ../../mod/dfrn_request.php:666
-#, php-format
-msgid ""
-"Diaspora members: Please do not use this form. Instead, enter \"%s\" into "
-"your Diaspora search bar."
-msgstr "Diaspora-User: Bitte nicht dieses Formular benutzen! Gebt statt dessen \"%s\" in der Diaspora-Suchleiste ein."
-
-#: ../../mod/dfrn_request.php:669
+#: ../../mod/dfrn_request.php:670
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
-"social networks:"
+"communications networks:"
 msgstr "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:"
 
-#: ../../mod/dfrn_request.php:672
+#: ../../mod/dfrn_request.php:686
+msgid "<strike>Connect as an email follower</strike> (Coming soon)"
+msgstr "<strike>Als E-Mail-Kontakt verbinden</strike> (In Kürze verfügbar)"
+
+#: ../../mod/dfrn_request.php:688
+msgid ""
+"If you are not yet a member of the free social web, <a "
+"href=\"http://dir.friendica.com/siteinfo\">follow this link to find a public"
+" Friendica site and join us today</a>."
+msgstr "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"http://dir.friendica.com/siteinfo\">folge diesem Link</a> um einen öffentlichen Friendica-Server zu finden und beizutreten."
+
+#: ../../mod/dfrn_request.php:691
 msgid "Friend/Connection Request"
 msgstr "Freundschafts-/Kontaktanfrage"
 
-#: ../../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 "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"
 
-#: ../../mod/dfrn_request.php:674
+#: ../../mod/dfrn_request.php:693
 msgid "Please answer the following:"
 msgstr "Bitte beantworte Folgendes:"
 
-#: ../../mod/dfrn_request.php:675
+#: ../../mod/dfrn_request.php:694
 #, php-format
 msgid "Does %s know you?"
 msgstr "Kennt %s dich?"
 
-#: ../../mod/dfrn_request.php:678
+#: ../../mod/dfrn_request.php:697
 msgid "Add a personal note:"
 msgstr "Eine persönliche Notiz beifügen:"
 
-#: ../../mod/dfrn_request.php:680 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:699 ../../include/contact_selectors.php:76
 msgid "Friendica"
 msgstr "Friendica"
 
-#: ../../mod/dfrn_request.php:681
+#: ../../mod/dfrn_request.php:700
 msgid "StatusNet/Federated Social Web"
 msgstr "StatusNet/Federated Social Web"
 
-#: ../../mod/dfrn_request.php:682 ../../mod/settings.php:548
+#: ../../mod/dfrn_request.php:701 ../../mod/settings.php:629
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr "Diaspora"
 
-#: ../../mod/dfrn_request.php:683
-msgid "- please share from your own site as noted above"
-msgstr "- bitte fange von Deiner eigenen Seite aus zu teilen an"
+#: ../../mod/dfrn_request.php:702
+#, php-format
+msgid ""
+" - please do not use this form.  Instead, enter %s into your Diaspora search"
+" bar."
+msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in deiner Diaspora Suchleiste."
 
-#: ../../mod/dfrn_request.php:684
+#: ../../mod/dfrn_request.php:703
 msgid "Your Identity Address:"
 msgstr "Adresse deines Profils:"
 
-#: ../../mod/dfrn_request.php:685
+#: ../../mod/dfrn_request.php:706
 msgid "Submit Request"
 msgstr "Anfrage abschicken"
 
@@ -984,8 +1021,8 @@ msgid "This is required for message delivery to work."
 msgstr "Dies wird für die Auslieferung von Nachrichten benötigt."
 
 #: ../../mod/install.php:343
-msgid "PHP \"register_argc_argv\""
-msgstr "PHP \"register_argc_argv\""
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
 
 #: ../../mod/install.php:364
 msgid ""
@@ -1093,7 +1130,7 @@ msgid "Errors encountered creating database tables."
 msgstr "Fehler aufgetreten während der Erzeugung der Datenbanktabellen."
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:268
+#: ../../include/bb2diaspora.php:238
 msgid "l F d, Y \\@ g:i A"
 msgstr "l F d, Y \\@ g:i A"
 
@@ -1139,7 +1176,7 @@ msgid "is interested in:"
 msgstr "ist interessiert an:"
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:930
+#: ../../include/contact_widgets.php:9 ../../boot.php:986
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -1164,184 +1201,187 @@ msgstr "Willkommen zu %s"
 msgid "Invalid request identifier."
 msgstr "Invalid request identifier."
 
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:157
-#: ../../mod/notifications.php:203
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:161
+#: ../../mod/notifications.php:207
 msgid "Discard"
 msgstr "Verwerfen"
 
-#: ../../mod/notifications.php:47 ../../mod/notifications.php:156
-#: ../../mod/notifications.php:202 ../../mod/contacts.php:302
+#: ../../mod/notifications.php:51 ../../mod/notifications.php:160
+#: ../../mod/notifications.php:206 ../../mod/contacts.php:302
 #: ../../mod/contacts.php:345
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../../mod/notifications.php:71
+#: ../../mod/notifications.php:75
 msgid "System"
 msgstr "System"
 
-#: ../../mod/notifications.php:76 ../../include/nav.php:109
+#: ../../mod/notifications.php:80 ../../include/nav.php:113
 msgid "Network"
 msgstr "Netzwerk"
 
-#: ../../mod/notifications.php:81 ../../mod/network.php:177
+#: ../../mod/notifications.php:85 ../../mod/network.php:182
 msgid "Personal"
 msgstr "Persönlich"
 
-#: ../../mod/notifications.php:86 ../../include/nav.php:73
-#: ../../include/nav.php:111
+#: ../../mod/notifications.php:90 ../../view/theme/diabook-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 "Pinnwand"
 
-#: ../../mod/notifications.php:91 ../../include/nav.php:117
+#: ../../mod/notifications.php:95 ../../include/nav.php:121
 msgid "Introductions"
 msgstr "Kontaktanfragen"
 
-#: ../../mod/notifications.php:96 ../../mod/message.php:76
-#: ../../include/nav.php:124
+#: ../../mod/notifications.php:100 ../../mod/message.php:103
+#: ../../include/nav.php:128
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: ../../mod/notifications.php:115
+#: ../../mod/notifications.php:119
 msgid "Show Ignored Requests"
 msgstr "Zeige ignorierte Anfragen"
 
-#: ../../mod/notifications.php:115
+#: ../../mod/notifications.php:119
 msgid "Hide Ignored Requests"
 msgstr "Verberge ignorierte Anfragen"
 
-#: ../../mod/notifications.php:141 ../../mod/notifications.php:187
+#: ../../mod/notifications.php:145 ../../mod/notifications.php:191
 msgid "Notification type: "
 msgstr "Benachrichtigungstyp: "
 
-#: ../../mod/notifications.php:142
+#: ../../mod/notifications.php:146
 msgid "Friend Suggestion"
 msgstr "Kontaktvorschlag"
 
-#: ../../mod/notifications.php:144
+#: ../../mod/notifications.php:148
 #, php-format
 msgid "suggested by %s"
 msgstr "vorgeschlagen von %s"
 
-#: ../../mod/notifications.php:149 ../../mod/notifications.php:196
+#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
 #: ../../mod/contacts.php:350
 msgid "Hide this contact from others"
 msgstr "Verberge diesen Kontakt vor anderen"
 
-#: ../../mod/notifications.php:150 ../../mod/notifications.php:197
+#: ../../mod/notifications.php:154 ../../mod/notifications.php:201
 msgid "Post a new friend activity"
 msgstr "Neue-Kontakt Nachricht senden"
 
-#: ../../mod/notifications.php:150 ../../mod/notifications.php:197
+#: ../../mod/notifications.php:154 ../../mod/notifications.php:201
 msgid "if applicable"
 msgstr "falls anwendbar"
 
-#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
-#: ../../mod/admin.php:482
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/admin.php:530
 msgid "Approve"
 msgstr "Genehmigen"
 
-#: ../../mod/notifications.php:173
+#: ../../mod/notifications.php:177
 msgid "Claims to be known to you: "
 msgstr "Behauptet dich zu kennen: "
 
-#: ../../mod/notifications.php:173
+#: ../../mod/notifications.php:177
 msgid "yes"
 msgstr "ja"
 
-#: ../../mod/notifications.php:173
+#: ../../mod/notifications.php:177
 msgid "no"
 msgstr "nein"
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:184
 msgid "Approve as: "
 msgstr "Genehmigen als: "
 
-#: ../../mod/notifications.php:181
+#: ../../mod/notifications.php:185
 msgid "Friend"
 msgstr "Freund"
 
-#: ../../mod/notifications.php:182
+#: ../../mod/notifications.php:186
 msgid "Sharer"
 msgstr "Teilenden"
 
-#: ../../mod/notifications.php:182
+#: ../../mod/notifications.php:186
 msgid "Fan/Admirer"
 msgstr "Fan/Verehrer"
 
-#: ../../mod/notifications.php:188
+#: ../../mod/notifications.php:192
 msgid "Friend/Connect Request"
 msgstr "Kontakt-/Freundschaftsanfrage"
 
-#: ../../mod/notifications.php:188
+#: ../../mod/notifications.php:192
 msgid "New Follower"
 msgstr "Neuer Bewunderer"
 
-#: ../../mod/notifications.php:209
+#: ../../mod/notifications.php:213
 msgid "No introductions."
 msgstr "Keine Kontaktanfragen."
 
-#: ../../mod/notifications.php:212 ../../include/nav.php:118
+#: ../../mod/notifications.php:216 ../../include/nav.php:122
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: ../../mod/notifications.php:249 ../../mod/notifications.php:374
-#: ../../mod/notifications.php:461
+#: ../../mod/notifications.php:253 ../../mod/notifications.php:378
+#: ../../mod/notifications.php:465
 #, php-format
 msgid "%s liked %s's post"
 msgstr "%s mag %ss Beitrag"
 
-#: ../../mod/notifications.php:258 ../../mod/notifications.php:383
-#: ../../mod/notifications.php:470
+#: ../../mod/notifications.php:262 ../../mod/notifications.php:387
+#: ../../mod/notifications.php:474
 #, php-format
 msgid "%s disliked %s's post"
 msgstr "%s mag %ss Beitrag nicht"
 
-#: ../../mod/notifications.php:272 ../../mod/notifications.php:397
-#: ../../mod/notifications.php:484
+#: ../../mod/notifications.php:276 ../../mod/notifications.php:401
+#: ../../mod/notifications.php:488
 #, php-format
 msgid "%s is now friends with %s"
 msgstr "%s ist jetzt mit %s befreundet"
 
-#: ../../mod/notifications.php:279 ../../mod/notifications.php:404
+#: ../../mod/notifications.php:283 ../../mod/notifications.php:408
 #, php-format
 msgid "%s created a new post"
 msgstr "%s hat einen neuen Beitrag erstellt"
 
-#: ../../mod/notifications.php:280 ../../mod/notifications.php:405
-#: ../../mod/notifications.php:493
+#: ../../mod/notifications.php:284 ../../mod/notifications.php:409
+#: ../../mod/notifications.php:497
 #, php-format
 msgid "%s commented on %s's post"
 msgstr "%s hat %ss Beitrag kommentiert"
 
-#: ../../mod/notifications.php:294
+#: ../../mod/notifications.php:298
 msgid "No more network notifications."
 msgstr "Keine weiteren Netzwerk-Benachrichtigungen."
 
-#: ../../mod/notifications.php:298
+#: ../../mod/notifications.php:302
 msgid "Network Notifications"
 msgstr "Netzwerk Benachrichtigungen"
 
-#: ../../mod/notifications.php:324 ../../mod/notify.php:59
+#: ../../mod/notifications.php:328 ../../mod/notify.php:61
 msgid "No more system notifications."
 msgstr "Keine weiteren System Benachrichtigungen."
 
-#: ../../mod/notifications.php:328 ../../mod/notify.php:63
+#: ../../mod/notifications.php:332 ../../mod/notify.php:65
 msgid "System Notifications"
 msgstr "System Benachrichtigungen"
 
-#: ../../mod/notifications.php:419
+#: ../../mod/notifications.php:423
 msgid "No more personal notifications."
 msgstr "Keine weiteren persönlichen Benachrichtigungen"
 
-#: ../../mod/notifications.php:423
+#: ../../mod/notifications.php:427
 msgid "Personal Notifications"
 msgstr "Persönliche Benachrichtigungen"
 
-#: ../../mod/notifications.php:500
+#: ../../mod/notifications.php:504
 msgid "No more home notifications."
 msgstr "Keine weiteren Pinnwand-Benachrichtigungen"
 
-#: ../../mod/notifications.php:504
+#: ../../mod/notifications.php:508
 msgid "Home Notifications"
 msgstr "Pinnwand Benachrichtigungen"
 
@@ -1433,12 +1473,12 @@ msgid "View all contacts"
 msgstr "Alle Kontakte anzeigen"
 
 #: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:534
 msgid "Unblock"
 msgstr "Entsperren"
 
 #: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:533
 msgid "Block"
 msgstr "Sperren"
 
@@ -1473,8 +1513,8 @@ msgstr "Kontakt Informationen / Notizen"
 msgid "Edit contact notes"
 msgstr "Notizen zum Kontakt bearbiten"
 
-#: ../../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 "Besuche %ss Profil [%s]"
@@ -1507,7 +1547,7 @@ msgstr "letzte Aktualisierung:"
 msgid "Update public posts"
 msgstr "Öffentliche Beiträge aktualisieren"
 
-#: ../../mod/contacts.php:341 ../../mod/admin.php:896
+#: ../../mod/contacts.php:341 ../../mod/admin.php:955
 msgid "Update now"
 msgstr "Jetzt aktualisieren"
 
@@ -1524,57 +1564,64 @@ msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein"
 
-#: ../../mod/contacts.php:399 ../../mod/group.php:194
+#: ../../mod/contacts.php:399
+msgid "Suggestions"
+msgstr "Kontaktvorschläge"
+
+#: ../../mod/contacts.php:404 ../../mod/group.php:191
 msgid "All Contacts"
 msgstr "Alle Kontakte"
 
-#: ../../mod/contacts.php:404
+#: ../../mod/contacts.php:409
 msgid "Unblocked Contacts"
 msgstr "Nicht blockierte Kontakte"
 
-#: ../../mod/contacts.php:410
+#: ../../mod/contacts.php:415
 msgid "Blocked Contacts"
 msgstr "Blockierte Kontakte"
 
-#: ../../mod/contacts.php:416
+#: ../../mod/contacts.php:421
 msgid "Ignored Contacts"
 msgstr "Ignorierte Kontakte"
 
-#: ../../mod/contacts.php:422
+#: ../../mod/contacts.php:427
 msgid "Hidden Contacts"
 msgstr "Verborgene Kontakte"
 
-#: ../../mod/contacts.php:473
+#: ../../mod/contacts.php:477
 msgid "Mutual Friendship"
 msgstr "Beidseitige Freundschaft"
 
-#: ../../mod/contacts.php:477
+#: ../../mod/contacts.php:481
 msgid "is a fan of yours"
 msgstr "ist ein Fan von dir"
 
-#: ../../mod/contacts.php:481
+#: ../../mod/contacts.php:485
 msgid "you are a fan of"
 msgstr "du bist Fan von"
 
-#: ../../mod/contacts.php:498 ../../include/Contact.php:135
-#: ../../include/conversation.php:773
+#: ../../mod/contacts.php:502 ../../include/Contact.php:141
+#: ../../include/conversation.php:817
 msgid "Edit contact"
 msgstr "Kontakt bearbeiten"
 
-#: ../../mod/contacts.php:518 ../../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 "Kontakte"
 
-#: ../../mod/contacts.php:522
+#: ../../mod/contacts.php:527
 msgid "Search your contacts"
 msgstr "Suche in deinen Kontakten"
 
-#: ../../mod/contacts.php:523 ../../mod/directory.php:67
+#: ../../mod/contacts.php:528 ../../mod/directory.php:57
 msgid "Finding: "
 msgstr "Funde: "
 
-#: ../../mod/contacts.php:524 ../../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 "Finde"
 
@@ -1582,495 +1629,558 @@ msgstr "Finde"
 msgid "No valid account found."
 msgstr "Kein gültiger Account gefunden."
 
-#: ../../mod/lostpass.php:31
+#: ../../mod/lostpass.php:32
 msgid "Password reset request issued. Check your email."
 msgstr "Zurücksetzen des Passworts eingeleitet. Bitte überprüfe deine E-Mail."
 
-#: ../../mod/lostpass.php:42
+#: ../../mod/lostpass.php:43
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten"
 
-#: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106
-#: ../../mod/register.php:380 ../../mod/register.php:434
-#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:716
-#: ../../include/items.php:2513
+#: ../../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 "Administrator"
 
-#: ../../mod/lostpass.php:64
+#: ../../mod/lostpass.php:65
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."
 
-#: ../../mod/lostpass.php:82 ../../boot.php:723
+#: ../../mod/lostpass.php:83 ../../boot.php:779
 msgid "Password Reset"
 msgstr "Passwort zurücksetzen"
 
-#: ../../mod/lostpass.php:83
+#: ../../mod/lostpass.php:84
 msgid "Your password has been reset as requested."
 msgstr "Dein Passwort wurde wie gewünscht zurückgesetzt."
 
-#: ../../mod/lostpass.php:84
+#: ../../mod/lostpass.php:85
 msgid "Your new password is"
 msgstr "Dein neues Passwort lautet"
 
-#: ../../mod/lostpass.php:85
+#: ../../mod/lostpass.php:86
 msgid "Save or copy your new password - and then"
 msgstr "Speichere oder kopiere dein neues Passwort - und dann"
 
-#: ../../mod/lostpass.php:86
+#: ../../mod/lostpass.php:87
 msgid "click here to login"
 msgstr "hier klicken, um dich anzumelden"
 
-#: ../../mod/lostpass.php:87
+#: ../../mod/lostpass.php:88
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr "Du kannst das Passwort in den <em>Einstellungen</em> ändern, sobald du dich erfolgreich angemeldet hast."
 
-#: ../../mod/lostpass.php:118
+#: ../../mod/lostpass.php:119
 msgid "Forgot your Password?"
 msgstr "Hast du dein Passwort vergessen?"
 
-#: ../../mod/lostpass.php:119
+#: ../../mod/lostpass.php:120
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr "Gib deine Email-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet."
 
-#: ../../mod/lostpass.php:120
+#: ../../mod/lostpass.php:121
 msgid "Nickname or Email: "
 msgstr "Spitzname oder Email:"
 
-#: ../../mod/lostpass.php:121
+#: ../../mod/lostpass.php:122
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: ../../mod/settings.php:70
+#: ../../mod/settings.php:89
 msgid "Missing some important data!"
 msgstr "Wichtige Daten fehlen!"
 
-#: ../../mod/settings.php:73 ../../mod/settings.php:479 ../../mod/admin.php:75
+#: ../../mod/settings.php:92 ../../mod/settings.php:556 ../../mod/admin.php:75
 msgid "Update"
 msgstr "Aktualisierungen"
 
-#: ../../mod/settings.php:168
+#: ../../mod/settings.php:197
 msgid "Failed to connect with email account using the settings provided."
 msgstr "Konnte das Email Konto mit den angegebenen Einstellungen nicht erreichen."
 
-#: ../../mod/settings.php:173
+#: ../../mod/settings.php:202
 msgid "Email settings updated."
 msgstr "EMail Einstellungen bearbeitet."
 
-#: ../../mod/settings.php:191
+#: ../../mod/settings.php:261
 msgid "Passwords do not match. Password unchanged."
 msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."
 
-#: ../../mod/settings.php:196
+#: ../../mod/settings.php:266
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert."
 
-#: ../../mod/settings.php:207
+#: ../../mod/settings.php:277
 msgid "Password changed."
 msgstr "Passwort ändern."
 
-#: ../../mod/settings.php:209
+#: ../../mod/settings.php:279
 msgid "Password update failed. Please try again."
 msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal."
 
-#: ../../mod/settings.php:273
+#: ../../mod/settings.php:340
 msgid " Please use a shorter name."
 msgstr " Bitte verwende einen kürzeren Namen."
 
-#: ../../mod/settings.php:275
+#: ../../mod/settings.php:342
 msgid " Name too short."
 msgstr " Name ist zu kurz."
 
-#: ../../mod/settings.php:281
+#: ../../mod/settings.php:348
 msgid " Not valid email."
 msgstr " Keine gültige E-Mail."
 
-#: ../../mod/settings.php:283
+#: ../../mod/settings.php:350
 msgid " Cannot change to that email."
 msgstr "Ändern der E-Mail nicht möglich. "
 
-#: ../../mod/settings.php:351 ../../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 "Einstellungen aktualisiert."
 
-#: ../../mod/settings.php:415 ../../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 "Account Einstellungen"
 
-#: ../../mod/settings.php:420
+#: ../../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 "Anzeige Einstellungen"
+
+#: ../../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 "Connector-Einstellungen"
 
-#: ../../mod/settings.php:425
+#: ../../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 "Plugin-Einstellungen"
 
-#: ../../mod/settings.php:430
+#: ../../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 "Verbindungen"
 
-#: ../../mod/settings.php:435
+#: ../../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 "Persönliche Daten exportieren"
 
-#: ../../mod/settings.php:452 ../../mod/settings.php:478
-#: ../../mod/settings.php:511
+#: ../../mod/settings.php:528 ../../mod/settings.php:555
+#: ../../mod/settings.php:591
 msgid "Add application"
 msgstr "Programm hinzufügen"
 
-#: ../../mod/settings.php:456 ../../mod/settings.php:482
-#: ../../addon/statusnet/statusnet.php:526
+#: ../../mod/settings.php:532 ../../mod/settings.php:559
+#: ../../addon/statusnet/statusnet.php:541
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../mod/settings.php:457 ../../mod/settings.php:483
-#: ../../addon/statusnet/statusnet.php:525
+#: ../../mod/settings.php:533 ../../mod/settings.php:560
+#: ../../addon/statusnet/statusnet.php:540
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../mod/settings.php:458 ../../mod/settings.php:484
+#: ../../mod/settings.php:534 ../../mod/settings.php:561
 msgid "Redirect"
 msgstr "Umleiten"
 
-#: ../../mod/settings.php:459 ../../mod/settings.php:485
+#: ../../mod/settings.php:535 ../../mod/settings.php:562
 msgid "Icon url"
 msgstr "Icon URL"
 
-#: ../../mod/settings.php:470
+#: ../../mod/settings.php:546
 msgid "You can't edit this application."
 msgstr "Du kannst dieses Programm nicht bearbeiten."
 
-#: ../../mod/settings.php:510
+#: ../../mod/settings.php:590
 msgid "Connected Apps"
 msgstr "Verbundene Programme"
 
-#: ../../mod/settings.php:514
+#: ../../mod/settings.php:594
 msgid "Client key starts with"
 msgstr "Anwender Schlüssel beginnt mit"
 
-#: ../../mod/settings.php:515
+#: ../../mod/settings.php:595
 msgid "No name"
 msgstr "Kein Name"
 
-#: ../../mod/settings.php:516
+#: ../../mod/settings.php:596
 msgid "Remove authorization"
 msgstr "Autorisierung entziehen"
 
-#: ../../mod/settings.php:528
+#: ../../mod/settings.php:608
 msgid "No Plugin settings configured"
 msgstr "Keine Plugin-Einstellungen konfiguriert"
 
-#: ../../mod/settings.php:535 ../../addon/widgets/widgets.php:122
+#: ../../mod/settings.php:616 ../../addon/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr "Plugin-Einstellungen"
 
-#: ../../mod/settings.php:548 ../../mod/settings.php:549
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s"
 
-#: ../../mod/settings.php:548 ../../mod/settings.php:549
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
 msgid "enabled"
 msgstr "eingeschaltet"
 
-#: ../../mod/settings.php:548 ../../mod/settings.php:549
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
 msgid "disabled"
 msgstr "ausgeschaltet"
 
-#: ../../mod/settings.php:549
+#: ../../mod/settings.php:630
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: ../../mod/settings.php:575
+#: ../../mod/settings.php:660
 msgid "Connector Settings"
 msgstr "Verbindungs-Einstellungen"
 
-#: ../../mod/settings.php:581
+#: ../../mod/settings.php:666
 msgid "Email/Mailbox Setup"
 msgstr "E-Mail/Postfach-Einstellungen"
 
-#: ../../mod/settings.php:582
+#: ../../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 "Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an."
 
-#: ../../mod/settings.php:583
+#: ../../mod/settings.php:668
 msgid "Last successful email check:"
 msgstr "Letzter erfolgreicher Email Check"
 
-#: ../../mod/settings.php:584
+#: ../../mod/settings.php:669
 msgid "Email access is disabled on this site."
 msgstr "Zugriff auf E-Mails für diese Seite deaktiviert."
 
-#: ../../mod/settings.php:585
+#: ../../mod/settings.php:670
 msgid "IMAP server name:"
 msgstr "IMAP-Server-Name:"
 
-#: ../../mod/settings.php:586
+#: ../../mod/settings.php:671
 msgid "IMAP port:"
 msgstr "IMAP-Port:"
 
-#: ../../mod/settings.php:587
+#: ../../mod/settings.php:672
 msgid "Security:"
 msgstr "Sicherheit:"
 
-#: ../../mod/settings.php:587
+#: ../../mod/settings.php:672 ../../mod/settings.php:677
 msgid "None"
 msgstr "Keine"
 
-#: ../../mod/settings.php:588
+#: ../../mod/settings.php:673
 msgid "Email login name:"
 msgstr "E-Mail-Login-Name:"
 
-#: ../../mod/settings.php:589
+#: ../../mod/settings.php:674
 msgid "Email password:"
 msgstr "E-Mail-Passwort:"
 
-#: ../../mod/settings.php:590
+#: ../../mod/settings.php:675
 msgid "Reply-to address:"
 msgstr "Reply-to Adresse:"
 
-#: ../../mod/settings.php:591
+#: ../../mod/settings.php:676
 msgid "Send public posts to all email contacts:"
 msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:"
 
-#: ../../mod/settings.php:648 ../../mod/admin.php:142 ../../mod/admin.php:459
+#: ../../mod/settings.php:677
+msgid "Action after import:"
+msgstr "Aktion nach Import:"
+
+#: ../../mod/settings.php:677
+msgid "Mark as seen"
+msgstr "Als gelesen markieren"
+
+#: ../../mod/settings.php:677
+msgid "Move to folder"
+msgstr "In einen Ordner verschieben"
+
+#: ../../mod/settings.php:678
+msgid "Move to folder:"
+msgstr "In diesen Ordner verschieben:"
+
+#: ../../mod/settings.php:739
+msgid "Display Settings"
+msgstr "Anzeige Einstellungen"
+
+#: ../../mod/settings.php:745
+msgid "Display Theme:"
+msgstr "Theme:"
+
+#: ../../mod/settings.php:746
+msgid "Update browser every xx seconds"
+msgstr "Browser alle xx Sekunden aktualisieren"
+
+#: ../../mod/settings.php:746
+msgid "Minimum of 10 seconds, no maximum"
+msgstr "Minimal 10 Sekunden, kein Maximum"
+
+#: ../../mod/settings.php:747
+msgid "Number of items to display on the network page:"
+msgstr "Zahl der Beiträge, welche pro Netzwerkseite angezeigt werden sollen: "
+
+#: ../../mod/settings.php:747
+msgid "Maximum of 100 items"
+msgstr "Maximal 100 Beiträge"
+
+#: ../../mod/settings.php:748
+msgid "Don't show emoticons"
+msgstr "Keine Smilies anzeigen"
+
+#: ../../mod/settings.php:808 ../../mod/admin.php:142 ../../mod/admin.php:506
 msgid "Normal Account"
 msgstr "Normaler Account"
 
-#: ../../mod/settings.php:649
+#: ../../mod/settings.php:809
 msgid "This account is a normal personal profile"
 msgstr "Dieser Account ist ein normales persönliches Profil"
 
-#: ../../mod/settings.php:652 ../../mod/admin.php:143 ../../mod/admin.php:460
+#: ../../mod/settings.php:812 ../../mod/admin.php:143 ../../mod/admin.php:507
 msgid "Soapbox Account"
 msgstr "Sandkasten-Account"
 
-#: ../../mod/settings.php:653
+#: ../../mod/settings.php:813
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr "Freundschaftsanfragen werden automatisch als Nurlese-Fans akzeptiert"
 
-#: ../../mod/settings.php:656 ../../mod/admin.php:144 ../../mod/admin.php:461
+#: ../../mod/settings.php:816 ../../mod/admin.php:144 ../../mod/admin.php:508
 msgid "Community/Celebrity Account"
 msgstr "Gemeinschafts/Promi-Account"
 
-#: ../../mod/settings.php:657
+#: ../../mod/settings.php:817
 msgid ""
 "Automatically approve all connection/friend requests as read-write fans"
 msgstr "Freundschaftsanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert"
 
-#: ../../mod/settings.php:660 ../../mod/admin.php:145 ../../mod/admin.php:462
+#: ../../mod/settings.php:820 ../../mod/admin.php:145 ../../mod/admin.php:509
 msgid "Automatic Friend Account"
 msgstr "Automatischer Freundesaccount"
 
-#: ../../mod/settings.php:661
+#: ../../mod/settings.php:821
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr "Freundschaftsanfragen werden automatisch als Freund akzeptiert"
 
-#: ../../mod/settings.php:671
+#: ../../mod/settings.php:831
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: ../../mod/settings.php:671
+#: ../../mod/settings.php:831
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "(Optional) Erlaube die Anmeldung für diesen Account mit dieser OpenID."
 
-#: ../../mod/settings.php:681
+#: ../../mod/settings.php:841
 msgid "Publish your default profile in your local site directory?"
 msgstr "Veröffentliche dein Standardprofil im Verzeichnis der lokalen Seite?"
 
-#: ../../mod/settings.php:687
+#: ../../mod/settings.php:847
 msgid "Publish your default profile in the global social directory?"
 msgstr "Veröffentliche dein Standardprofil im weltweiten Verzeichnis?"
 
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:855
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?"
 
-#: ../../mod/settings.php:699
+#: ../../mod/settings.php:859
 msgid "Hide your profile details from unknown viewers?"
 msgstr "Profil-Details vor unbekannten Betrachtern verbergen?"
 
-#: ../../mod/settings.php:704
+#: ../../mod/settings.php:864
 msgid "Allow friends to post to your profile page?"
 msgstr "Deinen Kontakten erlauben, auf deine Pinnwand zu schreiben?"
 
-#: ../../mod/settings.php:710
+#: ../../mod/settings.php:870
 msgid "Allow friends to tag your posts?"
 msgstr "Deinen Kontakten erlauben, deine Beiträge mit Schlagwörtern zu versehen?"
 
-#: ../../mod/settings.php:716
+#: ../../mod/settings.php:876
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Erlaube uns dich als potentiellen Kontakt für neue Mitglieder vorzuschlagen?"
 
-#: ../../mod/settings.php:725
+#: ../../mod/settings.php:882
+msgid "Permit unknown people to send you private mail?"
+msgstr "Erlaube es Unbekannten dir private Nachrichten zu schicken?"
+
+#: ../../mod/settings.php:891
 msgid "Profile is <strong>not published</strong>."
 msgstr "Profil ist <strong>nicht veröffentlicht</strong>."
 
-#: ../../mod/settings.php:757 ../../mod/profile_photo.php:206
+#: ../../mod/settings.php:897 ../../mod/profile_photo.php:211
 msgid "or"
 msgstr "oder"
 
-#: ../../mod/settings.php:762
+#: ../../mod/settings.php:902
 msgid "Your Identity Address is"
 msgstr "Die Adresse deines Profils lautet:"
 
-#: ../../mod/settings.php:773
+#: ../../mod/settings.php:913
 msgid "Automatically expire posts after this many days:"
 msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen"
 
-#: ../../mod/settings.php:773
+#: ../../mod/settings.php:913
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht."
 
-#: ../../mod/settings.php:774
+#: ../../mod/settings.php:914
 msgid "Advanced expiration settings"
 msgstr "Erweiterte Verfallseinstellungen"
 
-#: ../../mod/settings.php:775
+#: ../../mod/settings.php:915
 msgid "Advanced Expiration"
 msgstr "Erweitertes Verfallen"
 
-#: ../../mod/settings.php:776
+#: ../../mod/settings.php:916
 msgid "Expire posts:"
 msgstr "Beiträge verfallen lassen:"
 
-#: ../../mod/settings.php:777
+#: ../../mod/settings.php:917
 msgid "Expire personal notes:"
 msgstr "Persönliche Notizen verfallen lassen:"
 
-#: ../../mod/settings.php:778
+#: ../../mod/settings.php:918
 msgid "Expire starred posts:"
 msgstr "Markierte Beiträge verfallen lassen:"
 
-#: ../../mod/settings.php:779
+#: ../../mod/settings.php:919
 msgid "Expire photos:"
 msgstr "Fotos verfallen lassen:"
 
-#: ../../mod/settings.php:784
+#: ../../mod/settings.php:924
 msgid "Account Settings"
 msgstr "Account-Einstellungen"
 
-#: ../../mod/settings.php:792
+#: ../../mod/settings.php:933
 msgid "Password Settings"
 msgstr "Passwort-Einstellungen"
 
-#: ../../mod/settings.php:793
+#: ../../mod/settings.php:934
 msgid "New Password:"
 msgstr "Neues Passwort:"
 
-#: ../../mod/settings.php:794
+#: ../../mod/settings.php:935
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
-#: ../../mod/settings.php:794
+#: ../../mod/settings.php:935
 msgid "Leave password fields blank unless changing"
 msgstr "Lass die Passwort-Felder leer, außer du willst das Passwort ändern"
 
-#: ../../mod/settings.php:798
+#: ../../mod/settings.php:939
 msgid "Basic Settings"
 msgstr "Grundeinstellungen"
 
-#: ../../mod/settings.php:799 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:940 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr "Kompletter Name:"
 
-#: ../../mod/settings.php:800
+#: ../../mod/settings.php:941
 msgid "Email Address:"
 msgstr "Emailadresse:"
 
-#: ../../mod/settings.php:801
+#: ../../mod/settings.php:942
 msgid "Your Timezone:"
 msgstr "Deine Zeitzone:"
 
-#: ../../mod/settings.php:802
+#: ../../mod/settings.php:943
 msgid "Default Post Location:"
 msgstr "Standardstandort:"
 
-#: ../../mod/settings.php:803
+#: ../../mod/settings.php:944
 msgid "Use Browser Location:"
 msgstr "Verwende den Standort des Browsers:"
 
-#: ../../mod/settings.php:804
-msgid "Display Theme:"
-msgstr "Theme:"
-
-#: ../../mod/settings.php:805
-msgid "Update browser every xx seconds"
-msgstr "Browser alle xx Sekunden aktualisieren"
-
-#: ../../mod/settings.php:805
-msgid "Minimum of 10 seconds, no maximum"
-msgstr "Minimal 10 Sekunden, kein Maximum"
-
-#: ../../mod/settings.php:807
+#: ../../mod/settings.php:947
 msgid "Security and Privacy Settings"
 msgstr "Sicherheits- und Privatsphäre-Einstellungen"
 
-#: ../../mod/settings.php:809
+#: ../../mod/settings.php:949
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximale Anzahl von Freundschaftsanfragen/Tag:"
 
-#: ../../mod/settings.php:809
+#: ../../mod/settings.php:949 ../../mod/settings.php:964
 msgid "(to prevent spam abuse)"
 msgstr "(um SPAM zu vermeiden)"
 
-#: ../../mod/settings.php:810
+#: ../../mod/settings.php:950
 msgid "Default Post Permissions"
 msgstr "Standard-Zugriffsrechte für Beiträge"
 
-#: ../../mod/settings.php:811
+#: ../../mod/settings.php:951
 msgid "(click to open/close)"
 msgstr "(klicke zum öffnen/schließen)"
 
-#: ../../mod/settings.php:826
+#: ../../mod/settings.php:964
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:"
+
+#: ../../mod/settings.php:967
 msgid "Notification Settings"
 msgstr "Benachrichtigungseinstellungen"
 
-#: ../../mod/settings.php:827
+#: ../../mod/settings.php:968
 msgid "Send a notification email when:"
 msgstr "Benachrichtigungs-E-Mail senden wenn:"
 
-#: ../../mod/settings.php:828
+#: ../../mod/settings.php:969
 msgid "You receive an introduction"
 msgstr "- du eine Kontaktanfrage erhältst"
 
-#: ../../mod/settings.php:829
+#: ../../mod/settings.php:970
 msgid "Your introductions are confirmed"
 msgstr "- eine deiner Kontaktanfragen akzeptiert wurde"
 
-#: ../../mod/settings.php:830
+#: ../../mod/settings.php:971
 msgid "Someone writes on your profile wall"
 msgstr "- jemand etwas auf deine Pinnwand schreibt"
 
-#: ../../mod/settings.php:831
+#: ../../mod/settings.php:972
 msgid "Someone writes a followup comment"
 msgstr "- jemand auch einen Kommentar verfasst"
 
-#: ../../mod/settings.php:832
+#: ../../mod/settings.php:973
 msgid "You receive a private message"
 msgstr "- du eine private Nachricht erhältst"
 
-#: ../../mod/settings.php:833
+#: ../../mod/settings.php:974
 msgid "You receive a friend suggestion"
 msgstr "- du eine Empfehlung erhältst"
 
-#: ../../mod/settings.php:834
+#: ../../mod/settings.php:975
 msgid "You are tagged in a post"
-msgstr "- du in einem Beitrag erwähnt wurdest"
+msgstr "Du wurdest in einem Beitrag erwähnt."
 
-#: ../../mod/settings.php:837
+#: ../../mod/settings.php:978
 msgid "Advanced Page Settings"
 msgstr "Erweiterte Seiten-Einstellungen"
 
@@ -2092,39 +2202,39 @@ msgstr "Wähle eine Identität zum Verwalten: "
 msgid "Search Results For:"
 msgstr "Suchergebnisse für:"
 
-#: ../../mod/network.php:77 ../../mod/search.php:16
+#: ../../mod/network.php:82 ../../mod/search.php:16
 msgid "Remove term"
 msgstr "Begriff entfernen"
 
-#: ../../mod/network.php:86 ../../mod/search.php:13
+#: ../../mod/network.php:91 ../../mod/search.php:13
 msgid "Saved Searches"
 msgstr "Gespeicherte Suchen"
 
-#: ../../mod/network.php:87 ../../include/group.php:216
+#: ../../mod/network.php:92 ../../include/group.php:216
 msgid "add"
 msgstr "hinzufügen"
 
-#: ../../mod/network.php:166
+#: ../../mod/network.php:171
 msgid "Commented Order"
 msgstr "Neueste Kommentare"
 
-#: ../../mod/network.php:171
+#: ../../mod/network.php:176
 msgid "Posted Order"
 msgstr "Neueste Beiträge"
 
-#: ../../mod/network.php:182
+#: ../../mod/network.php:187
 msgid "New"
 msgstr "Neue"
 
-#: ../../mod/network.php:187
+#: ../../mod/network.php:192
 msgid "Starred"
 msgstr "Markierte"
 
-#: ../../mod/network.php:192
-msgid "Bookmarks"
-msgstr "Lesezeichen"
+#: ../../mod/network.php:197
+msgid "Shared Links"
+msgstr "Geteilte Links"
 
-#: ../../mod/network.php:250
+#: ../../mod/network.php:270
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
@@ -2132,42 +2242,103 @@ msgid_plural ""
 msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk."
 msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken."
 
-#: ../../mod/network.php:253
+#: ../../mod/network.php:273
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten."
 
-#: ../../mod/network.php:300
+#: ../../mod/network.php:318
 msgid "No such group"
 msgstr "Es gibt keine solche Gruppe"
 
-#: ../../mod/network.php:311
+#: ../../mod/network.php:329
 msgid "Group is empty"
 msgstr "Gruppe ist leer"
 
-#: ../../mod/network.php:315
+#: ../../mod/network.php:333
 msgid "Group: "
 msgstr "Gruppe: "
 
-#: ../../mod/network.php:325
+#: ../../mod/network.php:343
 msgid "Contact: "
 msgstr "Kontakt: "
 
-#: ../../mod/network.php:327
+#: ../../mod/network.php:345
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen."
 
-#: ../../mod/network.php:332
+#: ../../mod/network.php:350
 msgid "Invalid contact."
 msgstr "Ungültiger Kontakt."
 
-#: ../../mod/notes.php:44 ../../boot.php:1354
+#: ../../mod/notes.php:44 ../../boot.php:1426
 msgid "Personal Notes"
 msgstr "Persönliche Notizen"
 
-#: ../../mod/notes.php:63 ../../include/text.php:639
+#: ../../mod/notes.php:63 ../../mod/filer.php:30
+#: ../../addon/facebook/facebook.php:673 ../../include/text.php:649
 msgid "Save"
 msgstr "Speichern"
 
+#: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen."
+
+#: ../../mod/wallmessage.php:56 ../../mod/message.php:60
+msgid "No recipient selected."
+msgstr "Kein Empfänger gewählt."
+
+#: ../../mod/wallmessage.php:59
+msgid "Unable to check your home location."
+msgstr "Konnte deinen Heimatort nicht bestimmen."
+
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:67
+msgid "Message could not be sent."
+msgstr "Nachricht konnte nicht gesendet werden."
+
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:70
+msgid "Message collection failure."
+msgstr "Konnte Nachrichten nicht abrufen."
+
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:73
+msgid "Message sent."
+msgstr "Nachricht gesendet."
+
+#: ../../mod/wallmessage.php:86 ../../mod/wallmessage.php:95
+msgid "No recipient."
+msgstr "Kein Empfänger."
+
+#: ../../mod/wallmessage.php:124 ../../mod/message.php:170
+#: ../../include/conversation.php:914
+msgid "Please enter a link URL:"
+msgstr "Bitte gib die URL des Links ein:"
+
+#: ../../mod/wallmessage.php:131 ../../mod/message.php:178
+msgid "Send Private Message"
+msgstr "Private Nachricht senden"
+
+#: ../../mod/wallmessage.php:132
+#, php-format
+msgid ""
+"If you wish for %s to respond, please check that the privacy settings on "
+"your site allow private mail from unknown senders."
+msgstr "Wenn du möchtest, dass %s dir antworten kann, überprüfe deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern."
+
+#: ../../mod/wallmessage.php:133 ../../mod/message.php:179
+#: ../../mod/message.php:348
+msgid "To:"
+msgstr "An:"
+
+#: ../../mod/wallmessage.php:134 ../../mod/message.php:180
+#: ../../mod/message.php:349
+msgid "Subject:"
+msgstr "Betreff:"
+
+#: ../../mod/wallmessage.php:140 ../../mod/message.php:184
+#: ../../mod/message.php:352 ../../mod/invite.php:113
+msgid "Your message:"
+msgstr "Deine Nachricht:"
+
 #: ../../mod/newmember.php:6
 msgid "Welcome to Friendica"
 msgstr "Willkommen bei Friendica"
@@ -2186,12 +2357,19 @@ msgstr "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnte
 
 #: ../../mod/newmember.php:16
 msgid ""
+"On your <em>Quick Start</em> page - find a brief introduction to your "
+"profile and network tabs, connect to Facebook, make some new connections, "
+"and find some groups to join."
+msgstr "Auf der <em>Quick Start</em> Seite findest du eine kurze Einleitung in die einzelnen Funktionen deines Profils und die Netzwerk-Reiter, wo du interessante Foren findest, wie du alte Freunde von Facebook wieder findest und neue Kontakte knüpfst."
+
+#: ../../mod/newmember.php:18
+msgid ""
 "On your <em>Settings</em> page -  change your initial password. Also make a "
 "note of your Identity Address. This looks just like an email address - and "
 "will be useful in making friends on the free social web."
 msgstr "Ändere bitte unter <em>Einstellungen</em> Dein Passwort. Außerdem merke Dir Deine Indentifikations-Adresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Freundschaften mit anderen im Friendica Netzwerk zu schliessen."
 
-#: ../../mod/newmember.php:18
+#: ../../mod/newmember.php:20
 msgid ""
 "Review the other settings, particularly the privacy settings. An unpublished"
 " directory listing is like having an unlisted phone number. In general, you "
@@ -2199,61 +2377,61 @@ msgid ""
 "potential friends know exactly how to find you."
 msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen genau, wie sie dich finden können."
 
-#: ../../mod/newmember.php:20
+#: ../../mod/newmember.php:22
 msgid ""
 "Upload a profile photo if you have not done so already. Studies have shown "
 "that people with real photos of themselves are ten times more likely to make"
 " friends than people who do not."
 msgstr "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Freunde zu finden, wenn du ein Bild von dir selbst verwendest, als wenn du dies nicht tust."
 
-#: ../../mod/newmember.php:23
+#: ../../mod/newmember.php:25
 msgid ""
 "Authorise the Facebook Connector if you currently have a Facebook account "
 "and we will (optionally) import all your Facebook friends and conversations."
 msgstr "Richte die Verbindung zu Facebook ein, wenn du im Augenblick ein Facebook Konto hast und (optional) deine Facebook Freunde und Unterhaltungen importieren willst."
 
-#: ../../mod/newmember.php:25
+#: ../../mod/newmember.php:27
 msgid ""
 "<em>If</em> this is your own personal server, installing the Facebook addon "
 "may ease your transition to the free social web."
 msgstr "<em>Wenn</em> dies dein privater Server ist, könnte die Installation des Facebook Connectors deinen Umzug ins freie soziale Netz angenehmer gestalten."
 
-#: ../../mod/newmember.php:30
+#: ../../mod/newmember.php:32
 msgid ""
 "Enter your email access information on your Connector Settings page if you "
 "wish to import and interact with friends or mailing lists from your email "
 "INBOX"
 msgstr "Gib deine E-Mail-Zugangsinformationen auf der Connector-Einstellungsseite ein, falls du E-Mails aus deinem Posteingang importieren und mit Freunden und Mailinglisten interagieren willlst."
 
-#: ../../mod/newmember.php:32
+#: ../../mod/newmember.php:34
 msgid ""
 "Edit your <strong>default</strong> profile to your liking. Review the "
 "settings for hiding your list of friends and hiding the profile from unknown"
 " visitors."
 msgstr "Editiere dein <strong>Standard</strong> Profil nach deinen Vorlieben. Überprüfe die Einstellungen zum Verbergen deiner Freundesliste vor unbekannten Betrachtern des Profils."
 
-#: ../../mod/newmember.php:34
+#: ../../mod/newmember.php:36
 msgid ""
 "Set some public keywords for your default profile which describe your "
 "interests. We may be able to find other people with similar interests and "
 "suggest friendships."
 msgstr "Trage ein paar öffentliche Stichwörter in dein Standardprofil ein, die deine Interessen beschreiben. Eventuell sind wir in der Lage Leute zu finden, die deine Interessen teilen und können dir dann Kontakte vorschlagen."
 
-#: ../../mod/newmember.php:36
+#: ../../mod/newmember.php:38
 msgid ""
 "Your Contacts page is your gateway to managing friendships and connecting "
 "with friends on other networks. Typically you enter their address or site "
 "URL in the <em>Add New Contact</em> dialog."
 msgstr "Die Kontakte-Seite ist die Einstiegsseite, von der aus du Kontakte verwalten und dich mit Freunden in anderen Netzwerken verbinden kannst. Normalerweise gibst du dazu einfach ihre Adresse oder die URL der Seite im Kasten <em>Neuen Kontakt hinzufügen</em> ein."
 
-#: ../../mod/newmember.php:38
+#: ../../mod/newmember.php:40
 msgid ""
 "The Directory page lets you find other people in this network or other "
 "federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
 "their profile page. Provide your own Identity Address if requested."
 msgstr "Über die Verzeichnisseite kannst du andere Personen auf diesem Server oder anderen verknüpften Seiten finden. Halte nach einem <em>Verbinden</em> oder <em>Folgen</em> Link auf deren Profilseiten Ausschau und gib deine eigene Profiladresse an, falls du danach gefragt wirst."
 
-#: ../../mod/newmember.php:40
+#: ../../mod/newmember.php:42
 msgid ""
 "On the side panel of the Contacts page are several tools to find new "
 "friends. We can match people by interest, look up people by name or "
@@ -2262,14 +2440,14 @@ msgid ""
 "hours."
 msgstr "Im seitlichen Bedienfeld der Kontakte-Seite gibt es diverse Werkzeuge, um neue Freunde zu finden. Wir können Menschen mit den gleichen Interessen finden, anhand von Namen oder Interessen suchen oder aber aufgrund vorhandener Kontakte neue Freunde vorschlagen.\nAuf einer brandneuen - soeben erstellten - Seite starten die Kontaktvorschläge innerhalb von 24 Stunden."
 
-#: ../../mod/newmember.php:42
+#: ../../mod/newmember.php:44
 msgid ""
 "Once you have made some friends, organize them into private conversation "
 "groups from the sidebar of your Contacts page and then you can interact with"
 " each group privately on your Network page."
 msgstr "Sobald du einige Freunde gefunden hast, organisiere sie in Gruppen zur privaten Kommunikation im Seitenmenü der Kontakte-Seite. Du kannst dann mit jeder dieser Gruppen von der Netzwerkseite aus privat interagieren."
 
-#: ../../mod/newmember.php:44
+#: ../../mod/newmember.php:46
 msgid ""
 "Our <strong>help</strong> pages may be consulted for detail on other program"
 " features and resources."
@@ -2283,54 +2461,54 @@ msgstr "Beitrag nicht verfügbar."
 msgid "Item was not found."
 msgstr "Beitrag konnte nicht gefunden werden."
 
-#: ../../mod/group.php:27
+#: ../../mod/group.php:29
 msgid "Group created."
 msgstr "Gruppe erstellt."
 
-#: ../../mod/group.php:33
+#: ../../mod/group.php:35
 msgid "Could not create group."
 msgstr "Konnte die Gruppe nicht erstellen."
 
-#: ../../mod/group.php:43 ../../mod/group.php:123
+#: ../../mod/group.php:47 ../../mod/group.php:137
 msgid "Group not found."
 msgstr "Gruppe nicht gefunden."
 
-#: ../../mod/group.php:56
+#: ../../mod/group.php:60
 msgid "Group name changed."
 msgstr "Gruppenname geändert."
 
-#: ../../mod/group.php:67 ../../mod/profperm.php:19 ../../index.php:287
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:293
 msgid "Permission denied"
 msgstr "Zugriff verweigert"
 
-#: ../../mod/group.php:82
+#: ../../mod/group.php:90
 msgid "Create a group of contacts/friends."
 msgstr "Eine Gruppe von Kontakten/Freunden anlegen."
 
-#: ../../mod/group.php:83 ../../mod/group.php:166
+#: ../../mod/group.php:91 ../../mod/group.php:177
 msgid "Group Name: "
 msgstr "Gruppenname:"
 
-#: ../../mod/group.php:98
+#: ../../mod/group.php:110
 msgid "Group removed."
 msgstr "Gruppe entfernt."
 
-#: ../../mod/group.php:100
+#: ../../mod/group.php:112
 msgid "Unable to remove group."
 msgstr "Konnte die Gruppe nicht entfernen."
 
-#: ../../mod/group.php:164 ../../mod/profperm.php:105
-msgid "Click on a contact to add or remove."
-msgstr "Klicke einen Kontakt an, um ihn hinzuzufügen oder zu entfernen"
-
-#: ../../mod/group.php:165
+#: ../../mod/group.php:176
 msgid "Group Editor"
 msgstr "Gruppeneditor"
 
-#: ../../mod/group.php:179
+#: ../../mod/group.php:189
 msgid "Members"
 msgstr "Mitglieder"
 
+#: ../../mod/group.php:221 ../../mod/profperm.php:105
+msgid "Click on a contact to add or remove."
+msgstr "Klicke einen Kontakt an, um ihn hinzuzufügen oder zu entfernen"
+
 #: ../../mod/profperm.php:25 ../../mod/profperm.php:55
 msgid "Invalid profile identifier."
 msgstr "Ungültiger Profil-Bezeichner"
@@ -2339,9 +2517,12 @@ msgstr "Ungültiger Profil-Bezeichner"
 msgid "Profile Visibility Editor"
 msgstr "Editor für die Profil-Sichtbarkeit"
 
-#: ../../mod/profperm.php:103 ../../include/profile_advanced.php:7
-#: ../../include/profile_advanced.php:76 ../../include/nav.php:48
-#: ../../boot.php:1336
+#: ../../mod/profperm.php:103 ../../view/theme/diabook-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 "Profil"
 
@@ -2357,157 +2538,163 @@ msgstr "Alle Kontakte (mit gesichertem Profilzugriff)"
 msgid "No contacts."
 msgstr "Keine Kontakte."
 
-#: ../../mod/viewcontacts.php:73 ../../include/text.php:578
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:586
 msgid "View Contacts"
 msgstr "Kontakte anzeigen"
 
-#: ../../mod/register.php:62
+#: ../../mod/register.php:64
 msgid "An invitation is required."
 msgstr "Du benötigst eine Einladung."
 
-#: ../../mod/register.php:67
+#: ../../mod/register.php:69
 msgid "Invitation could not be verified."
 msgstr "Die Einladung konnte nicht überprüft werden."
 
-#: ../../mod/register.php:75
+#: ../../mod/register.php:77
 msgid "Invalid OpenID url"
 msgstr "Ungültige OpenID URL"
 
-#: ../../mod/register.php:90
+#: ../../mod/register.php:92
 msgid "Please enter the required information."
 msgstr "Bitte trage die erforderlichen Informationen ein."
 
-#: ../../mod/register.php:104
+#: ../../mod/register.php:106
 msgid "Please use a shorter name."
 msgstr "Bitte verwende einen kürzeren Namen."
 
-#: ../../mod/register.php:106
+#: ../../mod/register.php:108
 msgid "Name too short."
 msgstr "Der Name ist zu kurz."
 
-#: ../../mod/register.php:121
+#: ../../mod/register.php:123
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr "Das scheint nicht dein kompletter Name (Vor- und Nachname) zu sein."
 
-#: ../../mod/register.php:126
+#: ../../mod/register.php:128
 msgid "Your email domain is not among those allowed on this site."
 msgstr "Die Domain deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt."
 
-#: ../../mod/register.php:129
+#: ../../mod/register.php:131
 msgid "Not a valid email address."
 msgstr "Keine gültige E-Mail-Adresse."
 
-#: ../../mod/register.php:139
+#: ../../mod/register.php:141
 msgid "Cannot use that email."
 msgstr "Konnte diese E-Mail-Adresse nicht verwenden."
 
-#: ../../mod/register.php:145
+#: ../../mod/register.php:147
 msgid ""
 "Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
 "must also begin with a letter."
 msgstr "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\", \"_\" und \"-\") bestehen, außerdem muss er mit einem Buchstaben beginnen."
 
-#: ../../mod/register.php:151 ../../mod/register.php:252
+#: ../../mod/register.php:153 ../../mod/register.php:264
 msgid "Nickname is already registered. Please choose another."
 msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."
 
-#: ../../mod/register.php:170
+#: ../../mod/register.php:163
+msgid ""
+"Nickname was once registered here and may not be re-used. Please choose "
+"another."
+msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."
+
+#: ../../mod/register.php:182
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden."
 
-#: ../../mod/register.php:238
+#: ../../mod/register.php:250
 msgid "An error occurred during registration. Please try again."
 msgstr "Wärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal."
 
-#: ../../mod/register.php:274
+#: ../../mod/register.php:286
 msgid "An error occurred creating your default profile. Please try again."
 msgstr "Bei der Erstellung des Standard-Profils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."
 
-#: ../../mod/register.php:378 ../../mod/regmod.php:52
+#: ../../mod/register.php:390 ../../mod/regmod.php:52
 #, php-format
 msgid "Registration details for %s"
 msgstr "Details der Registration von %s"
 
-#: ../../mod/register.php:386
+#: ../../mod/register.php:398
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet."
 
-#: ../../mod/register.php:390
+#: ../../mod/register.php:402
 msgid "Failed to send email message. Here is the message that failed."
 msgstr "Konnte die E-Mail nicht versenden. Hier ist die Nachricht, die nicht gesendet werden konnte."
 
-#: ../../mod/register.php:395
+#: ../../mod/register.php:407
 msgid "Your registration can not be processed."
 msgstr "Deine Registrierung konnte nicht verarbeitet werden."
 
-#: ../../mod/register.php:432
+#: ../../mod/register.php:444
 #, php-format
 msgid "Registration request at %s"
 msgstr "Registrierungsanfrage auf %s"
 
-#: ../../mod/register.php:441
+#: ../../mod/register.php:453
 msgid "Your registration is pending approval by the site owner."
 msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."
 
-#: ../../mod/register.php:479
+#: ../../mod/register.php:491
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal."
 
-#: ../../mod/register.php:505
+#: ../../mod/register.php:517
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr "Du kannst dieses Formular auch (optional) mit deiner OpenID ausfüllen, indem du deine OpenID angibst und 'Registrieren' klickst."
 
-#: ../../mod/register.php:506
+#: ../../mod/register.php:518
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr "Wenn du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus."
 
-#: ../../mod/register.php:507
+#: ../../mod/register.php:519
 msgid "Your OpenID (optional): "
 msgstr "Deine OpenID (optional): "
 
-#: ../../mod/register.php:521
+#: ../../mod/register.php:533
 msgid "Include your profile in member directory?"
 msgstr "Soll dein Profil im Nutzerverzeichnis angezeigt werden?"
 
-#: ../../mod/register.php:536
+#: ../../mod/register.php:553
 msgid "Membership on this site is by invitation only."
 msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
 
-#: ../../mod/register.php:537
+#: ../../mod/register.php:554
 msgid "Your invitation ID: "
 msgstr "ID deiner Einladung: "
 
-#: ../../mod/register.php:540 ../../mod/admin.php:313
+#: ../../mod/register.php:557 ../../mod/admin.php:358
 msgid "Registration"
 msgstr "Registrierung"
 
-#: ../../mod/register.php:548
+#: ../../mod/register.php:565
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr "Vollständiger Name (z.B. Max Mustermann): "
 
-#: ../../mod/register.php:549
+#: ../../mod/register.php:566
 msgid "Your Email Address: "
 msgstr "Deine E-Mail-Adresse: "
 
-#: ../../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 "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse deines Profils auf dieser Seite wird '<strong>spitzname@$sitename</strong>' sein."
 
-#: ../../mod/register.php:551
+#: ../../mod/register.php:568
 msgid "Choose a nickname: "
 msgstr "Spitznamen wählen: "
 
-#: ../../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 "Registrieren"
 
@@ -2516,18 +2703,29 @@ msgid "People Search"
 msgstr "Personen Suche"
 
 #: ../../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:1654 ../../include/conversation.php:48
 #: ../../include/conversation.php:57 ../../include/conversation.php:121
 #: ../../include/conversation.php:130
 msgid "status"
 msgstr "Status"
 
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1096
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php: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:1670 ../../include/conversation.php:65
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s mag %2$ss %3$s"
@@ -2538,13 +2736,12 @@ msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s mag %2$ss %3$s nicht"
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:127
-#: ../../mod/admin.php:518 ../../mod/admin.php:694 ../../mod/display.php:29
-#: ../../mod/display.php:134 ../../mod/viewd.php:14
-#: ../../include/items.php:2880
+#: ../../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 "Beitrag nicht gefunden."
 
-#: ../../mod/viewsrc.php:7 ../../mod/viewd.php:6
+#: ../../mod/viewsrc.php:7
 msgid "Access denied."
 msgstr "Zugriff verweigert."
 
@@ -2552,12 +2749,12 @@ msgstr "Zugriff verweigert."
 msgid "Account approved."
 msgstr "Account freigegeben."
 
-#: ../../mod/regmod.php:93
+#: ../../mod/regmod.php:98
 #, php-format
 msgid "Registration revoked for %s"
 msgstr "Registrierung für %s wurde zurückgezogen"
 
-#: ../../mod/regmod.php:105
+#: ../../mod/regmod.php:110
 msgid "Please login."
 msgstr "Bitte melde dich an."
 
@@ -2569,97 +2766,97 @@ msgstr "Konnte den Originalbeitrag nicht finden."
 msgid "Empty post discarded."
 msgstr "Leerer Beitrag wurde verworfen."
 
-#: ../../mod/item.php:351 ../../mod/wall_upload.php:81
+#: ../../mod/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 "Pinnwand-Bilder"
 
-#: ../../mod/item.php:830
+#: ../../mod/item.php:763
 msgid "System error. Post not saved."
 msgstr "Systemfehler. Beitrag konnte nicht gespeichert werden."
 
-#: ../../mod/item.php:855
+#: ../../mod/item.php:788
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social "
 "network."
 msgstr "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica."
 
-#: ../../mod/item.php:857
+#: ../../mod/item.php:790
 #, php-format
 msgid "You may visit them online at %s"
 msgstr "Du kannst sie online unter %s besuchen"
 
-#: ../../mod/item.php:858
+#: ../../mod/item.php:791
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr "Falls du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem du auf diese Nachricht antwortest."
 
-#: ../../mod/item.php:860
+#: ../../mod/item.php:793
 #, php-format
 msgid "%s posted an update."
 msgstr "%s hat ein Update veröffentlicht."
 
-#: ../../mod/profile_photo.php:28
+#: ../../mod/profile_photo.php:30
 msgid "Image uploaded but image cropping failed."
 msgstr "Bilder hochgeladen, aber das Zuschneiden ist fehlgeschlagen."
 
-#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
-#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:258
+#: ../../mod/profile_photo.php:63 ../../mod/profile_photo.php:70
+#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:264
 #, php-format
 msgid "Image size reduction [%s] failed."
 msgstr "Verkleinern der Bildgröße von [%s] ist gescheitert."
 
-#: ../../mod/profile_photo.php:89
+#: ../../mod/profile_photo.php:91
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird."
 
-#: ../../mod/profile_photo.php:99
+#: ../../mod/profile_photo.php:101
 msgid "Unable to process image"
 msgstr "Bild konnte nicht verarbeitet werden"
 
-#: ../../mod/profile_photo.php:113 ../../mod/wall_upload.php:56
+#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:56
 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr "Bildgröße überschreitet das Limit von %d"
 
-#: ../../mod/profile_photo.php:203
+#: ../../mod/profile_photo.php:207
 msgid "Upload File:"
 msgstr "Datei hochladen:"
 
-#: ../../mod/profile_photo.php:204
+#: ../../mod/profile_photo.php:208
 msgid "Upload Profile Photo"
 msgstr "Profilbild hochladen"
 
-#: ../../mod/profile_photo.php:205
+#: ../../mod/profile_photo.php:209
 msgid "Upload"
 msgstr "Hochladen"
 
-#: ../../mod/profile_photo.php:206
+#: ../../mod/profile_photo.php:211
 msgid "skip this step"
 msgstr "diesen Schritt überspringen"
 
-#: ../../mod/profile_photo.php:206
+#: ../../mod/profile_photo.php:211
 msgid "select a photo from your photo albums"
 msgstr "wähle ein Foto von deinen Fotoalben"
 
-#: ../../mod/profile_photo.php:219
+#: ../../mod/profile_photo.php:224
 msgid "Crop Image"
 msgstr "Bild zurechtschneiden"
 
-#: ../../mod/profile_photo.php:220
+#: ../../mod/profile_photo.php:225
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann."
 
-#: ../../mod/profile_photo.php:221
+#: ../../mod/profile_photo.php:227
 msgid "Done Editing"
 msgstr "Bearbeitung abgeschlossen"
 
-#: ../../mod/profile_photo.php:249
+#: ../../mod/profile_photo.php:255
 msgid "Image uploaded successfully."
 msgstr "Bild erfolgreich auf den Server geladen."
 
@@ -2681,88 +2878,71 @@ msgstr "Dies wird deinen Account endgültig löschen. Es gibt keine Möglichkeit
 msgid "Please enter your password for verification:"
 msgstr "Bitte gib dein Passwort zur Verifikation ein:"
 
-#: ../../mod/message.php:23
-msgid "No recipient selected."
-msgstr "Kein Empfänger gewählt."
+#: ../../mod/message.php:22 ../../include/nav.php:131
+msgid "New Message"
+msgstr "Neue Nachricht"
 
-#: ../../mod/message.php:26
+#: ../../mod/message.php:64
 msgid "Unable to locate contact information."
 msgstr "Konnte die Kontaktinformationen nicht finden."
 
-#: ../../mod/message.php:29
-msgid "Message could not be sent."
-msgstr "Nachricht konnte nicht gesendet werden."
-
-#: ../../mod/message.php:32
-msgid "Message collection failure."
-msgstr "Konnte Nachrichten nicht abrufen."
-
-#: ../../mod/message.php:35
-msgid "Message sent."
-msgstr "Nachricht gesendet."
-
-#: ../../mod/message.php:55
-msgid "Inbox"
-msgstr "Eingang"
-
-#: ../../mod/message.php:60
-msgid "Outbox"
-msgstr "Ausgang"
-
-#: ../../mod/message.php:65
-msgid "New Message"
-msgstr "Neue Nachricht"
-
-#: ../../mod/message.php:91
+#: ../../mod/message.php:118
 msgid "Message deleted."
 msgstr "Nachricht gelöscht."
 
-#: ../../mod/message.php:121
+#: ../../mod/message.php:148
 msgid "Conversation removed."
 msgstr "Unterhaltung gelöscht."
 
-#: ../../mod/message.php:137 ../../include/conversation.php:868
-msgid "Please enter a link URL:"
-msgstr "Bitte gib die URL des Links ein:"
-
-#: ../../mod/message.php:145
-msgid "Send Private Message"
-msgstr "Private Nachricht senden"
-
-#: ../../mod/message.php:146 ../../mod/message.php:287
-msgid "To:"
-msgstr "An:"
+#: ../../mod/message.php:220
+msgid "No messages."
+msgstr "Keine Nachrichten."
 
-#: ../../mod/message.php:147 ../../mod/message.php:288
-msgid "Subject:"
-msgstr "Betreff:"
+#: ../../mod/message.php:227
+#, php-format
+msgid "Unknown sender - %s"
+msgstr "'Unbekannter Absender - %s"
 
-#: ../../mod/message.php:150 ../../mod/message.php:291
-#: ../../mod/invite.php:101
-msgid "Your message:"
-msgstr "Deine Nachricht:"
+#: ../../mod/message.php:230
+#, php-format
+msgid "You and %s"
+msgstr "Du und %s"
 
-#: ../../mod/message.php:188
-msgid "No messages."
-msgstr "Keine Nachrichten."
+#: ../../mod/message.php:233
+#, php-format
+msgid "%s and You"
+msgstr "%s und Du"
 
-#: ../../mod/message.php:201
+#: ../../mod/message.php:243 ../../mod/message.php:341
 msgid "Delete conversation"
 msgstr "Unterhaltung löschen"
 
-#: ../../mod/message.php:204
+#: ../../mod/message.php:246
 msgid "D, d M Y - g:i A"
 msgstr "D, d. M Y - g:i A"
 
-#: ../../mod/message.php:239
+#: ../../mod/message.php:248
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d Nachricht"
+msgstr[1] "%d Nachrichten"
+
+#: ../../mod/message.php:283
 msgid "Message not available."
 msgstr "Nachricht nicht verfügbar."
 
-#: ../../mod/message.php:276
+#: ../../mod/message.php:325
 msgid "Delete message"
 msgstr "Nachricht löschen"
 
-#: ../../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 "Sichere Kommunikation ist nicht verfügbar. <strong>Eventuell</strong> kannst du auf der Profilseite des Absenders antworten."
+
+#: ../../mod/message.php:347
 msgid "Send Reply"
 msgstr "Antwort senden"
 
@@ -2775,23 +2955,23 @@ msgstr "Freunde von %s"
 msgid "No friends to display."
 msgstr "Keine Freunde zum Anzeigen."
 
-#: ../../mod/admin.php:71 ../../mod/admin.php:311
+#: ../../mod/admin.php:71 ../../mod/admin.php:356
 msgid "Site"
 msgstr "Seite"
 
-#: ../../mod/admin.php:72 ../../mod/admin.php:476 ../../mod/admin.php:488
+#: ../../mod/admin.php:72 ../../mod/admin.php:524 ../../mod/admin.php:536
 msgid "Users"
 msgstr "Nutzer"
 
-#: ../../mod/admin.php:73 ../../mod/admin.php:565 ../../mod/admin.php:602
+#: ../../mod/admin.php:73 ../../mod/admin.php:613 ../../mod/admin.php:653
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../../mod/admin.php:74 ../../mod/admin.php:736 ../../mod/admin.php:768
+#: ../../mod/admin.php:74 ../../mod/admin.php:791 ../../mod/admin.php:825
 msgid "Themes"
 msgstr "Themen"
 
-#: ../../mod/admin.php:89 ../../mod/admin.php:846
+#: ../../mod/admin.php:89 ../../mod/admin.php:905
 msgid "Logs"
 msgstr "Protokolle"
 
@@ -2799,387 +2979,534 @@ msgstr "Protokolle"
 msgid "User registrations waiting for confirmation"
 msgstr "Nutzeranmeldungen die auf Bestätigung warten"
 
-#: ../../mod/admin.php:160 ../../mod/admin.php:310 ../../mod/admin.php:475
-#: ../../mod/admin.php:564 ../../mod/admin.php:601 ../../mod/admin.php:735
-#: ../../mod/admin.php:767 ../../mod/admin.php:845
+#: ../../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 "Administration"
 
-#: ../../mod/admin.php:161
+#: ../../mod/admin.php:158
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: ../../mod/admin.php:162
+#: ../../mod/admin.php:159
 msgid "Registered users"
 msgstr "Registrierte Nutzer"
 
-#: ../../mod/admin.php:164
+#: ../../mod/admin.php:161
 msgid "Pending registrations"
 msgstr "Anstehende Anmeldungen"
 
-#: ../../mod/admin.php:165
+#: ../../mod/admin.php:162
 msgid "Version"
 msgstr "Version"
 
-#: ../../mod/admin.php:167
+#: ../../mod/admin.php:164
 msgid "Active plugins"
 msgstr "Aktive Plugins"
 
-#: ../../mod/admin.php:259
+#: ../../mod/admin.php:298
 msgid "Site settings updated."
 msgstr "Seiteneinstellungen aktualisiert."
 
-#: ../../mod/admin.php:303
+#: ../../mod/admin.php:342
 msgid "Closed"
 msgstr "Geschlossen"
 
-#: ../../mod/admin.php:304
+#: ../../mod/admin.php:343
 msgid "Requires approval"
 msgstr "Bedarf der Zustimmung"
 
-#: ../../mod/admin.php:305
+#: ../../mod/admin.php:344
 msgid "Open"
 msgstr "Offen"
 
-#: ../../mod/admin.php:314
+#: ../../mod/admin.php:348
+msgid "No SSL policy, links will track page SSL state"
+msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten"
+
+#: ../../mod/admin.php:349
+msgid "Force all links to use SSL"
+msgstr "SSL für alle Links erzwingen"
+
+#: ../../mod/admin.php:350
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+msgstr "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)"
+
+#: ../../mod/admin.php:359
 msgid "File upload"
 msgstr "Datei hochladen"
 
-#: ../../mod/admin.php:315
+#: ../../mod/admin.php:360
 msgid "Policies"
 msgstr "Regeln"
 
-#: ../../mod/admin.php:316
+#: ../../mod/admin.php:361
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: ../../mod/admin.php:320 ../../addon/statusnet/statusnet.php:523
+#: ../../mod/admin.php:365 ../../addon/statusnet/statusnet.php:538
 msgid "Site name"
 msgstr "Seitenname"
 
-#: ../../mod/admin.php:321
+#: ../../mod/admin.php:366
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: ../../mod/admin.php:322
+#: ../../mod/admin.php:367
 msgid "System language"
 msgstr "Systemsprache"
 
-#: ../../mod/admin.php:323
+#: ../../mod/admin.php:368
 msgid "System theme"
 msgstr "Systemweites Thema"
 
-#: ../../mod/admin.php:325
+#: ../../mod/admin.php:368
+msgid "Default system theme - may be over-ridden by user profiles"
+msgstr "Standard Server Theme - kann von den Benutzereinstellungen überschrieben werden."
+
+#: ../../mod/admin.php:369
+msgid "SSL link policy"
+msgstr "Regeln für SSL Links"
+
+#: ../../mod/admin.php:369
+msgid "Determines whether generated links should be forced to use SSL"
+msgstr "Bestimmt, ob generierte Links SSL verwenden müssen"
+
+#: ../../mod/admin.php:370
 msgid "Maximum image size"
 msgstr "Maximale Größe von Bildern"
 
-#: ../../mod/admin.php:327
+#: ../../mod/admin.php:370
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit."
+
+#: ../../mod/admin.php:372
 msgid "Register policy"
 msgstr "Registrierungsmethode"
 
-#: ../../mod/admin.php:328
+#: ../../mod/admin.php:373
 msgid "Register text"
 msgstr "Registrierungstext"
 
-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:373
+msgid "Will be displayed prominently on the registration page."
+msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."
+
+#: ../../mod/admin.php:374
 msgid "Accounts abandoned after x days"
 msgstr "Accounts gelten nach x Tagen als unbenutzt"
 
-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:374
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit."
 
-#: ../../mod/admin.php:330
+#: ../../mod/admin.php:375
 msgid "Allowed friend domains"
 msgstr "Erlaubte Domains für Kontakte"
 
-#: ../../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 "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
+
+#: ../../mod/admin.php:376
 msgid "Allowed email domains"
 msgstr "Erlaubte Domains für Emails"
 
-#: ../../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 "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
+
+#: ../../mod/admin.php:377
 msgid "Block public"
 msgstr "Öffentlichen Zugriff blockieren"
 
-#: ../../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 "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist."
+
+#: ../../mod/admin.php:378
 msgid "Force publish"
 msgstr "Erzwinge Veröffentlichung"
 
-#: ../../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 "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen."
+
+#: ../../mod/admin.php:379
 msgid "Global directory update URL"
 msgstr "URL für Updates beim weltweiten Verzeichnis"
 
-#: ../../mod/admin.php:336
+#: ../../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 "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar."
+
+#: ../../mod/admin.php:381
 msgid "Block multiple registrations"
 msgstr "Unterbinde Mehrfachregistrierung"
 
-#: ../../mod/admin.php:337
+#: ../../mod/admin.php:381
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr "Benutzern nicht erlauben, weitere Accounts als zusätzliche Profile anzulegen."
+
+#: ../../mod/admin.php:382
 msgid "OpenID support"
 msgstr "OpenID Unterstützung"
 
-#: ../../mod/admin.php:338
+#: ../../mod/admin.php:382
+msgid "OpenID support for registration and logins."
+msgstr "OpenID-Unterstützung für Registrierung und Login."
+
+#: ../../mod/admin.php:383
 msgid "Gravatar support"
 msgstr "Gravatar Unterstützung"
 
-#: ../../mod/admin.php:339
+#: ../../mod/admin.php:383
+msgid "Search new user's photo on Gravatar."
+msgstr "Suchfunktion bei Gravatar für Profilbilder neuer Nutzer."
+
+#: ../../mod/admin.php:384
 msgid "Fullname check"
 msgstr "Namen auf Vollständigkeit überprüfen"
 
-#: ../../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 "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden."
+
+#: ../../mod/admin.php:385
 msgid "UTF-8 Regular expressions"
 msgstr "UTF-8 Reguläre Ausdrücke"
 
-#: ../../mod/admin.php:341
+#: ../../mod/admin.php:385
+msgid "Use PHP UTF8 regular expressions"
+msgstr "PHP UTF8 Ausdrücke verwenden"
+
+#: ../../mod/admin.php:386
 msgid "Show Community Page"
 msgstr "Gemeinschaftsseite anzeigen"
 
-#: ../../mod/admin.php:342
+#: ../../mod/admin.php:386
+msgid ""
+"Display a Community page showing all recent public postings on this site."
+msgstr "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server."
+
+#: ../../mod/admin.php:387
 msgid "Enable OStatus support"
 msgstr "OStatus Unterstützung aktivieren"
 
-#: ../../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 "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt."
+
+#: ../../mod/admin.php:388
 msgid "Enable Diaspora support"
 msgstr "Diaspora-Support aktivieren"
 
-#: ../../mod/admin.php:344
+#: ../../mod/admin.php:388
+msgid "Provide built-in Diaspora network compatibility."
+msgstr "Verwende die eingebaute Diaspora-Verknüpfung."
+
+#: ../../mod/admin.php:389
 msgid "Only allow Friendica contacts"
 msgstr "Nur Friendica-Kontakte erlauben"
 
-#: ../../mod/admin.php:345
+#: ../../mod/admin.php:389
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
+msgstr "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert."
+
+#: ../../mod/admin.php:390
 msgid "Verify SSL"
 msgstr "SSL Überprüfen"
 
-#: ../../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 "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle anstellen. Das bedeutet, das man zu keinen Seiten mit selbst unterzeichneten SSL eine Verbindung herstellen kann."
+
+#: ../../mod/admin.php:391
 msgid "Proxy user"
 msgstr "Proxy Nutzer"
 
-#: ../../mod/admin.php:347
+#: ../../mod/admin.php:392
 msgid "Proxy URL"
 msgstr "Proxy URL"
 
-#: ../../mod/admin.php:348
+#: ../../mod/admin.php:393
 msgid "Network timeout"
 msgstr "Netzwerk Wartezeit"
 
-#: ../../mod/admin.php:369
+#: ../../mod/admin.php:393
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)."
+
+#: ../../mod/admin.php:414
 #, php-format
-msgid "%s user blocked"
+msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
-msgstr[0] "%s Nutzer gesperrt"
-msgstr[1] "%s Nutzer gesperrt/entsperrt"
+msgstr[0] "%s Benutzer geblockt/freigegeben"
+msgstr[1] "%s Benutzer geblockt/freigegeben"
 
-#: ../../mod/admin.php:376
+#: ../../mod/admin.php:421
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] "%s Nutzer gelöscht"
 msgstr[1] "%s Nutzer gelöscht"
 
-#: ../../mod/admin.php:410
+#: ../../mod/admin.php:455
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Nutzer '%s' gelöscht"
 
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:462
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "Nutzer '%s' entsperrt"
 
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:462
 #, php-format
 msgid "User '%s' blocked"
 msgstr "Nutzer '%s' gesperrt"
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:526
 msgid "select all"
 msgstr "Alle auswählen"
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:527
 msgid "User registrations waiting for confirm"
 msgstr "Neuanmeldungen, die auf deine Bestätigung warten"
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:528
 msgid "Request date"
 msgstr "Anfrage Datum"
 
-#: ../../mod/admin.php:480 ../../mod/admin.php:489
+#: ../../mod/admin.php:528 ../../mod/admin.php:537
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr "Email"
 
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:529
 msgid "No registrations."
 msgstr "Keine Neuanmeldungen."
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:531
 msgid "Deny"
 msgstr "Verwehren"
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:537
 msgid "Register date"
 msgstr "Anmeldedatum"
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:537
 msgid "Last login"
 msgstr "Letzte Anmeldung"
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:537
 msgid "Last item"
 msgstr "Letzter Beitrag"
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:537
 msgid "Account"
 msgstr "Nutzerkonto"
 
-#: ../../mod/admin.php:491
+#: ../../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 "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist du sicher?"
 
-#: ../../mod/admin.php:492
+#: ../../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 "Der Nutzer {0} wird gelöscht!\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist du sicher?"
 
-#: ../../mod/admin.php:528
+#: ../../mod/admin.php:576
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plugin %s deaktiviert."
 
-#: ../../mod/admin.php:532
+#: ../../mod/admin.php:580
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plugin %s aktiviert."
 
-#: ../../mod/admin.php:542 ../../mod/admin.php:718
+#: ../../mod/admin.php:590 ../../mod/admin.php:769
 msgid "Disable"
 msgstr "Ausschalten"
 
-#: ../../mod/admin.php:544 ../../mod/admin.php:720
+#: ../../mod/admin.php:592 ../../mod/admin.php:771
 msgid "Enable"
 msgstr "Einschalten"
 
-#: ../../mod/admin.php:566 ../../mod/admin.php:737
+#: ../../mod/admin.php:614 ../../mod/admin.php:792
 msgid "Toggle"
 msgstr "Umschalten"
 
-#: ../../mod/admin.php:567 ../../mod/admin.php:738 ../../include/nav.php:130
+#: ../../mod/admin.php:615 ../../mod/admin.php:793 ../../include/nav.php:137
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../../mod/admin.php:683
+#: ../../mod/admin.php:622 ../../mod/admin.php:802
+msgid "Author: "
+msgstr "Autor:"
+
+#: ../../mod/admin.php:623 ../../mod/admin.php:803
+msgid "Maintainer: "
+msgstr "Betreuer:"
+
+#: ../../mod/admin.php:734
 msgid "No themes found."
 msgstr "Keine Themen gefunden."
 
-#: ../../mod/admin.php:795
+#: ../../mod/admin.php:784
+msgid "Screenshot"
+msgstr "Bildschirmfoto"
+
+#: ../../mod/admin.php:830
+msgid "[Experimental]"
+msgstr "[Experimentell]"
+
+#: ../../mod/admin.php:831
+msgid "[Unsupported]"
+msgstr "[Nicht unterstützt]"
+
+#: ../../mod/admin.php:854
 msgid "Log settings updated."
 msgstr "Protokolleinstellungen aktualisiert."
 
-#: ../../mod/admin.php:848
+#: ../../mod/admin.php:907
 msgid "Clear"
 msgstr "löschen"
 
-#: ../../mod/admin.php:854
+#: ../../mod/admin.php:913
 msgid "Debugging"
 msgstr "Protokoll führen"
 
-#: ../../mod/admin.php:855
+#: ../../mod/admin.php:914
 msgid "Log file"
 msgstr "Protokolldatei"
 
-#: ../../mod/admin.php:855
+#: ../../mod/admin.php:914
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis."
 
-#: ../../mod/admin.php:856
+#: ../../mod/admin.php:915
 msgid "Log level"
 msgstr "Protokoll-Level"
 
-#: ../../mod/admin.php:897
+#: ../../mod/admin.php:956
 msgid "Close"
 msgstr "Schließen"
 
-#: ../../mod/admin.php:903
+#: ../../mod/admin.php:962
 msgid "FTP Host"
 msgstr "FTP Host"
 
-#: ../../mod/admin.php:904
+#: ../../mod/admin.php:963
 msgid "FTP Path"
 msgstr "FTP Pfad"
 
-#: ../../mod/admin.php:905
+#: ../../mod/admin.php:964
 msgid "FTP User"
 msgstr "FTP Nutzername"
 
-#: ../../mod/admin.php:906
+#: ../../mod/admin.php:965
 msgid "FTP Password"
 msgstr "FTP Passwort"
 
-#: ../../mod/profile.php:15 ../../boot.php:845
+#: ../../mod/profile.php:20 ../../boot.php:901
 msgid "Requested profile is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
 
-#: ../../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 "Der Zugriff zu diesem Profil wurde eingeschränkt."
 
-#: ../../mod/profile.php:131
+#: ../../mod/profile.php:144
 msgid "Tips for New Members"
 msgstr "Tipps für neue Nutzer"
 
-#: ../../mod/ping.php:146
+#: ../../mod/ping.php:175
 msgid "{0} wants to be your friend"
 msgstr "{0} möchte mit dir in Kontakt treten"
 
-#: ../../mod/ping.php:151
+#: ../../mod/ping.php:180
 msgid "{0} sent you a message"
 msgstr "{0} hat dir eine Nachricht geschickt"
 
-#: ../../mod/ping.php:156
+#: ../../mod/ping.php:185
 msgid "{0} requested registration"
 msgstr "{0} möchte sich registrieren"
 
-#: ../../mod/ping.php:162
+#: ../../mod/ping.php:191
 #, php-format
 msgid "{0} commented %s's post"
 msgstr "{0} kommentierte einen Beitrag von %s"
 
-#: ../../mod/ping.php:167
+#: ../../mod/ping.php:196
 #, php-format
 msgid "{0} liked %s's post"
 msgstr "{0} mag %ss Beitrag"
 
-#: ../../mod/ping.php:172
+#: ../../mod/ping.php:201
 #, php-format
 msgid "{0} disliked %s's post"
 msgstr "{0} mag %ss Beitrag nicht"
 
-#: ../../mod/ping.php:177
+#: ../../mod/ping.php:206
 #, php-format
 msgid "{0} is now friends with %s"
 msgstr "{0} ist jetzt mit %s befreundet"
 
-#: ../../mod/ping.php:182
+#: ../../mod/ping.php:211
 msgid "{0} posted"
 msgstr "{0} hat etwas veröffentlicht"
 
-#: ../../mod/ping.php:187
+#: ../../mod/ping.php:216
 #, php-format
 msgid "{0} tagged %s's post with #%s"
 msgstr "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen"
 
-#: ../../mod/ping.php:193
+#: ../../mod/ping.php:222
 msgid "{0} mentioned you in a post"
 msgstr "{0} hat dich in einem Beitrag erwähnt"
 
-#: ../../mod/openid.php:63 ../../mod/openid.php:77 ../../include/auth.php:90
-#: ../../include/auth.php:115 ../../include/auth.php:169
+#: ../../mod/openid.php:24
+msgid "OpenID protocol error. No ID returned."
+msgstr "OpenID Protokollfehler. Keine ID zurückgegeben."
+
+#: ../../mod/openid.php:53
+msgid ""
+"Account not found and OpenID registration is not permitted on this site."
+msgstr "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet."
+
+#: ../../mod/openid.php:93 ../../include/auth.php:90
+#: ../../include/auth.php:153
 msgid "Login failed."
 msgstr "Annmeldung fehlgeschlagen."
 
@@ -3236,7 +3563,7 @@ msgstr "Gemeinsame Freunde"
 msgid "No friends in common."
 msgstr "Keine gemeinsamen Freunde."
 
-#: ../../mod/display.php:127
+#: ../../mod/display.php:135
 msgid "Item has been removed."
 msgstr "Eintrag wurde entfernt."
 
@@ -3252,222 +3579,233 @@ msgstr "Keine Applikationen installiert."
 msgid "Search This Site"
 msgstr "Diese Seite durchsuchen"
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:239
-#: ../../mod/profiles.php:344 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:242
+#: ../../mod/profiles.php:356 ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr "Profil nicht gefunden."
 
-#: ../../mod/profiles.php:28
+#: ../../mod/profiles.php:31
 msgid "Profile Name is required."
 msgstr "Profilname ist erforderlich."
 
-#: ../../mod/profiles.php:198
+#: ../../mod/profiles.php:201
 msgid "Profile updated."
 msgstr "Profil aktualisiert."
 
-#: ../../mod/profiles.php:256
+#: ../../mod/profiles.php:261
 msgid "Profile deleted."
 msgstr "Profil gelöscht."
 
-#: ../../mod/profiles.php:272 ../../mod/profiles.php:303
+#: ../../mod/profiles.php:279 ../../mod/profiles.php:313
 msgid "Profile-"
 msgstr "Profil-"
 
-#: ../../mod/profiles.php:291 ../../mod/profiles.php:330
+#: ../../mod/profiles.php:298 ../../mod/profiles.php:340
 msgid "New profile created."
 msgstr "Neues Profil angelegt."
 
-#: ../../mod/profiles.php:309
+#: ../../mod/profiles.php:319
 msgid "Profile unavailable to clone."
 msgstr "Profil nicht zum Duplizieren verfügbar."
 
-#: ../../mod/profiles.php:356
+#: ../../mod/profiles.php:368
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?"
 
-#: ../../mod/profiles.php:374
+#: ../../mod/profiles.php:389
 msgid "Edit Profile Details"
 msgstr "Profil bearbeiten"
 
-#: ../../mod/profiles.php:376
+#: ../../mod/profiles.php:391
 msgid "View this profile"
 msgstr "Dieses Profil anzeigen"
 
-#: ../../mod/profiles.php:377
+#: ../../mod/profiles.php:392
 msgid "Create a new profile using these settings"
 msgstr "Neues Profil anlegen und diese Einstellungen verwenden"
 
-#: ../../mod/profiles.php:378
+#: ../../mod/profiles.php:393
 msgid "Clone this profile"
 msgstr "Dieses Profil duplizieren"
 
-#: ../../mod/profiles.php:379
+#: ../../mod/profiles.php:394
 msgid "Delete this profile"
 msgstr "Dieses Profil löschen"
 
-#: ../../mod/profiles.php:380
+#: ../../mod/profiles.php:395
 msgid "Profile Name:"
 msgstr "Profilname:"
 
-#: ../../mod/profiles.php:381
+#: ../../mod/profiles.php:396
 msgid "Your Full Name:"
 msgstr "Dein kompletter Name:"
 
-#: ../../mod/profiles.php:382
+#: ../../mod/profiles.php:397
 msgid "Title/Description:"
 msgstr "Titel/Beschreibung:"
 
-#: ../../mod/profiles.php:383
+#: ../../mod/profiles.php:398
 msgid "Your Gender:"
 msgstr "Dein Geschlecht:"
 
-#: ../../mod/profiles.php:384
+#: ../../mod/profiles.php:399
 #, php-format
 msgid "Birthday (%s):"
 msgstr "Geburtstag (%s):"
 
-#: ../../mod/profiles.php:385
+#: ../../mod/profiles.php:400
 msgid "Street Address:"
 msgstr "Adresse:"
 
-#: ../../mod/profiles.php:386
+#: ../../mod/profiles.php:401
 msgid "Locality/City:"
 msgstr "Wohnort/Stadt:"
 
-#: ../../mod/profiles.php:387
+#: ../../mod/profiles.php:402
 msgid "Postal/Zip Code:"
 msgstr "Postleitzahl:"
 
-#: ../../mod/profiles.php:388
+#: ../../mod/profiles.php:403
 msgid "Country:"
 msgstr "Land:"
 
-#: ../../mod/profiles.php:389
+#: ../../mod/profiles.php:404
 msgid "Region/State:"
 msgstr "Region/Bundesstaat:"
 
-#: ../../mod/profiles.php:390
+#: ../../mod/profiles.php:405
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr "<span class=\"heart\">&hearts;</span> Beziehungsstatus:"
 
-#: ../../mod/profiles.php:391
+#: ../../mod/profiles.php:406
 msgid "Who: (if applicable)"
 msgstr "Wer: (falls anwendbar)"
 
-#: ../../mod/profiles.php:392
+#: ../../mod/profiles.php:407
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com"
 
-#: ../../mod/profiles.php:393 ../../include/profile_advanced.php:43
+#: ../../mod/profiles.php:408 ../../include/profile_advanced.php:43
 msgid "Sexual Preference:"
 msgstr "Sexuelle Vorlieben:"
 
-#: ../../mod/profiles.php:394
+#: ../../mod/profiles.php:409
 msgid "Homepage URL:"
 msgstr "Adresse der Homepage:"
 
-#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:49
+#: ../../mod/profiles.php:410 ../../include/profile_advanced.php:49
 msgid "Political Views:"
 msgstr "Politische Ansichten:"
 
-#: ../../mod/profiles.php:396
+#: ../../mod/profiles.php:411
 msgid "Religious Views:"
 msgstr "Religiöse Ansichten:"
 
-#: ../../mod/profiles.php:397
+#: ../../mod/profiles.php:412
 msgid "Public Keywords:"
 msgstr "Öffentliche Schlüsselwörter:"
 
-#: ../../mod/profiles.php:398
+#: ../../mod/profiles.php:413
 msgid "Private Keywords:"
 msgstr "Private Schlüsselwörter:"
 
-#: ../../mod/profiles.php:399
+#: ../../mod/profiles.php:414
 msgid "Example: fishing photography software"
 msgstr "Beispiel: Fischen Fotografie Software"
 
-#: ../../mod/profiles.php:400
+#: ../../mod/profiles.php:415
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr "(Wird verwendet um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)"
 
-#: ../../mod/profiles.php:401
+#: ../../mod/profiles.php:416
 msgid "(Used for searching profiles, never shown to others)"
 msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"
 
-#: ../../mod/profiles.php:402
+#: ../../mod/profiles.php:417
 msgid "Tell us about yourself..."
 msgstr "Erzähle uns ein bisschen von dir …"
 
-#: ../../mod/profiles.php:403
+#: ../../mod/profiles.php:418
 msgid "Hobbies/Interests"
 msgstr "Hobbies/Interessen"
 
-#: ../../mod/profiles.php:404
+#: ../../mod/profiles.php:419
 msgid "Contact information and Social Networks"
 msgstr "Kontaktinformationen und Soziale Netzwerke"
 
-#: ../../mod/profiles.php:405
+#: ../../mod/profiles.php:420
 msgid "Musical interests"
 msgstr "Musikalische Interessen"
 
-#: ../../mod/profiles.php:406
+#: ../../mod/profiles.php:421
 msgid "Books, literature"
 msgstr "Literatur/Bücher"
 
-#: ../../mod/profiles.php:407
+#: ../../mod/profiles.php:422
 msgid "Television"
 msgstr "Fernsehen"
 
-#: ../../mod/profiles.php:408
+#: ../../mod/profiles.php:423
 msgid "Film/dance/culture/entertainment"
 msgstr "Filme/Tänze/Kultur/Unterhaltung"
 
-#: ../../mod/profiles.php:409
+#: ../../mod/profiles.php:424
 msgid "Love/romance"
 msgstr "Liebesleben"
 
-#: ../../mod/profiles.php:410
+#: ../../mod/profiles.php:425
 msgid "Work/employment"
 msgstr "Arbeit/Beschäftigung"
 
-#: ../../mod/profiles.php:411
+#: ../../mod/profiles.php:426
 msgid "School/education"
 msgstr "Schule/Ausbildung"
 
-#: ../../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 "Dies ist dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein."
 
-#: ../../mod/profiles.php:426 ../../mod/directory.php:124
+#: ../../mod/profiles.php:441 ../../mod/directory.php:111
 msgid "Age: "
 msgstr "Alter: "
 
-#: ../../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 "Verwalte/Editiere Profile"
 
-#: ../../mod/profiles.php:462 ../../boot.php:946
+#: ../../mod/profiles.php:477 ../../boot.php:1008
 msgid "Change profile photo"
 msgstr "Profilbild ändern"
 
-#: ../../mod/profiles.php:463 ../../boot.php:947
+#: ../../mod/profiles.php:478 ../../boot.php:1009
 msgid "Create New Profile"
 msgstr "Neues Profil anlegen"
 
-#: ../../mod/profiles.php:473 ../../boot.php:957
+#: ../../mod/profiles.php:489 ../../boot.php:1019
 msgid "Profile Image"
 msgstr "Profilbild"
 
-#: ../../mod/profiles.php:475 ../../boot.php:960
+#: ../../mod/profiles.php:491 ../../boot.php:1022
 msgid "visible to everybody"
 msgstr "sichtbar für jeden"
 
-#: ../../mod/profiles.php:476 ../../boot.php:961
+#: ../../mod/profiles.php:492 ../../boot.php:1023
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
+#: ../../mod/filer.php:29 ../../include/conversation.php:918
+msgid "Save to Folder:"
+msgstr "In diesen Ordner verschieben:"
+
+#: ../../mod/filer.php:29
+msgid "- select -"
+msgstr "- auswählen -"
+
 #: ../../mod/tagger.php:103 ../../include/conversation.php:138
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
@@ -3508,7 +3846,11 @@ msgstr "Hinzufügen"
 msgid "No entries."
 msgstr "Keine Einträge"
 
-#: ../../mod/suggest.php:38 ../../include/contact_widgets.php:35
+#: ../../mod/suggest.php:38 ../../view/theme/diabook-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 "Kontaktvorschläge"
 
@@ -3522,31 +3864,26 @@ msgstr "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es
 msgid "Ignore/Hide"
 msgstr "Ignorieren/Verbergen"
 
-#: ../../mod/directory.php:51
+#: ../../mod/directory.php:47 ../../view/theme/diabook-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 "Weltweites Verzeichnis"
 
-#: ../../mod/directory.php:57
-msgid "Normal site view"
-msgstr "Normale Seitenansicht"
-
-#: ../../mod/directory.php:59
-msgid "Admin - View all site entries"
-msgstr "Admin: Alle Einträge dieses Servers anzeigen"
-
-#: ../../mod/directory.php:65
+#: ../../mod/directory.php:55
 msgid "Find on this site"
 msgstr "Auf diesem Server suchen"
 
-#: ../../mod/directory.php:68
+#: ../../mod/directory.php:58
 msgid "Site Directory"
 msgstr "Verzeichnis"
 
-#: ../../mod/directory.php:127
+#: ../../mod/directory.php:114
 msgid "Gender: "
 msgstr "Geschlecht:"
 
-#: ../../mod/directory.php:153
+#: ../../mod/directory.php:140
 msgid "No entries (some entries may be hidden)."
 msgstr "Keine Einträge (einige Einträge könnten versteckt sein)."
 
@@ -3556,9 +3893,8 @@ msgid "%s : Not a valid email address."
 msgstr "%s: Keine gültige Email Adresse."
 
 #: ../../mod/invite.php:59
-#, php-format
-msgid "Please join my network on %s"
-msgstr "Bitte trete meinem Netzwerk auf %s bei"
+msgid "Please join us on Friendica"
+msgstr "Bitte trete uns auf Friendica bei"
 
 #: ../../mod/invite.php:69
 #, php-format
@@ -3576,173 +3912,212 @@ msgstr[1] "%d Nachrichten gesendet."
 msgid "You have no more invitations available"
 msgstr "Du hast keine weiteren Einladungen"
 
-#: ../../mod/invite.php:99
-msgid "Send invitations"
-msgstr "Einladungen senden"
-
 #: ../../mod/invite.php:100
-msgid "Enter email addresses, one per line:"
-msgstr "E-Mail-Adressen eingeben, eine pro Zeile:"
+#, php-format
+msgid ""
+"Visit %s for a list of public sites that you can join. Friendica members on "
+"other sites can all connect with each other, as well as with members of many"
+" other social networks."
+msgstr "Besuche %s für eine Liste der öffentlichen Server, denen du beitreten kannst. Friendica Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer Sozialer Netzwerke."
 
 #: ../../mod/invite.php:102
 #, php-format
-msgid "Please join my social network on %s"
-msgstr "Bitte trete meinem Sozialen Netzwerk auf %s bei"
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
+msgstr "Um diese Freundschaftsanfrage zu akzeptieren, besuche und registriere dich bitte bei %s oder einer anderen öffentlichen Friendica Website."
 
 #: ../../mod/invite.php:103
-msgid "To accept this invitation, please visit:"
-msgstr "Um diese Einladung anzunehmen besuche bitte:"
+#, php-format
+msgid ""
+"Friendica sites all inter-connect to create a huge privacy-enhanced social "
+"web that is owned and controlled by its members. They can also connect with "
+"many traditional social networks. See %s for a list of alternate Friendica "
+"sites you can join."
+msgstr "Friendica Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica Server, denen du beitreten kannst."
+
+#: ../../mod/invite.php:106
+msgid ""
+"Our apologies. This system is not currently configured to connect with other"
+" public sites or invite members."
+msgstr "Es tut uns Leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen."
+
+#: ../../mod/invite.php:111
+msgid "Send invitations"
+msgstr "Einladungen senden"
+
+#: ../../mod/invite.php:112
+msgid "Enter email addresses, one per line:"
+msgstr "E-Mail-Adressen eingeben, eine pro Zeile:"
 
-#: ../../mod/invite.php:104
+#: ../../mod/invite.php:114
+msgid ""
+"You are cordially invited to join me and other close friends on Friendica - "
+"and help us to create a better social web."
+msgstr "Du bist herzlich dazu eingeladen, dich mir und anderen guten Freunden auf Friendica anzuschließen - und ein besseres Soziales Netz aufzubauen."
+
+#: ../../mod/invite.php:116
 msgid "You will need to supply this invitation code: $invite_code"
 msgstr "Du benötigst den folgenden Einladungscode: $invite_code"
 
-#: ../../mod/invite.php:104
+#: ../../mod/invite.php:116
 msgid ""
 "Once you have registered, please connect with me via my profile page at:"
 msgstr "Sobald du registriert bist, kontaktiere mich bitte auf meiner Profilseite:"
 
-#: ../../mod/dfrn_confirm.php:238
+#: ../../mod/invite.php:118
+msgid ""
+"For more information about the Friendica project and why we feel it is "
+"important, please visit http://friendica.com"
+msgstr "Für weitere Informationen über das Friendica Projekt und warum wir es für ein wichtiges Projekt halten, besuche bitte http://friendica.com"
+
+#: ../../mod/dfrn_confirm.php:119
+msgid ""
+"This may occasionally happen if contact was requested by both persons and it"
+" has already been approved."
+msgstr "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde."
+
+#: ../../mod/dfrn_confirm.php:242
 msgid "Response from remote site was not understood."
 msgstr "Antwort der Gegenstelle unverständlich."
 
-#: ../../mod/dfrn_confirm.php:247
+#: ../../mod/dfrn_confirm.php:251
 msgid "Unexpected response from remote site: "
 msgstr "Unerwartete Antwort der Gegenstelle: "
 
-#: ../../mod/dfrn_confirm.php:255
+#: ../../mod/dfrn_confirm.php:259
 msgid "Confirmation completed successfully."
 msgstr "Bestätigung erfolgreich abgeschlossen."
 
-#: ../../mod/dfrn_confirm.php:257 ../../mod/dfrn_confirm.php:271
-#: ../../mod/dfrn_confirm.php:278
+#: ../../mod/dfrn_confirm.php:261 ../../mod/dfrn_confirm.php:275
+#: ../../mod/dfrn_confirm.php:282
 msgid "Remote site reported: "
 msgstr "Gegenstelle meldet: "
 
-#: ../../mod/dfrn_confirm.php:269
+#: ../../mod/dfrn_confirm.php:273
 msgid "Temporary failure. Please wait and try again."
 msgstr "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal."
 
-#: ../../mod/dfrn_confirm.php:276
+#: ../../mod/dfrn_confirm.php:280
 msgid "Introduction failed or was revoked."
 msgstr "Kontaktanfrage schlug fehl oder wurde zurück gezogen."
 
-#: ../../mod/dfrn_confirm.php:421
+#: ../../mod/dfrn_confirm.php:425
 msgid "Unable to set contact photo."
 msgstr "Konnte das Bild des Kontakts nicht speichern."
 
-#: ../../mod/dfrn_confirm.php:473 ../../include/diaspora.php:495
+#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507
 #: ../../include/conversation.php:101
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr "%1$s ist nun mit %2$s befreundet"
 
-#: ../../mod/dfrn_confirm.php:543
+#: ../../mod/dfrn_confirm.php:548
 #, php-format
 msgid "No user record found for '%s' "
 msgstr "Für '%s' wurde kein Nutzer gefunden"
 
-#: ../../mod/dfrn_confirm.php:553
+#: ../../mod/dfrn_confirm.php:558
 msgid "Our site encryption key is apparently messed up."
 msgstr "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend im Arsch."
 
-#: ../../mod/dfrn_confirm.php:564
+#: ../../mod/dfrn_confirm.php:569
 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden."
 
-#: ../../mod/dfrn_confirm.php:585
+#: ../../mod/dfrn_confirm.php:590
 msgid "Contact record was not found for you on our site."
 msgstr "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden."
 
-#: ../../mod/dfrn_confirm.php:599
+#: ../../mod/dfrn_confirm.php:604
 #, php-format
 msgid "Site public key not available in contact record for URL %s."
 msgstr "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server."
 
-#: ../../mod/dfrn_confirm.php:619
+#: ../../mod/dfrn_confirm.php:624
 msgid ""
 "The ID provided by your system is a duplicate on our system. It should work "
 "if you try again."
 msgstr "Die ID, die uns dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal."
 
-#: ../../mod/dfrn_confirm.php:630
+#: ../../mod/dfrn_confirm.php:635
 msgid "Unable to set your contact credentials on our system."
 msgstr "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden."
 
-#: ../../mod/dfrn_confirm.php:684
+#: ../../mod/dfrn_confirm.php:700
 msgid "Unable to update your contact profile details on our system"
 msgstr "Die Updates für dein Profil konnten nicht gespeichert werden"
 
-#: ../../mod/dfrn_confirm.php:714
+#: ../../mod/dfrn_confirm.php:730
 #, php-format
 msgid "Connection accepted at %s"
 msgstr "Auf %s wurde die Verbindung akzeptiert"
 
-#: ../../addon/facebook/facebook.php:338
+#: ../../addon/facebook/facebook.php:462
 msgid "Facebook disabled"
 msgstr "Facebook deaktiviert"
 
-#: ../../addon/facebook/facebook.php:343
+#: ../../addon/facebook/facebook.php:467
 msgid "Updating contacts"
 msgstr "Aktualisiere Kontakte"
 
-#: ../../addon/facebook/facebook.php:352
+#: ../../addon/facebook/facebook.php:488
 msgid "Facebook API key is missing."
 msgstr "Facebook-API-Schlüssel nicht gefunden"
 
-#: ../../addon/facebook/facebook.php:359
+#: ../../addon/facebook/facebook.php:495
 msgid "Facebook Connect"
 msgstr "Mit Facebook verbinden"
 
-#: ../../addon/facebook/facebook.php:365
+#: ../../addon/facebook/facebook.php:501
 msgid "Install Facebook connector for this account."
 msgstr "Facebook-Connector für diesen Account installieren."
 
-#: ../../addon/facebook/facebook.php:372
+#: ../../addon/facebook/facebook.php:508
 msgid "Remove Facebook connector"
 msgstr "Facebook-Connector entfernen"
 
-#: ../../addon/facebook/facebook.php:377
+#: ../../addon/facebook/facebook.php:513
 msgid ""
 "Re-authenticate [This is necessary whenever your Facebook password is "
 "changed.]"
 msgstr "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]"
 
-#: ../../addon/facebook/facebook.php:384
+#: ../../addon/facebook/facebook.php:520
 msgid "Post to Facebook by default"
 msgstr "Veröffentliche standardmäßig bei Facebook"
 
-#: ../../addon/facebook/facebook.php:388
+#: ../../addon/facebook/facebook.php:524
 msgid "Link all your Facebook friends and conversations on this website"
 msgstr "All meine Facebook-Kontakte und -Konversationen hier auf diese Website importieren"
 
-#: ../../addon/facebook/facebook.php:390
+#: ../../addon/facebook/facebook.php:526
 msgid ""
 "Facebook conversations consist of your <em>profile wall</em> and your friend"
 " <em>stream</em>."
 msgstr "Facebook-Konversationen bestehen aus deinen Beiträgen auf deiner<em>Pinnwand</em>, sowie den Beiträgen deiner Freunde <em>Stream</em>."
 
-#: ../../addon/facebook/facebook.php:391
+#: ../../addon/facebook/facebook.php:527
 msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr "Hier auf dieser Webseite kannst nur du die Beiträge Deiner Facebook-Freunde (Stream) sehen."
 
-#: ../../addon/facebook/facebook.php:392
+#: ../../addon/facebook/facebook.php:528
 msgid ""
 "The following settings determine the privacy of your Facebook profile wall "
 "on this website."
 msgstr "Mit den folgenden Einstellungen kannst Du die Privatsphäre der Kopie Deiner Facebook-Pinnwand hier auf dieser Seite einstellen."
 
-#: ../../addon/facebook/facebook.php:396
+#: ../../addon/facebook/facebook.php:532
 msgid ""
 "On this website your Facebook profile wall conversations will only be "
 "visible to you"
 msgstr "Meine Facebook-Pinnwand hier auf dieser Webseite nur für mich sichtbar machen"
 
-#: ../../addon/facebook/facebook.php:401
+#: ../../addon/facebook/facebook.php:537
 msgid "Do not import your Facebook profile wall conversations"
 msgstr "Facebook-Pinnwand nicht importieren"
 
-#: ../../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 "
@@ -3750,43 +4125,123 @@ msgid ""
 "who may see the conversations."
 msgstr "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann."
 
-#: ../../addon/facebook/facebook.php:408
+#: ../../addon/facebook/facebook.php:544
 msgid "Comma separated applications to ignore"
 msgstr "Komma separiert Anwendungen, die ignoriert werden sollen"
 
-#: ../../addon/facebook/facebook.php:476
+#: ../../addon/facebook/facebook.php:615
+msgid "Problems with Facebook Real-Time Updates"
+msgstr "Probleme mit Facebook Echtzeit-Updates"
+
+#: ../../addon/facebook/facebook.php:639
 #: ../../include/contact_selectors.php:81
 msgid "Facebook"
 msgstr "Facebook"
 
-#: ../../addon/facebook/facebook.php:477
+#: ../../addon/facebook/facebook.php:640
 msgid "Facebook Connector Settings"
 msgstr "Facebook-Verbindungseinstellungen"
 
-#: ../../addon/facebook/facebook.php:491
+#: ../../addon/facebook/facebook.php:649
+msgid "Facebook API Key"
+msgstr "Facebook API Schlüssel"
+
+#: ../../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 "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.<br><br>"
+
+#: ../../addon/facebook/facebook.php:663
+msgid ""
+"Error: the given API Key seems to be incorrect (the application access token"
+" could not be retrieved)."
+msgstr "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden)."
+
+#: ../../addon/facebook/facebook.php:665
+msgid "The given API Key seems to work correctly."
+msgstr "Der angegebene API Schlüssel scheint nicht korrekt zu funktionieren."
+
+#: ../../addon/facebook/facebook.php:667
+msgid ""
+"The correctness of the API Key could not be detected. Somthing strange's "
+"going on."
+msgstr "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange."
+
+#: ../../addon/facebook/facebook.php:670
+msgid "App-ID / API-Key"
+msgstr "App-ID / API-Key"
+
+#: ../../addon/facebook/facebook.php:671
+msgid "Application secret"
+msgstr "Anwendungs-Geheimnis"
+
+#: ../../addon/facebook/facebook.php:672
+#, php-format
+msgid "Polling Interval (min. %1$s minutes)"
+msgstr "Abrufintervall (min. %1$s Minuten)"
+
+#: ../../addon/facebook/facebook.php:676
+msgid "Real-Time Updates"
+msgstr "Echt-Zeit Aktualisierungen"
+
+#: ../../addon/facebook/facebook.php:680
+msgid "Real-Time Updates are activated."
+msgstr "Echtzeit-Updates sind aktiviert."
+
+#: ../../addon/facebook/facebook.php:681
+msgid "Deactivate Real-Time Updates"
+msgstr "Echtzeit-Updates deaktivieren"
+
+#: ../../addon/facebook/facebook.php:683
+msgid "Real-Time Updates not activated."
+msgstr "Echtzeit-Updates nicht aktiviert."
+
+#: ../../addon/facebook/facebook.php:683
+msgid "Activate Real-Time Updates"
+msgstr "Echtzeit-Updates aktivieren"
+
+#: ../../addon/facebook/facebook.php:697
+msgid "The new values have been saved."
+msgstr "Die neuen Einstellungen wurden gespeichert."
+
+#: ../../addon/facebook/facebook.php:716
 msgid "Post to Facebook"
 msgstr "Bei Facebook veröffentlichen"
 
-#: ../../addon/facebook/facebook.php:582
+#: ../../addon/facebook/facebook.php:808
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr "Beitrag wurde nicht bei Facebook veröffentlicht, da Konflikte bei den Multi-Netzwerk-Zugriffsrechten vorliegen."
 
-#: ../../addon/facebook/facebook.php:651
-msgid "Image: "
-msgstr "Bild: "
-
-#: ../../addon/facebook/facebook.php:728
+#: ../../addon/facebook/facebook.php:1026
 msgid "View on Friendica"
 msgstr "In Friendica betrachten"
 
-#: ../../addon/facebook/facebook.php:752
+#: ../../addon/facebook/facebook.php:1051
 msgid "Facebook post failed. Queued for retry."
 msgstr "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut."
 
-#: ../../addon/facebook/facebook.php:877 ../../addon/facebook/facebook.php:886
-#: ../../include/bb2diaspora.php:132
+#: ../../addon/facebook/facebook.php:1087
+msgid "Your Facebook connection became invalid. Please Re-authenticate."
+msgstr "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich."
+
+#: ../../addon/facebook/facebook.php:1088
+msgid "Facebook connection became invalid"
+msgstr "Facebook Anmeldedaten sind ungültig geworden"
+
+#: ../../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 "Hi %1$s,\n\ndie Verbindung von deinem Account auf %2$s und Facebook funktioniert derzeit nicht. Dies ist im Allgemeinen das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du  %3$sden Facebook-Connector neu Authentifizieren%4$s."
+
+#: ../../addon/facebook/facebook.php:1214
+#: ../../addon/facebook/facebook.php:1223 ../../include/bb2diaspora.php:102
 msgid "link"
 msgstr "Verweis"
 
@@ -3804,15 +4259,15 @@ msgid_plural "%d people don't like this"
 msgstr[0] " %d Person mag das nicht"
 msgstr[1] "%d Leute mögen das nicht"
 
-#: ../../addon/widgets/widgets.php:55
+#: ../../addon/widgets/widgets.php:56
 msgid "Generate new key"
 msgstr "Neuen Schlüssel erstellen"
 
-#: ../../addon/widgets/widgets.php:58
+#: ../../addon/widgets/widgets.php:59
 msgid "Widgets key"
 msgstr "Widgets Schlüssel"
 
-#: ../../addon/widgets/widgets.php:60
+#: ../../addon/widgets/widgets.php:61
 msgid "Widgets available"
 msgstr "Verfügbare Widgets"
 
@@ -3844,17 +4299,51 @@ msgstr "SSL Verwenden "
 msgid "yourls Settings saved."
 msgstr "yourls Einstellungen gespeichert"
 
+#: ../../addon/ljpost/ljpost.php:39
+msgid "Post to LiveJournal"
+msgstr "In LiveJournal veröffentlichen."
+
+#: ../../addon/ljpost/ljpost.php:70
+msgid "LiveJournal Post Settings"
+msgstr "LiveJournal Veröffentlichungs-Einstellungen"
+
+#: ../../addon/ljpost/ljpost.php:72
+msgid "Enable LiveJournal Post Plugin"
+msgstr "LiveJournal Post Plugin aktivieren"
+
+#: ../../addon/ljpost/ljpost.php:77
+msgid "LiveJournal username"
+msgstr "LiveJournal Benutzername"
+
+#: ../../addon/ljpost/ljpost.php:82
+msgid "LiveJournal password"
+msgstr "LiveJournal Passwort"
+
+#: ../../addon/ljpost/ljpost.php:87
+msgid "Post to LiveJournal by default"
+msgstr "Standardmäßig bei LiveJournal veröffentlichen"
+
 #: ../../addon/nsfw/nsfw.php:47
-msgid "\"Not Safe For Work\" Settings"
-msgstr "\"Not Safe For Work\"-Einstellungen"
+msgid "Not Safe For Work (General Purpose Content Filter) settings"
+msgstr "Not Safe for Work (allg. Filter für ungewollte Inhalte) Einstellungen:"
+
+#: ../../addon/nsfw/nsfw.php:49
+msgid ""
+"This plugin looks in posts for the words/text you specify below, and "
+"collapses any content containing those keywords so it is not displayed at "
+"inappropriate times, such as sexual innuendo that may be improper in a work "
+"setting. It is polite and recommended to tag any content containing nudity "
+"with #NSFW.  This filter can also match any other word/text you specify, and"
+" can thereby be used as a general purpose content filter."
+msgstr "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Su kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden."
 
 #: ../../addon/nsfw/nsfw.php:50
-msgid "Enable NSFW filter"
-msgstr "NSFW Filter aktivieren"
+msgid "Enable Content filter"
+msgstr "Aktiviere den Inhaltsfilter"
 
 #: ../../addon/nsfw/nsfw.php:53
-msgid "Comma separated words to treat as NSFW"
-msgstr "Wörter, die gefiltert werden sollen (durch Kommas getrennt)"
+msgid "Comma separated list of keywords to hide"
+msgstr "Durch Komma getrennte Liste von Schlüsselwörtern die verborgen werden sollen"
 
 #: ../../addon/nsfw/nsfw.php:58
 msgid "Use /expression/ to provide regular expressions"
@@ -3869,33 +4358,46 @@ msgstr "NSFW-Einstellungen gespeichert"
 msgid "%s - Click to open/close"
 msgstr "%s – Zum Öffnen/Schließen klicken"
 
+#: ../../addon/page/page.php:47
+msgid "Forums"
+msgstr "Foren"
+
 #: ../../addon/communityhome/communityhome.php:28
-#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:62
-#: ../../boot.php:710
+#: ../../addon/communityhome/communityhome.php:34
+#: ../../addon/communityhome/twillingham/communityhome.php:28
+#: ../../addon/communityhome/twillingham/communityhome.php:34
+#: ../../include/nav.php:64 ../../boot.php:766
 msgid "Login"
 msgstr "Anmeldung"
 
 #: ../../addon/communityhome/communityhome.php:29
+#: ../../addon/communityhome/twillingham/communityhome.php:29
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../../addon/communityhome/communityhome.php:38
-msgid "Last users"
-msgstr "Letzte Nutzer"
+#: ../../addon/communityhome/twillingham/communityhome.php:38
+msgid "Latest users"
+msgstr "Letzte Benutzer"
 
 #: ../../addon/communityhome/communityhome.php:81
+#: ../../addon/communityhome/twillingham/communityhome.php:81
 msgid "Most active users"
 msgstr "Aktivste Nutzer"
 
 #: ../../addon/communityhome/communityhome.php:98
-msgid "Last photos"
-msgstr "Letzte Fotos"
+msgid "Latest photos"
+msgstr "Neueste Fotos"
 
 #: ../../addon/communityhome/communityhome.php:133
-msgid "Last likes"
-msgstr "Zuletzt gemocht"
+msgid "Latest likes"
+msgstr "Neueste Favoriten"
 
 #: ../../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 "Veranstaltung"
@@ -3987,6 +4489,30 @@ msgstr "Randplace-Einstellungen"
 msgid "Enable Randplace Plugin"
 msgstr "Randplace-Plugin aktivieren"
 
+#: ../../addon/dwpost/dwpost.php:39
+msgid "Post to Dreamwidth"
+msgstr "In Dreamwidth veröffentlichen"
+
+#: ../../addon/dwpost/dwpost.php:70
+msgid "Dreamwidth Post Settings"
+msgstr "Dreamwidth Veröffentlichungs-Einstellungen"
+
+#: ../../addon/dwpost/dwpost.php:72
+msgid "Enable dreamwidth Post Plugin"
+msgstr "Dreamwidth Post Plugin aktivieren"
+
+#: ../../addon/dwpost/dwpost.php:77
+msgid "dreamwidth username"
+msgstr "Dreamwidth Benutzername"
+
+#: ../../addon/dwpost/dwpost.php:82
+msgid "dreamwidth password"
+msgstr "Dreamwidth Passwort"
+
+#: ../../addon/dwpost/dwpost.php:87
+msgid "Post to dreamwidth by default"
+msgstr "Standardmäßig bei Dreamwidth veröffentlichen"
+
 #: ../../addon/drpost/drpost.php:35
 msgid "Post to Drupal"
 msgstr "Bei Drupal veröffentlichen"
@@ -4023,7 +4549,7 @@ msgstr "Drupal Seite verwendet bereinigte URLs"
 msgid "Post to Drupal by default"
 msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Drupal"
 
-#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:172
+#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190
 #: ../../addon/posterous/posterous.php:173
 msgid "Post from Friendica"
 msgstr "Beitrag via Friendica"
@@ -4165,10 +4691,16 @@ msgid "Quick Comment Settings"
 msgstr "Schnell-Kommentar Einstellungen"
 
 #: ../../addon/qcomment/qcomment.php:56
+msgid ""
+"Quick comments are found near comment boxes, sometimes hidden. Click them to"
+" provide simple replies."
+msgstr "Kurz-Kommentare findet man in der Nähe der Kommentar-Boxen. Ein Klick darauf erstellt einfache Antworten."
+
+#: ../../addon/qcomment/qcomment.php:57
 msgid "Enter quick comments, one per line"
 msgstr "Gib einen Schnell-Kommentar pro Zeile ein"
 
-#: ../../addon/qcomment/qcomment.php:74
+#: ../../addon/qcomment/qcomment.php:75
 msgid "Quick Comment settings saved."
 msgstr "Schnell-Kommentare Einstellungen gespeichert"
 
@@ -4202,15 +4734,39 @@ msgstr "Editplain Einstellungen"
 msgid "Disable richtext status editor"
 msgstr "RichText Editor deaktivieren"
 
-#: ../../addon/pageheader/pageheader.php:47
+#: ../../addon/pageheader/pageheader.php:50
 msgid "\"pageheader\" Settings"
 msgstr "\"pageheader\"-Einstellungen"
 
-#: ../../addon/pageheader/pageheader.php:65
+#: ../../addon/pageheader/pageheader.php:68
 msgid "pageheader Settings saved."
 msgstr "pageheader-Einstellungen gespeichert."
 
-#: ../../addon/viewsrc/viewsrc.php:25
+#: ../../addon/ijpost/ijpost.php:39
+msgid "Post to Insanejournal"
+msgstr "Auf InsaneJournal posten."
+
+#: ../../addon/ijpost/ijpost.php:70
+msgid "InsaneJournal Post Settings"
+msgstr "InsaneJournal Beitrags-Einstellungen"
+
+#: ../../addon/ijpost/ijpost.php:72
+msgid "Enable InsaneJournal Post Plugin"
+msgstr "InsaneJournal Plugin aktivieren"
+
+#: ../../addon/ijpost/ijpost.php:77
+msgid "InsaneJournal username"
+msgstr "InsaneJournal Benutzername"
+
+#: ../../addon/ijpost/ijpost.php:82
+msgid "InsaneJournal password"
+msgstr "InsaneJournal Passwort"
+
+#: ../../addon/ijpost/ijpost.php:87
+msgid "Post to InsaneJournal by default"
+msgstr "Standardmäßig auf InsaneJournal posten."
+
+#: ../../addon/viewsrc/viewsrc.php:37
 msgid "View Source"
 msgstr "Quelle ansehen"
 
@@ -4218,40 +4774,40 @@ msgstr "Quelle ansehen"
 msgid "Post to StatusNet"
 msgstr "Bei StatusNet veröffentlichen"
 
-#: ../../addon/statusnet/statusnet.php:175
+#: ../../addon/statusnet/statusnet.php:176
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr "Bitte kontaktiere den Administrator des Servers.<br />Die angegebene API-URL ist nicht gültig."
 
-#: ../../addon/statusnet/statusnet.php:203
+#: ../../addon/statusnet/statusnet.php:204
 msgid "We could not contact the StatusNet API with the Path you entered."
 msgstr "Die StatusNet-API konnte mit dem angegebenen Pfad nicht erreicht werden."
 
-#: ../../addon/statusnet/statusnet.php:229
+#: ../../addon/statusnet/statusnet.php:232
 msgid "StatusNet settings updated."
 msgstr "StatusNet Einstellungen aktualisiert."
 
-#: ../../addon/statusnet/statusnet.php:252
+#: ../../addon/statusnet/statusnet.php:257
 msgid "StatusNet Posting Settings"
 msgstr "StatusNet-Beitragseinstellungen"
 
-#: ../../addon/statusnet/statusnet.php:266
+#: ../../addon/statusnet/statusnet.php:271
 msgid "Globally Available StatusNet OAuthKeys"
 msgstr "Verfügbare OAuth Schlüssel für StatusNet"
 
-#: ../../addon/statusnet/statusnet.php:267
+#: ../../addon/statusnet/statusnet.php:272
 msgid ""
 "There are preconfigured OAuth key pairs for some StatusNet servers "
 "available. If you are useing one of them, please use these credentials. If "
 "not feel free to connect to any other StatusNet instance (see below)."
 msgstr "Für einige StatusNet Server sind voreingestellt OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stellen stattdessen eine Verbindung zu irgend einem anderen StatusNet Server her (siehe unten)."
 
-#: ../../addon/statusnet/statusnet.php:275
+#: ../../addon/statusnet/statusnet.php:280
 msgid "Provide your own OAuth Credentials"
 msgstr "Eigene OAuth Schlüssel eintragen"
 
-#: ../../addon/statusnet/statusnet.php:276
+#: ../../addon/statusnet/statusnet.php:281
 msgid ""
 "No consumer key pair for StatusNet found. Register your Friendica Account as"
 " an desktop client on your StatusNet account, copy the consumer key pair "
@@ -4260,19 +4816,19 @@ msgid ""
 "Friendica installation at your favorited StatusNet installation."
 msgstr "Kein Consumer-Schlüsselpaar für StatusNet gefunden. Registriere deinen Friendica-Account als Desktop-Client, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.<br />Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Friendica-Servers, ob schon ein Schlüsselpaar für diesen Friendica-Server auf diesem StatusNet-Server existiert."
 
-#: ../../addon/statusnet/statusnet.php:278
+#: ../../addon/statusnet/statusnet.php:283
 msgid "OAuth Consumer Key"
 msgstr "OAuth Consumer Key"
 
-#: ../../addon/statusnet/statusnet.php:281
+#: ../../addon/statusnet/statusnet.php:286
 msgid "OAuth Consumer Secret"
 msgstr "OAuth Consumer Secret"
 
-#: ../../addon/statusnet/statusnet.php:284
+#: ../../addon/statusnet/statusnet.php:289
 msgid "Base API Path (remember the trailing /)"
 msgstr "Basis-URL der StatusNet-API (vergiss den abschließenden / nicht)"
 
-#: ../../addon/statusnet/statusnet.php:305
+#: ../../addon/statusnet/statusnet.php:310
 msgid ""
 "To connect to your StatusNet account click the button below to get a "
 "security code from StatusNet which you have to copy into the input box below"
@@ -4280,38 +4836,38 @@ msgid ""
 " to StatusNet."
 msgstr "Um deinen Account mit einem StatusNet-Account zu verknüpfen, klicke den Button an, um einen Sicherheitscode von StatusNet zu erhalten, und kopiere diesen in das Eingabefeld weiter unten. Es werden ausschließlich deine <strong>öffentlichen</strong> Nachrichten an StatusNet gesendet."
 
-#: ../../addon/statusnet/statusnet.php:306
+#: ../../addon/statusnet/statusnet.php:311
 msgid "Log in with StatusNet"
 msgstr "Bei StatusNet anmelden"
 
-#: ../../addon/statusnet/statusnet.php:308
+#: ../../addon/statusnet/statusnet.php:313
 msgid "Copy the security code from StatusNet here"
 msgstr "Kopiere den Sicherheitscode von StatusNet hier hin"
 
-#: ../../addon/statusnet/statusnet.php:314
+#: ../../addon/statusnet/statusnet.php:319
 msgid "Cancel Connection Process"
 msgstr "Verbindungsprozess abbrechen"
 
-#: ../../addon/statusnet/statusnet.php:316
+#: ../../addon/statusnet/statusnet.php:321
 msgid "Current StatusNet API is"
 msgstr "Derzeitige StatusNet-API-URL lautet"
 
-#: ../../addon/statusnet/statusnet.php:317
+#: ../../addon/statusnet/statusnet.php:322
 msgid "Cancel StatusNet Connection"
 msgstr "Verbindung zum StatusNet Server abbrechen"
 
-#: ../../addon/statusnet/statusnet.php:328 ../../addon/twitter/twitter.php:184
+#: ../../addon/statusnet/statusnet.php:333 ../../addon/twitter/twitter.php:189
 msgid "Currently connected to: "
 msgstr "Momentan verbunden mit: "
 
-#: ../../addon/statusnet/statusnet.php:329
+#: ../../addon/statusnet/statusnet.php:334
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated StatusNet account. You can choose to do so by default (here) or "
 "for every posting separately in the posting options when writing the entry."
 msgstr "Wenn aktiviert, so können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen StatusNet Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."
 
-#: ../../addon/statusnet/statusnet.php:331
+#: ../../addon/statusnet/statusnet.php:336
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "
@@ -4319,19 +4875,23 @@ msgid ""
 "informing the visitor that the access to your profile has been restricted."
 msgstr "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an deinen StatusNet Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."
 
-#: ../../addon/statusnet/statusnet.php:334
+#: ../../addon/statusnet/statusnet.php:339
 msgid "Allow posting to StatusNet"
 msgstr "Veröffentlichung bei StatusNet erlauben"
 
-#: ../../addon/statusnet/statusnet.php:337
+#: ../../addon/statusnet/statusnet.php:342
 msgid "Send public postings to StatusNet by default"
 msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei StatusNet"
 
-#: ../../addon/statusnet/statusnet.php:342 ../../addon/twitter/twitter.php:198
+#: ../../addon/statusnet/statusnet.php:345
+msgid "Send #tag links to StatusNet"
+msgstr "#Tags nach StatusNet senden"
+
+#: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206
 msgid "Clear OAuth configuration"
 msgstr "OAuth-Konfiguration löschen"
 
-#: ../../addon/statusnet/statusnet.php:524
+#: ../../addon/statusnet/statusnet.php:539
 msgid "API URL"
 msgstr "API-URL"
 
@@ -4371,6 +4931,29 @@ msgstr "Numfriends Einstellungen"
 msgid "How many contacts to display on profile sidebar"
 msgstr "Wie viele Kontakte sollen in der Seitenleiste angezeigt werden"
 
+#: ../../addon/gnot/gnot.php:48
+msgid "Gnot settings updated."
+msgstr "Gnot Einstellungen aktualisiert."
+
+#: ../../addon/gnot/gnot.php:79
+msgid "Gnot Settings"
+msgstr "Gnot Einstellungen"
+
+#: ../../addon/gnot/gnot.php:81
+msgid ""
+"Allows threading of email comment notifications on Gmail and anonymising the"
+" subject line."
+msgstr "Erlaubt das Veröffentlichen von E-Mail Kommentar Benachrichtigungen bei Gmail mit anonymisiertem Betreff"
+
+#: ../../addon/gnot/gnot.php:82
+msgid "Enable this plugin/addon?"
+msgstr "Dieses Plugin/Addon aktivieren?"
+
+#: ../../addon/gnot/gnot.php:97
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d"
+msgstr "[Friendica Meldung] Kommentar zum Beitrag #%d"
+
 #: ../../addon/wppost/wppost.php:42
 msgid "Post to Wordpress"
 msgstr "Bei WordPress veröffentlichen"
@@ -4415,9 +4998,10 @@ msgstr "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben"
 msgid "Show More Settings saved."
 msgstr "\"Mehr zeigen\" Einstellungen gesichert."
 
-#: ../../addon/showmore/showmore.php:86
-msgid "Show More"
-msgstr "\"Mehr zeigen\""
+#: ../../addon/showmore/showmore.php:86 ../../include/conversation.php:466
+#: ../../boot.php:495
+msgid "show more"
+msgstr "mehr anzeigen"
 
 #: ../../addon/piwik/piwik.php:79
 msgid ""
@@ -4459,21 +5043,21 @@ msgstr "Asynchrones Tracken"
 msgid "Post to Twitter"
 msgstr "Bei Twitter veröffentlichen"
 
-#: ../../addon/twitter/twitter.php:119
+#: ../../addon/twitter/twitter.php:122
 msgid "Twitter settings updated."
 msgstr "Twitter Einstellungen aktualisiert."
 
-#: ../../addon/twitter/twitter.php:141
+#: ../../addon/twitter/twitter.php:146
 msgid "Twitter Posting Settings"
 msgstr "Twitter-Beitragseinstellungen"
 
-#: ../../addon/twitter/twitter.php:148
+#: ../../addon/twitter/twitter.php:153
 msgid ""
 "No consumer key pair for Twitter found. Please contact your site "
 "administrator."
 msgstr "Kein Consumer-Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite."
 
-#: ../../addon/twitter/twitter.php:167
+#: ../../addon/twitter/twitter.php:172
 msgid ""
 "At this Friendica instance the Twitter plugin was enabled but you have not "
 "yet connected your account to your Twitter account. To do so click the "
@@ -4482,22 +5066,22 @@ msgid ""
 " be posted to Twitter."
 msgstr "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du dann in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur <strong>öffentliche</strong> Beiträge werden bei Twitter veröffentlicht."
 
-#: ../../addon/twitter/twitter.php:168
+#: ../../addon/twitter/twitter.php:173
 msgid "Log in with Twitter"
 msgstr "bei Twitter anmelden"
 
-#: ../../addon/twitter/twitter.php:170
+#: ../../addon/twitter/twitter.php:175
 msgid "Copy the PIN from Twitter here"
 msgstr "Kopiere die Twitter-PIN hier her"
 
-#: ../../addon/twitter/twitter.php:185
+#: ../../addon/twitter/twitter.php:190
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for"
 " every posting separately in the posting options when writing the entry."
 msgstr "Wenn aktiviert, so können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen Twitter Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."
 
-#: ../../addon/twitter/twitter.php:187
+#: ../../addon/twitter/twitter.php:192
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "
@@ -4505,22 +5089,34 @@ msgid ""
 "the visitor that the access to your profile has been restricted."
 msgstr "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an an deinen Twitter Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."
 
-#: ../../addon/twitter/twitter.php:190
+#: ../../addon/twitter/twitter.php:195
 msgid "Allow posting to Twitter"
 msgstr "Veröffentlichung bei Twitter erlauben"
 
-#: ../../addon/twitter/twitter.php:193
+#: ../../addon/twitter/twitter.php:198
 msgid "Send public postings to Twitter by default"
 msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter"
 
-#: ../../addon/twitter/twitter.php:357
+#: ../../addon/twitter/twitter.php:201
+msgid "Send #tag links to Twitter"
+msgstr "#Tags nach Twitter senden"
+
+#: ../../addon/twitter/twitter.php:371
 msgid "Consumer key"
 msgstr "Consumer Key"
 
-#: ../../addon/twitter/twitter.php:358
+#: ../../addon/twitter/twitter.php:372
 msgid "Consumer secret"
 msgstr "Consumer Secret"
 
+#: ../../addon/irc/irc.php:25
+msgid "IRC Chatroom"
+msgstr "IRC Chatraum"
+
+#: ../../addon/irc/irc.php:46
+msgid "Popular Channels"
+msgstr "Beliebte Räume"
+
 #: ../../addon/posterous/posterous.php:36
 msgid "Post to Posterous"
 msgstr "Nach Posterous senden"
@@ -4545,7 +5141,183 @@ msgstr "Posterous-Passwort"
 msgid "Post to Posterous by default"
 msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous"
 
-#: ../../include/profile_advanced.php:17 ../../boot.php:982
+#: ../../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 "Letzte Nutzer"
+
+#: ../../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 "Zuletzt gemocht"
+
+#: ../../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 "Letzte Fotos"
+
+#: ../../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 "Freunde finden"
+
+#: ../../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 "Lokales Verzeichnis"
+
+#: ../../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 "Ähnliche Interessen"
+
+#: ../../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 "Freunde einladen"
+
+#: ../../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 "Foren"
+
+#: ../../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 "Hilfe oder @NewHere"
+
+#: ../../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 "Verbinde Dienste"
+
+#: ../../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 "PostIt nach Friendica"
+
+#: ../../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 "Bei Friendica veröffentlichen"
+
+#: ../../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 " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst."
+
+#: ../../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 "Deine Beiträge und Unterhaltungen"
+
+#: ../../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 "Deine Profilseite"
+
+#: ../../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 "Deine Kontakte"
+
+#: ../../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 "Bilder"
+
+#: ../../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 "Deine Fotos"
+
+#: ../../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 "Deine Ereignisse"
+
+#: ../../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 "Persönliche Notizen"
+
+#: ../../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 "Deine privaten Fotos"
+
+#: ../../view/theme/quattro/config.php:23
+msgid "Theme settings"
+msgstr "Themen Einstellungen"
+
+#: ../../view/theme/quattro/config.php:24
+msgid "Alignment"
+msgstr "Ausrichtung"
+
+#: ../../view/theme/quattro/config.php:24
+msgid "Left"
+msgstr "Links"
+
+#: ../../view/theme/quattro/config.php:24
+msgid "Center"
+msgstr "Mitte"
+
+#: ../../view/theme/quattro/config.php:25
+msgid "Color scheme"
+msgstr "Farbschema"
+
+#: ../../include/profile_advanced.php:17 ../../boot.php:1044
 msgid "Gender:"
 msgstr "Geschlecht:"
 
@@ -4558,7 +5330,7 @@ msgid "j F"
 msgstr "j F"
 
 #: ../../include/profile_advanced.php:30 ../../include/datetime.php:438
-#: ../../include/items.php:1349
+#: ../../include/items.php:1392
 msgid "Birthday:"
 msgstr "Geburtstag:"
 
@@ -4566,11 +5338,11 @@ msgstr "Geburtstag:"
 msgid "Age:"
 msgstr "Alter:"
 
-#: ../../include/profile_advanced.php:37 ../../boot.php:985
+#: ../../include/profile_advanced.php:37 ../../boot.php:1047
 msgid "Status:"
 msgstr "Status:"
 
-#: ../../include/profile_advanced.php:45 ../../boot.php:987
+#: ../../include/profile_advanced.php:45 ../../boot.php:1049
 msgid "Homepage:"
 msgstr "Homepage:"
 
@@ -4906,160 +5678,200 @@ msgstr "Ist mir nicht wichtig"
 msgid "Ask me"
 msgstr "Frag mich"
 
-#: ../../include/event.php:17 ../../include/bb2diaspora.php:274
+#: ../../include/event.php:17 ../../include/bb2diaspora.php:244
 msgid "Starts:"
 msgstr "Beginnt:"
 
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:282
+#: ../../include/event.php:27 ../../include/bb2diaspora.php:252
 msgid "Finishes:"
 msgstr "Endet:"
 
-#: ../../include/delivery.php:424 ../../include/notifier.php:637
+#: ../../include/delivery.php:434 ../../include/notifier.php:651
 msgid "(no subject)"
 msgstr "(kein Betreff)"
 
-#: ../../include/delivery.php:431 ../../include/enotify.php:16
-#: ../../include/notifier.php:644
+#: ../../include/delivery.php:441 ../../include/enotify.php:23
+#: ../../include/notifier.php:658
 msgid "noreply"
 msgstr "noreply"
 
-#: ../../include/text.php:232
+#: ../../include/text.php:240
 msgid "prev"
 msgstr "vorige"
 
-#: ../../include/text.php:234
+#: ../../include/text.php:242
 msgid "first"
 msgstr "erste"
 
-#: ../../include/text.php:263
+#: ../../include/text.php:271
 msgid "last"
 msgstr "letzte"
 
-#: ../../include/text.php:266
+#: ../../include/text.php:274
 msgid "next"
 msgstr "nächste"
 
-#: ../../include/text.php:557
+#: ../../include/text.php:565
 msgid "No contacts"
 msgstr "Keine Kontakte"
 
-#: ../../include/text.php:566
+#: ../../include/text.php:574
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] "%d Kontakt"
 msgstr[1] "%d Kontakte"
 
-#: ../../include/text.php:637 ../../include/nav.php:87
+#: ../../include/text.php:647 ../../include/nav.php:91
 msgid "Search"
 msgstr "Suche"
 
-#: ../../include/text.php:813
+#: ../../include/text.php:828
 msgid "Monday"
 msgstr "Montag"
 
-#: ../../include/text.php:813
+#: ../../include/text.php:828
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../../include/text.php:813
+#: ../../include/text.php:828
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: ../../include/text.php:813
+#: ../../include/text.php:828
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../../include/text.php:813
+#: ../../include/text.php:828
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../../include/text.php:813
+#: ../../include/text.php:828
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../../include/text.php:813
+#: ../../include/text.php:828
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: ../../include/text.php:817
+#: ../../include/text.php:832
 msgid "January"
 msgstr "Januar"
 
-#: ../../include/text.php:817
+#: ../../include/text.php:832
 msgid "February"
 msgstr "Februar"
 
-#: ../../include/text.php:817
+#: ../../include/text.php:832
 msgid "March"
 msgstr "März"
 
-#: ../../include/text.php:817
+#: ../../include/text.php:832
 msgid "April"
 msgstr "April"
 
-#: ../../include/text.php:817
+#: ../../include/text.php:832
 msgid "May"
 msgstr "Mai"
 
-#: ../../include/text.php:817
+#: ../../include/text.php:832
 msgid "June"
 msgstr "Juni"
 
-#: ../../include/text.php:817
+#: ../../include/text.php:832
 msgid "July"
 msgstr "Juli"
 
-#: ../../include/text.php:817
+#: ../../include/text.php:832
 msgid "August"
 msgstr "August"
 
-#: ../../include/text.php:817
+#: ../../include/text.php:832
 msgid "September"
 msgstr "September"
 
-#: ../../include/text.php:817
+#: ../../include/text.php:832
 msgid "October"
 msgstr "Oktober"
 
-#: ../../include/text.php:817
+#: ../../include/text.php:832
 msgid "November"
 msgstr "November"
 
-#: ../../include/text.php:817
+#: ../../include/text.php:832
 msgid "December"
 msgstr "Dezember"
 
-#: ../../include/text.php:887
+#: ../../include/text.php:916
 msgid "bytes"
 msgstr "Byte"
 
-#: ../../include/text.php:982
+#: ../../include/text.php:933
+msgid "Categories:"
+msgstr "Kategorien:"
+
+#: ../../include/text.php:945
+msgid "remove"
+msgstr "löschen"
+
+#: ../../include/text.php:945
+msgid "[remove]"
+msgstr "[löschen]"
+
+#: ../../include/text.php:948
+msgid "Filed under:"
+msgstr "Abgelegt unter:"
+
+#: ../../include/text.php:964 ../../include/text.php:976
+msgid "Click to open/close"
+msgstr "Zum öffnen/schließen klicken"
+
+#: ../../include/text.php:1068
 msgid "Select an alternate language"
 msgstr "Alternative Sprache auswählen"
 
-#: ../../include/text.php:994
+#: ../../include/text.php:1080
 msgid "default"
 msgstr "standard"
 
-#: ../../include/diaspora.php:570
+#: ../../include/text.php:1296
+msgid "activity"
+msgstr "Aktivität"
+
+#: ../../include/text.php:1298
+msgid "comment"
+msgstr "Kommentar"
+
+#: ../../include/text.php:1299
+msgid "post"
+msgstr "Beitrag"
+
+#: ../../include/text.php:1454
+msgid "Item filed"
+msgstr "Beitrag abgelegt"
+
+#: ../../include/diaspora.php:582
 msgid "Sharing notification from Diaspora network"
 msgstr "Freigabe-Benachrichtigung von Diaspora"
 
-#: ../../include/diaspora.php:1911
+#: ../../include/diaspora.php:1969
 msgid "Attachments:"
 msgstr "Anhänge:"
 
-#: ../../include/diaspora.php:2094
+#: ../../include/diaspora.php:2152
 #, php-format
 msgid "[Relayed] Comment authored by %s from network %s"
 msgstr "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk"
 
-#: ../../include/oembed.php:128
+#: ../../include/network.php:817
+msgid "view full size"
+msgstr "Volle Größe anzeigen"
+
+#: ../../include/oembed.php:132
 msgid "Embedded content"
 msgstr "Eingebetteter Inhalt"
 
-#: ../../include/oembed.php:137
+#: ../../include/oembed.php:141
 msgid "Embedding disabled"
 msgstr "Einbettungen deaktiviert"
 
@@ -5090,135 +5902,115 @@ msgstr "Gruppe bearbeiten"
 msgid "Create a new group"
 msgstr "Neue Gruppe erstellen"
 
-#: ../../include/nav.php:44 ../../boot.php:709
+#: ../../include/nav.php:46 ../../boot.php:765
 msgid "Logout"
 msgstr "Abmelden"
 
-#: ../../include/nav.php:44
+#: ../../include/nav.php:46
 msgid "End this session"
 msgstr "Diese Sitzung beenden"
 
-#: ../../include/nav.php:47 ../../boot.php:1331
+#: ../../include/nav.php:49 ../../boot.php:1403
 msgid "Status"
 msgstr "Status"
 
-#: ../../include/nav.php:47 ../../include/nav.php:111
-msgid "Your posts and conversations"
-msgstr "Deine Beiträge und Unterhaltungen"
-
-#: ../../include/nav.php:48
-msgid "Your profile page"
-msgstr "Deine Profilseite"
-
-#: ../../include/nav.php:49 ../../boot.php:1341
-msgid "Photos"
-msgstr "Bilder"
-
-#: ../../include/nav.php:49
-msgid "Your photos"
-msgstr "Deine Fotos"
-
-#: ../../include/nav.php:50
-msgid "Your events"
-msgstr "Deine Ereignisse"
-
-#: ../../include/nav.php:51
-msgid "Personal notes"
-msgstr "Persönliche Notizen"
-
-#: ../../include/nav.php:51
-msgid "Your personal photos"
-msgstr "Deine privaten Fotos"
-
-#: ../../include/nav.php:62
+#: ../../include/nav.php:64
 msgid "Sign in"
 msgstr "Anmelden"
 
-#: ../../include/nav.php:73
+#: ../../include/nav.php:77
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../../include/nav.php:77
+#: ../../include/nav.php:81
 msgid "Create an account"
 msgstr "Account erstellen"
 
-#: ../../include/nav.php:82
+#: ../../include/nav.php:86
 msgid "Help and documentation"
 msgstr "Hilfe und Dokumentation"
 
-#: ../../include/nav.php:85
+#: ../../include/nav.php:89
 msgid "Apps"
 msgstr "Apps"
 
-#: ../../include/nav.php:85
+#: ../../include/nav.php:89
 msgid "Addon applications, utilities, games"
 msgstr "Addon Anwendungen, Dienstprogramme, Spiele"
 
-#: ../../include/nav.php:87
+#: ../../include/nav.php:91
 msgid "Search site content"
 msgstr "Inhalt der Seite durchsuchen"
 
-#: ../../include/nav.php:97
+#: ../../include/nav.php:101
 msgid "Conversations on this site"
 msgstr "Unterhaltungen auf dieser Seite"
 
-#: ../../include/nav.php:99
+#: ../../include/nav.php:103
 msgid "Directory"
 msgstr "Verzeichnis"
 
-#: ../../include/nav.php:99
+#: ../../include/nav.php:103
 msgid "People directory"
 msgstr "Nutzerverzeichnis"
 
-#: ../../include/nav.php:109
+#: ../../include/nav.php:113
 msgid "Conversations from your friends"
 msgstr "Unterhaltungen deiner Kontakte"
 
-#: ../../include/nav.php:117
+#: ../../include/nav.php:121
 msgid "Friend Requests"
 msgstr "Kontaktanfragen"
 
-#: ../../include/nav.php:119
+#: ../../include/nav.php:123
 msgid "See all notifications"
 msgstr "Alle Benachrichtigungen anzeigen"
 
-#: ../../include/nav.php:120
+#: ../../include/nav.php:124
 msgid "Mark all system notifications seen"
 msgstr "Markiere alle System-Benachrichtigungen als gelesen"
 
-#: ../../include/nav.php:124
+#: ../../include/nav.php:128
 msgid "Private mail"
 msgstr "Private Email"
 
-#: ../../include/nav.php:127
+#: ../../include/nav.php:129
+msgid "Inbox"
+msgstr "Eingang"
+
+#: ../../include/nav.php:130
+msgid "Outbox"
+msgstr "Ausgang"
+
+#: ../../include/nav.php:134
 msgid "Manage"
 msgstr "Verwalten"
 
-#: ../../include/nav.php:127
+#: ../../include/nav.php:134
 msgid "Manage other pages"
 msgstr "Andere Seiten verwalten"
 
-#: ../../include/nav.php:131 ../../boot.php:940
+#: ../../include/nav.php:138 ../../boot.php:1002
 msgid "Profiles"
 msgstr "Profile"
 
-#: ../../include/nav.php:131 ../../boot.php:940
+#: ../../include/nav.php:138 ../../boot.php:1002
 msgid "Manage/edit profiles"
 msgstr "Profile verwalten/editieren"
 
-#: ../../include/nav.php:132
+#: ../../include/nav.php:139
 msgid "Manage/edit friends and contacts"
 msgstr "Freunde und Kontakte verwalten/editieren"
 
-#: ../../include/nav.php:139
+#: ../../include/nav.php:146
 msgid "Admin"
 msgstr "Administration"
 
-#: ../../include/nav.php:139
+#: ../../include/nav.php:146
 msgid "Site setup and configuration"
 msgstr "Einstellungen der Seite und Konfiguration"
 
-#: ../../include/nav.php:162
+#: ../../include/nav.php:169
 msgid "Nothing new here"
 msgstr "Keine Neuigkeiten."
 
@@ -5234,49 +6026,63 @@ msgstr "Adresse oder Web-Link eingeben"
 msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr "Beispiel: bob@example.com, http://example.com/barbara"
 
-#: ../../include/contact_widgets.php:18
-msgid "Invite Friends"
-msgstr "Freunde einladen"
-
-#: ../../include/contact_widgets.php:24
+#: ../../include/contact_widgets.php:22
 #, php-format
 msgid "%d invitation available"
 msgid_plural "%d invitations available"
 msgstr[0] "%d Einladung verfügbar"
 msgstr[1] "%d Einladungen verfügbar"
 
-#: ../../include/contact_widgets.php:30
+#: ../../include/contact_widgets.php:28
 msgid "Find People"
 msgstr "Leute finden"
 
-#: ../../include/contact_widgets.php:31
+#: ../../include/contact_widgets.php:29
 msgid "Enter name or interest"
 msgstr "Name oder Interessen eingeben"
 
-#: ../../include/contact_widgets.php:32
+#: ../../include/contact_widgets.php:30
 msgid "Connect/Follow"
 msgstr "Verbinden/Folgen"
 
-#: ../../include/contact_widgets.php:33
+#: ../../include/contact_widgets.php:31
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Beispiel: Robert Morgenstein, Angeln"
 
-#: ../../include/contact_widgets.php:36
-msgid "Similar Interests"
-msgstr "Ähnliche Interessen"
-
-#: ../../include/contact_widgets.php:68
+#: ../../include/contact_widgets.php:66
 msgid "Networks"
 msgstr "Netzwerke"
 
-#: ../../include/contact_widgets.php:71
+#: ../../include/contact_widgets.php:69
 msgid "All Networks"
 msgstr "Alle Netzwerke"
 
+#: ../../include/contact_widgets.php:96
+msgid "Saved Folders"
+msgstr "Gespeicherte Ordner"
+
+#: ../../include/contact_widgets.php:99 ../../include/contact_widgets.php:127
+msgid "Everything"
+msgstr "Alles"
+
+#: ../../include/contact_widgets.php:124
+msgid "Categories"
+msgstr "Kategorien"
+
 #: ../../include/auth.php:29
 msgid "Logged out."
 msgstr "Abgemeldet."
 
+#: ../../include/auth.php:106
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "Beim versuch dich mit der von dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe dass du die OpenID richtig geschrieben hast."
+
+#: ../../include/auth.php:106
+msgid "The error message was:"
+msgstr "Die Fehlermeldung lautete:"
+
 #: ../../include/datetime.php:43 ../../include/datetime.php:45
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
@@ -5350,252 +6156,277 @@ msgstr "Sekunden"
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s her"
 
-#: ../../include/poller.php:474
+#: ../../include/poller.php:533
 msgid "From: "
 msgstr "Von: "
 
-#: ../../include/bbcode.php:202
+#: ../../include/bbcode.php:203 ../../include/bbcode.php:223
 msgid "$1 wrote:"
 msgstr "$1 hat geschrieben:"
 
-#: ../../include/bbcode.php:216 ../../include/bbcode.php:282
+#: ../../include/bbcode.php:237 ../../include/bbcode.php:303
 msgid "Image/photo"
 msgstr "Bild/Foto"
 
-#: ../../include/dba.php:39
+#: ../../include/dba.php:41
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Kann die DNS Informationen für den Datenbanken Server '%s' nicht ermitteln."
 
-#: ../../include/message.php:14
+#: ../../include/message.php:15 ../../include/message.php:171
 msgid "[no subject]"
 msgstr "[kein Betreff]"
 
-#: ../../include/acl_selectors.php:279
+#: ../../include/acl_selectors.php:286
 msgid "Visible to everybody"
 msgstr "Für jeden sichtbar"
 
-#: ../../include/acl_selectors.php:280
+#: ../../include/acl_selectors.php:287
 msgid "show"
 msgstr "zeigen"
 
-#: ../../include/acl_selectors.php:281
+#: ../../include/acl_selectors.php:288
 msgid "don't show"
 msgstr "nicht zeigen"
 
-#: ../../include/enotify.php:8
+#: ../../include/enotify.php:14
 msgid "Friendica Notification"
 msgstr "Friendica-Benachrichtigung"
 
-#: ../../include/enotify.php:11
+#: ../../include/enotify.php:17
 msgid "Thank You,"
 msgstr "Danke,"
 
-#: ../../include/enotify.php:13
+#: ../../include/enotify.php:19
 #, php-format
 msgid "%s Administrator"
 msgstr "der Administrator von %s"
 
-#: ../../include/enotify.php:28
+#: ../../include/enotify.php:35
 #, php-format
-msgid "New mail received at %s"
-msgstr "Neue Nachricht auf %s empfangen"
+msgid "%s <!item_type!>"
+msgstr "%s <!item_type!>"
 
-#: ../../include/enotify.php:30
+#: ../../include/enotify.php:39
+#, php-format
+msgid "[Friendica:Notify] New mail received at %s"
+msgstr "[Friendica Meldung] Neue Nachricht erhalten von %s"
+
+#: ../../include/enotify.php:41
 #, php-format
 msgid "%s sent you a new private message at %s."
 msgstr "%s hat dir eine neue private Nachricht auf %s geschrieben."
 
-#: ../../include/enotify.php:31
+#: ../../include/enotify.php:42
 #, php-format
 msgid "%s sent you %s."
 msgstr "%s hat Dir geschickt %s"
 
-#: ../../include/enotify.php:31
+#: ../../include/enotify.php:42
 msgid "a private message"
 msgstr "eine private Nachricht"
 
-#: ../../include/enotify.php:32
+#: ../../include/enotify.php:43
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten."
 
-#: ../../include/enotify.php:40
+#: ../../include/enotify.php:73
 #, php-format
-msgid "%s commented on an item at %s"
-msgstr "%s kommentierte einen Beitrag auf %s"
+msgid "%s's"
+msgstr "%s's"
 
-#: ../../include/enotify.php:41
+#: ../../include/enotify.php:77
+msgid "your"
+msgstr "Dein"
+
+#: ../../include/enotify.php:84
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d by %s"
+msgstr "[Friendica Meldung] Kommentar zum Beitrag #%d von %s"
+
+#: ../../include/enotify.php:85
 #, php-format
 msgid "%s commented on an item/conversation you have been following."
 msgstr "%s hat einen Beitrag kommentiert, dem du folgst."
 
-#: ../../include/enotify.php:42
+#: ../../include/enotify.php:86
 #, php-format
-msgid "%s commented in %s."
-msgstr "%s wurde kommentiert in %s"
+msgid "%s commented on %s."
+msgstr "%s kommentierte %s."
 
-#: ../../include/enotify.php:42
-msgid "a watched conversation"
-msgstr "eine beobachtete Unterhaltung"
-
-#: ../../include/enotify.php:44 ../../include/enotify.php:54
-#: ../../include/enotify.php:64 ../../include/enotify.php:74
+#: ../../include/enotify.php:88 ../../include/enotify.php:101
+#: ../../include/enotify.php:112 ../../include/enotify.php:123
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren."
 
-#: ../../include/enotify.php:51
+#: ../../include/enotify.php:95
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
+msgstr "[Friendica Meldung] %s hat auf Deine Pinnwand geschrieben"
+
+#: ../../include/enotify.php:97
 #, php-format
 msgid "%s posted to your profile wall at %s"
 msgstr "%s hat auf deine Pinnwand bei %s gepostet"
 
-#: ../../include/enotify.php:52
+#: ../../include/enotify.php:99
 #, php-format
 msgid "%s posted to %s"
 msgstr "%s schrieb an %s"
 
-#: ../../include/enotify.php:52
+#: ../../include/enotify.php:99
 msgid "your profile wall."
 msgstr "Deine Pinnwand"
 
-#: ../../include/enotify.php:61
+#: ../../include/enotify.php:108
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
+msgstr "[Friendica Meldung] %s hat Dich erwähnt"
+
+#: ../../include/enotify.php:109
 #, php-format
 msgid "%s tagged you at %s"
 msgstr "%s hat dich auf %s erwähnt"
 
-#: ../../include/enotify.php:62
+#: ../../include/enotify.php:110
 #, php-format
 msgid "%s %s."
 msgstr "%s %s."
 
-#: ../../include/enotify.php:62
+#: ../../include/enotify.php:110
 msgid "tagged you"
 msgstr "erwähnte Dich"
 
-#: ../../include/enotify.php:71
+#: ../../include/enotify.php:119
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
+msgstr "[Friendica Meldung] %s markierte Deinen Beitrag"
+
+#: ../../include/enotify.php:120
 #, php-format
 msgid "%s tagged your post at %s"
 msgstr "%s hat deinen Beitrag auf %s getaggt"
 
-#: ../../include/enotify.php:72
+#: ../../include/enotify.php:121
 #, php-format
 msgid "%s tagged %s"
 msgstr "%s markierte %s"
 
-#: ../../include/enotify.php:72
+#: ../../include/enotify.php:121
 msgid "your post"
 msgstr "Dein Beitrag"
 
-#: ../../include/enotify.php:81
-#, php-format
-msgid "Introduction received at %s"
-msgstr "Kontaktanfrage auf %s erhalten"
+#: ../../include/enotify.php:130
+msgid "[Friendica:Notify] Introduction received"
+msgstr "[Friendica Meldung] Kontaktanfrage erhalten"
 
-#: ../../include/enotify.php:82
+#: ../../include/enotify.php:131
 #, php-format
 msgid "You've received an introduction from '%s' at %s"
 msgstr "Du hast eine Kontaktanfrage von '%s' auf %s erhalten"
 
-#: ../../include/enotify.php:83
+#: ../../include/enotify.php:132
 #, php-format
 msgid "You've received %s from %s."
 msgstr "Du hast %s von %s erhalten."
 
-#: ../../include/enotify.php:83
+#: ../../include/enotify.php:132
 msgid "an introduction"
-msgstr "eine Einführung"
+msgstr "eine Kontaktanfrage"
 
-#: ../../include/enotify.php:84 ../../include/enotify.php:101
+#: ../../include/enotify.php:133 ../../include/enotify.php:150
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Hier kannst du das Profil betrachten: %s"
 
-#: ../../include/enotify.php:86
+#: ../../include/enotify.php:135
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen."
 
-#: ../../include/enotify.php:93
-#, php-format
-msgid "Friend suggestion received at %s"
-msgstr "Kontaktvorschlag empfangen auf %s"
+#: ../../include/enotify.php:142
+msgid "[Friendica:Notify] Friend suggestion received"
+msgstr "[Friendica Meldung] Kontaktvorschlag erhalten"
 
-#: ../../include/enotify.php:94
+#: ../../include/enotify.php:143
 #, php-format
 msgid "You've received a friend suggestion from '%s' at %s"
 msgstr "Du hast von '%s' einen Kontaktvorschlag erhalten auf %s"
 
-#: ../../include/enotify.php:95
+#: ../../include/enotify.php:144
 #, php-format
 msgid "You've received %s for %s from %s."
 msgstr "Du hast %s für %s von %s erhalten."
 
-#: ../../include/enotify.php:96
+#: ../../include/enotify.php:145
 msgid "a friend suggestion"
 msgstr "ein Freunde Vorschlag"
 
-#: ../../include/enotify.php:99
+#: ../../include/enotify.php:148
 msgid "Name:"
 msgstr "Name:"
 
-#: ../../include/enotify.php:100
+#: ../../include/enotify.php:149
 msgid "Photo:"
 msgstr "Foto:"
 
-#: ../../include/enotify.php:103
+#: ../../include/enotify.php:152
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen."
 
-#: ../../include/items.php:2511
+#: ../../include/items.php:2656
 msgid "A new person is sharing with you at "
 msgstr "Eine neue Person teilt mit dir auf "
 
-#: ../../include/items.php:2511
+#: ../../include/items.php:2656
 msgid "You have a new follower at "
 msgstr "Du hast einen neuen Kontakt auf "
 
-#: ../../include/bb2diaspora.php:83
-msgid "view full size"
-msgstr "Volle Größe anzeigen"
-
-#: ../../include/bb2diaspora.php:132 ../../include/bb2diaspora.php:142
-#: ../../include/bb2diaspora.php:143
+#: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112
+#: ../../include/bb2diaspora.php:113
 msgid "image/photo"
 msgstr "Bild/Foto"
 
-#: ../../include/security.php:20
+#: ../../include/security.php:21
 msgid "Welcome "
 msgstr "Willkommen "
 
-#: ../../include/security.php:21
+#: ../../include/security.php:22
 msgid "Please upload a profile photo."
 msgstr "Bitte lade ein Profilbild hoch."
 
-#: ../../include/security.php:24
+#: ../../include/security.php:25
 msgid "Welcome back "
 msgstr "Willkommen zurück "
 
-#: ../../include/Contact.php:131 ../../include/conversation.php:769
+#: ../../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 "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."
+
+#: ../../include/Contact.php:137 ../../include/conversation.php:813
 msgid "View status"
 msgstr "Status anzeigen"
 
-#: ../../include/Contact.php:132 ../../include/conversation.php:770
+#: ../../include/Contact.php:138 ../../include/conversation.php:814
 msgid "View profile"
 msgstr "Profil anzeigen"
 
-#: ../../include/Contact.php:133 ../../include/conversation.php:771
+#: ../../include/Contact.php:139 ../../include/conversation.php:815
 msgid "View photos"
 msgstr "Fotos ansehen"
 
-#: ../../include/Contact.php:134 ../../include/Contact.php:147
-#: ../../include/conversation.php:772
+#: ../../include/Contact.php:140 ../../include/Contact.php:153
+#: ../../include/conversation.php:816
 msgid "View recent"
 msgstr "Neueste anzeigen"
 
-#: ../../include/Contact.php:136 ../../include/Contact.php:147
-#: ../../include/conversation.php:774
+#: ../../include/Contact.php:142 ../../include/Contact.php:153
+#: ../../include/conversation.php:818
 msgid "Send PM"
 msgstr "Private Nachricht senden"
 
@@ -5608,251 +6439,251 @@ msgstr "Nachricht/Beitrag"
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert"
 
-#: ../../include/conversation.php:301 ../../include/conversation.php:562
+#: ../../include/conversation.php:317 ../../include/conversation.php:575
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../../include/conversation.php:316 ../../include/conversation.php:648
-#: ../../include/conversation.php:649
+#: ../../include/conversation.php:334 ../../include/conversation.php:672
+#: ../../include/conversation.php:673
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Das Profil von %s auf %s betrachten."
 
-#: ../../include/conversation.php:325 ../../include/conversation.php:660
+#: ../../include/conversation.php:344 ../../include/conversation.php:684
 #, php-format
 msgid "%s from %s"
 msgstr "%s von %s"
 
-#: ../../include/conversation.php:341
+#: ../../include/conversation.php:360
 msgid "View in context"
 msgstr "Im Zusammenhang betrachten"
 
-#: ../../include/conversation.php:456
+#: ../../include/conversation.php:465
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d Kommentar"
 msgstr[1] "%d Kommentare"
 
-#: ../../include/conversation.php:459 ../../boot.php:448
-msgid "show more"
-msgstr "mehr anzeigen"
-
-#: ../../include/conversation.php:519
+#: ../../include/conversation.php:529
 msgid "like"
 msgstr "mag ich"
 
-#: ../../include/conversation.php:520
+#: ../../include/conversation.php:530
 msgid "dislike"
 msgstr "mag ich nicht"
 
-#: ../../include/conversation.php:522
+#: ../../include/conversation.php:532
 msgid "Share this"
 msgstr "Teile dieses"
 
-#: ../../include/conversation.php:522
+#: ../../include/conversation.php:532
 msgid "share"
 msgstr "Teilen"
 
-#: ../../include/conversation.php:572
+#: ../../include/conversation.php:588
 msgid "add star"
 msgstr "markieren"
 
-#: ../../include/conversation.php:573
+#: ../../include/conversation.php:589
 msgid "remove star"
 msgstr "Markierung entfernen"
 
-#: ../../include/conversation.php:574
+#: ../../include/conversation.php:590
 msgid "toggle star status"
 msgstr "Markierung umschalten"
 
-#: ../../include/conversation.php:577
+#: ../../include/conversation.php:593
 msgid "starred"
 msgstr "markiert"
 
-#: ../../include/conversation.php:578
+#: ../../include/conversation.php:594
 msgid "add tag"
 msgstr "Tag hinzufügen"
 
-#: ../../include/conversation.php:650
+#: ../../include/conversation.php:598
+msgid "save to folder"
+msgstr "In Ordner speichern"
+
+#: ../../include/conversation.php:674
 msgid "to"
 msgstr "zu"
 
-#: ../../include/conversation.php:651
+#: ../../include/conversation.php:675
 msgid "Wall-to-Wall"
 msgstr "Wall-to-Wall"
 
-#: ../../include/conversation.php:652
+#: ../../include/conversation.php:676
 msgid "via Wall-To-Wall:"
 msgstr "via Wall-To-Wall:"
 
-#: ../../include/conversation.php:694
+#: ../../include/conversation.php:721
 msgid "Delete Selected Items"
 msgstr "Lösche die markierten Beiträge"
 
-#: ../../include/conversation.php:826
+#: ../../include/conversation.php:872
 #, php-format
 msgid "%s likes this."
 msgstr "%s mag das."
 
-#: ../../include/conversation.php:826
+#: ../../include/conversation.php:872
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s mag das nicht."
 
-#: ../../include/conversation.php:830
+#: ../../include/conversation.php:876
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr "<span  %1$s>%2$d Leute</span> mögen das."
 
-#: ../../include/conversation.php:832
+#: ../../include/conversation.php:878
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr "<span  %1$s>%2$d Leute</span> mögen das nicht."
 
-#: ../../include/conversation.php:838
+#: ../../include/conversation.php:884
 msgid "and"
 msgstr "und"
 
-#: ../../include/conversation.php:841
+#: ../../include/conversation.php:887
 #, php-format
 msgid ", and %d other people"
 msgstr " und %d andere"
 
-#: ../../include/conversation.php:842
+#: ../../include/conversation.php:888
 #, php-format
 msgid "%s like this."
 msgstr "%s mögen das."
 
-#: ../../include/conversation.php:842
+#: ../../include/conversation.php:888
 #, php-format
 msgid "%s don't like this."
 msgstr "%s mögen das nicht."
 
-#: ../../include/conversation.php:867
+#: ../../include/conversation.php:913
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Für <strong>jedermann</strong> sichtbar"
 
-#: ../../include/conversation.php:869
+#: ../../include/conversation.php:915
 msgid "Please enter a video link/URL:"
 msgstr "Bitte Link/URL zum Video einfügen:"
 
-#: ../../include/conversation.php:870
+#: ../../include/conversation.php:916
 msgid "Please enter an audio link/URL:"
 msgstr "Bitte Link/URL zum Audio einfügen:"
 
-#: ../../include/conversation.php:871
+#: ../../include/conversation.php:917
 msgid "Tag term:"
 msgstr "Tag:"
 
-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:919
 msgid "Where are you right now?"
 msgstr "Wo hältst du dich jetzt gerade auf?"
 
-#: ../../include/conversation.php:873
-msgid "Enter a title for this item"
-msgstr "Gib den Titel für diesen Beitrag ein"
-
-#: ../../include/conversation.php:916
+#: ../../include/conversation.php:962
 msgid "upload photo"
 msgstr "Bild hochladen"
 
-#: ../../include/conversation.php:918
+#: ../../include/conversation.php:964
 msgid "attach file"
 msgstr "Datei anhängen"
 
-#: ../../include/conversation.php:920
+#: ../../include/conversation.php:966
 msgid "web link"
 msgstr "Weblink"
 
-#: ../../include/conversation.php:921
+#: ../../include/conversation.php:967
 msgid "Insert video link"
 msgstr "Video-Adresse einfügen"
 
-#: ../../include/conversation.php:922
+#: ../../include/conversation.php:968
 msgid "video link"
 msgstr "Video-Link"
 
-#: ../../include/conversation.php:923
+#: ../../include/conversation.php:969
 msgid "Insert audio link"
 msgstr "Audio-Adresse einfügen"
 
-#: ../../include/conversation.php:924
+#: ../../include/conversation.php:970
 msgid "audio link"
 msgstr "Audio-Link"
 
-#: ../../include/conversation.php:926
+#: ../../include/conversation.php:972
 msgid "set location"
 msgstr "Ort setzen"
 
-#: ../../include/conversation.php:928
+#: ../../include/conversation.php:974
 msgid "clear location"
 msgstr "Ort löschen"
 
-#: ../../include/conversation.php:933
+#: ../../include/conversation.php:981
 msgid "permissions"
 msgstr "Zugriffsrechte"
 
-#: ../../boot.php:446
+#: ../../boot.php:493
 msgid "Delete this item?"
 msgstr "Diesen Beitrag löschen?"
 
-#: ../../boot.php:449
+#: ../../boot.php:496
 msgid "show fewer"
 msgstr "weniger anzeigen"
 
-#: ../../boot.php:692
+#: ../../boot.php:744
 msgid "Create a New Account"
 msgstr "Neuen Account erstellen"
 
-#: ../../boot.php:712
+#: ../../boot.php:768
 msgid "Nickname or Email address: "
 msgstr "Spitzname oder Email-Adresse: "
 
-#: ../../boot.php:713
+#: ../../boot.php:769
 msgid "Password: "
 msgstr "Passwort: "
 
-#: ../../boot.php:716
+#: ../../boot.php:772
 msgid "Or login using OpenID: "
 msgstr "Oder melde dich mit deiner OpenID an: "
 
-#: ../../boot.php:722
+#: ../../boot.php:778
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: ../../boot.php:879
+#: ../../boot.php:935
 msgid "Edit profile"
 msgstr "Profil bearbeiten"
 
-#: ../../boot.php:1046 ../../boot.php:1117
+#: ../../boot.php:994
+msgid "Message"
+msgstr "Nachricht"
+
+#: ../../boot.php:1109 ../../boot.php:1180
 msgid "g A l F d"
 msgstr "l. d, F G \\U\\h\\\\r"
 
-#: ../../boot.php:1047 ../../boot.php:1118
+#: ../../boot.php:1110 ../../boot.php:1181
 msgid "F d"
 msgstr "d. F"
 
-#: ../../boot.php:1072
+#: ../../boot.php:1135
 msgid "Birthday Reminders"
 msgstr "Geburtstagserinnerungen"
 
-#: ../../boot.php:1073
+#: ../../boot.php:1136
 msgid "Birthdays this week:"
 msgstr "Geburtstage diese Woche:"
 
-#: ../../boot.php:1096 ../../boot.php:1160
+#: ../../boot.php:1159 ../../boot.php:1223
 msgid "[today]"
 msgstr "[heute]"
 
-#: ../../boot.php:1141
+#: ../../boot.php:1204
 msgid "Event Reminders"
 msgstr "Veranstaltungserinnerungen"
 
-#: ../../boot.php:1142
+#: ../../boot.php:1205
 msgid "Events this week:"
 msgstr "Veranstaltungen diese Woche"
 
-#: ../../boot.php:1154
+#: ../../boot.php:1217
 msgid "[No description]"
 msgstr "[keine Beschreibung]"
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 a093b7068..28567396b 100755..100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -120,7 +120,7 @@ $a->strings["running at web location"] = "die unter folgender Webadresse zu find
 $a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Bitte besuche <a href=\"http://friendica.com\">Friendica.com</a> um mehr über das Friendica Projekt zu erfahren.";
 $a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
 $a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Vorschläge, Lob, Spenden usw.: E-Mail an \"Info\" at Friendica - dot com";
-$a->strings["Installed plugins/addons/apps"] = "Installierte Plugins/Erweiterungen/Apps";
+$a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Erweiterungen/Apps";
 $a->strings["No installed plugins/addons/apps"] = "Keine Plugins/Erweiterungen/Apps installiert";
 $a->strings["Item not found"] = "Beitrag nicht gefunden";
 $a->strings["Edit post"] = "Beitrag bearbeiten";
@@ -128,7 +128,7 @@ $a->strings["Post to Email"] = "An E-Mail senden";
 $a->strings["Edit"] = "Bearbeiten";
 $a->strings["Upload photo"] = "Foto hochladen";
 $a->strings["Attach file"] = "Datei anhängen";
-$a->strings["Insert web link"] = "Weblink einfügen";
+$a->strings["Insert web link"] = "eine Kontaktanfrage";
 $a->strings["Insert YouTube video"] = "YouTube-Video einfügen";
 $a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg] Video einfügen";
 $a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg] Audio einfügen";
@@ -138,6 +138,7 @@ $a->strings["Permission settings"] = "Berechtigungseinstellungen";
 $a->strings["CC: email addresses"] = "Cc:-E-Mail-Addressen";
 $a->strings["Public post"] = "Öffentlicher Beitrag";
 $a->strings["Set title"] = "Titel setzen";
+$a->strings["Categories (comma-separated list)"] = "Kategorien (mit Komma separierte Liste)";
 $a->strings["Example: bob@example.com, mary@example.com"] = "Z.B.: bob@example.com, mary@example.com";
 $a->strings["This introduction has already been accepted."] = "Diese Kontaktanfrage wurde bereits akzeptiert.";
 $a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung.";
@@ -167,8 +168,9 @@ $a->strings["Welcome home %s."] = "Willkommen zurück %s.";
 $a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige deine Kontaktanfrage bei %s.";
 $a->strings["Confirm"] = "Bestätigen";
 $a->strings["[Name Withheld]"] = "[Name unterdrückt]";
-$a->strings["Diaspora members: Please do not use this form. Instead, enter \"%s\" into your Diaspora search bar."] = "Diaspora-User: Bitte nicht dieses Formular benutzen! Gebt statt dessen \"%s\" in der Diaspora-Suchleiste ein.";
-$a->strings["Please enter your 'Identity Address' from one of the following supported social networks:"] = "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:";
+$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:";
+$a->strings["<strike>Connect as an email follower</strike> (Coming soon)"] = "<strike>Als E-Mail-Kontakt verbinden</strike> (In Kürze verfügbar)";
+$a->strings["If you are not yet a member of the free social web, <a href=\"http://dir.friendica.com/siteinfo\">follow this link to find a public Friendica site and join us today</a>."] = "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"http://dir.friendica.com/siteinfo\">folge diesem Link</a> um einen öffentlichen Friendica-Server zu finden und beizutreten.";
 $a->strings["Friend/Connection Request"] = "Freundschafts-/Kontaktanfrage";
 $a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
 $a->strings["Please answer the following:"] = "Bitte beantworte Folgendes:";
@@ -177,7 +179,7 @@ $a->strings["Add a personal note:"] = "Eine persönliche Notiz beifügen:";
 $a->strings["Friendica"] = "Friendica";
 $a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web";
 $a->strings["Diaspora"] = "Diaspora";
-$a->strings["- please share from your own site as noted above"] = "- bitte fange von Deiner eigenen Seite aus zu teilen an";
+$a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in deiner Diaspora Suchleiste.";
 $a->strings["Your Identity Address:"] = "Adresse deines Profils:";
 $a->strings["Submit Request"] = "Anfrage abschicken";
 $a->strings["Friendica Social Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup";
@@ -210,7 +212,7 @@ $a->strings["Enter full path to php executable"] = "Kompletter Pfad zum PHP-Exec
 $a->strings["Command line PHP"] = "Kommandozeilen-PHP";
 $a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert.";
 $a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt.";
-$a->strings["PHP \"register_argc_argv\""] = "PHP \"register_argc_argv\"";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
 $a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen";
 $a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn der Server unter Windows läuft, schau dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an.";
 $a->strings["Generate encryption keys"] = "Schlüssel erzeugen";
@@ -334,6 +336,7 @@ $a->strings["Update now"] = "Jetzt aktualisieren";
 $a->strings["Currently blocked"] = "Derzeit geblockt";
 $a->strings["Currently ignored"] = "Derzeit ignoriert";
 $a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein";
+$a->strings["Suggestions"] = "Kontaktvorschläge";
 $a->strings["All Contacts"] = "Alle Kontakte";
 $a->strings["Unblocked Contacts"] = "Nicht blockierte Kontakte";
 $a->strings["Blocked Contacts"] = "Blockierte Kontakte";
@@ -376,6 +379,7 @@ $a->strings[" Not valid email."] = " Keine gültige E-Mail.";
 $a->strings[" Cannot change to that email."] = "Ändern der E-Mail nicht möglich. ";
 $a->strings["Settings updated."] = "Einstellungen aktualisiert.";
 $a->strings["Account settings"] = "Account Einstellungen";
+$a->strings["Display settings"] = "Anzeige Einstellungen";
 $a->strings["Connector settings"] = "Connector-Einstellungen";
 $a->strings["Plugin settings"] = "Plugin-Einstellungen";
 $a->strings["Connections"] = "Verbindungen";
@@ -409,6 +413,17 @@ $a->strings["Email login name:"] = "E-Mail-Login-Name:";
 $a->strings["Email password:"] = "E-Mail-Passwort:";
 $a->strings["Reply-to address:"] = "Reply-to Adresse:";
 $a->strings["Send public posts to all email contacts:"] = "Sende öffentliche Beiträge an alle E-Mail-Kontakte:";
+$a->strings["Action after import:"] = "Aktion nach Import:";
+$a->strings["Mark as seen"] = "Als gelesen markieren";
+$a->strings["Move to folder"] = "In einen Ordner verschieben";
+$a->strings["Move to folder:"] = "In diesen Ordner verschieben:";
+$a->strings["Display Settings"] = "Anzeige Einstellungen";
+$a->strings["Display Theme:"] = "Theme:";
+$a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren";
+$a->strings["Minimum of 10 seconds, no maximum"] = "Minimal 10 Sekunden, kein Maximum";
+$a->strings["Number of items to display on the network page:"] = "Zahl der Beiträge, welche pro Netzwerkseite angezeigt werden sollen: ";
+$a->strings["Maximum of 100 items"] = "Maximal 100 Beiträge";
+$a->strings["Don't show emoticons"] = "Keine Smilies anzeigen";
 $a->strings["Normal Account"] = "Normaler Account";
 $a->strings["This account is a normal personal profile"] = "Dieser Account ist ein normales persönliches Profil";
 $a->strings["Soapbox Account"] = "Sandkasten-Account";
@@ -426,6 +441,7 @@ $a->strings["Hide your profile details from unknown viewers?"] = "Profil-Details
 $a->strings["Allow friends to post to your profile page?"] = "Deinen Kontakten erlauben, auf deine Pinnwand zu schreiben?";
 $a->strings["Allow friends to tag your posts?"] = "Deinen Kontakten erlauben, deine Beiträge mit Schlagwörtern zu versehen?";
 $a->strings["Allow us to suggest you as a potential friend to new members?"] = "Erlaube uns dich als potentiellen Kontakt für neue Mitglieder vorzuschlagen?";
+$a->strings["Permit unknown people to send you private mail?"] = "Erlaube es Unbekannten dir private Nachrichten zu schicken?";
 $a->strings["Profile is <strong>not published</strong>."] = "Profil ist <strong>nicht veröffentlicht</strong>.";
 $a->strings["or"] = "oder";
 $a->strings["Your Identity Address is"] = "Die Adresse deines Profils lautet:";
@@ -448,14 +464,12 @@ $a->strings["Email Address:"] = "Emailadresse:";
 $a->strings["Your Timezone:"] = "Deine Zeitzone:";
 $a->strings["Default Post Location:"] = "Standardstandort:";
 $a->strings["Use Browser Location:"] = "Verwende den Standort des Browsers:";
-$a->strings["Display Theme:"] = "Theme:";
-$a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren";
-$a->strings["Minimum of 10 seconds, no maximum"] = "Minimal 10 Sekunden, kein Maximum";
 $a->strings["Security and Privacy Settings"] = "Sicherheits- und Privatsphäre-Einstellungen";
 $a->strings["Maximum Friend Requests/Day:"] = "Maximale Anzahl von Freundschaftsanfragen/Tag:";
 $a->strings["(to prevent spam abuse)"] = "(um SPAM zu vermeiden)";
 $a->strings["Default Post Permissions"] = "Standard-Zugriffsrechte für Beiträge";
 $a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)";
+$a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:";
 $a->strings["Notification Settings"] = "Benachrichtigungseinstellungen";
 $a->strings["Send a notification email when:"] = "Benachrichtigungs-E-Mail senden wenn:";
 $a->strings["You receive an introduction"] = "- du eine Kontaktanfrage erhältst";
@@ -464,7 +478,7 @@ $a->strings["Someone writes on your profile wall"] = "- jemand etwas auf deine P
 $a->strings["Someone writes a followup comment"] = "- jemand auch einen Kommentar verfasst";
 $a->strings["You receive a private message"] = "- du eine private Nachricht erhältst";
 $a->strings["You receive a friend suggestion"] = "- du eine Empfehlung erhältst";
-$a->strings["You are tagged in a post"] = "- du in einem Beitrag erwähnt wurdest";
+$a->strings["You are tagged in a post"] = "Du wurdest in einem Beitrag erwähnt.";
 $a->strings["Advanced Page Settings"] = "Erweiterte Seiten-Einstellungen";
 $a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten";
 $a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Wechsle zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppen-Seiten, die deine Zugangsdetails teilen oder zu denen du \"Manage\" Befugnisse bekommen hast.";
@@ -477,7 +491,7 @@ $a->strings["Commented Order"] = "Neueste Kommentare";
 $a->strings["Posted Order"] = "Neueste Beiträge";
 $a->strings["New"] = "Neue";
 $a->strings["Starred"] = "Markierte";
-$a->strings["Bookmarks"] = "Lesezeichen";
+$a->strings["Shared Links"] = "Geteilte Links";
 $a->strings["Warning: This group contains %s member from an insecure network."] = array(
 	0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk.",
 	1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken.",
@@ -491,9 +505,23 @@ $a->strings["Private messages to this person are at risk of public disclosure."]
 $a->strings["Invalid contact."] = "Ungültiger Kontakt.";
 $a->strings["Personal Notes"] = "Persönliche Notizen";
 $a->strings["Save"] = "Speichern";
+$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen.";
+$a->strings["No recipient selected."] = "Kein Empfänger gewählt.";
+$a->strings["Unable to check your home location."] = "Konnte deinen Heimatort nicht bestimmen.";
+$a->strings["Message could not be sent."] = "Nachricht konnte nicht gesendet werden.";
+$a->strings["Message collection failure."] = "Konnte Nachrichten nicht abrufen.";
+$a->strings["Message sent."] = "Nachricht gesendet.";
+$a->strings["No recipient."] = "Kein Empfänger.";
+$a->strings["Please enter a link URL:"] = "Bitte gib die URL des Links ein:";
+$a->strings["Send Private Message"] = "Private Nachricht senden";
+$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Wenn du möchtest, dass %s dir antworten kann, überprüfe deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern.";
+$a->strings["To:"] = "An:";
+$a->strings["Subject:"] = "Betreff:";
+$a->strings["Your message:"] = "Deine Nachricht:";
 $a->strings["Welcome to Friendica"] = "Willkommen bei Friendica";
 $a->strings["New Member Checklist"] = "Checkliste für neue Mitglieder";
 $a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für Dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden.";
+$a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, connect to Facebook, make some new connections, and find some groups to join."] = "Auf der <em>Quick Start</em> Seite findest du eine kurze Einleitung in die einzelnen Funktionen deines Profils und die Netzwerk-Reiter, wo du interessante Foren findest, wie du alte Freunde von Facebook wieder findest und neue Kontakte knüpfst.";
 $a->strings["On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "Ändere bitte unter <em>Einstellungen</em> Dein Passwort. Außerdem merke Dir Deine Indentifikations-Adresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Freundschaften mit anderen im Friendica Netzwerk zu schliessen.";
 $a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen genau, wie sie dich finden können.";
 $a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Freunde zu finden, wenn du ein Bild von dir selbst verwendest, als wenn du dies nicht tust.";
@@ -518,9 +546,9 @@ $a->strings["Create a group of contacts/friends."] = "Eine Gruppe von Kontakten/
 $a->strings["Group Name: "] = "Gruppenname:";
 $a->strings["Group removed."] = "Gruppe entfernt.";
 $a->strings["Unable to remove group."] = "Konnte die Gruppe nicht entfernen.";
-$a->strings["Click on a contact to add or remove."] = "Klicke einen Kontakt an, um ihn hinzuzufügen oder zu entfernen";
 $a->strings["Group Editor"] = "Gruppeneditor";
 $a->strings["Members"] = "Mitglieder";
+$a->strings["Click on a contact to add or remove."] = "Klicke einen Kontakt an, um ihn hinzuzufügen oder zu entfernen";
 $a->strings["Invalid profile identifier."] = "Ungültiger Profil-Bezeichner";
 $a->strings["Profile Visibility Editor"] = "Editor für die Profil-Sichtbarkeit";
 $a->strings["Profile"] = "Profil";
@@ -540,6 +568,7 @@ $a->strings["Not a valid email address."] = "Keine gültige E-Mail-Adresse.";
 $a->strings["Cannot use that email."] = "Konnte diese E-Mail-Adresse nicht verwenden.";
 $a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\", \"_\" und \"-\") bestehen, außerdem muss er mit einem Buchstaben beginnen.";
 $a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
+$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
 $a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden.";
 $a->strings["An error occurred during registration. Please try again."] = "Wärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
 $a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standard-Profils ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
@@ -597,26 +626,23 @@ $a->strings["No profile"] = "Kein Profil";
 $a->strings["Remove My Account"] = "Account löschen";
 $a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Dies wird deinen Account endgültig löschen. Es gibt keine Möglichkeit, ihn wiederherzustellen.";
 $a->strings["Please enter your password for verification:"] = "Bitte gib dein Passwort zur Verifikation ein:";
-$a->strings["No recipient selected."] = "Kein Empfänger gewählt.";
-$a->strings["Unable to locate contact information."] = "Konnte die Kontaktinformationen nicht finden.";
-$a->strings["Message could not be sent."] = "Nachricht konnte nicht gesendet werden.";
-$a->strings["Message collection failure."] = "Konnte Nachrichten nicht abrufen.";
-$a->strings["Message sent."] = "Nachricht gesendet.";
-$a->strings["Inbox"] = "Eingang";
-$a->strings["Outbox"] = "Ausgang";
 $a->strings["New Message"] = "Neue Nachricht";
+$a->strings["Unable to locate contact information."] = "Konnte die Kontaktinformationen nicht finden.";
 $a->strings["Message deleted."] = "Nachricht gelöscht.";
 $a->strings["Conversation removed."] = "Unterhaltung gelöscht.";
-$a->strings["Please enter a link URL:"] = "Bitte gib die URL des Links ein:";
-$a->strings["Send Private Message"] = "Private Nachricht senden";
-$a->strings["To:"] = "An:";
-$a->strings["Subject:"] = "Betreff:";
-$a->strings["Your message:"] = "Deine Nachricht:";
 $a->strings["No messages."] = "Keine Nachrichten.";
+$a->strings["Unknown sender - %s"] = "'Unbekannter Absender - %s";
+$a->strings["You and %s"] = "Du und %s";
+$a->strings["%s and You"] = "%s und Du";
 $a->strings["Delete conversation"] = "Unterhaltung löschen";
 $a->strings["D, d M Y - g:i A"] = "D, d. M Y - g:i A";
+$a->strings["%d message"] = array(
+	0 => "%d Nachricht",
+	1 => "%d Nachrichten",
+);
 $a->strings["Message not available."] = "Nachricht nicht verfügbar.";
 $a->strings["Delete message"] = "Nachricht löschen";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Sichere Kommunikation ist nicht verfügbar. <strong>Eventuell</strong> kannst du auf der Profilseite des Absenders antworten.";
 $a->strings["Send Reply"] = "Antwort senden";
 $a->strings["Friends of %s"] = "Freunde von %s";
 $a->strings["No friends to display."] = "Keine Freunde zum Anzeigen.";
@@ -636,6 +662,9 @@ $a->strings["Site settings updated."] = "Seiteneinstellungen aktualisiert.";
 $a->strings["Closed"] = "Geschlossen";
 $a->strings["Requires approval"] = "Bedarf der Zustimmung";
 $a->strings["Open"] = "Offen";
+$a->strings["No SSL policy, links will track page SSL state"] = "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten";
+$a->strings["Force all links to use SSL"] = "SSL für alle Links erzwingen";
+$a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)";
 $a->strings["File upload"] = "Datei hochladen";
 $a->strings["Policies"] = "Regeln";
 $a->strings["Advanced"] = "Erweitert";
@@ -643,32 +672,53 @@ $a->strings["Site name"] = "Seitenname";
 $a->strings["Banner/Logo"] = "Banner/Logo";
 $a->strings["System language"] = "Systemsprache";
 $a->strings["System theme"] = "Systemweites Thema";
+$a->strings["Default system theme - may be over-ridden by user profiles"] = "Standard Server Theme - kann von den Benutzereinstellungen überschrieben werden.";
+$a->strings["SSL link policy"] = "Regeln für SSL Links";
+$a->strings["Determines whether generated links should be forced to use SSL"] = "Bestimmt, ob generierte Links SSL verwenden müssen";
 $a->strings["Maximum image size"] = "Maximale Größe von Bildern";
+$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit.";
 $a->strings["Register policy"] = "Registrierungsmethode";
 $a->strings["Register text"] = "Registrierungstext";
+$a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungs-Seite angezeigt.";
 $a->strings["Accounts abandoned after x days"] = "Accounts gelten nach x Tagen als unbenutzt";
 $a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit.";
 $a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte";
+$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben.";
 $a->strings["Allowed email domains"] = "Erlaubte Domains für Emails";
+$a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben.";
 $a->strings["Block public"] = "Öffentlichen Zugriff blockieren";
+$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist.";
 $a->strings["Force publish"] = "Erzwinge Veröffentlichung";
+$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen.";
 $a->strings["Global directory update URL"] = "URL für Updates beim weltweiten Verzeichnis";
+$a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar.";
 $a->strings["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung";
+$a->strings["Disallow users to register additional accounts for use as pages."] = "Benutzern nicht erlauben, weitere Accounts als zusätzliche Profile anzulegen.";
 $a->strings["OpenID support"] = "OpenID Unterstützung";
+$a->strings["OpenID support for registration and logins."] = "OpenID-Unterstützung für Registrierung und Login.";
 $a->strings["Gravatar support"] = "Gravatar Unterstützung";
+$a->strings["Search new user's photo on Gravatar."] = "Suchfunktion bei Gravatar für Profilbilder neuer Nutzer.";
 $a->strings["Fullname check"] = "Namen auf Vollständigkeit überprüfen";
+$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden.";
 $a->strings["UTF-8 Regular expressions"] = "UTF-8 Reguläre Ausdrücke";
+$a->strings["Use PHP UTF8 regular expressions"] = "PHP UTF8 Ausdrücke verwenden";
 $a->strings["Show Community Page"] = "Gemeinschaftsseite anzeigen";
+$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.";
 $a->strings["Enable Diaspora support"] = "Diaspora-Support aktivieren";
+$a->strings["Provide built-in Diaspora network compatibility."] = "Verwende die eingebaute Diaspora-Verknüpfung.";
 $a->strings["Only allow Friendica contacts"] = "Nur Friendica-Kontakte erlauben";
+$a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert.";
 $a->strings["Verify SSL"] = "SSL Überprüfen";
+$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle anstellen. Das bedeutet, das man zu keinen Seiten mit selbst unterzeichneten SSL eine Verbindung herstellen kann.";
 $a->strings["Proxy user"] = "Proxy Nutzer";
 $a->strings["Proxy URL"] = "Proxy URL";
 $a->strings["Network timeout"] = "Netzwerk Wartezeit";
-$a->strings["%s user blocked"] = array(
-	0 => "%s Nutzer gesperrt",
-	1 => "%s Nutzer gesperrt/entsperrt",
+$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen).";
+$a->strings["%s user blocked/unblocked"] = array(
+	0 => "%s Benutzer geblockt/freigegeben",
+	1 => "%s Benutzer geblockt/freigegeben",
 );
 $a->strings["%s user deleted"] = array(
 	0 => "%s Nutzer gelöscht",
@@ -695,7 +745,12 @@ $a->strings["Disable"] = "Ausschalten";
 $a->strings["Enable"] = "Einschalten";
 $a->strings["Toggle"] = "Umschalten";
 $a->strings["Settings"] = "Einstellungen";
+$a->strings["Author: "] = "Autor:";
+$a->strings["Maintainer: "] = "Betreuer:";
 $a->strings["No themes found."] = "Keine Themen gefunden.";
+$a->strings["Screenshot"] = "Bildschirmfoto";
+$a->strings["[Experimental]"] = "[Experimentell]";
+$a->strings["[Unsupported]"] = "[Nicht unterstützt]";
 $a->strings["Log settings updated."] = "Protokolleinstellungen aktualisiert.";
 $a->strings["Clear"] = "löschen";
 $a->strings["Debugging"] = "Protokoll führen";
@@ -720,6 +775,8 @@ $a->strings["{0} is now friends with %s"] = "{0} ist jetzt mit %s befreundet";
 $a->strings["{0} posted"] = "{0} hat etwas veröffentlicht";
 $a->strings["{0} tagged %s's post with #%s"] = "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen";
 $a->strings["{0} mentioned you in a post"] = "{0} hat dich in einem Beitrag erwähnt";
+$a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
+$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet.";
 $a->strings["Login failed."] = "Annmeldung fehlgeschlagen.";
 $a->strings["Connect URL missing."] = "Connect-URL fehlt";
 $a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann.";
@@ -790,6 +847,8 @@ $a->strings["Create New Profile"] = "Neues Profil anlegen";
 $a->strings["Profile Image"] = "Profilbild";
 $a->strings["visible to everybody"] = "sichtbar für jeden";
 $a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
+$a->strings["Save to Folder:"] = "In diesen Ordner verschieben:";
+$a->strings["- select -"] = "- auswählen -";
 $a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$ss %3\$s mit %4\$s getaggt";
 $a->strings["No potential page delegates located."] = "Keine potentiellen Bevollmächtigten für die Seite gefunden.";
 $a->strings["Delegate Page Management"] = "Delegiere das Management für die Seite";
@@ -803,26 +862,29 @@ $a->strings["Friend Suggestions"] = "Kontaktvorschläge";
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal.";
 $a->strings["Ignore/Hide"] = "Ignorieren/Verbergen";
 $a->strings["Global Directory"] = "Weltweites Verzeichnis";
-$a->strings["Normal site view"] = "Normale Seitenansicht";
-$a->strings["Admin - View all site entries"] = "Admin: Alle Einträge dieses Servers anzeigen";
 $a->strings["Find on this site"] = "Auf diesem Server suchen";
 $a->strings["Site Directory"] = "Verzeichnis";
 $a->strings["Gender: "] = "Geschlecht:";
 $a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein).";
 $a->strings["%s : Not a valid email address."] = "%s: Keine gültige Email Adresse.";
-$a->strings["Please join my network on %s"] = "Bitte trete meinem Netzwerk auf %s bei";
+$a->strings["Please join us on Friendica"] = "Bitte trete uns auf Friendica bei";
 $a->strings["%s : Message delivery failed."] = "%s: Zustellung der Nachricht fehlgeschlagen.";
 $a->strings["%d message sent."] = array(
 	0 => "%d Nachricht gesendet.",
 	1 => "%d Nachrichten gesendet.",
 );
 $a->strings["You have no more invitations available"] = "Du hast keine weiteren Einladungen";
+$a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "Besuche %s für eine Liste der öffentlichen Server, denen du beitreten kannst. Friendica Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer Sozialer Netzwerke.";
+$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Um diese Freundschaftsanfrage zu akzeptieren, besuche und registriere dich bitte bei %s oder einer anderen öffentlichen Friendica Website.";
+$a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."] = "Friendica Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica Server, denen du beitreten kannst.";
+$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Es tut uns Leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen.";
 $a->strings["Send invitations"] = "Einladungen senden";
 $a->strings["Enter email addresses, one per line:"] = "E-Mail-Adressen eingeben, eine pro Zeile:";
-$a->strings["Please join my social network on %s"] = "Bitte trete meinem Sozialen Netzwerk auf %s bei";
-$a->strings["To accept this invitation, please visit:"] = "Um diese Einladung anzunehmen besuche bitte:";
+$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Du bist herzlich dazu eingeladen, dich mir und anderen guten Freunden auf Friendica anzuschließen - und ein besseres Soziales Netz aufzubauen.";
 $a->strings["You will need to supply this invitation code: \$invite_code"] = "Du benötigst den folgenden Einladungscode: \$invite_code";
 $a->strings["Once you have registered, please connect with me via my profile page at:"] = "Sobald du registriert bist, kontaktiere mich bitte auf meiner Profilseite:";
+$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendica.com"] = "Für weitere Informationen über das Friendica Projekt und warum wir es für ein wichtiges Projekt halten, besuche bitte http://friendica.com";
+$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde.";
 $a->strings["Response from remote site was not understood."] = "Antwort der Gegenstelle unverständlich.";
 $a->strings["Unexpected response from remote site: "] = "Unerwartete Antwort der Gegenstelle: ";
 $a->strings["Confirmation completed successfully."] = "Bestätigung erfolgreich abgeschlossen.";
@@ -856,13 +918,30 @@ $a->strings["On this website your Facebook profile wall conversations will only
 $a->strings["Do not import your Facebook profile wall conversations"] = "Facebook-Pinnwand nicht importieren";
 $a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann.";
 $a->strings["Comma separated applications to ignore"] = "Komma separiert Anwendungen, die ignoriert werden sollen";
+$a->strings["Problems with Facebook Real-Time Updates"] = "Probleme mit Facebook Echtzeit-Updates";
 $a->strings["Facebook"] = "Facebook";
 $a->strings["Facebook Connector Settings"] = "Facebook-Verbindungseinstellungen";
+$a->strings["Facebook API Key"] = "Facebook API Schlüssel";
+$a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>"] = "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.<br><br>";
+$a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden).";
+$a->strings["The given API Key seems to work correctly."] = "Der angegebene API Schlüssel scheint nicht korrekt zu funktionieren.";
+$a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange.";
+$a->strings["App-ID / API-Key"] = "App-ID / API-Key";
+$a->strings["Application secret"] = "Anwendungs-Geheimnis";
+$a->strings["Polling Interval (min. %1\$s minutes)"] = "Abrufintervall (min. %1\$s Minuten)";
+$a->strings["Real-Time Updates"] = "Echt-Zeit Aktualisierungen";
+$a->strings["Real-Time Updates are activated."] = "Echtzeit-Updates sind aktiviert.";
+$a->strings["Deactivate Real-Time Updates"] = "Echtzeit-Updates deaktivieren";
+$a->strings["Real-Time Updates not activated."] = "Echtzeit-Updates nicht aktiviert.";
+$a->strings["Activate Real-Time Updates"] = "Echtzeit-Updates aktivieren";
+$a->strings["The new values have been saved."] = "Die neuen Einstellungen wurden gespeichert.";
 $a->strings["Post to Facebook"] = "Bei Facebook veröffentlichen";
 $a->strings["Post to Facebook cancelled because of multi-network access permission conflict."] = "Beitrag wurde nicht bei Facebook veröffentlicht, da Konflikte bei den Multi-Netzwerk-Zugriffsrechten vorliegen.";
-$a->strings["Image: "] = "Bild: ";
 $a->strings["View on Friendica"] = "In Friendica betrachten";
 $a->strings["Facebook post failed. Queued for retry."] = "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut.";
+$a->strings["Your Facebook connection became invalid. Please Re-authenticate."] = "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich.";
+$a->strings["Facebook connection became invalid"] = "Facebook Anmeldedaten sind ungültig geworden";
+$a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."] = "Hi %1\$s,\n\ndie Verbindung von deinem Account auf %2\$s und Facebook funktioniert derzeit nicht. Dies ist im Allgemeinen das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du  %3\$sden Facebook-Connector neu Authentifizieren%4\$s.";
 $a->strings["link"] = "Verweis";
 $a->strings["%d person likes this"] = array(
 	0 => "%d Person mag das",
@@ -882,18 +961,26 @@ $a->strings["Username:"] = "Nutzername:";
 $a->strings["Password:"] = "Passwort:";
 $a->strings["Use SSL "] = "SSL Verwenden ";
 $a->strings["yourls Settings saved."] = "yourls Einstellungen gespeichert";
-$a->strings["\"Not Safe For Work\" Settings"] = "\"Not Safe For Work\"-Einstellungen";
-$a->strings["Enable NSFW filter"] = "NSFW Filter aktivieren";
-$a->strings["Comma separated words to treat as NSFW"] = "Wörter, die gefiltert werden sollen (durch Kommas getrennt)";
+$a->strings["Post to LiveJournal"] = "In LiveJournal veröffentlichen.";
+$a->strings["LiveJournal Post Settings"] = "LiveJournal Veröffentlichungs-Einstellungen";
+$a->strings["Enable LiveJournal Post Plugin"] = "LiveJournal Post Plugin aktivieren";
+$a->strings["LiveJournal username"] = "LiveJournal Benutzername";
+$a->strings["LiveJournal password"] = "LiveJournal Passwort";
+$a->strings["Post to LiveJournal by default"] = "Standardmäßig bei LiveJournal veröffentlichen";
+$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Not Safe for Work (allg. Filter für ungewollte Inhalte) Einstellungen:";
+$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Su kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden.";
+$a->strings["Enable Content filter"] = "Aktiviere den Inhaltsfilter";
+$a->strings["Comma separated list of keywords to hide"] = "Durch Komma getrennte Liste von Schlüsselwörtern die verborgen werden sollen";
 $a->strings["Use /expression/ to provide regular expressions"] = "Verwende /expression/ um reguläre Ausdrücke zu verwenden";
 $a->strings["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert";
 $a->strings["%s - Click to open/close"] = "%s – Zum Öffnen/Schließen klicken";
+$a->strings["Forums"] = "Foren";
 $a->strings["Login"] = "Anmeldung";
 $a->strings["OpenID"] = "OpenID";
-$a->strings["Last users"] = "Letzte Nutzer";
+$a->strings["Latest users"] = "Letzte Benutzer";
 $a->strings["Most active users"] = "Aktivste Nutzer";
-$a->strings["Last photos"] = "Letzte Fotos";
-$a->strings["Last likes"] = "Zuletzt gemocht";
+$a->strings["Latest photos"] = "Neueste Fotos";
+$a->strings["Latest likes"] = "Neueste Favoriten";
 $a->strings["event"] = "Veranstaltung";
 $a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "Ermöglicht dir, deine friendica id (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>";
 $a->strings["Template URL (with {category})"] = "Vorlagen URL (mit {Kategorie})";
@@ -914,6 +1001,12 @@ $a->strings["\"Cat\" game!"] = "Unentschieden!";
 $a->strings["I won!"] = "Ich gewinne!";
 $a->strings["Randplace Settings"] = "Randplace-Einstellungen";
 $a->strings["Enable Randplace Plugin"] = "Randplace-Plugin aktivieren";
+$a->strings["Post to Dreamwidth"] = "In Dreamwidth veröffentlichen";
+$a->strings["Dreamwidth Post Settings"] = "Dreamwidth Veröffentlichungs-Einstellungen";
+$a->strings["Enable dreamwidth Post Plugin"] = "Dreamwidth Post Plugin aktivieren";
+$a->strings["dreamwidth username"] = "Dreamwidth Benutzername";
+$a->strings["dreamwidth password"] = "Dreamwidth Passwort";
+$a->strings["Post to dreamwidth by default"] = "Standardmäßig bei Dreamwidth veröffentlichen";
 $a->strings["Post to Drupal"] = "Bei Drupal veröffentlichen";
 $a->strings["Drupal Post Settings"] = "Drupal-Beitragseinstellungen";
 $a->strings["Enable Drupal Post Plugin"] = "Veröffentlichung bei Drupal erlauben";
@@ -956,6 +1049,7 @@ $a->strings[":-)"] = ":-)";
 $a->strings[":-("] = ":-(";
 $a->strings["lol"] = "lol";
 $a->strings["Quick Comment Settings"] = "Schnell-Kommentar Einstellungen";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Kurz-Kommentare findet man in der Nähe der Kommentar-Boxen. Ein Klick darauf erstellt einfache Antworten.";
 $a->strings["Enter quick comments, one per line"] = "Gib einen Schnell-Kommentar pro Zeile ein";
 $a->strings["Quick Comment settings saved."] = "Schnell-Kommentare Einstellungen gespeichert";
 $a->strings["Tile Server URL"] = "Tile Server URL";
@@ -967,6 +1061,12 @@ $a->strings["Editplain Settings"] = "Editplain Einstellungen";
 $a->strings["Disable richtext status editor"] = "RichText Editor deaktivieren";
 $a->strings["\"pageheader\" Settings"] = "\"pageheader\"-Einstellungen";
 $a->strings["pageheader Settings saved."] = "pageheader-Einstellungen gespeichert.";
+$a->strings["Post to Insanejournal"] = "Auf InsaneJournal posten.";
+$a->strings["InsaneJournal Post Settings"] = "InsaneJournal Beitrags-Einstellungen";
+$a->strings["Enable InsaneJournal Post Plugin"] = "InsaneJournal Plugin aktivieren";
+$a->strings["InsaneJournal username"] = "InsaneJournal Benutzername";
+$a->strings["InsaneJournal password"] = "InsaneJournal Passwort";
+$a->strings["Post to InsaneJournal by default"] = "Standardmäßig auf InsaneJournal posten.";
 $a->strings["View Source"] = "Quelle ansehen";
 $a->strings["Post to StatusNet"] = "Bei StatusNet veröffentlichen";
 $a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Bitte kontaktiere den Administrator des Servers.<br />Die angegebene API-URL ist nicht gültig.";
@@ -991,6 +1091,7 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted
 $a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an deinen StatusNet Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde.";
 $a->strings["Allow posting to StatusNet"] = "Veröffentlichung bei StatusNet erlauben";
 $a->strings["Send public postings to StatusNet by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei StatusNet";
+$a->strings["Send #tag links to StatusNet"] = "#Tags nach StatusNet senden";
 $a->strings["Clear OAuth configuration"] = "OAuth-Konfiguration löschen";
 $a->strings["API URL"] = "API-URL";
 $a->strings["Post to Tumblr"] = "Bei Tumblr veröffentlichen";
@@ -1002,6 +1103,11 @@ $a->strings["Post to Tumblr by default"] = "Standardmäßig bei Tumblr veröffen
 $a->strings["Numfriends settings updated."] = "Numfriends Einstellungen aktualisiert";
 $a->strings["Numfriends Settings"] = "Numfriends Einstellungen";
 $a->strings["How many contacts to display on profile sidebar"] = "Wie viele Kontakte sollen in der Seitenleiste angezeigt werden";
+$a->strings["Gnot settings updated."] = "Gnot Einstellungen aktualisiert.";
+$a->strings["Gnot Settings"] = "Gnot Einstellungen";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Erlaubt das Veröffentlichen von E-Mail Kommentar Benachrichtigungen bei Gmail mit anonymisiertem Betreff";
+$a->strings["Enable this plugin/addon?"] = "Dieses Plugin/Addon aktivieren?";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica Meldung] Kommentar zum Beitrag #%d";
 $a->strings["Post to Wordpress"] = "Bei WordPress veröffentlichen";
 $a->strings["WordPress Post Settings"] = "WordPress-Beitragseinstellungen";
 $a->strings["Enable WordPress Post Plugin"] = "WordPress-Plugin aktivieren.";
@@ -1013,7 +1119,7 @@ $a->strings["\"Show more\" Settings"] = "\"Mehr zeigen\" Einstellungen";
 $a->strings["Enable Show More"] = "Aktiviere \"Mehr zeigen\"";
 $a->strings["Cutting posts after how much characters"] = "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben";
 $a->strings["Show More Settings saved."] = "\"Mehr zeigen\" Einstellungen gesichert.";
-$a->strings["Show More"] = "\"Mehr zeigen\"";
+$a->strings["show more"] = "mehr anzeigen";
 $a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Diese Website benutzt <a href='http://www.piwik.org'>Piwik</a>, eine Open Source-Software zur statistischen Auswertung der Besucherzugriffe.";
 $a->strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Wenn Du nicht willst, dass Deine Besuche auf diese Weise gespeichert werden, kannst Du <a href='%s'>ein Cookie setzen</a>. Dann wird Piwik Dich auf dieser Website nicht mehr verfolgen (opt-out).";
 $a->strings["Piwik Base URL"] = "Piwik Basis URL";
@@ -1032,14 +1138,43 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted
 $a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an an deinen Twitter Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde.";
 $a->strings["Allow posting to Twitter"] = "Veröffentlichung bei Twitter erlauben";
 $a->strings["Send public postings to Twitter by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter";
+$a->strings["Send #tag links to Twitter"] = "#Tags nach Twitter senden";
 $a->strings["Consumer key"] = "Consumer Key";
 $a->strings["Consumer secret"] = "Consumer Secret";
+$a->strings["IRC Chatroom"] = "IRC Chatraum";
+$a->strings["Popular Channels"] = "Beliebte Räume";
 $a->strings["Post to Posterous"] = "Nach Posterous senden";
 $a->strings["Posterous Post Settings"] = "Posterous Beitrags-Einstellungen";
 $a->strings["Enable Posterous Post Plugin"] = "Posterous-Plugin aktivieren";
 $a->strings["Posterous login"] = "Posterous-Anmeldename";
 $a->strings["Posterous password"] = "Posterous-Passwort";
 $a->strings["Post to Posterous by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous";
+$a->strings["Last users"] = "Letzte Nutzer";
+$a->strings["Last likes"] = "Zuletzt gemocht";
+$a->strings["Last photos"] = "Letzte Fotos";
+$a->strings["Find Friends"] = "Freunde finden";
+$a->strings["Local Directory"] = "Lokales Verzeichnis";
+$a->strings["Similar Interests"] = "Ähnliche Interessen";
+$a->strings["Invite Friends"] = "Freunde einladen";
+$a->strings["Community Pages"] = "Foren";
+$a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
+$a->strings["Connect Services"] = "Verbinde Dienste";
+$a->strings["PostIt to Friendica"] = "PostIt nach Friendica";
+$a->strings["Post to Friendica"] = "Bei Friendica veröffentlichen";
+$a->strings[" from anywhere by bookmarking this Link."] = " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst.";
+$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
+$a->strings["Your profile page"] = "Deine Profilseite";
+$a->strings["Your contacts"] = "Deine Kontakte";
+$a->strings["Photos"] = "Bilder";
+$a->strings["Your photos"] = "Deine Fotos";
+$a->strings["Your events"] = "Deine Ereignisse";
+$a->strings["Personal notes"] = "Persönliche Notizen";
+$a->strings["Your personal photos"] = "Deine privaten Fotos";
+$a->strings["Theme settings"] = "Themen Einstellungen";
+$a->strings["Alignment"] = "Ausrichtung";
+$a->strings["Left"] = "Links";
+$a->strings["Center"] = "Mitte";
+$a->strings["Color scheme"] = "Farbschema";
 $a->strings["Gender:"] = "Geschlecht:";
 $a->strings["j F, Y"] = "j F, Y";
 $a->strings["j F"] = "j F";
@@ -1164,11 +1299,21 @@ $a->strings["October"] = "Oktober";
 $a->strings["November"] = "November";
 $a->strings["December"] = "Dezember";
 $a->strings["bytes"] = "Byte";
+$a->strings["Categories:"] = "Kategorien:";
+$a->strings["remove"] = "löschen";
+$a->strings["[remove]"] = "[löschen]";
+$a->strings["Filed under:"] = "Abgelegt unter:";
+$a->strings["Click to open/close"] = "Zum öffnen/schließen klicken";
 $a->strings["Select an alternate language"] = "Alternative Sprache auswählen";
 $a->strings["default"] = "standard";
+$a->strings["activity"] = "Aktivität";
+$a->strings["comment"] = "Kommentar";
+$a->strings["post"] = "Beitrag";
+$a->strings["Item filed"] = "Beitrag abgelegt";
 $a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora";
 $a->strings["Attachments:"] = "Anhänge:";
 $a->strings["[Relayed] Comment authored by %s from network %s"] = "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk";
+$a->strings["view full size"] = "Volle Größe anzeigen";
 $a->strings["Embedded content"] = "Eingebetteter Inhalt";
 $a->strings["Embedding disabled"] = "Einbettungen deaktiviert";
 $a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen.";
@@ -1180,13 +1325,6 @@ $a->strings["Create a new group"] = "Neue Gruppe erstellen";
 $a->strings["Logout"] = "Abmelden";
 $a->strings["End this session"] = "Diese Sitzung beenden";
 $a->strings["Status"] = "Status";
-$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
-$a->strings["Your profile page"] = "Deine Profilseite";
-$a->strings["Photos"] = "Bilder";
-$a->strings["Your photos"] = "Deine Fotos";
-$a->strings["Your events"] = "Deine Ereignisse";
-$a->strings["Personal notes"] = "Persönliche Notizen";
-$a->strings["Your personal photos"] = "Deine privaten Fotos";
 $a->strings["Sign in"] = "Anmelden";
 $a->strings["Home Page"] = "Homepage";
 $a->strings["Create an account"] = "Account erstellen";
@@ -1202,6 +1340,8 @@ $a->strings["Friend Requests"] = "Kontaktanfragen";
 $a->strings["See all notifications"] = "Alle Benachrichtigungen anzeigen";
 $a->strings["Mark all system notifications seen"] = "Markiere alle System-Benachrichtigungen als gelesen";
 $a->strings["Private mail"] = "Private Email";
+$a->strings["Inbox"] = "Eingang";
+$a->strings["Outbox"] = "Ausgang";
 $a->strings["Manage"] = "Verwalten";
 $a->strings["Manage other pages"] = "Andere Seiten verwalten";
 $a->strings["Profiles"] = "Profile";
@@ -1213,7 +1353,6 @@ $a->strings["Nothing new here"] = "Keine Neuigkeiten.";
 $a->strings["Add New Contact"] = "Neuen Kontakt hinzufügen";
 $a->strings["Enter address or web location"] = "Adresse oder Web-Link eingeben";
 $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@example.com, http://example.com/barbara";
-$a->strings["Invite Friends"] = "Freunde einladen";
 $a->strings["%d invitation available"] = array(
 	0 => "%d Einladung verfügbar",
 	1 => "%d Einladungen verfügbar",
@@ -1222,10 +1361,14 @@ $a->strings["Find People"] = "Leute finden";
 $a->strings["Enter name or interest"] = "Name oder Interessen eingeben";
 $a->strings["Connect/Follow"] = "Verbinden/Folgen";
 $a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiel: Robert Morgenstein, Angeln";
-$a->strings["Similar Interests"] = "Ähnliche Interessen";
 $a->strings["Networks"] = "Netzwerke";
 $a->strings["All Networks"] = "Alle Netzwerke";
+$a->strings["Saved Folders"] = "Gespeicherte Ordner";
+$a->strings["Everything"] = "Alles";
+$a->strings["Categories"] = "Kategorien";
 $a->strings["Logged out."] = "Abgemeldet.";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim versuch dich mit der von dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe dass du die OpenID richtig geschrieben hast.";
+$a->strings["The error message was:"] = "Die Fehlermeldung lautete:";
 $a->strings["Miscellaneous"] = "Verschiedenes";
 $a->strings["year"] = "Jahr";
 $a->strings["month"] = "Monat";
@@ -1255,32 +1398,37 @@ $a->strings["don't show"] = "nicht zeigen";
 $a->strings["Friendica Notification"] = "Friendica-Benachrichtigung";
 $a->strings["Thank You,"] = "Danke,";
 $a->strings["%s Administrator"] = "der Administrator von %s";
-$a->strings["New mail received at %s"] = "Neue Nachricht auf %s empfangen";
+$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
+$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica Meldung] Neue Nachricht erhalten von %s";
 $a->strings["%s sent you a new private message at %s."] = "%s hat dir eine neue private Nachricht auf %s geschrieben.";
 $a->strings["%s sent you %s."] = "%s hat Dir geschickt %s";
 $a->strings["a private message"] = "eine private Nachricht";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten.";
-$a->strings["%s commented on an item at %s"] = "%s kommentierte einen Beitrag auf %s";
+$a->strings["%s's"] = "%s's";
+$a->strings["your"] = "Dein";
+$a->strings["[Friendica:Notify] Comment to conversation #%d by %s"] = "[Friendica Meldung] Kommentar zum Beitrag #%d von %s";
 $a->strings["%s commented on an item/conversation you have been following."] = "%s hat einen Beitrag kommentiert, dem du folgst.";
-$a->strings["%s commented in %s."] = "%s wurde kommentiert in %s";
-$a->strings["a watched conversation"] = "eine beobachtete Unterhaltung";
+$a->strings["%s commented on %s."] = "%s kommentierte %s.";
 $a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren.";
+$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica Meldung] %s hat auf Deine Pinnwand geschrieben";
 $a->strings["%s posted to your profile wall at %s"] = "%s hat auf deine Pinnwand bei %s gepostet";
 $a->strings["%s posted to %s"] = "%s schrieb an %s";
 $a->strings["your profile wall."] = "Deine Pinnwand";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica Meldung] %s hat Dich erwähnt";
 $a->strings["%s tagged you at %s"] = "%s hat dich auf %s erwähnt";
 $a->strings["%s %s."] = "%s %s.";
 $a->strings["tagged you"] = "erwähnte Dich";
+$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica Meldung] %s markierte Deinen Beitrag";
 $a->strings["%s tagged your post at %s"] = "%s hat deinen Beitrag auf %s getaggt";
 $a->strings["%s tagged %s"] = "%s markierte %s";
 $a->strings["your post"] = "Dein Beitrag";
-$a->strings["Introduction received at %s"] = "Kontaktanfrage auf %s erhalten";
+$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica Meldung] Kontaktanfrage erhalten";
 $a->strings["You've received an introduction from '%s' at %s"] = "Du hast eine Kontaktanfrage von '%s' auf %s erhalten";
 $a->strings["You've received %s from %s."] = "Du hast %s von %s erhalten.";
-$a->strings["an introduction"] = "eine Einführung";
+$a->strings["an introduction"] = "eine Kontaktanfrage";
 $a->strings["You may visit their profile at %s"] = "Hier kannst du das Profil betrachten: %s";
 $a->strings["Please visit %s to approve or reject the introduction."] = "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen.";
-$a->strings["Friend suggestion received at %s"] = "Kontaktvorschlag empfangen auf %s";
+$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica Meldung] Kontaktvorschlag erhalten";
 $a->strings["You've received a friend suggestion from '%s' at %s"] = "Du hast von '%s' einen Kontaktvorschlag erhalten auf %s";
 $a->strings["You've received %s for %s from %s."] = "Du hast %s für %s von %s erhalten.";
 $a->strings["a friend suggestion"] = "ein Freunde Vorschlag";
@@ -1289,11 +1437,11 @@ $a->strings["Photo:"] = "Foto:";
 $a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen.";
 $a->strings["A new person is sharing with you at "] = "Eine neue Person teilt mit dir auf ";
 $a->strings["You have a new follower at "] = "Du hast einen neuen Kontakt auf ";
-$a->strings["view full size"] = "Volle Größe anzeigen";
 $a->strings["image/photo"] = "Bild/Foto";
 $a->strings["Welcome "] = "Willkommen ";
 $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
 $a->strings["Welcome back "] = "Willkommen zurück ";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before subitting it."] = "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
 $a->strings["View status"] = "Status anzeigen";
 $a->strings["View profile"] = "Profil anzeigen";
 $a->strings["View photos"] = "Fotos ansehen";
@@ -1309,7 +1457,6 @@ $a->strings["%d comment"] = array(
 	0 => "%d Kommentar",
 	1 => "%d Kommentare",
 );
-$a->strings["show more"] = "mehr anzeigen";
 $a->strings["like"] = "mag ich";
 $a->strings["dislike"] = "mag ich nicht";
 $a->strings["Share this"] = "Teile dieses";
@@ -1319,6 +1466,7 @@ $a->strings["remove star"] = "Markierung entfernen";
 $a->strings["toggle star status"] = "Markierung umschalten";
 $a->strings["starred"] = "markiert";
 $a->strings["add tag"] = "Tag hinzufügen";
+$a->strings["save to folder"] = "In Ordner speichern";
 $a->strings["to"] = "zu";
 $a->strings["Wall-to-Wall"] = "Wall-to-Wall";
 $a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
@@ -1336,7 +1484,6 @@ $a->strings["Please enter a video link/URL:"] = "Bitte Link/URL zum Video einfü
 $a->strings["Please enter an audio link/URL:"] = "Bitte Link/URL zum Audio einfügen:";
 $a->strings["Tag term:"] = "Tag:";
 $a->strings["Where are you right now?"] = "Wo hältst du dich jetzt gerade auf?";
-$a->strings["Enter a title for this item"] = "Gib den Titel für diesen Beitrag ein";
 $a->strings["upload photo"] = "Bild hochladen";
 $a->strings["attach file"] = "Datei anhängen";
 $a->strings["web link"] = "Weblink";
@@ -1355,6 +1502,7 @@ $a->strings["Password: "] = "Passwort: ";
 $a->strings["Or login using OpenID: "] = "Oder melde dich mit deiner OpenID an: ";
 $a->strings["Forgot your password?"] = "Passwort vergessen?";
 $a->strings["Edit profile"] = "Profil bearbeiten";
+$a->strings["Message"] = "Nachricht";
 $a->strings["g A l F d"] = "l. d, F G \\U\\h\\\\r";
 $a->strings["F d"] = "d. F";
 $a->strings["Birthday Reminders"] = "Geburtstagserinnerungen";
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 cd98a4daa..d8aa8b181 100755..100644
--- a/view/dfrn_request.tpl
+++ b/view/dfrn_request.tpl
@@ -7,7 +7,11 @@ $page_desc<br />
 <li><a href="http://friendica.com" title="$friendica">$friendica</a></li>
 <li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li>
 <li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li>
+<li>$emailnet</li>
 </ul>
+$invite_desc
+</p>
+<p>
 $desc
 </p>
 
diff --git a/view/diasp_dec_hdr.tpl b/view/diasp_dec_hdr.tpl
index e87c61888..e87c61888 100755..100644
--- a/view/diasp_dec_hdr.tpl
+++ b/view/diasp_dec_hdr.tpl
diff --git a/view/diaspora_comment.tpl b/view/diaspora_comment.tpl
index 6ef4ab664..6ef4ab664 100755..100644
--- a/view/diaspora_comment.tpl
+++ b/view/diaspora_comment.tpl
diff --git a/view/diaspora_comment_relay.tpl b/view/diaspora_comment_relay.tpl
index e82de1171..e82de1171 100755..100644
--- a/view/diaspora_comment_relay.tpl
+++ b/view/diaspora_comment_relay.tpl
diff --git a/view/diaspora_conversation.tpl b/view/diaspora_conversation.tpl
index 12807ba59..12807ba59 100755..100644
--- a/view/diaspora_conversation.tpl
+++ b/view/diaspora_conversation.tpl
diff --git a/view/diaspora_like.tpl b/view/diaspora_like.tpl
index a777aeebe..a777aeebe 100755..100644
--- a/view/diaspora_like.tpl
+++ b/view/diaspora_like.tpl
diff --git a/view/diaspora_like_relay.tpl b/view/diaspora_like_relay.tpl
index 65559b05b..65559b05b 100755..100644
--- a/view/diaspora_like_relay.tpl
+++ b/view/diaspora_like_relay.tpl
diff --git a/view/diaspora_message.tpl b/view/diaspora_message.tpl
index 667b8d53f..667b8d53f 100755..100644
--- a/view/diaspora_message.tpl
+++ b/view/diaspora_message.tpl
diff --git a/view/diaspora_photo.tpl b/view/diaspora_photo.tpl
index 75ca7f15c..75ca7f15c 100755..100644
--- a/view/diaspora_photo.tpl
+++ b/view/diaspora_photo.tpl
diff --git a/view/diaspora_post.tpl b/view/diaspora_post.tpl
index 1ba3ebb1f..1ba3ebb1f 100755..100644
--- a/view/diaspora_post.tpl
+++ b/view/diaspora_post.tpl
diff --git a/view/diaspora_profile.tpl b/view/diaspora_profile.tpl
index e5c3d3cad..e5c3d3cad 100755..100644
--- a/view/diaspora_profile.tpl
+++ b/view/diaspora_profile.tpl
diff --git a/view/diaspora_retract.tpl b/view/diaspora_retract.tpl
index 6d5b6e22b..6d5b6e22b 100755..100644
--- a/view/diaspora_retract.tpl
+++ b/view/diaspora_retract.tpl
diff --git a/view/diaspora_share.tpl b/view/diaspora_share.tpl
index c16341b1e..c16341b1e 100755..100644
--- a/view/diaspora_share.tpl
+++ b/view/diaspora_share.tpl
diff --git a/view/diaspora_signed_retract.tpl b/view/diaspora_signed_retract.tpl
index 22120e287..22120e287 100755..100644
--- a/view/diaspora_signed_retract.tpl
+++ b/view/diaspora_signed_retract.tpl
diff --git a/view/diaspora_vcard.tpl b/view/diaspora_vcard.tpl
index de3981a94..de3981a94 100755..100644
--- a/view/diaspora_vcard.tpl
+++ b/view/diaspora_vcard.tpl
diff --git a/view/directory_header.tpl b/view/directory_header.tpl
index 1f03540f2..1f03540f2 100755..100644
--- a/view/directory_header.tpl
+++ b/view/directory_header.tpl
diff --git a/view/directory_item.tpl b/view/directory_item.tpl
index b45da4465..b45da4465 100755..100644
--- a/view/directory_item.tpl
+++ b/view/directory_item.tpl
diff --git a/view/email_notify_html.tpl b/view/email_notify_html.tpl
index 43f72f15c..43f72f15c 100755..100644
--- a/view/email_notify_html.tpl
+++ b/view/email_notify_html.tpl
diff --git a/view/email_notify_text.tpl b/view/email_notify_text.tpl
index 018bb6078..018bb6078 100755..100644
--- a/view/email_notify_text.tpl
+++ b/view/email_notify_text.tpl
diff --git a/view/en/follow_notify_eml.tpl b/view/en/follow_notify_eml.tpl
index ae758c9a8..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
new file mode 100644
index 000000000..54fba7435
--- /dev/null
+++ b/view/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"><a href="$base" class="fileas-link fileas-all{{ if $sel_all }} fileas-selected{{ endif }}">$all</a></li>
+		{{ for $terms as $term }}
+			<li class="tool"><a href="$base?f=&file=$term.name" class="fileas-link{{ if $term.selected }} fileas-selected{{ endif }}">$term.name</a></li>
+		{{ endfor }}
+	</ul>
+	
+</div>
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 cbae1610f..2cbebbb8e 100755..100644
--- a/view/group_drop.tpl
+++ b/view/group_drop.tpl
@@ -1,5 +1,5 @@
 <div class="group-delete-wrapper button" id="group-delete-wrapper-$id" >
-	<a href="group/drop/$id" 
+	<a href="group/drop/$id?t=$form_security_token" 
 		onclick="return confirmDelete();" 
 		id="group-delete-icon-$id" 
 		class="icon drophide group-delete-icon" 
diff --git a/view/group_edit.tpl b/view/group_edit.tpl
index 3689db753..2fa2b1a55 100755..100644
--- a/view/group_edit.tpl
+++ b/view/group_edit.tpl
@@ -3,6 +3,7 @@
 
 <div id="group-edit-wrapper" >
 	<form action="group/$gid" id="group-edit-form" method="post" >
+		<input type='hidden' name='form_security_token' value='$form_security_token'>
 		
 		{{ inc field_input.tpl with $field=$gname }}{{ endinc }}
 		{{ if $drop }}$drop{{ endif }}
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 f606f2f7e..cd6f5ca97 100755..100644
--- a/view/head.tpl
+++ b/view/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/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 7e2acdca5..1302b5a70 100755..100644
--- a/view/install_db.tpl
+++ b/view/install_db.tpl
@@ -20,7 +20,7 @@ $info_03
 
 {{ inc field_input.tpl with $field=$dbhost }}{{endinc}}
 {{ inc field_input.tpl with $field=$dbuser }}{{endinc}}
-{{ inc field_input.tpl with $field=$dbpass }}{{endinc}}
+{{ inc field_password.tpl with $field=$dbpass }}{{endinc}}
 {{ inc field_input.tpl with $field=$dbdata }}{{endinc}}
 
 
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 d6b172b6a..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,
@@ -121,7 +123,6 @@ function enableOnUser(){
 <script type="text/javascript" src="$baseurl/js/ajaxupload.js" ></script>
 <script>
 	var ispublic = '$ispublic';
-	var addtitle = '$addtitle';
 
 	$(document).ready(function() {
 		
@@ -262,6 +263,39 @@ function enableOnUser(){
 		}
 	}
 
+	function itemFiler(id) {
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.fancybox(data);
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply);
+					if(timer) clearTimeout(timer);
+					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.fancybox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+		
+	}
+
 	function jotClearLocation() {
 		$('#jot-coord').val('');
 		$('#profile-nolocation-wrapper').hide();
diff --git a/view/jot.tpl b/view/jot.tpl
index 2c1ce5ae1..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" />
-		
-		<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 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>
+
+
+	<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>
 
@@ -41,13 +74,12 @@
 			<div id="profile-jot-email-end"></div>
 			$jotnets
 		</div>
-	</div>	
-
-	
-</form>
-
-{{ if $content }}<script>initEditor();</script>{{ endif }}
-
+	</div>
 
 
+</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 2c467c3c2..2651ea1f8 100755..100644
--- a/view/like_noshare.tpl
+++ b/view/like_noshare.tpl
@@ -1,5 +1,5 @@
 <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-				<a href="#" class="icon like"title="$likethis" onclick="dolike($id,'like'); return false"></a>
-				<a href="#" class="icon dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a>
-				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-			</div>
+	<a href="#" class="icon like" title="$likethis" onclick="dolike($id,'like'); return false"></a>
+	<a href="#" class="icon dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a>
+	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+</div>
diff --git a/view/login.tpl b/view/login.tpl
index 5349fa3d8..4cbbb1624 100755..100644
--- a/view/login.tpl
+++ b/view/login.tpl
@@ -1,5 +1,5 @@
 
-<form action="" method="post" >
+<form action="$dest_url" method="post" >
 	<input type="hidden" name="auth-params" value="login" />
 
 	<div id="login_standard">
diff --git a/view/logout.tpl b/view/logout.tpl
index 6a84a5bbc..efc971df8 100755..100644
--- a/view/logout.tpl
+++ b/view/logout.tpl
@@ -1,4 +1,4 @@
-<form action="" method="post" >
+<form action="$dest_url" method="post" >
 <div class="logout-wrapper">
 <input type="hidden" name="auth-params" value="logout" />
 <input type="submit" name="submit" id="logout-button" value="$logout" />
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/mail_list.tpl b/view/mail_list.tpl
index b284ffb0e..22e35dec8 100755..100644
--- a/view/mail_list.tpl
+++ b/view/mail_list.tpl
@@ -1,6 +1,6 @@
 <div class="mail-list-outside-wrapper">
 	<div class="mail-list-sender" >
-		<a href="$from_url" class="mail-list-sender-url" ><img class="mail-list-sender-photo$sparkle" src="$from_photo" height="80 width="80" alt="$from_name" /></a>
+		<a href="$from_url" class="mail-list-sender-url" ><img class="mail-list-sender-photo$sparkle" src="$from_photo" height="80" width="80" alt="$from_name" /></a>
 	</div>
 	<div class="mail-list-detail">
 		<div class="mail-list-sender-name" >$from_name</div>
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 a74154c19..2d1ea7a61 100755..100644
--- a/view/msg-header.tpl
+++ b/view/msg-header.tpl
@@ -2,55 +2,48 @@
 <script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
 
-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",
-	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.onKeyUp.add(function(ed, e) {
-			var txt = tinyMCE.activeEditor.getContent();
-			var text = txt.length;
-			if(txt.length <= 140) {
-				$('#character-counter').removeClass('red');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('grey');
-			}
-			if((txt.length > 140) && (txt .length <= 420)) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('red');
-				$('#character-counter').addClass('orange');
-			}
-			if(txt.length > 420) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('red');
-			}
-			$('#character-counter').text(text);
-    	});
+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");
 
-		ed.onInit.add(function(ed) {
-			ed.pasteAsPlainText = true;
-		});
-	}
-});
 
 </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 0953e66a6..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?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 5dbcabadf..732caf690 100755..100644
--- a/view/photo_view.tpl
+++ b/view/photo_view.tpl
@@ -14,7 +14,7 @@
 <div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
 {{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
 <div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
+<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>
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 8dab72649..e5c7162d0 100755..100644
--- a/view/profile_edit.tpl
+++ b/view/profile_edit.tpl
@@ -5,9 +5,9 @@ $default
 <div id="profile-edit-links">
 <ul>
 <li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="$viewprof">$viewprof</a></li>
-<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li>
+<li><a href="$profile_clone_link" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li>
 <li></li>
-<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="$del_prof" $disabled >$del_prof</a></li>
+<li><a href="$profile_drop_link" id="profile-edit-drop-link" title="$del_prof" $disabled >$del_prof</a></li>
 
 </ul>
 </div>
@@ -17,6 +17,7 @@ $default
 
 <div id="profile-edit-wrapper" >
 <form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
+<input type='hidden' name='form_security_token' value='$form_security_token'>
 
 <div id="profile-edit-profile-name-wrapper" >
 <label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >$lbl_profname </label>
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 09e4fc9b2..61a273792 100755..100644
--- a/view/profile_listing_header.tpl
+++ b/view/profile_listing_header.tpl
@@ -3,6 +3,6 @@
 <a href="profile_photo" >$chg_photo</a>
 </p>
 <div id="profile-listing-new-link-wrapper" class="button" >
-<a href="profiles/new" id="profile-listing-new-link" title="$cr_new" >$cr_new</a>
+<a href="$cr_new_link" id="profile-listing-new-link" title="$cr_new" >$cr_new</a>
 </div>
 
diff --git a/view/profile_photo.tpl b/view/profile_photo.tpl
index f258b5b86..0b3a1cac1 100755..100644
--- a/view/profile_photo.tpl
+++ b/view/profile_photo.tpl
@@ -1,6 +1,7 @@
 <h1>$title</h1>
 
 <form enctype="multipart/form-data" action="profile_photo" method="post">
+<input type='hidden' name='form_security_token' value='$form_security_token'>
 
 <div id="profile-photo-upload-wrapper">
 <label id="profile-photo-upload-label" for="profile-photo-upload">$lbl_upfile </label>
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 5bcbfd0b0..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>
-				
-			</ul>
-			</div>
-		{{ endif }}
-	</div>
+	<div class="fn label">$profile.name</div>
+	
 				
 	
 	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+	<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 25bf93b99..2ce07ce6f 100755..100644
--- a/view/prv_message.tpl
+++ b/view/prv_message.tpl
@@ -10,14 +10,14 @@ $parent
 $select
 
 <div id="prvmail-subject-label">$subject</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly />
+<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" ></textarea>
+<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" />
+	<input type="submit" id="prvmail-submit" name="submit" value="Submit" tabindex="13" />
 	<div id="prvmail-upload-wrapper" >
 		<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
 	</div> 
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 1172df8b9..8753474af 100755..100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -5,7 +5,7 @@ $tabs
 $nickname_block
 
 <form action="settings" id="settings-form" method="post" autocomplete="off" >
-
+<input type='hidden' name='form_security_token' value='$form_security_token'>
 
 <h3 class="settings-heading">$h_pass</h3>
 
@@ -28,8 +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}}
 
 
 <div class="settings-submit-wrapper" >
@@ -58,11 +56,15 @@ $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="#advaced-expire-popup" id="advenced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
+	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
 	<div style="display: none;">
-		<div id="advaced-expire-popup" style="width:auto;height:auto;overflow:auto;">
+		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
 			<h3>$expire.advanced</h3>
 			{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
 			{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
diff --git a/view/settings_addons.tpl b/view/settings_addons.tpl
index 2cbfd17e9..28fca5362 100755..100644
--- a/view/settings_addons.tpl
+++ b/view/settings_addons.tpl
@@ -4,6 +4,7 @@ $tabs
 
 
 <form action="settings/addon" method="post" autocomplete="off">
+<input type='hidden' name='form_security_token' value='$form_security_token'>
 
 $settings_addons
 
diff --git a/view/settings_connectors.tpl b/view/settings_connectors.tpl
index 9493c8bf7..43c0346bb 100755..100644
--- a/view/settings_connectors.tpl
+++ b/view/settings_connectors.tpl
@@ -6,6 +6,7 @@ $tabs
 <div class="connector_statusmsg">$ostat_enabled</div>
 
 <form action="settings/connectors" method="post" autocomplete="off">
+<input type='hidden' name='form_security_token' value='$form_security_token'>
 
 $settings_connectors
 
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 0de0dbe98..da1398ab9 100755..100644
--- a/view/settings_oauth.tpl
+++ b/view/settings_oauth.tpl
@@ -4,7 +4,8 @@ $tabs
 
 
 <form action="settings/oauth" method="post" autocomplete="off">
-	
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
 	<div id="profile-edit-links">
 		<ul>
 			<li>
@@ -24,7 +25,7 @@ $tabs
 		{{ endif }}
 		{{ if $app.my }}
 		<a href="$baseurl/settings/oauth/edit/$app.client_id" class="icon s22 edit" title="$edit">&nbsp;</a>
-		<a href="$baseurl/settings/oauth/delete/$app.client_id" class="icon s22 delete" title="$delete">&nbsp;</a>
+		<a href="$baseurl/settings/oauth/delete/$app.client_id?t=$form_security_token" class="icon s22 delete" title="$delete">&nbsp;</a>
 		{{ endif }}		
 	</div>
 	{{ endfor }}
diff --git a/view/settings_oauth_edit.tpl b/view/settings_oauth_edit.tpl
index 98b7457aa..d29341386 100755..100644
--- a/view/settings_oauth_edit.tpl
+++ b/view/settings_oauth_edit.tpl
@@ -3,6 +3,8 @@ $tabs
 <h1>$title</h1>
 
 <form method="POST">
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
 {{ inc field_input.tpl with $field=$name }}{{ endinc }}
 {{ inc field_input.tpl with $field=$key }}{{ endinc }}
 {{ inc field_input.tpl with $field=$secret }}{{ endinc }}
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/comix-plain/comment_item.tpl b/view/theme/comix-plain/comment_item.tpl
new file mode 100644
index 000000000..9c3facaff
--- /dev/null
+++ b/view/theme/comix-plain/comment_item.tpl
@@ -0,0 +1,32 @@
+		<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 triangle-isosceles left" style="display: block;" 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/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
new file mode 100644
index 000000000..dba289031
--- /dev/null
+++ b/view/theme/comix-plain/search_item.tpl
@@ -0,0 +1,54 @@
+<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 triangle-isosceles left" 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/comix-plain/style.css b/view/theme/comix-plain/style.css
new file mode 100644
index 000000000..1a89cae7c
--- /dev/null
+++ b/view/theme/comix-plain/style.css
@@ -0,0 +1,105 @@
+@import url('../duepuntozero/style.css');
+
+.wall-item-content-wrapper {
+	border: none;
+}
+
+.wall-item-content-wrapper.comment {
+	background: #ffffff !important;
+	border-left: 1px solid #EEE;
+}
+
+.wall-item-tools {
+	background: none;
+}
+
+.comment-edit-text-empty, .comment-edit-text-full {
+	border: none;
+	border-left: 1px solid #EEE;
+	background: #EEEEEE;
+}
+
+.comment-edit-wrapper, .comment-wwedit-wrapper {
+	background: #ffffff !important;
+}
+
+section {
+	margin: 0px 32px;
+}
+
+aside {
+	margin-left: 32px;
+}
+nav {
+	margin-left: 32px;
+	margin-right: 32px;
+}
+
+nav #site-location {
+	top: 80px;
+	right: 36px;
+}
+
+.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	margin-top: 15px;
+}
+
+.wall-item-photo.comment {
+	margin-top: 26px;
+}
+
+
+.triangle-isosceles {
+	position:relative;
+	padding:15px;
+	margin:1em 0 3em;
+	color:#000;
+	background:#EEEEEE; /* default background for browsers without gradient support */
+	/* css3 */
+	background:-webkit-gradient(linear, 0 0, 0 100%, from(#EEEEEE), to(#ffffff));
+	background:-moz-linear-gradient(#EEEEEE, #ffffff);
+	background:-o-linear-gradient(#EEEEEE, #ffffff);
+	background:linear-gradient(#EEEEEE, #ffffff);
+	-webkit-border-radius:10px;
+	-moz-border-radius:10px;
+	border-radius:10px;
+}
+
+/* Variant : for left/right positioned triangle
+------------------------------------------ */
+
+.triangle-isosceles.left {
+	margin-left:30px;
+	background:#F8F8F8;
+	border: 2px solid #CCCCCC;
+}
+
+/* THE TRIANGLE
+------------------------------------------------------------------------------------------------------------------------------- */
+
+/* creates triangle */
+.triangle-isosceles:after {
+	content:"";
+	position:absolute;
+	bottom:-8px; /* value = - border-top-width - border-bottom-width */
+	left:30px; /* controls horizontal position */
+	border-width:15px 15px 0; /* vary these values to change the angle of the vertex */
+	border-style:solid;
+	border-color:#f8f8f8 transparent;
+    /* reduce the damage in FF3.0 */
+    display:block; 
+    width:0;
+}
+
+/* Variant : left
+------------------------------------------ */
+
+.triangle-isosceles.left:after {
+	top:12px; /* controls vertical position */
+	left:-30px; /* value = - border-left-width - border-right-width */
+	bottom:auto;
+	border-width:10px 30px 10px 0;
+	border-color:transparent #f8f8f8;
+}
diff --git a/view/theme/comix-plain/theme.php b/view/theme/comix-plain/theme.php
new file mode 100644
index 000000000..be3180dc9
--- /dev/null
+++ b/view/theme/comix-plain/theme.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * Name: Comix-Plain
+ * Description: Comix theme with a standard font
+ * Version: 1.0
+ * Author: Mike Macgirvin <mike@macgirvin.com>
+ */
+
+
+$a->theme_info = array(
+  'extends' => 'duepuntozero',
+);
+
+$a->page['htmlhead'] .= <<< EOT
+<script>
+$(document).ready(function() {
+
+$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+
+$('.group-edit-icon').hover(
+	function() {
+		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
+	function() {
+		$(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+$('.sidebar-group-element').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+	);
+
+
+$('.savedsearchdrop').hover(
+	function() {
+		$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+	function() {
+		$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+$('.savedsearchterm').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
+	);
+
+});
+
+
+</script>
+EOT;
diff --git a/view/theme/comix-plain/wall_item.tpl b/view/theme/comix-plain/wall_item.tpl
new file mode 100644
index 000000000..dfcd8ca96
--- /dev/null
+++ b/view/theme/comix-plain/wall_item.tpl
@@ -0,0 +1,78 @@
+<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$item.indent" 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 triangle-isosceles left" 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/comix-plain/wallwall_item.tpl b/view/theme/comix-plain/wallwall_item.tpl
new file mode 100644
index 000000000..abd5967b2
--- /dev/null
+++ b/view/theme/comix-plain/wallwall_item.tpl
@@ -0,0 +1,85 @@
+<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$item.indent" 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 triangle-isosceles left" 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/comix/comment_item.tpl b/view/theme/comix/comment_item.tpl
new file mode 100644
index 000000000..9c3facaff
--- /dev/null
+++ b/view/theme/comix/comment_item.tpl
@@ -0,0 +1,32 @@
+		<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 triangle-isosceles left" style="display: block;" 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/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
new file mode 100644
index 000000000..dba289031
--- /dev/null
+++ b/view/theme/comix/search_item.tpl
@@ -0,0 +1,54 @@
+<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 triangle-isosceles left" 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/comix/style.css b/view/theme/comix/style.css
new file mode 100644
index 000000000..534e79cf4
--- /dev/null
+++ b/view/theme/comix/style.css
@@ -0,0 +1,109 @@
+@import url('../duepuntozero/style.css');
+
+body {
+	font-family: "Comic Sans MS", sans !important;
+	font-size: 13px;
+}
+.wall-item-content-wrapper {
+	border: none;
+}
+
+.wall-item-content-wrapper.comment {
+	background: #ffffff !important;
+	border-left: 1px solid #EEE;
+}
+
+.wall-item-tools {
+	background: none;
+}
+
+.comment-edit-text-empty, .comment-edit-text-full {
+	border: none;
+	border-left: 1px solid #EEE;
+	background: #EEEEEE;
+}
+
+.comment-edit-wrapper, .comment-wwedit-wrapper {
+	background: #ffffff !important;
+}
+
+section {
+	margin: 0px 32px;
+}
+
+aside {
+	margin-left: 32px;
+}
+nav {
+	margin-left: 32px;
+	margin-right: 32px;
+}
+
+nav #site-location {
+	top: 80px;
+	right: 36px;
+}
+
+.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	margin-top: 15px;
+}
+
+.wall-item-photo.comment {
+	margin-top: 26px;
+}
+
+
+.triangle-isosceles {
+	position:relative;
+	padding:15px;
+	margin:1em 0 3em;
+	color:#000;
+	background:#EEEEEE; /* default background for browsers without gradient support */
+	/* css3 */
+	background:-webkit-gradient(linear, 0 0, 0 100%, from(#EEEEEE), to(#ffffff));
+	background:-moz-linear-gradient(#EEEEEE, #ffffff);
+	background:-o-linear-gradient(#EEEEEE, #ffffff);
+	background:linear-gradient(#EEEEEE, #ffffff);
+	-webkit-border-radius:10px;
+	-moz-border-radius:10px;
+	border-radius:10px;
+}
+
+/* Variant : for left/right positioned triangle
+------------------------------------------ */
+
+.triangle-isosceles.left {
+	margin-left:30px;
+	background:#F8F8F8;
+	border: 2px solid #CCCCCC;
+}
+
+/* THE TRIANGLE
+------------------------------------------------------------------------------------------------------------------------------- */
+
+/* creates triangle */
+.triangle-isosceles:after {
+	content:"";
+	position:absolute;
+	bottom:-8px; /* value = - border-top-width - border-bottom-width */
+	left:30px; /* controls horizontal position */
+	border-width:15px 15px 0; /* vary these values to change the angle of the vertex */
+	border-style:solid;
+	border-color:#f8f8f8 transparent;
+    /* reduce the damage in FF3.0 */
+    display:block; 
+    width:0;
+}
+
+/* Variant : left
+------------------------------------------ */
+
+.triangle-isosceles.left:after {
+	top:12px; /* controls vertical position */
+	left:-30px; /* value = - border-left-width - border-right-width */
+	bottom:auto;
+	border-width:10px 30px 10px 0;
+	border-color:transparent #f8f8f8;
+}
diff --git a/view/theme/comix/theme.php b/view/theme/comix/theme.php
new file mode 100644
index 000000000..e2f7f4db3
--- /dev/null
+++ b/view/theme/comix/theme.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * Name: Comix
+ * Description: An irreverent theme
+ * Version: 1.0
+ * Author: Mike Macgirvin <mike@macgirvin.com>
+ */
+
+
+$a->theme_info = array(
+  'extends' => 'duepuntozero',
+);
+
+$a->page['htmlhead'] .= <<< EOT
+<script>
+$(document).ready(function() {
+
+$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+
+$('.group-edit-icon').hover(
+	function() {
+		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
+	function() {
+		$(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+$('.sidebar-group-element').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+	);
+
+
+$('.savedsearchdrop').hover(
+	function() {
+		$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+	function() {
+		$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+$('.savedsearchterm').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
+	);
+
+});
+
+
+</script>
+EOT;
diff --git a/view/theme/comix/wall_item.tpl b/view/theme/comix/wall_item.tpl
new file mode 100644
index 000000000..dfcd8ca96
--- /dev/null
+++ b/view/theme/comix/wall_item.tpl
@@ -0,0 +1,78 @@
+<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$item.indent" 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 triangle-isosceles left" 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/comix/wallwall_item.tpl b/view/theme/comix/wallwall_item.tpl
new file mode 100644
index 000000000..abd5967b2
--- /dev/null
+++ b/view/theme/comix/wallwall_item.tpl
@@ -0,0 +1,85 @@
+<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$item.indent" 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 triangle-isosceles left" 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/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 326c98bbd..053730c21 100755..100644
--- a/view/theme/darkbubble/theme.php
+++ b/view/theme/darkbubble/theme.php
@@ -1,4 +1,22 @@
 <?php
+
+/*
+ * Name: Dark Bubble
+ * Version: 1.0
+ * Maintainer: Mike Macgirvin <mike@macgirvin.com>
+ */
+
+
 $a->theme_info = array(
   'extends' => 'testbubble',
 );
+
+
+$a->page['htmlhead'] .= <<< EOT
+<script>
+$(document).ready(function() {
+
+$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+});
+</script>
+EOT;
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 521b1859e..2d3e4fd56 100755..100644
--- a/view/theme/darkzero-NS/theme.php
+++ b/view/theme/darkzero-NS/theme.php
@@ -15,6 +15,8 @@ $a->page['htmlhead'] .= <<< EOT
 <script>
 $(document).ready(function() {
 
+$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+
 $('.group-edit-icon').hover(
 	function() {
 		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
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 fdaf26f19..12c7d3c25 100755..100644
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -24,7 +24,8 @@ nav #banner #logo-text a { color: #ffffff; }
 
 .wall-item-content-wrapper { border: 1px solid #444444; }
 .wall-item-tools {	background-color: #444444;   background-image: none;}
-.comment-edit-wrapper{ background-color: #333333; }
+.comment-wwedit-wrapper{ background-color: #333333; }
+.comment-edit-preview{ color: #000000; }
 .wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
 .photo-top-album-name{ background-color: #333333; }
 .photo-album-image-wrapper .caption { background-color: rgba(51, 51, 51, 0.8); color: #FFFFFF; }
@@ -75,20 +76,32 @@ 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 {
 	background: #ddd;
 	color: #000;
 }
+
+.acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net {
+        color: #000000;
+}
+
+input#acl-search {
+        background-color: #aaa;
+}
diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php
index 37632c4b5..8c4d3e9ac 100755..100644
--- a/view/theme/darkzero/theme.php
+++ b/view/theme/darkzero/theme.php
@@ -4,6 +4,8 @@
  * Name: Darkzero
  * Version: 1.0
  * Author: Fabio Communi <fabrix.xm@gmail.com>
+ * Maintainer: Fabio Communi <fabrix.xm@gmail.com>
+ * Maintainer: Mike Macgirvin <mike@macgirvin.com>
  */
 
 $a->theme_info = array(
@@ -14,6 +16,8 @@ $a->page['htmlhead'] .= <<< EOT
 <script>
 $(document).ready(function() {
 
+$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+
 $('.group-edit-icon').hover(
 	function() {
 		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl
new file mode 100755
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
--- 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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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/loozah/jot.tpl b/view/theme/diabook-aerith/jot.tpl
index ac64223fb..ee30da7bf 100755
--- a/view/theme/loozah/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>
 
@@ -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>
+		<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-aerith/js/README b/view/theme/diabook-aerith/js/README
new file mode 100644
index 000000000..c93b2118e
--- /dev/null
+++ b/view/theme/diabook-aerith/js/README
@@ -0,0 +1,22 @@
+jQuery Resize Plugin Demo
+
+Version: v2.1.1
+Author: Adeel Ejaz (http://adeelejaz.com/)
+License: Dual licensed under MIT and GPL licenses.
+
+Introduction
+aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions.
+
+Usage:
+.aeImageResize( height, width )
+
+height
+An integer representing the maximum height for the image.
+
+width
+An integer representing the maximum width for the image.
+
+Example
+$(function() {
+  $( ".resizeme" ).aeImageResize({ height: 250, width: 250 });
+});
\ No newline at end of file
diff --git a/view/theme/diabook-aerith/js/jquery.ae.image.resize.js b/view/theme/diabook-aerith/js/jquery.ae.image.resize.js
new file mode 100644
index 000000000..bac09cd45
--- /dev/null
+++ b/view/theme/diabook-aerith/js/jquery.ae.image.resize.js
@@ -0,0 +1,69 @@
+(function( $ ) {
+
+  $.fn.aeImageResize = function( params ) {
+
+    var aspectRatio = 0
+      // Nasty I know but it's done only once, so not too bad I guess
+      // Alternate suggestions welcome :)
+      ,	isIE6 = $.browser.msie && (6 == ~~ $.browser.version)
+      ;
+
+    // We cannot do much unless we have one of these
+    if ( !params.height && !params.width ) {
+      return this;
+    }
+
+    // Calculate aspect ratio now, if possible
+    if ( params.height && params.width ) {
+      aspectRatio = params.width / params.height;
+    }
+
+    // Attach handler to load
+    // Handler is executed just once per element
+    // Load event required for Webkit browsers
+    return this.one( "load", function() {
+
+      // Remove all attributes and CSS rules
+      this.removeAttribute( "height" );
+      this.removeAttribute( "width" );
+      this.style.height = this.style.width = "";
+
+      var imgHeight = this.height
+        , imgWidth = this.width
+        , imgAspectRatio = imgWidth / imgHeight
+        , bxHeight = params.height
+        , bxWidth = params.width
+        , bxAspectRatio = aspectRatio;
+				
+      // Work the magic!
+      // If one parameter is missing, we just force calculate it
+      if ( !bxAspectRatio ) {
+        if ( bxHeight ) {
+          bxAspectRatio = imgAspectRatio + 1;
+        } else {
+          bxAspectRatio = imgAspectRatio - 1;
+        }
+      }
+
+      // Only resize the images that need resizing
+      if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) {
+
+        if ( imgAspectRatio > bxAspectRatio ) {
+          bxHeight = ~~ ( imgHeight / imgWidth * bxWidth );
+        } else {
+          bxWidth = ~~ ( imgWidth / imgHeight * bxHeight );
+        }
+
+        this.height = bxHeight;
+        this.width = bxWidth;
+      }
+    })
+    .each(function() {
+
+      // Trigger load event (for Gecko and MSIE)
+      if ( this.complete || isIE6 ) {
+        $( this ).trigger( "load" );
+      }
+    });
+  };
+})( jQuery );
\ No newline at end of file
diff --git a/view/theme/diabook-aerith/js/jquery.ae.image.resize.min.js b/view/theme/diabook-aerith/js/jquery.ae.image.resize.min.js
new file mode 100644
index 000000000..16c30b123
--- /dev/null
+++ b/view/theme/diabook-aerith/js/jquery.ae.image.resize.min.js
@@ -0,0 +1 @@
+(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery);
\ No newline at end of file
diff --git a/view/theme/diabook-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 100755
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..6fab83afc
--- /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-li" class="nav-notify"></span></li>
+					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
+				</ul>
+			</li>	
+			{{ endif }}
+			
+			{{ if $nav.messages }}
+			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
+			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
+			  <span class="icon messages">$nav.messages.1</span>
+				<span id="mail-update" class="nav-notify"></span></a>
+				<ul id="nav-messages-menu" class="menu-popup">
+					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
+					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></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_item.tpl b/view/theme/diabook-aerith/photo_item.tpl
new file mode 100644
index 000000000..5d65a89b7
--- /dev/null
+++ b/view/theme/diabook-aerith/photo_item.tpl
@@ -0,0 +1,65 @@
+{{ if $indent }}{{ else }}
+<div class="wall-item-decor">
+	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+</div>
+{{ endif }}
+
+<div class="wall-item-photo-container $indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper" >
+				<a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id">
+					<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
+				$photo_menu
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> 
+			<span class="wall-item-ago">-
+			{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
+			{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
+			$body
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{ for $tags as $tag }}
+				<span class='tag'>$tag</span>
+			{{ endfor }}
+		</div>
+	</div>
+	
+	<div class="wall-item-bottom" style="display: table-row;">
+		<div class="wall-item-actions">
+	   </div>
+		<div class="wall-item-actions">
+			
+			<div class="wall-item-actions-tools">
+
+				{{ if $drop.dropping }}
+					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
+					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a>
+				{{ endif }}
+				{{ if $edpost }}
+					<a class="icon pencil" href="$edpost.0" title="$edpost.1"></a>
+				{{ endif }}
+			</div>
+
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+			
+	</div>
+</div>
+
diff --git a/view/theme/diabook-aerith/photo_view.tpl b/view/theme/diabook-aerith/photo_view.tpl
new file mode 100755
index 000000000..071972e0c
--- /dev/null
+++ b/view/theme/diabook-aerith/photo_view.tpl
@@ -0,0 +1,35 @@
+<div id="live-display"></div>
+<h3><a href="$album.0">$album.1</a></h3>
+
+<div id="photo-edit-link-wrap">
+{{ if $tools }}
+<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
+-
+<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
+{{ endif }}
+{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
+</div>
+
+<div id="photo-photo">
+	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
+	<a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
+	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
+</div>
+
+<div id="photo-photo-end"></div>
+<div id="photo-caption" >$desc</div>
+{{ if $tags }}
+<div id="in-this-photo-text">$tags.0</div>
+<div id="in-this-photo">$tags.1</div>
+{{ endif }}
+{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
+
+{{ if $edit }}$edit{{ endif }}
+
+<div style="margin-top:20px">
+</div>
+<div id="wall-photo-container">
+$comments
+</div>
+
+$paginate
diff --git a/view/theme/diabook-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/diabook-aerith/profile_vcard.tpl b/view/theme/diabook-aerith/profile_vcard.tpl
new file mode 100644
index 000000000..6fcffcc9b
--- /dev/null
+++ b/view/theme/diabook-aerith/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"  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-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 100755
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 100755
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..3b461e6db
--- /dev/null
+++ b/view/theme/diabook-aerith/style-network.css
@@ -0,0 +1,2634 @@
+/**
+ * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Additional Changes: Michael Vogel <icarus@dabo.de>
+ **/
+
+/* ========= */
+/* = Admin = */
+/* ========= */
+
+#adminpage {
+/*        width: 80%;*/
+}
+
+#pending-update {
+        float:right;
+        color: #ffffff;
+        font-weight: bold;
+        background-color: #FF0000;
+        padding: 0em 0.3em;
+}
+
+.admin.linklist {
+        border: 0px; padding: 0px;
+}
+
+.admin.link {
+        list-style-position: inside;
+        font-size: 1em;
+        padding: 5px;
+        width: 100px;
+        margin: 5px;
+}
+
+#adminpage dl {
+        clear: left;
+        margin-bottom: 2px;
+        padding-bottom: 2px;
+        border-bottom: 1px solid black;
+}
+
+#adminpage dt {
+        width: 200px;
+        float: left;
+        font-weight: bold;
+}
+
+#adminpage dd {
+        margin-left: 200px;
+}
+#adminpage h3 {
+        border-bottom: 1px solid #898989;
+        margin-bottom: 5px;
+        margin-top: 10px;
+}
+
+#adminpage .submit {
+        clear:left;
+}
+
+#adminpage #pluginslist {
+        margin: 0px; padding: 0px;
+}
+
+#adminpage .plugin {
+        list-style: none;
+        display: block;
+	/* border: 1px solid #888888; */
+        padding: 1em;
+        margin-bottom: 5px;
+        clear: left;
+}
+
+#adminpage .toggleplugin {
+        float:left;
+        margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #eeeeee; }
+#adminpage .selectall { text-align: right; }
+/* icons */
+
+.icon.contacts {
+  background-image: url("../../../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-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;
+  margin-bottom: 14px;
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 400px; 
+  max-height: 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: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#jot #jot-tools li.loading {
+  float: right;
+  background-color: #ffffff;
+  width: 20px;
+  vertical-align: center;
+  text-align: center;
+  border-top: 2px solid #9eabb0;
+  height: 38px;
+}
+#jot #jot-tools li.loading img {
+  margin-top: 10px;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 585px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 585px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+	
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #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: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	font-size: large;
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+
+#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..73f46e9ee
--- /dev/null
+++ b/view/theme/diabook-aerith/style-profile.css
@@ -0,0 +1,2623 @@
+/**
+ * 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-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;
+  margin-bottom: 14px;
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 400px;
+  max-height: 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: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#jot #jot-tools li.loading {
+  float: right;
+  background-color: #ffffff;
+  width: 20px;
+  vertical-align: center;
+  text-align: center;
+  border-top: 2px solid #9eabb0;
+  height: 38px;
+}
+#jot #jot-tools li.loading img {
+  margin-top: 10px;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 585px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 585px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+ 	 font-weight: bolder;
+	 cursor: pointer;
+}
+.button.creation2 {
+    background-color: #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: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	font-size: large;
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 48px;
+        height: 48px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+
+#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..f82652154
--- /dev/null
+++ b/view/theme/diabook-aerith/style.css
@@ -0,0 +1,2769 @@
+/**
+ * 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;
+}
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover {
+	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-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-photo-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-photo-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-photo-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-photo-container .wall-item-content {
+  font-size: 12.5px;
+  max-width: 720px;
+  word-wrap: break-word;
+  line-height: 1.2;
+  margin-bottom: 14px;
+}
+.wall-item-photo-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon:hover {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-photo-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-photo-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-photo-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-photo-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-photo-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-photo-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 40px;
+  width: 650px;
+  border-bottom: 1px solid #D2D2D2;
+}
+.wall-item-photo-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-photo-container {
+  display: table;
+  width: 780px;
+}
+.my-comment-photo {
+  width: 48px;
+  margin-left: 40px;
+  margin-right: 32px;
+	}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+}
+.comment-edit-text-empty {
+    width: 500px;
+    border: 1px solid #D2D2D2;
+    height: 3.2em;
+    color: #2d2d2d;
+}
+.comment-edit-text-full {
+  font-size: 12.5px;
+  height: 3.3em;
+  
+  border: 1px solid #D2D2D2;
+  width: 500px;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+    display: table-cell;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+.wall-item-container .wall-item-content {
+  font-size: 12.5px;
+  max-width: 720px;
+  word-wrap: break-word;
+  line-height: 1.2;
+  margin-bottom: 14px;
+}
+
+.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: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 785px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 783px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#jot #jot-tools li.loading {
+  float: right;
+  background-color: #ffffff;
+  width: 20px;
+  vertical-align: center;
+  text-align: center;
+  border-top: 2px solid #9eabb0;
+  height: 38px;
+}
+#jot #jot-tools li.loading img {
+  margin-top: 10px;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 785px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 785px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+	
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    font-weight: bolder;
+	 cursor: pointer;
+}
+.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: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+    color: #777;
+}
+.oembed {
+	font-size: large;
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+
+#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 100755
index 000000000..a1ea51e82
--- /dev/null
+++ b/view/theme/diabook-aerith/theme.php
@@ -0,0 +1,475 @@
+<?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.014)
+ * Author: 
+ */
+
+
+//print diabook-version for debugging
+$diabook_version = "Diabook-aerith (Version: 1.014)";
+$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
+
+
+//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);
+
+//load jquery.ae.image.resize.js
+$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.ae.image.resize.js";
+$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
+
+//js scripts
+//comment-edit-wrapper on photo_view
+if ($a->argv[0].$a->argv[2] === "photos"."image"){
+
+$a->page['htmlhead'] .= '
+<script>
+	$(function(){
+	
+		$(".comment-edit-form").css("display","table");
+			
+			});
+    </script>';
+	
+}
+
+$a->page['htmlhead'] .= '
+
+<script>
+ $(function() {
+	$("a.lightbox").fancybox(); // Select all links with lightbox class
+ });
+  
+ </script>';
+
+
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
+$a->page['htmlhead'] .= '
+<script>
+
+ $(function() {
+	$(".oembed.photo img").aeImageResize({height: 400, width: 400});
+  });
+
+$("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 100755
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/loozah/contact_template.tpl b/view/theme/diabook-blue/contact_template.tpl
index 48930b48a..48930b48a 100755
--- a/view/theme/loozah/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 100755
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 100755
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
new file mode 100755
index 000000000..af183d04d
--- /dev/null
+++ b/view/theme/diabook-blue/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-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
new file mode 100755
index 000000000..1958041cf
--- /dev/null
+++ 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
new file mode 100755
index 000000000..8d779a409
--- /dev/null
+++ b/view/theme/diabook-blue/icons/audio.png
diff --git a/view/theme/diabook-blue/icons/bluebug.png b/view/theme/diabook-blue/icons/bluebug.png
new file mode 100644
index 000000000..3979e7d8e
--- /dev/null
+++ b/view/theme/diabook-blue/icons/bluebug.png
diff --git a/view/theme/diabook-blue/icons/camera.png b/view/theme/diabook-blue/icons/camera.png
new file mode 100755
index 000000000..a5c7f1236
--- /dev/null
+++ 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 100755
index 000000000..28e2675b8
--- /dev/null
+++ b/view/theme/diabook-blue/icons/close_box.png
diff --git a/view/theme/diabook-blue/icons/com_side.png b/view/theme/diabook-blue/icons/com_side.png
new file mode 100644
index 000000000..bc5969ef1
--- /dev/null
+++ b/view/theme/diabook-blue/icons/com_side.png
diff --git a/view/theme/diabook-blue/icons/community.png b/view/theme/diabook-blue/icons/community.png
new file mode 100644
index 000000000..7c91e8b75
--- /dev/null
+++ b/view/theme/diabook-blue/icons/community.png
diff --git a/view/theme/diabook-blue/icons/contacts.png b/view/theme/diabook-blue/icons/contacts.png
new file mode 100644
index 000000000..ca714acaf
--- /dev/null
+++ b/view/theme/diabook-blue/icons/contacts.png
diff --git a/view/theme/diabook-blue/icons/contacts2.png b/view/theme/diabook-blue/icons/contacts2.png
new file mode 100755
index 000000000..7817279f4
--- /dev/null
+++ b/view/theme/diabook-blue/icons/contacts2.png
diff --git a/view/theme/diabook-blue/icons/dislike.png b/view/theme/diabook-blue/icons/dislike.png
new file mode 100644
index 000000000..23de426c5
--- /dev/null
+++ b/view/theme/diabook-blue/icons/dislike.png
diff --git a/view/theme/diabook-blue/icons/drop.png b/view/theme/diabook-blue/icons/drop.png
new file mode 100755
index 000000000..2abb82ef2
--- /dev/null
+++ 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/events.png b/view/theme/diabook-blue/icons/events.png
new file mode 100644
index 000000000..4a0b3f3f1
--- /dev/null
+++ b/view/theme/diabook-blue/icons/events.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
new file mode 100755
index 000000000..16713fa53
--- /dev/null
+++ b/view/theme/diabook-blue/icons/file_as.png
diff --git a/view/theme/diabook-blue/icons/ftdevs.gif b/view/theme/diabook-blue/icons/ftdevs.gif
new file mode 100644
index 000000000..e0fc25743
--- /dev/null
+++ b/view/theme/diabook-blue/icons/ftdevs.gif
diff --git a/view/theme/diabook-blue/icons/globe.png b/view/theme/diabook-blue/icons/globe.png
new file mode 100644
index 000000000..6bb9bc09d
--- /dev/null
+++ b/view/theme/diabook-blue/icons/globe.png
diff --git a/view/theme/diabook-blue/icons/home.png b/view/theme/diabook-blue/icons/home.png
new file mode 100644
index 000000000..be47a48fc
--- /dev/null
+++ b/view/theme/diabook-blue/icons/home.png
diff --git a/view/theme/diabook-blue/icons/language.png b/view/theme/diabook-blue/icons/language.png
new file mode 100644
index 000000000..8029c0155
--- /dev/null
+++ b/view/theme/diabook-blue/icons/language.png
diff --git a/view/theme/diabook-blue/icons/like.png b/view/theme/diabook-blue/icons/like.png
new file mode 100644
index 000000000..b65edccc0
--- /dev/null
+++ b/view/theme/diabook-blue/icons/like.png
diff --git a/view/theme/diabook-blue/icons/link.png b/view/theme/diabook-blue/icons/link.png
new file mode 100755
index 000000000..0ef666a67
--- /dev/null
+++ 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
new file mode 100755
index 000000000..7e34bf279
--- /dev/null
+++ 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
new file mode 100755
index 000000000..f8b228347
--- /dev/null
+++ b/view/theme/diabook-blue/icons/lupe.png
diff --git a/view/theme/diabook-blue/icons/mess_side.png b/view/theme/diabook-blue/icons/mess_side.png
new file mode 100644
index 000000000..49ef896bc
--- /dev/null
+++ b/view/theme/diabook-blue/icons/mess_side.png
diff --git a/view/theme/diabook-blue/icons/messages.png b/view/theme/diabook-blue/icons/messages.png
new file mode 100755
index 000000000..f7010c98c
--- /dev/null
+++ b/view/theme/diabook-blue/icons/messages.png
diff --git a/view/theme/diabook-blue/icons/messages2.png b/view/theme/diabook-blue/icons/messages2.png
new file mode 100644
index 000000000..54b68e7f7
--- /dev/null
+++ b/view/theme/diabook-blue/icons/messages2.png
diff --git a/view/theme/diabook-blue/icons/next.png b/view/theme/diabook-blue/icons/next.png
new file mode 100755
index 000000000..7b5e25b90
--- /dev/null
+++ b/view/theme/diabook-blue/icons/next.png
diff --git a/view/theme/diabook-blue/icons/notes.png b/view/theme/diabook-blue/icons/notes.png
new file mode 100644
index 000000000..7d4afca90
--- /dev/null
+++ b/view/theme/diabook-blue/icons/notes.png
diff --git a/view/theme/diabook-blue/icons/notifications.png b/view/theme/diabook-blue/icons/notifications.png
new file mode 100755
index 000000000..c23673dbd
--- /dev/null
+++ 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
new file mode 100755
index 000000000..8a7bdc38f
--- /dev/null
+++ b/view/theme/diabook-blue/icons/notify.png
diff --git a/view/theme/diabook-blue/icons/notify2.png b/view/theme/diabook-blue/icons/notify2.png
new file mode 100644
index 000000000..407e2dbb4
--- /dev/null
+++ b/view/theme/diabook-blue/icons/notify2.png
diff --git a/view/theme/diabook-blue/icons/pencil.png b/view/theme/diabook-blue/icons/pencil.png
new file mode 100755
index 000000000..772e49b17
--- /dev/null
+++ b/view/theme/diabook-blue/icons/pencil.png
diff --git a/view/theme/diabook-blue/icons/pencil2.png b/view/theme/diabook-blue/icons/pencil2.png
new file mode 100644
index 000000000..3b47d1864
--- /dev/null
+++ b/view/theme/diabook-blue/icons/pencil2.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
new file mode 100755
index 000000000..55c1464ba
--- /dev/null
+++ 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
new file mode 100644
index 000000000..6d9539610
--- /dev/null
+++ 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
new file mode 100755
index 000000000..c3b8d2bf4
--- /dev/null
+++ 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
new file mode 100755
index 000000000..a560cc55e
--- /dev/null
+++ 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
new file mode 100755
index 000000000..0e7f7ae6a
--- /dev/null
+++ 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
new file mode 100755
index 000000000..2a30ae252
--- /dev/null
+++ 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
new file mode 100755
index 000000000..0b00cb189
--- /dev/null
+++ b/view/theme/diabook-blue/icons/star.png
diff --git a/view/theme/diabook-blue/icons/star_dummy.png b/view/theme/diabook-blue/icons/star_dummy.png
new file mode 100644
index 000000000..ce11f30d4
--- /dev/null
+++ b/view/theme/diabook-blue/icons/star_dummy.png
diff --git a/view/theme/diabook-blue/icons/starred.png b/view/theme/diabook-blue/icons/starred.png
new file mode 100755
index 000000000..2b82dfca3
--- /dev/null
+++ 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
new file mode 100755
index 000000000..144649ef8
--- /dev/null
+++ b/view/theme/diabook-blue/icons/tagged.png
diff --git a/view/theme/diabook-blue/icons/toogle_off.png b/view/theme/diabook-blue/icons/toogle_off.png
new file mode 100644
index 000000000..0fcce4d5a
--- /dev/null
+++ b/view/theme/diabook-blue/icons/toogle_off.png
diff --git a/view/theme/diabook-blue/icons/toogle_on.png b/view/theme/diabook-blue/icons/toogle_on.png
new file mode 100644
index 000000000..79ce07f0e
--- /dev/null
+++ b/view/theme/diabook-blue/icons/toogle_on.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
new file mode 100755
index 000000000..a0cda0ae5
--- /dev/null
+++ 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
new file mode 100755
index 000000000..ba3183f5c
--- /dev/null
+++ 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
new file mode 100755
index 000000000..a03d1d818
--- /dev/null
+++ 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
new file mode 100755
index 000000000..216e78344
--- /dev/null
+++ 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
new file mode 100755
index 000000000..bd43994b5
--- /dev/null
+++ b/view/theme/diabook-blue/jot.tpl
@@ -0,0 +1,84 @@
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="$action" method="post" >
+		<input type="hidden" name="type" value="$ptyp" />
+		<input type="hidden" name="profile_uid" value="$profile_uid" />
+		<input type="hidden" name="return" value="$return_path" />
+		<input type="hidden" name="location" id="jot-location" value="$defloc" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="$post_id" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+		<div id="character-counter" class="grey"></div>		
+		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+	
+	<div id="profile-upload-wrapper" style="display: $visitor;" >
+		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
+	</div> 
+	<div id="profile-attach-wrapper" style="display: $visitor;" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
+	</div> 
+
+	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" style="display: $visitor;" >
+		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" style="display: $visitor;" >
+		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" style="display: $visitor;" >
+		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" style="/*display: none;*/" >
+		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
+	</div> 
+
+	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
+  
+   <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
+   
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
+	</div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	$jotplugins
+	</div>
+	
+	<div id="profile-rotator-wrapper" style="display: $visitor;" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+	</div> 
+	
+	</div>
+   <div id="profile-jot-perms-end"></div>
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			$acl
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+			<div id="profile-jot-email-end"></div>
+			$jotnets
+		</div>
+	</div>
+
+
+
+
+</form>
+</div>
+		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/diabook-blue/js/README b/view/theme/diabook-blue/js/README
new file mode 100644
index 000000000..c93b2118e
--- /dev/null
+++ b/view/theme/diabook-blue/js/README
@@ -0,0 +1,22 @@
+jQuery Resize Plugin Demo
+
+Version: v2.1.1
+Author: Adeel Ejaz (http://adeelejaz.com/)
+License: Dual licensed under MIT and GPL licenses.
+
+Introduction
+aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions.
+
+Usage:
+.aeImageResize( height, width )
+
+height
+An integer representing the maximum height for the image.
+
+width
+An integer representing the maximum width for the image.
+
+Example
+$(function() {
+  $( ".resizeme" ).aeImageResize({ height: 250, width: 250 });
+});
\ No newline at end of file
diff --git a/view/theme/diabook-blue/js/jquery.ae.image.resize.js b/view/theme/diabook-blue/js/jquery.ae.image.resize.js
new file mode 100644
index 000000000..bac09cd45
--- /dev/null
+++ b/view/theme/diabook-blue/js/jquery.ae.image.resize.js
@@ -0,0 +1,69 @@
+(function( $ ) {
+
+  $.fn.aeImageResize = function( params ) {
+
+    var aspectRatio = 0
+      // Nasty I know but it's done only once, so not too bad I guess
+      // Alternate suggestions welcome :)
+      ,	isIE6 = $.browser.msie && (6 == ~~ $.browser.version)
+      ;
+
+    // We cannot do much unless we have one of these
+    if ( !params.height && !params.width ) {
+      return this;
+    }
+
+    // Calculate aspect ratio now, if possible
+    if ( params.height && params.width ) {
+      aspectRatio = params.width / params.height;
+    }
+
+    // Attach handler to load
+    // Handler is executed just once per element
+    // Load event required for Webkit browsers
+    return this.one( "load", function() {
+
+      // Remove all attributes and CSS rules
+      this.removeAttribute( "height" );
+      this.removeAttribute( "width" );
+      this.style.height = this.style.width = "";
+
+      var imgHeight = this.height
+        , imgWidth = this.width
+        , imgAspectRatio = imgWidth / imgHeight
+        , bxHeight = params.height
+        , bxWidth = params.width
+        , bxAspectRatio = aspectRatio;
+				
+      // Work the magic!
+      // If one parameter is missing, we just force calculate it
+      if ( !bxAspectRatio ) {
+        if ( bxHeight ) {
+          bxAspectRatio = imgAspectRatio + 1;
+        } else {
+          bxAspectRatio = imgAspectRatio - 1;
+        }
+      }
+
+      // Only resize the images that need resizing
+      if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) {
+
+        if ( imgAspectRatio > bxAspectRatio ) {
+          bxHeight = ~~ ( imgHeight / imgWidth * bxWidth );
+        } else {
+          bxWidth = ~~ ( imgWidth / imgHeight * bxHeight );
+        }
+
+        this.height = bxHeight;
+        this.width = bxWidth;
+      }
+    })
+    .each(function() {
+
+      // Trigger load event (for Gecko and MSIE)
+      if ( this.complete || isIE6 ) {
+        $( this ).trigger( "load" );
+      }
+    });
+  };
+})( jQuery );
\ No newline at end of file
diff --git a/view/theme/diabook-blue/js/jquery.ae.image.resize.min.js b/view/theme/diabook-blue/js/jquery.ae.image.resize.min.js
new file mode 100644
index 000000000..16c30b123
--- /dev/null
+++ b/view/theme/diabook-blue/js/jquery.ae.image.resize.min.js
@@ -0,0 +1 @@
+(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery);
\ No newline at end of file
diff --git a/view/theme/diabook-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 100755
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
new file mode 100644
index 000000000..fd29d9309
--- /dev/null
+++ b/view/theme/diabook-blue/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-li" class="nav-notify"></span></li>
+					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
+				</ul>
+			</li>	
+			{{ endif }}
+			
+			{{ if $nav.messages }}
+			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
+			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
+			  <span class="icon messages">$nav.messages.1</span>
+				<span id="mail-update" class="nav-notify"></span></a>
+				<ul id="nav-messages-menu" class="menu-popup">
+					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
+					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
+					<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
+					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
+				</ul>
+			</li>		
+			{{ endif }}
+		
+      {{ if $nav.notifications }}
+			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
+			<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
+			<span class="icon notify">$nav.notifications.1</span>
+				<span id="notify-update" class="nav-notify"></span></a>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+					<li class="empty">$emptynotifications</li>
+				</ul>
+			</li>		
+		{{ endif }}	
+			
+		{{ if $nav.search}}
+		<li id="search-box">
+			<form method="get" action="$nav.search.0">
+				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
+			</form>
+		</li>		
+		{{ endif }}	
+		
+		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
+			<ul id="nav-site-menu" class="menu-popup">
+				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
+
+				{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
+
+				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
+										
+										 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
+
+				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
+				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
+
+				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
+
+				
+			</ul>		
+		</li>
+		
+		{{ if $nav.directory }}
+		<li id="nav-directory-link" class="nav-menu $sel.directory">
+			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+		</li>
+		{{ endif }}
+		
+		
+		{{ if $nav.apps }}
+			<li id="nav-apps-link" class="nav-menu $sel.apps">
+				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
+				<ul id="nav-apps-menu" class="menu-popup">
+					{{ for $apps as $ap }}
+					<li>$ap</li>
+					{{ endfor }}
+				</ul>
+			</li>	
+		{{ endif }}		
+		
+      {{ if $nav.settings }}
+			<li id="nav-home-link" class="nav-menu $sel.home">
+				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
+				<span id="home-update" class="nav-notify"></span></a>
+			</li>
+		{{ endif }}		
+		
+		{{ if $userinfo }}
+			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
+				<ul id="nav-user-menu" class="menu-popup">
+					{{ for $nav.usermenu as $usermenu }}
+						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
+					{{ endfor }}
+					
+					{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
+					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
+					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
+					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
+				</ul>
+			</li>
+		{{ endif }}
+		
+					{{ if $nav.login }}
+					<li id="nav-home-link" class="nav-menu $sel.home">
+						<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
+					<li>
+					{{ endif }}
+		
+		
+		
+	</ul>	
+
+
+	
+</nav>
+
+
+<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
+<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
+<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
+
+
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
+
+
+{#
+
+{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
+{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
+
+<span id="nav-link-wrapper" >
+
+{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+	
+<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+	
+{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+{{ if $nav.notifications }}
+<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
+<span id="notify-update" class="nav-ajax-left"></span>
+{{ endif }}
+{{ if $nav.messages }}
+<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+<span id="mail-update" class="nav-ajax-left"></span>
+{{ endif }}
+
+{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+
+{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+
+
+</span>
+<span id="nav-end"></span>
+<span id="banner">$banner</span>
+#}
diff --git a/view/theme/diabook-blue/photo_item.tpl b/view/theme/diabook-blue/photo_item.tpl
new file mode 100644
index 000000000..5d65a89b7
--- /dev/null
+++ b/view/theme/diabook-blue/photo_item.tpl
@@ -0,0 +1,65 @@
+{{ if $indent }}{{ else }}
+<div class="wall-item-decor">
+	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+</div>
+{{ endif }}
+
+<div class="wall-item-photo-container $indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper" >
+				<a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id">
+					<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
+				$photo_menu
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> 
+			<span class="wall-item-ago">-
+			{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
+			{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
+			$body
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{ for $tags as $tag }}
+				<span class='tag'>$tag</span>
+			{{ endfor }}
+		</div>
+	</div>
+	
+	<div class="wall-item-bottom" style="display: table-row;">
+		<div class="wall-item-actions">
+	   </div>
+		<div class="wall-item-actions">
+			
+			<div class="wall-item-actions-tools">
+
+				{{ if $drop.dropping }}
+					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
+					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a>
+				{{ endif }}
+				{{ if $edpost }}
+					<a class="icon pencil" href="$edpost.0" title="$edpost.1"></a>
+				{{ endif }}
+			</div>
+
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+			
+	</div>
+</div>
+
diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl
new file mode 100755
index 000000000..93b01d623
--- /dev/null
+++ b/view/theme/diabook-blue/photo_view.tpl
@@ -0,0 +1,37 @@
+<div id="live-display"></div>
+<h3><a href="$album.0">$album.1</a></h3>
+
+<div id="photo-edit-link-wrap">
+{{ if $tools }}
+<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
+-
+<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
+{{ endif }}
+{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
+</div>
+
+<div id="photo-photo">
+	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
+	<a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
+	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
+</div>
+
+<div id="photo-photo-end"></div>
+<div id="photo-caption" >$desc</div>
+{{ if $tags }}
+<div id="in-this-photo-text">$tags.0</div>
+<div id="in-this-photo">$tags.1</div>
+{{ endif }}
+{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
+
+{{ if $edit }}$edit{{ endif }}
+
+<div style="margin-top:20px">
+</div>
+<div id="wall-photo-container">
+$comments
+</div>
+
+$paginate
+
+
diff --git a/view/theme/diabook-blue/profile_side.tpl b/view/theme/diabook-blue/profile_side.tpl
new file mode 100644
index 000000000..94396300f
--- /dev/null
+++ b/view/theme/diabook-blue/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-blue/profile_vcard.tpl b/view/theme/diabook-blue/profile_vcard.tpl
new file mode 100644
index 000000000..6fcffcc9b
--- /dev/null
+++ b/view/theme/diabook-blue/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"  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-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 100755
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 100755
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..bd1cb249c
--- /dev/null
+++ b/view/theme/diabook-blue/style-network.css
@@ -0,0 +1,2595 @@
+/**
+ * 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-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;
+  margin-bottom: 14px;
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 400px; 
+  max-height: 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: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#jot #jot-tools li.loading {
+  float: right;
+  background-color: #ffffff;
+  width: 20px;
+  vertical-align: center;
+  text-align: center;
+  border-top: 2px solid #9eabb0;
+  height: 38px;
+}
+#jot #jot-tools li.loading img {
+  margin-top: 10px;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 585px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 585px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+  padding-right: 20px;
+}
+#acl-showall {
+  float: left;
+  display: block;
+  width: auto;
+  height: 18px;
+  background-color: #cccccc;
+  background-image: url("../../../images/show_all_off.png");
+  background-position: 7px 7px;
+  background-repeat: no-repeat;
+  padding: 7px 5px 0px 30px;
+  color: #999999;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+#acl-showall.selected {
+  color: #000000;
+  background-color: #ff9900;
+  background-image: url("../../../images/show_all_on.png");
+}
+#acl-list {
+  height: 210px;
+  border: 1px solid #cccccc;
+  clear: both;
+  margin-top: 30px;
+  overflow: auto;
+}
+.acl-list-item {
+  display: block;
+  width: 150px;
+  height: 30px;
+  border: 1px solid #cccccc;
+  margin: 5px;
+  float: left;
+}
+.acl-list-item img {
+  width: 22px;
+  height: 22px;
+  float: left;
+  margin: 4px;
+}
+.acl-list-item p {
+  height: 12px;
+  font-size: 10px;
+  margin: 0px;
+  padding: 2px 0px 1px;
+  overflow: hidden;
+}
+.acl-list-item a {
+  font-size: 8px;
+  display: block;
+  width: 40px;
+  height: 10px;
+  float: left;
+  color: #999999;
+  background-color: #cccccc;
+  background-position: 3px 3px;
+  background-repeat: no-repeat;
+  margin-right: 5px;
+  -webkit-border-radius: 2px ;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  padding-left: 15px;
+}
+#acl-wrapper a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+.acl-button-show {
+  background-image: url("../../../images/show_off.png");
+}
+.acl-button-hide {
+  background-image: url("../../../images/hide_off.png");
+}
+.acl-button-show.selected {
+  color: #000000;
+  background-color: #9ade00;
+  background-image: url("../../../images/show_on.png");
+}
+.acl-button-hide.selected {
+  color: #000000;
+  background-color: #ff4141;
+  background-image: url("../../../images/hide_on.png");
+}
+.acl-list-item.groupshow {
+  border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+  border-color: #ff4141;
+}
+/** /acl **/
+/** tab buttons 14618a**/
+ul.tabs {
+  list-style-type: none;
+  padding-bottom: 10px;
+  font-size: 13px;
+}
+ul.tabs li {
+  float: left;
+  margin-left: 5px;
+}
+ul.tabs li .active {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+}
+/**
+ * Form fields
+ */
+.field {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+  overflow: auto;
+  width: 100%;
+}
+.field label {
+  float: left;
+  width: 200px;
+}
+.field input, .field textarea {
+  width: 400px;
+}
+.field textarea {
+  height: 100px;
+}
+.field .field_help {
+  display: block;
+  margin-left: 200px;
+  color: #666666;
+}
+.field .onoff {
+  float: left;
+  width: 80px;
+}
+.field .onoff a {
+  display: block;
+  border: 1px solid #666666;
+  background-image: url("../../../images/onoff.jpg");
+  background-repeat: no-repeat;
+  padding: 4px 2px 2px 2px;
+  height: 16px;
+  text-decoration: none;
+}
+.field .onoff .off {
+  border-color: #666666;
+  padding-left: 40px;
+  background-position: left center;
+  background-color: #cccccc;
+  color: #666666;
+  text-align: right;
+}
+.field .onoff .on {
+  border-color: #204A87;
+  padding-right: 40px;
+  background-position: right center;
+  background-color: #D7E3F1;
+  color: #204A87;
+  text-align: left;
+}
+.field .hidden {
+  display: none!important;
+}
+.field.radio .field_help {
+  margin-left: 0px;
+}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -20px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	font-size: large;
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+
+#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..da826d74c
--- /dev/null
+++ b/view/theme/diabook-blue/style-profile.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-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-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;
+  margin-bottom: 14px;
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 400px;
+  max-height: 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: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#jot #jot-tools li.loading {
+  float: right;
+  background-color: #ffffff;
+  width: 20px;
+  vertical-align: center;
+  text-align: center;
+  border-top: 2px solid #9eabb0;
+  height: 38px;
+}
+#jot #jot-tools li.loading img {
+  margin-top: 10px;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 585px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 585px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	
+}
+#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: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -20px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	font-size: large;
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 48px;
+        height: 48px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+
+#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
new file mode 100644
index 000000000..ebf684708
--- /dev/null
+++ b/view/theme/diabook-blue/style.css
@@ -0,0 +1,2726 @@
+/**
+ * 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;}
+.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 {
+        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: 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: #1872A2;
+  /* color: #3e3e8c; */
+  text-decoration: none;
+  cursor: pointer;
+}
+.fakelink:hover {
+  /* color: blue; */
+  /*color: #005c94; */
+  text-decoration: underline;
+}
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover {
+	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: banner;
+  width: 82%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+}
+/* messages */
+#message-new {
+  background: #055580;
+  border: 1px solid #333;
+  width: 150px;
+}
+#message-new a {
+  color: #ffffff;
+  text-align: center;
+  display: block;
+  font-weight: bold;
+  padding: 1em 0px;
+    text-decoration: none;
+}
+.mail-list-wrapper {
+  background-color: #f6f7f8;
+  margin-bottom: 5px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+.mail-list-wrapper span {
+  display: block;
+  float: left;
+  width: 20%;
+  overflow: hidden;
+}
+.mail-list-wrapper .mail-subject {
+  width: 30%;
+  padding: 4px 0px 0px 4px;
+}
+.mail-list-wrapper .mail-subject a {
+  display: block;
+}
+.mail-list-wrapper .mail-subject.unseen a {
+  font-weight: bold;
+}
+.mail-list-wrapper .mail-date {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-from {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-count {
+  padding: 4px 4px 0px 4px;
+  text-align: right;
+}
+.mail-list-wrapper .mail-delete {
+  float: right;
+}
+#mail-display-subject {
+  background-color: #f6f7f8;
+  color: #2d2d2d;
+  margin-bottom: 10px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+#mail-display-subject span {
+  float: left;
+  overflow: hidden;
+  padding: 4px 0px 0px 10px;
+}
+#mail-display-subject .mail-delete {
+  float: right;
+  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+#mail-display-subject:hover .mail-delete {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #1872a2;
+  color: #ffffff;
+  z-index: 99;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  background-color: #308dbf;  
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+nav .nav-menu-icon.selected {
+  background-color: #fff;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+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: 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-blue/icons/selected.png") no-repeat left center;
+}
+/* widget: search */
+#add-search-popup {
+  width: 200px;
+  top: 18px;
+}
+/* section */
+section {
+  display: table-cell;
+  vertical-align: top;
+  width: 800px;
+  padding: 0px 0px 0px 12px;
+}
+body .pageheader{
+  text-align: center;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+	}
+.qcomment{
+  max-width: 122px;	
+	}
+#id_username {
+  width: 173px;	
+	}
+#id_password {
+  width: 173px;		
+	}
+#id_openid_url {
+  width: 173px;	
+	}
+#contact-edit-end {
+	}
+.pager {
+   padding: 10px;
+	text-align: center;
+	font-size: 1.0em;
+	clear: both;
+	display: block;
+}	
+
+.tabs {
+    
+    background-position: 0 -20px;
+    background-repeat: repeat-x;
+    height: 27px;
+    padding: 0;
+ }
+.tab.button {
+    margin-left: 5px;	
+    /*background: none repeat scroll 0 0 #F8F8F8;*/
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    font-weight: normal;
+    padding: 3px;
+    color:  #333333;
+	}
+	
+#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
+	margin-bottom: 10px;
+	}
+/* wall item */
+.tread-wrapper {
+  border-bottom: 1px solid #D2D2D2;
+  position: relative;
+  padding: 5px;
+  margin-bottom: 0px;
+  width: 775px;
+}
+.tread-wrapper a{
+  color: #1872A2;
+}
+
+.wall-item-decor {
+  position: absolute;
+  left: 790px;
+  top: -10px;
+  width: 16px;
+}
+
+.wall-item-container {
+  display: table;
+  width: 780px;
+}
+.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-photo-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-photo-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-photo-container .wall-item-content {
+  font-size: 12.5px;
+  max-width: 720px;
+  word-wrap: break-word;
+  line-height: 1.2;
+  margin-bottom: 14px;
+}
+.wall-item-photo-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon:hover {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-photo-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-photo-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-photo-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-photo-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-photo-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-photo-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 40px;
+  width: 650px;
+  border-bottom: 1px solid #D2D2D2;
+}
+.wall-item-photo-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-photo-container {
+  display: table;
+  width: 780px;
+}
+.my-comment-photo {
+  width: 48px;
+  margin-left: 40px;
+  margin-right: 32px;
+	}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+}
+.comment-edit-text-empty {
+    width: 500px;
+    border: 1px solid #D2D2D2;
+    height: 3.2em;
+    color: #2d2d2d;
+}
+.comment-edit-text-full {
+  font-size: 12.5px;
+  height: 3.3em;
+  
+  border: 1px solid #D2D2D2;
+  width: 500px;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+    display: table-cell;
+}
+
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+.wall-item-container .wall-item-content {
+  font-size: 12.5px;
+  max-width: 720px;
+  word-wrap: break-word;
+  line-height: 1.2;
+  margin-bottom: 14px;
+}
+
+.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: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 785px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 783px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#jot #jot-tools li.loading {
+  float: right;
+  background-color: #ffffff;
+  width: 20px;
+  vertical-align: center;
+  text-align: center;
+  border-top: 2px solid #9eabb0;
+  height: 38px;
+}
+#jot #jot-tools li.loading img {
+  margin-top: 10px;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 785px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 785px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #055580;
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
+}
+/*input[type="submit"] {
+	border: 0px;
+    background-color: @ButtonBackgroundColor;
+    color: @ButtonColor;
+    padding: 0px 10px;
+	.rounded(5px);
+    height: 18px;
+}*/
+/** acl **/
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+  display: block!important;
+}
+#acl-wrapper {
+  width: 690px;
+  float: left;
+}
+#acl-search {
+  float: right;
+  background: #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;
+}
+.suggest-select {
+width: 500px;
+height: 350px;	
+	}
+.message-to-select {
+	width: 400px;
+   height: 150px;
+	}
+#directory-search-form{
+	margin-bottom: 50px;
+	}
+#profile-edit-links-end {
+        clear: both;
+        margin-bottom: 15px;
+}
+
+#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; }
+
+#profile-edit-links li {
+  float: left;
+  list-style: none;
+  margin-left: 10px;
+}
+
+.profile-edit-side-div {
+  display: none;
+}
+
+#register-form label,
+#profile-edit-form label {
+        width: 300px; float: left;
+}
+
+.required {
+  display: inline;
+  color: #B20202;
+}
+
+/* oauth */
+.oauthapp {
+  height: auto;
+  overflow: auto;
+  border-bottom: 2px solid #cccccc;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+.oauthapp img {
+  float: left;
+  width: 48px;
+  height: 48px;
+  margin: 10px;
+}
+.oauthapp img.noicon {
+  background-image: url("../../../images/icons/48/plugin.png");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+.oauthapp a {
+  float: left;
+}
+/* contacts */
+.contact-entry-wrapper {
+  width: 120px;
+  height: 120px;
+  float: left;
+}
+/* photo */
+.photo {
+box-shadow: 2px 2px 5px 0px #000000;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -20px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	font-size: large;
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+
+#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-blue/theme.php b/view/theme/diabook-blue/theme.php
new file mode 100755
index 000000000..a8b4fcd6c
--- /dev/null
+++ b/view/theme/diabook-blue/theme.php
@@ -0,0 +1,475 @@
+<?php
+
+/*
+ * Name: Diabook-blue
+ * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
+ * Version: (Version: 1.014)
+ * Author: 
+ */
+
+
+//print diabook-version for debugging
+$diabook_version = "Diabook-blue (Version: 1.014)";
+$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
+
+//change css on network and profilepages
+$cssFile = null;
+
+
+/**
+ * prints last community activity
+ */
+function diabook_blue_community_info(){
+	$a = get_app();
+	//right_aside at networkpages
+
+	// last 12 users
+	$aside['$lastusers_title'] = t('Last users');
+	$aside['$lastusers_items'] = array();
+	$sql_extra = "";
+	$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
+	$order = " ORDER BY `register_date` DESC ";
+
+	$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
+			FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` 
+			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
+		0,
+		9
+	);
+	$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+	if(count($r)) {
+		$photo = 'thumb';
+		foreach($r as $rr) {
+			$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
+			$entry = replace_macros($tpl,array(
+				'$id' => $rr['id'],
+				'$profile-link' => $profile_link,
+				'$photo' => $rr[$photo],
+				'$alt-text' => $rr['name'],
+			));
+			$aside['$lastusers_items'][] = $entry;
+		}
+	}
+	
+	
+	// last 10 liked items
+	$aside['$like_title'] = t('Last likes');
+	$aside['$like_items'] = array();
+	$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM 
+			(SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` 
+				FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1
+			INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` 
+			WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
+			GROUP BY `uri`
+			ORDER BY `T1`.`created` DESC
+			LIMIT 0,5",
+			$a->get_baseurl(),$a->get_baseurl()
+			);
+
+	foreach ($r as $rr) {
+		$author	 = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
+		$objauthor =  '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
+		
+		//var_dump($rr['verb'],$rr['object-type']); killme();
+		switch($rr['verb']){
+			case 'http://activitystrea.ms/schema/1.0/post':
+				switch ($rr['object-type']){
+					case 'http://activitystrea.ms/schema/1.0/event':
+						$post_type = t('event');
+						break;
+					default:
+						$post_type = t('status');
+				}
+				break;
+			default:
+				if ($rr['resource-id']){
+					$post_type = t('photo');
+					$m=array();	preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
+					$rr['plink'] = $m[1];
+				} else {
+					$post_type = t('status');
+				}
+		}
+		$plink = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
+
+		$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
+		
+	}
+	
+	
+	// last 12 photos
+	$aside['$photos_title'] = t('Last photos');
+	$aside['$photos_items'] = array();
+	$r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM 
+				(SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` 
+					WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s')
+						AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1`
+				INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`,
+				`user` 
+				WHERE `user`.`uid` = `photo`.`uid`
+				AND `user`.`blockwall`=0
+				AND `user`.`hidewall`=0
+				ORDER BY `photo`.`edited` DESC
+				LIMIT 0, 9",
+				dbesc(t('Contact Photos')),
+				dbesc(t('Profile Photos'))
+				);
+		if(count($r)) {
+		$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+		foreach($r as $rr) {
+			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
+			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
+		
+			$entry = replace_macros($tpl,array(
+				'$id' => $rr['id'],
+				'$profile-link' => $photo_page,
+				'$photo' => $photo_url,
+				'$alt-text' => $rr['username']." : ".$rr['desc'],
+			));
+
+			$aside['$photos_items'][] = $entry;
+		}
+	}
+	
+	$fostitJS = "javascript: (function() {
+    					the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-blue/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
+    						a_funct = function() {
+        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
+    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
+    							else {a_funct()}})()" ;
+  
+   $aside['$fostitJS'] = $fostitJS;
+   
+   //nav FIND FRIENDS
+	if(local_user()) {
+	$nv = array();
+	$nv['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";
+	}
+}
+
+
+
+//right_aside at profile pages
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
+	if($ccCookie != "8") {
+	// COMMUNITY
+	diabook_blue_community_info();
+	
+	// CUSTOM CSS
+	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile.css";
+	}
+}
+
+//tabs at right_aside on settings page
+if ($a->argv[0] === "settings"){
+	
+	$tabs = array(
+		array(
+			'label'	=> t('Account settings'),
+			'url' 	=> $a->get_baseurl(true).'/settings',
+			'sel'	=> (($a->argc == 1)?'active':''),
+		),	
+		array(
+			'label'	=> t('Display settings'),
+			'url' 	=> $a->get_baseurl(true).'/settings/display',
+			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
+		),	
+		array(
+			'label'	=> t('Edit/Manage Profiles'),
+			'url' 	=> $a->get_baseurl(true).'/profiles',
+		),	
+		array(
+			'label'	=> t('Connector settings'),
+			'url' 	=> $a->get_baseurl(true).'/settings/connectors',
+			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
+		),
+		array(
+			'label'	=> t('Plugin settings'),
+			'url' 	=> $a->get_baseurl(true).'/settings/addon',
+			'sel'	=> (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
+		),
+		array(
+			'label' => t('Connections'),
+			'url' => $a->get_baseurl(true) . '/settings/oauth',
+			'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
+		),
+		array(
+			'label' => t('Export personal data'),
+			'url' => $a->get_baseurl(true) . '/uexport',
+			'sel' => ''
+		)
+	);
+	$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
+	$a->page['aside'] = replace_macros($tabtpl, array(
+		'$tabs' => $tabs,
+	));
+	
+	
+	// CUSTOM CSS
+	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-settings.css";
+	
+}
+
+
+// custom css
+if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
+
+//load jquery.cookie.js
+$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js";
+$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
+
+//load jquery.ae.image.resize.js
+$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.ae.image.resize.js";
+$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
+
+//js scripts
+//comment-edit-wrapper on photo_view
+if ($a->argv[0].$a->argv[2] === "photos"."image"){
+
+$a->page['htmlhead'] .= '
+<script>
+	$(function(){
+	
+		$(".comment-edit-form").css("display","table");
+			
+			});
+    </script>';
+	
+}
+
+
+$a->page['htmlhead'] .= '
+
+<script>
+ $(function() {
+	$("a.lightbox").fancybox(); // Select all links with lightbox class
+ });
+  
+ </script>';
+
+
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
+$a->page['htmlhead'] .= '
+<script>
+
+$(function() {
+	$(".oembed.photo img").aeImageResize({height: 400, width: 400});
+  });
+
+$("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-blue/wall_item.tpl b/view/theme/diabook-blue/wall_item.tpl
new file mode 100644
index 000000000..123834064
--- /dev/null
+++ b/view/theme/diabook-blue/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-blue/wallwall_item.tpl b/view/theme/diabook-blue/wallwall_item.tpl
new file mode 100644
index 000000000..bee75ad99
--- /dev/null
+++ b/view/theme/diabook-blue/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-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl
new file mode 100755
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/diabook-red/contact_template.tpl b/view/theme/diabook-red/contact_template.tpl
new file mode 100755
index 000000000..48930b48a
--- /dev/null
+++ b/view/theme/diabook-red/contact_template.tpl
@@ -0,0 +1,25 @@
+
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
+	<div class="contact-entry-photo-wrapper" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
+		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
+		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
+
+			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
+
+			{{ if $contact.photo_menu }}
+			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
+                    <ul>
+                        $contact.photo_menu
+                    </ul>
+                </div>
+			{{ endif }}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+
+	<div class="contact-entry-end" ></div>
+</div>
diff --git a/view/theme/diabook-red/directory_item.tpl b/view/theme/diabook-red/directory_item.tpl
new file mode 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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/diabook-red/jot.tpl b/view/theme/diabook-red/jot.tpl
new file mode 100755
index 000000000..bd43994b5
--- /dev/null
+++ b/view/theme/diabook-red/jot.tpl
@@ -0,0 +1,84 @@
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="$action" method="post" >
+		<input type="hidden" name="type" value="$ptyp" />
+		<input type="hidden" name="profile_uid" value="$profile_uid" />
+		<input type="hidden" name="return" value="$return_path" />
+		<input type="hidden" name="location" id="jot-location" value="$defloc" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="$post_id" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+		<div id="character-counter" class="grey"></div>		
+		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+	
+	<div id="profile-upload-wrapper" style="display: $visitor;" >
+		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
+	</div> 
+	<div id="profile-attach-wrapper" style="display: $visitor;" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
+	</div> 
+
+	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" style="display: $visitor;" >
+		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" style="display: $visitor;" >
+		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" style="display: $visitor;" >
+		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" style="/*display: none;*/" >
+		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
+	</div> 
+
+	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
+  
+   <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
+   
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
+	</div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	$jotplugins
+	</div>
+	
+	<div id="profile-rotator-wrapper" style="display: $visitor;" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+	</div> 
+	
+	</div>
+   <div id="profile-jot-perms-end"></div>
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			$acl
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+			<div id="profile-jot-email-end"></div>
+			$jotnets
+		</div>
+	</div>
+
+
+
+
+</form>
+</div>
+		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/diabook-red/js/README b/view/theme/diabook-red/js/README
new file mode 100644
index 000000000..c93b2118e
--- /dev/null
+++ b/view/theme/diabook-red/js/README
@@ -0,0 +1,22 @@
+jQuery Resize Plugin Demo
+
+Version: v2.1.1
+Author: Adeel Ejaz (http://adeelejaz.com/)
+License: Dual licensed under MIT and GPL licenses.
+
+Introduction
+aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions.
+
+Usage:
+.aeImageResize( height, width )
+
+height
+An integer representing the maximum height for the image.
+
+width
+An integer representing the maximum width for the image.
+
+Example
+$(function() {
+  $( ".resizeme" ).aeImageResize({ height: 250, width: 250 });
+});
\ No newline at end of file
diff --git a/view/theme/diabook-red/js/jquery.ae.image.resize.js b/view/theme/diabook-red/js/jquery.ae.image.resize.js
new file mode 100644
index 000000000..bac09cd45
--- /dev/null
+++ b/view/theme/diabook-red/js/jquery.ae.image.resize.js
@@ -0,0 +1,69 @@
+(function( $ ) {
+
+  $.fn.aeImageResize = function( params ) {
+
+    var aspectRatio = 0
+      // Nasty I know but it's done only once, so not too bad I guess
+      // Alternate suggestions welcome :)
+      ,	isIE6 = $.browser.msie && (6 == ~~ $.browser.version)
+      ;
+
+    // We cannot do much unless we have one of these
+    if ( !params.height && !params.width ) {
+      return this;
+    }
+
+    // Calculate aspect ratio now, if possible
+    if ( params.height && params.width ) {
+      aspectRatio = params.width / params.height;
+    }
+
+    // Attach handler to load
+    // Handler is executed just once per element
+    // Load event required for Webkit browsers
+    return this.one( "load", function() {
+
+      // Remove all attributes and CSS rules
+      this.removeAttribute( "height" );
+      this.removeAttribute( "width" );
+      this.style.height = this.style.width = "";
+
+      var imgHeight = this.height
+        , imgWidth = this.width
+        , imgAspectRatio = imgWidth / imgHeight
+        , bxHeight = params.height
+        , bxWidth = params.width
+        , bxAspectRatio = aspectRatio;
+				
+      // Work the magic!
+      // If one parameter is missing, we just force calculate it
+      if ( !bxAspectRatio ) {
+        if ( bxHeight ) {
+          bxAspectRatio = imgAspectRatio + 1;
+        } else {
+          bxAspectRatio = imgAspectRatio - 1;
+        }
+      }
+
+      // Only resize the images that need resizing
+      if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) {
+
+        if ( imgAspectRatio > bxAspectRatio ) {
+          bxHeight = ~~ ( imgHeight / imgWidth * bxWidth );
+        } else {
+          bxWidth = ~~ ( imgWidth / imgHeight * bxHeight );
+        }
+
+        this.height = bxHeight;
+        this.width = bxWidth;
+      }
+    })
+    .each(function() {
+
+      // Trigger load event (for Gecko and MSIE)
+      if ( this.complete || isIE6 ) {
+        $( this ).trigger( "load" );
+      }
+    });
+  };
+})( jQuery );
\ No newline at end of file
diff --git a/view/theme/diabook-red/js/jquery.ae.image.resize.min.js b/view/theme/diabook-red/js/jquery.ae.image.resize.min.js
new file mode 100644
index 000000000..16c30b123
--- /dev/null
+++ b/view/theme/diabook-red/js/jquery.ae.image.resize.min.js
@@ -0,0 +1 @@
+(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery);
\ No newline at end of file
diff --git a/view/theme/diabook-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 100755
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..dc3fd0cde
--- /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-li" class="nav-notify"></span></li>
+					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
+				</ul>
+			</li>	
+			{{ endif }}
+			
+			{{ if $nav.messages }}
+			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
+			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
+			  <span class="icon messages">$nav.messages.1</span>
+				<span id="mail-update" class="nav-notify"></span></a>
+				<ul id="nav-messages-menu" class="menu-popup">
+					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
+					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></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_item.tpl b/view/theme/diabook-red/photo_item.tpl
new file mode 100644
index 000000000..5d65a89b7
--- /dev/null
+++ b/view/theme/diabook-red/photo_item.tpl
@@ -0,0 +1,65 @@
+{{ if $indent }}{{ else }}
+<div class="wall-item-decor">
+	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+</div>
+{{ endif }}
+
+<div class="wall-item-photo-container $indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper" >
+				<a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id">
+					<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
+				$photo_menu
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> 
+			<span class="wall-item-ago">-
+			{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
+			{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
+			$body
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{ for $tags as $tag }}
+				<span class='tag'>$tag</span>
+			{{ endfor }}
+		</div>
+	</div>
+	
+	<div class="wall-item-bottom" style="display: table-row;">
+		<div class="wall-item-actions">
+	   </div>
+		<div class="wall-item-actions">
+			
+			<div class="wall-item-actions-tools">
+
+				{{ if $drop.dropping }}
+					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
+					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a>
+				{{ endif }}
+				{{ if $edpost }}
+					<a class="icon pencil" href="$edpost.0" title="$edpost.1"></a>
+				{{ endif }}
+			</div>
+
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+			
+	</div>
+</div>
+
diff --git a/view/theme/diabook-red/photo_view.tpl b/view/theme/diabook-red/photo_view.tpl
new file mode 100755
index 000000000..09dfb2aae
--- /dev/null
+++ b/view/theme/diabook-red/photo_view.tpl
@@ -0,0 +1,36 @@
+<div id="live-display"></div>
+<h3><a href="$album.0">$album.1</a></h3>
+
+<div id="photo-edit-link-wrap">
+{{ if $tools }}
+<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
+-
+<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
+{{ endif }}
+{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
+</div>
+
+<div id="photo-photo">
+	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
+	<a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
+	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
+</div>
+
+<div id="photo-photo-end"></div>
+<div id="photo-caption" >$desc</div>
+{{ if $tags }}
+<div id="in-this-photo-text">$tags.0</div>
+<div id="in-this-photo">$tags.1</div>
+{{ endif }}
+{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
+
+{{ if $edit }}$edit{{ endif }}
+
+<div style="margin-top:20px">
+</div>
+<div id="wall-photo-container">
+$comments
+</div>
+
+$paginate
+
diff --git a/view/theme/diabook-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 100755
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 100755
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..efbec090a
--- /dev/null
+++ b/view/theme/diabook-red/style-network.css
@@ -0,0 +1,2632 @@
+/**
+ * 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%);
+filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ad3b0a', endColorstr='#ff4f0f');
+
+background-image: -webkit-gradient(
+	linear,
+	left bottom,
+	left top,
+	color-stop(0, rgb(173,59,10)),
+	color-stop(0.65, rgb(255,79,15))
+);
+}
+header #site-location {
+  display: none;
+}
+header #banner {
+  overflow: hidden;
+  text-align: left;
+  width: 82%%;
+  margin-left: 25%;
+}
+header #banner a,
+header #banner a:active,
+header #banner a:visited,
+header #banner a:link,
+header #banner a:hover {
+  color: black;
+  text-decoration: none;
+  outline: none;
+  vertical-align: middle;
+  font-weight: bolder;
+  
+}
+header #banner #logo-img {
+  height: 25px;
+  margin-top: 3px;
+}
+header #banner #logo-text {
+  font-size: 20px;
+  position: absolute;
+  top: 10%;
+  margin-left: 3px;
+}
+/* nav */
+nav {
+  width: 80%;
+  height: 32px;
+  position: fixed;
+  left: 22%;
+  top: 0px;
+  padding: 0px;
+  background: #ff500f;
+  color: #000;
+  z-index: 99;
+  border-bottom: 1px;
+  border-bottom-color: black;
+  border-bottom-style: inset;
+  background-image: linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+background-image: -o-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+background-image: -moz-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+background-image: -webkit-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+background-image: -ms-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+
+background-image: -webkit-gradient(
+	linear,
+	left bottom,
+	left top,
+	color-stop(0, rgb(173,59,10)),
+	color-stop(0.65, rgb(255,79,15))
+);
+}
+nav a,
+nav a:active,
+nav a:visited,
+nav a:link,
+nav a:hover {
+  /*color: #1f1f1f;*/
+  text-decoration: none;
+  outline: none;
+}
+nav #banner {
+  overflow: hidden;
+  /*text-align: center;*/
+  width: 100%;
+}
+nav #banner a,
+nav #banner a:active,
+nav #banner a:visited,
+nav #banner a:link,
+nav #banner a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  outline: none;
+  vertical-align: bottom;
+}
+nav #banner #logo-img {
+  height: 22px;
+  margin-top: 5px;
+}
+nav #banner #logo-text {
+  font-size: 22px;
+}
+nav #navbar{
+	}
+nav ul {
+  margin: 0px;
+  padding: 0px 20px;
+}
+nav ul li {
+  list-style: none;
+  margin: 0px;
+  /* padding: 1px 1px 3px 1px; */
+  float: left;
+}
+nav ul li .menu-popup {
+  left: 0px;
+  right: auto;
+}
+
+nav #logo-img {
+  height: 25px;
+  margin-top: 4px;
+  margin-left: 30px;
+}
+
+nav #logo-text {
+    font-size: 22px;
+    margin-top: 3px;
+    margin-right: 15px;
+}
+nav .nav-menu-search {
+  position: relative;
+
+  margin: 4px 17px;
+  margin-right: 0px;
+  height: 17px;
+  width: 180px;
+  
+}
+
+nav #search-box #search-text {
+  background-image:  url('icons/lupe.png');
+  background-repeat:no-repeat;
+  padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
+	}
+
+
+nav .nav-menu-icon {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+nav .nav-menu-icon:hover {
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 5px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+nav .nav-menu-icon.selected {
+  background-color: #fff4d6;
+}
+nav .nav-menu-icon img {
+  width: 22px;
+  height: 22px;
+}
+nav .nav-menu-icon .nav-notify {
+  top: 3px;
+}
+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-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;
+  margin-bottom: 14px;
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 400px; 
+  max-height: 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: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#jot #jot-tools li.loading {
+  float: right;
+  background-color: #ffffff;
+  width: 20px;
+  vertical-align: center;
+  text-align: center;
+  border-top: 2px solid #9eabb0;
+  height: 38px;
+}
+#jot #jot-tools li.loading img {
+  margin-top: 10px;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 585px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 585px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #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: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	font-size: large;
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+
+#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..ef6fd8601
--- /dev/null
+++ b/view/theme/diabook-red/style-profile.css
@@ -0,0 +1,2604 @@
+/**
+ * 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-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;
+  margin-bottom: 14px;
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 400px;
+  max-height: 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: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 585px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 583px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#jot #jot-tools li.loading {
+  float: right;
+  background-color: #ffffff;
+  width: 20px;
+  vertical-align: center;
+  text-align: center;
+  border-top: 2px solid #9eabb0;
+  height: 38px;
+}
+#jot #jot-tools li.loading img {
+  margin-top: 10px;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 585px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 585px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+	
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+ 	 font-weight: bolder;
+	 cursor: pointer;
+}
+.button.creation2 {
+    background-color: #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: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	font-size: large;
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 48px;
+        height: 48px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+
+#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..ef06ef5ca
--- /dev/null
+++ b/view/theme/diabook-red/style.css
@@ -0,0 +1,2755 @@
+/**
+ * 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;
+}
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
+code {
+  font-family: Courier, monospace;
+  white-space: pre;
+  display: block;
+  overflow: auto;
+  border: 1px solid #444;
+  background: #EEE;
+  color: #444;
+  padding: 10px;
+  margin-top: 20px;
+}
+#panel {
+  position: absolute;
+  width: 12em;
+  background: #ffffff;
+  color: #2d2d2d;
+  margin: 0px;
+  padding: 1em;
+  list-style: none;
+  border: 3px solid #364e59;
+  z-index: 100000;
+  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+}
+/* tool */
+.tool {
+  height: auto;
+  overflow: auto;
+  padding: 3px;
+}
+#saved-search-ul .tool:hover,
+#nets-sidebar .tool:hover,
+#sidebar-group-list .tool:hover {
+	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-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-photo-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-photo-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-photo-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-photo-container .wall-item-content {
+  font-size: 12.5px;
+  max-width: 720px;
+  word-wrap: break-word;
+  line-height: 1.2;
+  margin-bottom: 14px;
+}
+.wall-item-photo-container .wall-item-content img {
+  max-width: 700px;
+}
+.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
+.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon:hover {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-photo-container .wall-item-name {
+  font-weight: bold;
+}
+.wall-item-photo-container .wall-item-actions-author {
+  width: 100%;
+  margin-bottom: 0.3em;
+}
+.wall-item-photo-container .wall-item-actions-social {
+  float: left;
+  margin-bottom: 1px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
+.wall-item-photo-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-tools a {
+  float: right;
+}
+.wall-item-photo-container .wall-item-actions-tools input {
+  float: right;
+}
+.wall-item-photo-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 40px;
+  width: 650px;
+  border-bottom: 1px solid #D2D2D2;
+}
+.wall-item-photo-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-photo-container {
+  display: table;
+  width: 780px;
+}
+.my-comment-photo {
+  width: 48px;
+  margin-left: 40px;
+  margin-right: 32px;
+	}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+}
+.comment-edit-text-empty {
+    width: 500px;
+    border: 1px solid #D2D2D2;
+    height: 3.2em;
+    color: #2d2d2d;
+}
+.comment-edit-text-full {
+  font-size: 12.5px;
+  height: 3.3em;
+  
+  border: 1px solid #D2D2D2;
+  width: 500px;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+    display: table-cell;
+}
+
+
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
+.wall-item-bottom {
+  font-size: 13px;
+}
+.wall-item-container .wall-item-bottom {
+/*  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out; */
+}
+.wall-item-container:hover .wall-item-bottom {
+/*  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out; */
+}
+.wall-item-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
+.wall-item-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
+.wall-item-location {
+  
+  clear: both;
+  overflow: hidden;
+  
+  margin-bottom: 5px;
+}
+
+.wall-item-container .wall-item-content {
+  font-size: 12.5px;
+  max-width: 720px;
+  word-wrap: break-word;
+  line-height: 1.2;
+  margin-bottom: 14px;
+}
+
+.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: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #999;
+  padding-left: 3px;
+  font-size: 12px;
+}
+.tag a {
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #999;
+}
+.wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
+  background: #FFFFFF;
+  border: 2px solid #364e59;
+  height: 25px;
+  width: 25px;
+  overflow: hidden;
+  padding: 1px;
+  position: absolute !important;
+  top: 40px;
+  left: 30px;
+  -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+}
+.wwto .contact-photo {
+  width: auto;
+  height: 25px;
+}
+/* contacts menu */
+.contact-photo-wrapper {
+  position: relative;
+  width: 80px;
+}
+
+.contact-photo-wrapper.wwto {
+  width: 25px;
+}
+
+.contact-photo {
+  width: 48px;
+  height: 48px;
+  overflow: hidden;
+  display: block;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+
+.contact-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 15px;
+}
+.contact-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.contact-wrapper {
+  left: 0px;
+  top: 63px;
+}
+.contact-photo {
+  width: 48px;
+  height: 48px;
+}
+.contact-photo img {
+  width: 48px;
+  height: 48px;
+}
+.contact-name {
+  /* text-align: center; */
+  /*font-weight: bold;*/
+  font-size: 12px;
+}
+.contact-details {
+  color: #999999;
+}
+/* editor */
+.jothidden {
+  display: none;
+}
+#jot {
+  width: 785px;
+  margin: 0px 2em 20px 0px;
+}
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
+  width: 99%;
+  font-size: 15px;
+  color: #999999;
+  border: 1px solid #DDD;
+  padding: 0.3em;
+  margin-bottom: 10px;
+}
+.grey
+{
+  display: inline;
+  float: right;	
+	}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 40px;
+  overflow: none;
+  width: 783px;
+  background-color: #fff;
+  border-bottom: 2px solid #9eabb0;
+}
+
+#jot #jot-tools li {
+  list-style: none;
+  float: left;
+  width: 80px;
+  height: 40px;
+  border-bottom: 2px solid #9eabb0;
+}
+#jot #jot-tools li a {
+  display: block;
+  color: #cccccc;
+  width: 100%;
+  height: 40px;
+  text-align: center;
+  line-height: 40px;
+  overflow: hidden;
+}
+#jot #jot-tools li:hover {
+  background-color: #364e59;
+  border-bottom: 2px solid #bdcdd4;
+}
+#jot #jot-tools li.perms {
+  float: right;
+  width: 40px;
+}
+#jot #jot-tools li.perms a.unlock {
+  width: 30px;
+  border-left: 10px solid #cccccc;
+  background-color: #cccccc;
+  background-position: left center;
+}
+#jot #jot-tools li.perms a.lock {
+  width: 30px;
+  border-left: 10px solid #666666;
+  background-color: #666666;
+}
+#jot #jot-tools li.submit {
+  float: right;
+  background-color: #cccccc;
+  border-bottom: 2px solid #cccccc;
+  border-right: 1px solid #666666;
+  border-left: 1px solid #666666;
+}
+#jot #jot-tools li.submit input {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+  background-color: #cccccc;
+  color: #666666;
+  width: 80px;
+  height: 40px;
+  line-height: 40px;
+}
+#jot #jot-tools li.submit input:hover {
+  background-color: #bdcdd4;
+  color: #666666;
+}
+#jot #jot-tools li.loading {
+  float: right;
+  background-color: #ffffff;
+  width: 20px;
+  vertical-align: center;
+  text-align: center;
+  border-top: 2px solid #9eabb0;
+  height: 38px;
+}
+#jot #jot-tools li.loading img {
+  margin-top: 10px;
+}
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 785px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 785px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    font-weight: bolder;
+	 cursor: pointer;
+}
+.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: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
+}
+.lframe {
+  float: left;
+  /*margin: 0px 10px 10px 0px;*/
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+	 color: #777;
+}
+.oembed {
+	font-size: large;
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+
+#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 100755
index 000000000..fae26ae70
--- /dev/null
+++ b/view/theme/diabook-red/theme.php
@@ -0,0 +1,476 @@
+<?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.014)
+ * Author: 
+ */
+
+
+//print diabook-version for debugging
+$diabook_version = "Diabook-red (Version: 1.014)";
+$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
+
+//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);
+
+//load jquery.ae.image.resize.js
+$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.ae.image.resize.js";
+$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
+
+
+//js scripts
+//comment-edit-wrapper on photo_view
+if ($a->argv[0].$a->argv[2] === "photos"."image"){
+
+$a->page['htmlhead'] .= '
+<script>
+	$(function(){
+	
+		$(".comment-edit-form").css("display","table");
+			
+			});
+    </script>';
+	
+}
+
+$a->page['htmlhead'] .= '
+
+<script>
+ $(function() {
+	$("a.lightbox").fancybox(); // Select all links with lightbox class
+ });
+  
+ </script>';
+
+
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
+$a->page['htmlhead'] .= '
+<script>
+
+$(function() {
+	$(".oembed.photo img").aeImageResize({height: 400, width: 400});
+  });
+
+$("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 100755
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/directory_item.tpl b/view/theme/diabook/directory_item.tpl
new file mode 100755
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/experimental b/view/theme/diabook/experimental
deleted file mode 100755
index e69de29bb..000000000
--- a/view/theme/diabook/experimental
+++ /dev/null
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 100755
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
new file mode 100755
index 000000000..af183d04d
--- /dev/null
+++ b/view/theme/diabook/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/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
new file mode 100755
index 000000000..1958041cf
--- /dev/null
+++ b/view/theme/diabook/icons/attach.png
diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png
new file mode 100755
index 000000000..8d779a409
--- /dev/null
+++ b/view/theme/diabook/icons/audio.png
diff --git a/view/theme/diabook/icons/bluebug.png b/view/theme/diabook/icons/bluebug.png
new file mode 100644
index 000000000..3979e7d8e
--- /dev/null
+++ b/view/theme/diabook/icons/bluebug.png
diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png
new file mode 100755
index 000000000..a5c7f1236
--- /dev/null
+++ 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 100755
index 000000000..28e2675b8
--- /dev/null
+++ b/view/theme/diabook/icons/close_box.png
diff --git a/view/theme/diabook/icons/com_side.png b/view/theme/diabook/icons/com_side.png
new file mode 100644
index 000000000..bc5969ef1
--- /dev/null
+++ b/view/theme/diabook/icons/com_side.png
diff --git a/view/theme/diabook/icons/community.png b/view/theme/diabook/icons/community.png
new file mode 100644
index 000000000..7c91e8b75
--- /dev/null
+++ b/view/theme/diabook/icons/community.png
diff --git a/view/theme/diabook/icons/contacts2.png b/view/theme/diabook/icons/contacts2.png
index f90b10f92..7817279f4 100755
--- a/view/theme/diabook/icons/contacts2.png
+++ b/view/theme/diabook/icons/contacts2.png
diff --git a/view/theme/diabook/icons/dislike.png b/view/theme/diabook/icons/dislike.png
index fb0f8b33d..23de426c5 100755..100644
--- a/view/theme/diabook/icons/dislike.png
+++ b/view/theme/diabook/icons/dislike.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/events.png b/view/theme/diabook/icons/events.png
new file mode 100644
index 000000000..4a0b3f3f1
--- /dev/null
+++ b/view/theme/diabook/icons/events.png
diff --git a/view/theme/diabook/icons/expand.png b/view/theme/diabook/icons/expand.png
new file mode 100755
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
new file mode 100755
index 000000000..16713fa53
--- /dev/null
+++ b/view/theme/diabook/icons/file_as.png
diff --git a/view/theme/diabook/icons/ftdevs.gif b/view/theme/diabook/icons/ftdevs.gif
new file mode 100644
index 000000000..e0fc25743
--- /dev/null
+++ b/view/theme/diabook/icons/ftdevs.gif
diff --git a/view/theme/diabook/icons/globe.png b/view/theme/diabook/icons/globe.png
new file mode 100644
index 000000000..6bb9bc09d
--- /dev/null
+++ b/view/theme/diabook/icons/globe.png
diff --git a/view/theme/diabook/icons/home.png b/view/theme/diabook/icons/home.png
new file mode 100644
index 000000000..be47a48fc
--- /dev/null
+++ b/view/theme/diabook/icons/home.png
diff --git a/view/theme/diabook/icons/language.png b/view/theme/diabook/icons/language.png
new file mode 100644
index 000000000..8029c0155
--- /dev/null
+++ b/view/theme/diabook/icons/language.png
diff --git a/view/theme/diabook/icons/like.png b/view/theme/diabook/icons/like.png
index 0006c3e2a..b65edccc0 100755..100644
--- a/view/theme/diabook/icons/like.png
+++ b/view/theme/diabook/icons/like.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 e00c5b2a2..7e34bf279 100755
--- 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
new file mode 100755
index 000000000..f8b228347
--- /dev/null
+++ b/view/theme/diabook/icons/lupe.png
diff --git a/view/theme/diabook/icons/mess_side.png b/view/theme/diabook/icons/mess_side.png
new file mode 100644
index 000000000..49ef896bc
--- /dev/null
+++ b/view/theme/diabook/icons/mess_side.png
diff --git a/view/theme/diabook/icons/messages2.png b/view/theme/diabook/icons/messages2.png
new file mode 100644
index 000000000..54b68e7f7
--- /dev/null
+++ b/view/theme/diabook/icons/messages2.png
diff --git a/view/theme/diabook/icons/next.png b/view/theme/diabook/icons/next.png
new file mode 100755
index 000000000..7b5e25b90
--- /dev/null
+++ b/view/theme/diabook/icons/next.png
diff --git a/view/theme/diabook/icons/notes.png b/view/theme/diabook/icons/notes.png
new file mode 100644
index 000000000..7d4afca90
--- /dev/null
+++ b/view/theme/diabook/icons/notes.png
diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png
index 5bdc34f76..270997740 100755
--- a/view/theme/diabook/icons/notifications.png
+++ b/view/theme/diabook/icons/notifications.png
diff --git a/view/theme/diabook/icons/notify2.png b/view/theme/diabook/icons/notify2.png
new file mode 100644
index 000000000..407e2dbb4
--- /dev/null
+++ b/view/theme/diabook/icons/notify2.png
diff --git a/view/theme/diabook/icons/pencil2.png b/view/theme/diabook/icons/pencil2.png
new file mode 100644
index 000000000..3b47d1864
--- /dev/null
+++ b/view/theme/diabook/icons/pencil2.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
new file mode 100755
index 000000000..55c1464ba
--- /dev/null
+++ 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
new file mode 100644
index 000000000..6d9539610
--- /dev/null
+++ b/view/theme/diabook/icons/pubgroups.png
diff --git a/view/theme/diabook/icons/scroll_top.png b/view/theme/diabook/icons/scroll_top.png
new file mode 100755
index 000000000..0e7f7ae6a
--- /dev/null
+++ b/view/theme/diabook/icons/scroll_top.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 32eff5a50..0b00cb189 100755
--- a/view/theme/diabook/icons/star.png
+++ b/view/theme/diabook/icons/star.png
diff --git a/view/theme/diabook/icons/star_dummy.png b/view/theme/diabook/icons/star_dummy.png
new file mode 100644
index 000000000..ce11f30d4
--- /dev/null
+++ b/view/theme/diabook/icons/star_dummy.png
diff --git a/view/theme/diabook/icons/starred.png b/view/theme/diabook/icons/starred.png
new file mode 100755
index 000000000..2b82dfca3
--- /dev/null
+++ b/view/theme/diabook/icons/starred.png
diff --git a/view/theme/diabook/icons/toogle_off.png b/view/theme/diabook/icons/toogle_off.png
new file mode 100644
index 000000000..0fcce4d5a
--- /dev/null
+++ b/view/theme/diabook/icons/toogle_off.png
diff --git a/view/theme/diabook/icons/toogle_on.png b/view/theme/diabook/icons/toogle_on.png
new file mode 100644
index 000000000..79ce07f0e
--- /dev/null
+++ b/view/theme/diabook/icons/toogle_on.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
new file mode 100755
index 000000000..a0cda0ae5
--- /dev/null
+++ b/view/theme/diabook/icons/unlock.png
diff --git a/view/theme/diabook/icons/unstarred.png b/view/theme/diabook/icons/unstarred.png
index ca2072414..ba3183f5c 100755
--- 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
new file mode 100755
index 000000000..a03d1d818
--- /dev/null
+++ b/view/theme/diabook/icons/video.png
diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png
new file mode 100755
index 000000000..216e78344
--- /dev/null
+++ 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
new file mode 100755
index 000000000..bd43994b5
--- /dev/null
+++ b/view/theme/diabook/jot.tpl
@@ -0,0 +1,84 @@
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="$action" method="post" >
+		<input type="hidden" name="type" value="$ptyp" />
+		<input type="hidden" name="profile_uid" value="$profile_uid" />
+		<input type="hidden" name="return" value="$return_path" />
+		<input type="hidden" name="location" id="jot-location" value="$defloc" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="$post_id" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+		<div id="character-counter" class="grey"></div>		
+		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+	
+	<div id="profile-upload-wrapper" style="display: $visitor;" >
+		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
+	</div> 
+	<div id="profile-attach-wrapper" style="display: $visitor;" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
+	</div> 
+
+	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" style="display: $visitor;" >
+		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" style="display: $visitor;" >
+		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" style="display: $visitor;" >
+		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" style="/*display: none;*/" >
+		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
+	</div> 
+
+	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
+  
+   <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
+   
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
+	</div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	$jotplugins
+	</div>
+	
+	<div id="profile-rotator-wrapper" style="display: $visitor;" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+	</div> 
+	
+	</div>
+   <div id="profile-jot-perms-end"></div>
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			$acl
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+			<div id="profile-jot-email-end"></div>
+			$jotnets
+		</div>
+	</div>
+
+
+
+
+</form>
+</div>
+		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/diabook/js/README b/view/theme/diabook/js/README
new file mode 100644
index 000000000..c93b2118e
--- /dev/null
+++ b/view/theme/diabook/js/README
@@ -0,0 +1,22 @@
+jQuery Resize Plugin Demo
+
+Version: v2.1.1
+Author: Adeel Ejaz (http://adeelejaz.com/)
+License: Dual licensed under MIT and GPL licenses.
+
+Introduction
+aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions.
+
+Usage:
+.aeImageResize( height, width )
+
+height
+An integer representing the maximum height for the image.
+
+width
+An integer representing the maximum width for the image.
+
+Example
+$(function() {
+  $( ".resizeme" ).aeImageResize({ height: 250, width: 250 });
+});
\ No newline at end of file
diff --git a/view/theme/diabook/js/jquery.ae.image.resize.js b/view/theme/diabook/js/jquery.ae.image.resize.js
new file mode 100644
index 000000000..bac09cd45
--- /dev/null
+++ b/view/theme/diabook/js/jquery.ae.image.resize.js
@@ -0,0 +1,69 @@
+(function( $ ) {
+
+  $.fn.aeImageResize = function( params ) {
+
+    var aspectRatio = 0
+      // Nasty I know but it's done only once, so not too bad I guess
+      // Alternate suggestions welcome :)
+      ,	isIE6 = $.browser.msie && (6 == ~~ $.browser.version)
+      ;
+
+    // We cannot do much unless we have one of these
+    if ( !params.height && !params.width ) {
+      return this;
+    }
+
+    // Calculate aspect ratio now, if possible
+    if ( params.height && params.width ) {
+      aspectRatio = params.width / params.height;
+    }
+
+    // Attach handler to load
+    // Handler is executed just once per element
+    // Load event required for Webkit browsers
+    return this.one( "load", function() {
+
+      // Remove all attributes and CSS rules
+      this.removeAttribute( "height" );
+      this.removeAttribute( "width" );
+      this.style.height = this.style.width = "";
+
+      var imgHeight = this.height
+        , imgWidth = this.width
+        , imgAspectRatio = imgWidth / imgHeight
+        , bxHeight = params.height
+        , bxWidth = params.width
+        , bxAspectRatio = aspectRatio;
+				
+      // Work the magic!
+      // If one parameter is missing, we just force calculate it
+      if ( !bxAspectRatio ) {
+        if ( bxHeight ) {
+          bxAspectRatio = imgAspectRatio + 1;
+        } else {
+          bxAspectRatio = imgAspectRatio - 1;
+        }
+      }
+
+      // Only resize the images that need resizing
+      if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) {
+
+        if ( imgAspectRatio > bxAspectRatio ) {
+          bxHeight = ~~ ( imgHeight / imgWidth * bxWidth );
+        } else {
+          bxWidth = ~~ ( imgWidth / imgHeight * bxHeight );
+        }
+
+        this.height = bxHeight;
+        this.width = bxWidth;
+      }
+    })
+    .each(function() {
+
+      // Trigger load event (for Gecko and MSIE)
+      if ( this.complete || isIE6 ) {
+        $( this ).trigger( "load" );
+      }
+    });
+  };
+})( jQuery );
\ No newline at end of file
diff --git a/view/theme/diabook/js/jquery.ae.image.resize.min.js b/view/theme/diabook/js/jquery.ae.image.resize.min.js
new file mode 100644
index 000000000..16c30b123
--- /dev/null
+++ b/view/theme/diabook/js/jquery.ae.image.resize.min.js
@@ -0,0 +1 @@
+(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery);
\ No newline at end of file
diff --git a/view/theme/diabook/js/jquery.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 100755
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 17df8e652..522fb22b4 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -1,6 +1,4 @@
 <header>
-	{# $langselector version 0.01#}
-
 	<div id="site-location">$sitelocation</div>
 	<div id="banner">$banner</div>
 </header>
@@ -13,56 +11,69 @@
 			{{ 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">Kontaktanfragen</a><span id="intro-update" class="nav-notify"></span></li>
+					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
 					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
 				</ul>
 			</li>	
+
 			{{ 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></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-inbox"><a href="$nav.messages.0">Eingang</a></li>
-					<li id="nav-messages-outbox"><a href="message/sent">Ausgang</a></li>
-					<li id="nav-messages-new"><a href="message/new">Neue Nachricht</a></li>
+					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></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></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>
 					<li class="empty">$emptynotifications</li>
 				</ul>
 			</li>		
-		{{ endif }}					
+		{{ 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.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="$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>
+										
 				{{ 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 }}
 
@@ -87,13 +98,13 @@
 					<li>$ap</li>
 					{{ endfor }}
 				</ul>
-			</li>
+			</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 }}		
 		
@@ -104,7 +115,8 @@
 						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
 					{{ endfor }}
 					
-					{{ if $nav.notifications }}<li><a class="menu-sep $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
+					{{ 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>
@@ -121,14 +133,24 @@
 		
 	</ul>	
 
+
+	
 </nav>
 
 
+<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
+<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
+<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
+
+
+
 
 <ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+	<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 }}
diff --git a/view/theme/diabook/oembed_video.tpl b/view/theme/diabook/oembed_video.tpl
new file mode 100644
index 000000000..026007271
--- /dev/null
+++ b/view/theme/diabook/oembed_video.tpl
@@ -0,0 +1,4 @@
+<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); return false;' style='float:left; margin: 1em; position: relative;'>
+	<img width='$tw' height='$th' src='$turl' >
+	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
+</a>
diff --git a/view/theme/diabook/photo_item.tpl b/view/theme/diabook/photo_item.tpl
new file mode 100644
index 000000000..5d65a89b7
--- /dev/null
+++ b/view/theme/diabook/photo_item.tpl
@@ -0,0 +1,65 @@
+{{ if $indent }}{{ else }}
+<div class="wall-item-decor">
+	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+</div>
+{{ endif }}
+
+<div class="wall-item-photo-container $indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper" >
+				<a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id">
+					<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
+				$photo_menu
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> 
+			<span class="wall-item-ago">-
+			{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
+			{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
+			$body
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{ for $tags as $tag }}
+				<span class='tag'>$tag</span>
+			{{ endfor }}
+		</div>
+	</div>
+	
+	<div class="wall-item-bottom" style="display: table-row;">
+		<div class="wall-item-actions">
+	   </div>
+		<div class="wall-item-actions">
+			
+			<div class="wall-item-actions-tools">
+
+				{{ if $drop.dropping }}
+					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
+					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a>
+				{{ endif }}
+				{{ if $edpost }}
+					<a class="icon pencil" href="$edpost.0" title="$edpost.1"></a>
+				{{ endif }}
+			</div>
+
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+			
+	</div>
+</div>
+
diff --git a/view/theme/diabook/photo_view.tpl b/view/theme/diabook/photo_view.tpl
new file mode 100644
index 000000000..272b67048
--- /dev/null
+++ b/view/theme/diabook/photo_view.tpl
@@ -0,0 +1,33 @@
+<div id="live-display"></div>
+<h3><a href="$album.0">$album.1</a></h3>
+
+<div id="photo-edit-link-wrap">
+{{ if $tools }}
+<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
+|
+<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
+{{ endif }}
+{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
+</div>
+
+{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
+<div id="photo-photo"><a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a></div>
+{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
+<div id="photo-photo-end"></div>
+<div id="photo-caption">$desc</div>
+{{ if $tags }}
+<div id="in-this-photo-text">$tags.0</div>
+<div id="in-this-photo">$tags.1</div>
+{{ endif }}
+{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
+
+{{ if $edit }}$edit{{ endif }}
+
+<div style="margin-top:20px">
+</div>
+<div id="wall-photo-container">
+$comments
+</div>
+
+$paginate
+
diff --git a/view/theme/diabook/profile_side.tpl b/view/theme/diabook/profile_side.tpl
new file mode 100644
index 000000000..0762dbe44
--- /dev/null
+++ b/view/theme/diabook/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/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl
new file mode 100644
index 000000000..b982a2069
--- /dev/null
+++ b/view/theme/diabook/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" 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/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 100755
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 100755
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..af6e4027a
--- /dev/null
+++ b/view/theme/diabook/style-network.css
@@ -0,0 +1,2552 @@
+/**
+ * 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-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;
+  margin-bottom: 14px;
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 400px;
+  max-height: 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: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #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 #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 585px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 585px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+	
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #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;
+    color: #777;
+}
+.oembed {
+	font-size: large;
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 55px;
+        height: 55px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+
+#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;
+}
diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
new file mode 100644
index 000000000..6b05903d3
--- /dev/null
+++ b/view/theme/diabook/style-profile.css
@@ -0,0 +1,2549 @@
+/**
+ * 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-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;
+  margin-bottom: 14px;
+}
+
+.wall-item-container .wall-item-content img {
+  max-width: 400px;
+  max-height: 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: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
+.comment-edit-preview .contact-photo {
+  width: 32px;
+  height: 32px;
+  margin-left: 16px;
+  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+
+}
+.comment-edit-preview {
+  top: 15px !important;
+  left: 15px !important;
+}
+.comment-edit-preview .wall-item-links {
+  padding-left: 12px;
+}
+.comment-edit-preview .wall-item-container {
+  width: 700px;
+}
+.comment-edit-preview .tread-wrapper {
+  width: 700px;
+  padding: 0;
+  margin: 10px 0;
+}
+
+.shiny {
+  /* border-right: 10px solid #fce94f; */
+	border-right: 1px solid #A7C7F7;
+	padding-right: 12px;
+}
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
+#jot-preview-content .tread-wrapper {
+  background-color: #fff797;
+}
+
+.wall-item-tags {
+  padding-top: 1px;
+  padding-bottom: 2px;
+}
+.tag {
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #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 #d2d2d2;
+}
+#profile-jot-form #jot-title:-webkit-input-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #jot-title:-moz-placeholder {
+  font-weight: normal;
+}
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+	width: 585px;
+	height: 100px;
+	}
+#jot #jot-title:hover {
+  border: 1px solid #999999;
+}
+#jot #jot-title:focus {
+  border: 1px solid #999999;
+}
+#jot #character-counter {
+  width: 80px;
+  float: right;
+  text-align: right;
+  height: 20px;
+  line-height: 20px;
+  padding-right: 20px;
+}
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 585px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 585px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
+/** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #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;	
+height: 145px !important;
+width: 145px !important;
+	}
+.lframe {
+  float: left;
+}
+/* profile match wrapper */
+.profile-match-wrapper {
+  float: left;
+  width: 90px;
+  height: 90px;
+  margin-bottom: 20px;
+}
+.profile-match-wrapper .contact-photo {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper .contact-photo img {
+  width: 80px;
+  height: 80px;
+}
+.profile-match-wrapper {
+  left: 0px;
+  top: 63px;
+}
+
+.contact-photo-menu-button {
+        position: relative;
+        background-image: url("../../../images/icons/16/menu.png");
+        background-position: top left; 
+        background-repeat: no-repeat;
+        margin: 0px 0px -16px 0px; 
+	padding: 0px;
+        width: 16px;
+        height: 16px;
+        top: -16px; left:0px;
+        overflow: hidden;
+        text-indent: 40px;
+        display: none;
+        
+}
+.contact-photo-menu {
+        width: 11em;
+        border: 3px solid #364e59;
+	color: #2d2d2d;
+        background: #FFFFFF;
+/*        position: absolute;*/
+        position: relative;
+        left: 0px; top: 0px;
+        display: none;
+        z-index: 10000;
+}
+.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu li a {
+	display: block; 
+	padding: 5px 10px; 
+	color: #2d2d2d;
+	text-decoration: none;
+}
+.contact-photo-menu li a:hover {
+	background-color: #bdcdd4; 
+}
+
+/* page footer */
+footer {
+  height: 100px;
+  display: table-row;
+}
+
+blockquote {
+    border-left: 1px solid #D2D2D2;
+    padding-left: 9px;
+    margin: 0 0 0 .8ex;
+    color: #777;
+}
+.oembed {
+	font-size: large;
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
+/* ================== */
+/* = Contacts Block = */
+/* ================== */
+
+.contact-block-img {
+        width: 48px;
+        height: 48px;
+        padding-right: 3px;
+}
+.contact-block-div {
+        float: left;
+}
+
+.contact-block-textdiv { width: 150px; height: 34px; float: left; }
+#contact-block-end { clear: both; } 
+
+#group-edit-wrapper {
+        margin-bottom: 10px;
+}
+
+#group-members-end {
+        clear: both;
+}
+#group-edit-desc {
+ margin-top: 15px;
+}
+
+/*
+#group-separator,
+#prof-separator { display: none;}
+*/
+
+#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;
+}
diff --git a/view/theme/diabook/style-settings.css b/view/theme/diabook/style-settings.css
new file mode 100644
index 000000000..60e2f336b
--- /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;
+}
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index c1eb3be5a..e99aa5644 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -91,6 +91,8 @@
   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");}
@@ -99,25 +101,61 @@
 .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.unstarred    { background-image: url("../../../view/theme/diabook/icons/unstarred.png");}
-.icon.star    { background-image: url("../../../view/theme/diabook/icons/star.png");}
+.icon.tagged    { background-image: url("../../../view/theme/diabook/icons/tagged.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;}
+/*.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;}
+/*.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;}
+/*.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;}
@@ -130,17 +168,17 @@
 .tools 		{ background-position: -50px  -40px;}
 /*.lock 		{ background-position: -70px  -40px;}*/
 
-.video          { background-position: -110px -40px;}
+/*.video          { background-position: -110px -40px;}*/
 .youtube        { background-position: -130px -40px;}
 
-.attach         { background-position: -190px -40px;}
-.language       { background-position: -210px -40px;}
+/*.attach         { background-position: -190px -40px;}*/
+/*.language       { background-position: -210px -40px;}*/
 
 
-.on             { background-position: -50px  -60px;}
-.off            { background-position: -70px  -60px;}
-.prev           { background-position: -90px  -60px;}
-.next           { background-position: -110px -60px;}
+.icon.on             { background-image: url("../../../view/theme/diabook/icons/toogle_on.png"); background-repeat: no-repeat;}
+.icon.off            { background-image: url("../../../view/theme/diabook/icons/toogle_off.png"); background-repeat: no-repeat;}
+.icon.prev           { background-image: url("../../../view/theme/diabook/icons/prev.png"); background-repeat: no-repeat;}
+.icon.next           { background-image: url("../../../view/theme/diabook/icons/next.png"); background-repeat: no-repeat;}
 /*.tagged     { background-position: -130px -60px;}*/
 
 .attachtype {
@@ -175,6 +213,17 @@
   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;
 }
@@ -198,7 +247,7 @@
   background-image: url("../../../images/icons/10/edit.png");
 }
 .icon.s10.star {
-  background-image: url("../../../images/icons/10/star.png");
+  background-image: url("../../../images/star_dummy.png");
 }
 .icon.s10.menu {
   background-image: url("../../../images/icons/10/menu.png");
@@ -236,7 +285,7 @@
   background-image: url("../../../images/icons/16/edit.png");
 }*/
 .icon.s16.star {
-  background-image: url("../../../images/icons/16/star.png");
+  background-image: url("../../../images/star_dummy.png");
 }
 .icon.s16.menu {
   background-image: url("../../../images/icons/16/menu.png");
@@ -274,7 +323,7 @@
   background-image: url("../../../images/icons/22/edit.png");
 }
 .icon.s22.star {
-  background-image: url("../../../images/icons/22/star.png");
+  background-image: url("../../../images/star_dummy.png");
 }
 .icon.s22.menu {
   background-image: url("../../../images/icons/22/menu.png");
@@ -312,7 +361,7 @@
   background-image: url("../../../images/icons/48/edit.png");
 }
 .icon.s48.star {
-  background-image: url("../../../images/icons/48/star.png");
+  background-image: url("../../../images/star_dummy.png");
 }
 .icon.s48.menu {
   background-image: url("../../../images/icons/48/menu.png");
@@ -345,14 +394,13 @@
 /* global */
 body {
   font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
+  font-size: 12.5px;
   background-color: #ffffff;
   color: #2d2d2d;
-  margin-left: : auto;
-  margin-right: auto;
-  margin-top: 50px;
+  margin: 50px auto auto;
   display: table;
 }
+
 h4 {
   font-size: 1.1em;
 }
@@ -401,6 +449,24 @@ a:hover {
   /*color: #005c94; */
   text-decoration: underline;
 }
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
 code {
   font-family: Courier, monospace;
   white-space: pre;
@@ -414,7 +480,7 @@ code {
 }
 #panel {
   position: absolute;
-  width: 10em;
+  width: 12em;
   background: #ffffff;
   color: #2d2d2d;
   margin: 0px;
@@ -468,7 +534,7 @@ header {
   top: 0px;
   margin: 0px;
   padding: 0px;
-  width: 20%;
+  width: 22%;
   height: 32px;
   background: #000;
   z-index: 100;
@@ -481,8 +547,9 @@ header #site-location {
 }
 header #banner {
   overflow: hidden;
-  text-align: center;
-  width: 100%;
+  text-align: left;
+  width: 82%%;
+  margin-left: 25%;
 }
 header #banner a,
 header #banner a:active,
@@ -492,27 +559,110 @@ header #banner a:hover {
   color: #ffffff;
   text-decoration: none;
   outline: none;
-  vertical-align: bottom;
+  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: 10%;
+}
+/* messages */
+#message-new {
+  background: #19aeff;
+  border: 1px solid #005c94;
+  width: 150px;
+}
+#message-new a {
+  color: #ffffff;
+  text-align: center;
+  display: block;
+  font-weight: bold;
+  padding: 1em 0px;
+  text-decoration: none;
+}
+.mail-list-wrapper {
+  background-color: #f6f7f8;
+  margin-bottom: 5px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+.mail-list-wrapper span {
+  display: block;
+  float: left;
+  width: 20%;
+  overflow: hidden;
+}
+.mail-list-wrapper .mail-subject {
+  width: 30%;
+  padding: 4px 0px 0px 4px;
+}
+.mail-list-wrapper .mail-subject a {
+  display: block;
+}
+.mail-list-wrapper .mail-subject.unseen a {
+  font-weight: bold;
+}
+.mail-list-wrapper .mail-date {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-from {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-count {
+  padding: 4px 4px 0px 4px;
+  text-align: right;
+}
+.mail-list-wrapper .mail-delete {
+  float: right;
+}
+#mail-display-subject {
+  background-color: #f6f7f8;
+  color: #2d2d2d;
+  margin-bottom: 10px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+#mail-display-subject span {
+  float: left;
+  overflow: hidden;
+  padding: 4px 0px 0px 10px;
+}
+#mail-display-subject .mail-delete {
+  float: right;
+  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+#mail-display-subject:hover .mail-delete {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
 }
 /* nav */
 nav {
   width: 80%;
   height: 32px;
   position: fixed;
-  left: 20%;
+  left: 22%;
   top: 0px;
   padding: 0px;
   background: #000;
   color: #ffffff;
-  z-index: 100;
+  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);
@@ -576,18 +726,38 @@ nav #logo-text {
     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 12px;
+  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: #364e59;
+  background-color: #fff;
 }
 nav .nav-menu-icon img {
   width: 22px;
@@ -639,14 +809,17 @@ nav #nav-user-linkmenu
 nav #nav-user-linkmenu{
 	margin-right: 0px;
 	}
-nav #nav-home-link{
+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-left: 0px;
-	margin-right: 0px;
-	font-weight: bold;
+  margin-right: 0px;	
+	}
+nav #nav-home-link{
+  margin-left: 0px;	
 	}
 nav #nav-help-link .menu-popup,
 nav #nav-search-link .menu-popup,
@@ -656,9 +829,19 @@ 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 {
-  background-image: url("../../../images/icons/22/notify_on.png");
-}
+
+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;
 }
@@ -690,7 +873,6 @@ ul.menu-popup {
   margin: 0px;
   padding: 0px;
   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);
@@ -703,7 +885,8 @@ ul.menu-popup a {
   text-decoration: none;
 }
 ul.menu-popup a:hover {
-  background-color: #bdcdd4;
+  background-color: #fff797; /*bdcdd4;*/
+  color: #000;
 }
 ul.menu-popup .menu-sep {
   border-top: 1px solid #9eabb0;
@@ -782,6 +965,73 @@ ul.menu-popup .empty {
         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;
+	}
+.menu-profile-list.pscontacts{
+	background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat;
+	}
+
 /* aside */
 aside {
   display: table-cell;
@@ -792,8 +1042,9 @@ aside {
   float: left;
   /* background: #F1F1F1; */
 }
+aside #page-sidebar{display: none;}
 aside .vcard .fn {
-  font-size: 16px;
+  font-size: 18px;
   font-weight: bold;
   margin-bottom: 5px;
 }
@@ -807,14 +1058,14 @@ aside .vcard dl {
 aside .vcard dt {
   float: left;
   margin-left: 0px;
-  width: 35%;
+  /*width: 35%;*/
   text-align: right;
   color: #999999;
 }
 aside .vcard dd {
   float: left;
-  margin-left: 4px;
-  width: 60%;
+  margin-left: 5px;
+  /*width: 60%;*/
 }
 aside #profile-extra-links ul {
   padding: 0px;
@@ -845,7 +1096,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;
@@ -878,6 +1135,10 @@ aside #side-peoplefind-url {
   widht: 55px;
   height: 55px;
 }
+#lost-password-link {
+  float: left;
+  margin-right: 20px;	
+	}
 /* widget */
 .widget {
   margin-bottom: 2em;
@@ -950,19 +1211,56 @@ section {
   display: table-cell;
   vertical-align: top;
   width: 800px;
-  padding: 0px 0px 0px 10px;
+  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-image: url("../../../view/theme/diabook/icons/head.jpg");
+    
     background-position: 0 -20px;
     background-repeat: repeat-x;
-    border-bottom: 1px solid #BABDB6;
     height: 27px;
     padding: 0;
  }
 .tab.button {
-    margin-right: 15px; 
-    margin-left: 15px;	
+    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 {
@@ -972,22 +1270,25 @@ section {
   margin-bottom: 0px;
   width: 775px;
 }
+
 .wall-item-decor {
   position: absolute;
   left: 790px;
   top: -10px;
   width: 16px;
 }
-.unstarred {
-  display: none;
-}
+
 .wall-item-container {
   display: table;
   width: 780px;
 }
+
 .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
   display: table-row;
 }
+.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom {
+  display: table-row;
+}
 .wall-item-bottom {
   font-size: 13px;
 }
@@ -1013,8 +1314,19 @@ section {
   text-align: left;
   width: 80px;
 }
+.wall-item-photo-container .wall-item-info {
+  display: table-cell;
+  vertical-align: top;
+  text-align: left;
+  width: 80px;
+}
 .wall-item-container .wall-item-location {
   padding-right: 40px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-location {
+  padding-right: 40px;
+  display: table-cell;
 }
 .wall-item-container .wall-item-ago {
   word-wrap: break-word;
@@ -1022,6 +1334,12 @@ section {
   margin-left: 10px;
   color: #999;
 }
+.wall-item-photo-container .wall-item-ago {
+  word-wrap: break-word;
+  width: 50px;
+  margin-left: 10px;
+  color: #999;
+}
 .wall-item-location {
   
   clear: both;
@@ -1031,19 +1349,33 @@ section {
 }
 
 .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;
+  margin-bottom: 14px;
+}
+.wall-item-photo-container .wall-item-content {
+  font-size: 12.5px;
+  max-width: 720px;
+  word-wrap: break-word;
+  line-height: 1.2;
+  margin-bottom: 14px;
 }
-
 .wall-item-container .wall-item-content img {
   max-width: 700px;
 }
+.wall-item-photo-container .wall-item-content img {
+  max-width: 700px;
+}
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
   vertical-align: middle;
 }
+.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions {
+  display: table-cell;
+  vertical-align: middle;
+}
 .wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
   opacity: 0.5;
   -webkit-transition: all 0.2s ease-in-out;
@@ -1052,6 +1384,14 @@ section {
   -ms-transition: all 0.2s ease-in-out;
   transition: all 0.2s ease-in-out;
 }
+.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon {
+  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
 .wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
   opacity: 1;
   -webkit-transition: all 0.2s ease-in-out;
@@ -1060,33 +1400,58 @@ section {
   -ms-transition: all 0.2s ease-in-out;
   transition: all 0.2s ease-in-out;
 }
-.wall-item-container .wall-item-name {
+.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon:hover {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+.wall-item-container .wall-item-name, .wall-item-photo-container .wall-item-name {
   font-weight: bold;
 }
-.wall-item-container .wall-item-actions-author {
+.wall-item-container .wall-item-actions-author, .wall-item-photo-container .wall-item-actions-author {
   width: 100%;
   margin-bottom: 0.3em;
 }
-.wall-item-container .wall-item-actions-social {
+.wall-item-container .wall-item-actions-social, .wall-item-photo-container .wall-item-actions-social {
   float: left;
   margin-bottom: 1px;
+  display: table-cell;
 }
 .wall-item-container .wall-item-actions-social a {
   margin-right: 1em;
 }
+.wall-item-photo-container .wall-item-actions-social a {
+  margin-right: 1em;
+}
 .wall-item-actions-social a {
   float: left;
 }
+
 .wall-item-container .wall-item-actions-tools {
   float: right;
   width: 80px;
+  display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-tools {
+  float: right;
+  width: 80px;
+  display: table-cell;
 }
 .wall-item-container .wall-item-actions-tools a {
   float: right;
 }
+.wall-item-photo-container .wall-item-actions-tools a {
+  float: right;
+}
 .wall-item-container .wall-item-actions-tools input {
   float: right;
 }
+.wall-item-photo-container .wall-item-actions-tools input {
+  float: right;
+}
 .wall-item-container.comment {
   margin-top: 5px;
   margin-bottom: 5px;
@@ -1094,6 +1459,48 @@ section {
   width: 700px;
   border-bottom: 1px solid hsl(198, 21%, 79%);
 }
+.wall-item-photo-container.comment {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 40px;
+  width: 650px;
+  border-bottom: 1px solid #D2D2D2;
+}
+.wall-item-photo-container.comment {
+  top: 15px !important;
+  left: 15px !important;
+}
+.wall-item-photo-container {
+  display: table;
+  width: 780px;
+}
+
+.my-comment-photo {
+  width: 48px;
+  margin-left: 40px;
+  margin-right: 32px;
+	}
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+}
+.comment-edit-text-empty {
+    width: 500px;
+    border: 1px solid #D2D2D2;
+    height: 3.2em;
+    color: #2d2d2d;
+}
+.comment-edit-text-full {
+  font-size: 12.5px;
+  height: 3.3em;
+  
+  border: 1px solid #D2D2D2;
+  width: 500px;
+}
+.comment-edit-photo {
+    margin: 10px 0 0;
+    display: table-cell;
+}
 .wall-item-container.comment .contact-photo {
   width: 32px;
   height: 32px;
@@ -1115,12 +1522,13 @@ section {
   display: none;
 }
 .wall-item-comment-wrapper textarea {
-  height: 1.2em;
+  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;
@@ -1128,11 +1536,7 @@ section {
   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;
@@ -1144,6 +1548,11 @@ section {
   top: 15px !important;
   left: 15px !important;
 }
+.comment-edit-preview {
+  width: 500px;
+  margin-top: 10px;
+  background-color:  #fff797;
+}
 .comment-edit-preview .wall-item-links {
   padding-left: 12px;
 }
@@ -1161,8 +1570,12 @@ section {
 	border-right: 1px solid #A7C7F7;
 	padding-right: 12px;
 }
+
+#jot-preview-content{
+	margin-top: 30px;}
+	
 #jot-preview-content .tread-wrapper {
-  background-color: #fce94f;
+  background-color: #fff797;
 }
 
 .wall-item-tags {
@@ -1264,25 +1677,30 @@ section {
   width: 785px;
   margin: 0px 2em 20px 0px;
 }
-#jot .profile-jot-text {
-  height: 1.2em;
+#profile-jot-form #profile-jot-text {
+  height: 2.0em;
   width: 99%;
-  font-size: 10px;
+  font-size: 15px;
   color: #999999;
   border: 1px solid #DDD;
   padding: 0.3em;
-  margin-top: 30px;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;	
+	}
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
   height: 40px;
   overflow: none;
   width: 783px;
-  background-color: #0e232e;
+  background-color: #fff;
   border-bottom: 2px solid #9eabb0;
 }
+
 #jot #jot-tools li {
   list-style: none;
   float: left;
@@ -1351,20 +1769,25 @@ section {
 #jot #jot-tools li.loading img {
   margin-top: 10px;
 }
-#jot #jot-title {
-  border: 0px;
-  margin: 0px;
-  height: 20px;
-  width: 700px;
-  font-weight: bold;
-  border: 1px solid #ffffff;
+#profile-jot-form #jot-title {
+    
+  	 border-radius: 5px 5px 5px 5px;
+    font-weight: bold;
+    height: 20px;
+    margin: 0 0 5px;
+    width: 60%;
+    border: 1px solid #d2d2d2;
 }
-#jot #jot-title:-webkit-input-placeholder {
+#profile-jot-form #jot-title:-webkit-input-placeholder {
   font-weight: normal;
 }
-#jot #jot-title:-moz-placeholder {
+#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;
 }
@@ -1379,7 +1802,116 @@ section {
   line-height: 20px;
   padding-right: 20px;
 }
+#jot-perms-icon, 
+#profile-location,
+#profile-nolocation,
+#profile-youtube, 
+#profile-video, 
+#profile-audio,
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+	cursor: pointer;
+	margin-top: 2px;
+}
+#profile-jot-wrapper{
+	margin: 0 2em 20px 0;
+   width: 785px;
+	}
+
+#profile-jot-submit-wrapper {
+	margin-bottom: 50px;
+	width: 785px;
+}
+
+#profile-jot-submit {
+	float: right;
+	margin-top: 2px;
+	font-size: 14px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-top: 2px;
+	margin-left: 10px;
+	
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+	margin-top: 2px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+	margin-top: 2px;
+}
+#profile-jot-perms {
+	float: left;
+	margin-left: 45px;
+	margin-top: 2px;
+}
+#jot-preview-link {
+	float: right;
+	margin-left: 10px;
+	margin-top: 2px;
+	font-size: 9px;
+	font-weight: bolder;
+	cursor: pointer;
+}
+#profile-jot-perms{
+   float: right;
+	margin-left: 10px;
+	margin-top: 2px;	
+	}
 /** buttons **/
+.button.creation1 {
+    background-color: #fff;
+    border: 1px solid #777777;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
+}
+.button.creation2 {
+    background-color: #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;
@@ -1500,10 +2032,15 @@ ul.tabs {
 }
 ul.tabs li {
   float: left;
-  margin-left: 7px;
+  margin-left: 5px;
 }
 ul.tabs li .active {
-  border-bottom: 1px solid #3465A4;
+    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
@@ -1564,6 +2101,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;
 	}
@@ -1623,9 +2168,13 @@ ul.tabs li .active {
   float: left;
 }
 /* photo */
+.photo {
+border-radius: 10px;	
+height: 145px !important;
+width: 145px !important;
+	}
 .lframe {
   float: left;
-  margin: 0px 10px 10px 0px;
 }
 /* profile match wrapper */
 .profile-match-wrapper {
@@ -1656,7 +2205,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;
@@ -1694,8 +2243,18 @@ blockquote {
     border-left: 1px solid #D2D2D2;
     padding-left: 9px;
     margin: 0 0 0 .8ex;
+	 color: #777;
 }
-
+.oembed {
+	font-size: large;
+	font-weight: bold;
+}
+.aprofile dt{
+box-shadow: 1px 1px 5px 0;
+    color: #666666;
+    margin: 15px 0 5px;
+    padding-left: 5px;	
+	}
 /* ================== */
 /* = Contacts Block = */
 /* ================== */
@@ -1719,6 +2278,9 @@ blockquote {
 #group-members-end {
         clear: both;
 }
+#group-edit-desc {
+ margin-top: 15px;
+}
 
 /*
 #group-separator,
@@ -1731,10 +2293,22 @@ blockquote {
 }
 
 #prvmail-submit {
-	float: left;
+	float: right;
 	margin-top: 10px;
-	margin-right: 30px;
 }
+#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 {
@@ -1922,15 +2496,34 @@ a.mail-list-link {
         padding: 10px;
         float: left;
 }
+.lightbox{
+	float: left;
+	}
 
 #photo-photo {
         float: left;
 }
+#photo-like-div .wall-item-like-buttons {
+	 float: left;
+    margin-right: 5px;
+    margin-top: 30px;
+	}
+
+
+.wall-item-like-buttons .icon.like {
+float: left;
+}
 
 #photo-photo-end {
         clear: both;
 }
 
+.tabs .comment-wwedit-wrapper {
+	display: block;
+   margin-top: 30px;
+   margin-left: 50px;
+	}
+
 .profile-match-photo {
         float: left;
         text-align: center;
@@ -1986,8 +2579,8 @@ a.mail-list-link {
   display: none;
   /* position: absolute; */
   /* position: absolute; */
-  left: -2px;
-  top: -20px;
+  left: 0px;
+  top: -16px;
 }
 .contact-wrapper {
   float: left;
@@ -2028,24 +2621,60 @@ a.mail-list-link {
 .contact-details {
   color: #999999;
 }
-
-.photo-top-image-wrapper {
+#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; 
-        overflow: hidden; 
-}
+        
+}*/
 .photo-top-album-name {
         width: 100%;
-        min-height: 2em;
         position: absolute; 
         bottom: 0px; 
-        padding: 0px 3px;
-        padding-top: 0.5em;
-        background-color: rgb(255, 255, 255);
+        padding-left: 3px;
+        background-color: #EEE;
 }
+.photo-top-album-link{
+  color: #3465A4;
+	}
 #photo-top-end {
         clear: both;
 }
@@ -2059,4 +2688,3 @@ a.mail-list-link {
         float: left;
         width: 175px;
 }
-
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
new file mode 100755
index 000000000..fbe42a304
--- /dev/null
+++ b/view/theme/diabook/theme.php
@@ -0,0 +1,504 @@
+<?php
+
+/*
+ * Name: Diabook
+ * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
+ * Version: (Version: 1.014)
+ * Author: 
+ */
+
+
+//print diabook-version for debugging
+$diabook_version = "Diabook (Version: 1.014)";
+$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
+
+//change css on network and profilepages
+$cssFile = null;
+
+
+/**
+ * prints last community activity
+ */
+
+
+ 
+function diabook_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/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/js/jquery.cookie.js";
+$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s"></script>', $cookieJS);
+
+//load jquery.ae.image.resize.js
+$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.ae.image.resize.js";
+$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
+
+
+//js scripts
+//comment-edit-wrapper on photo_view
+if ($a->argv[0].$a->argv[2] === "photos"."image"){
+
+$a->page['htmlhead'] .= '
+<script>
+	$(function(){
+	
+		$(".comment-edit-form").css("display","table");
+			
+			});
+    </script>';
+	
+}
+
+$a->page['htmlhead'] .= '
+
+<script>
+ $(function() {
+	$("a.lightbox").fancybox(); // Select all links with lightbox class
+ });
+   
+ </script>';
+ 
+$a->page['htmlhead'] .= '
+ <script>
+ 
+$(document).ready(function() {
+    $(".embed_yt iframe").each(function(){
+        var ifr_source = $(this).attr("src");
+        var wmode = "wmode=transparent";
+        if(ifr_source.indexOf("?") != -1) {
+            var getQString = ifr_source.split("?");
+            var oldString = getQString[1];
+            var newString = getQString[0];
+            $(this).attr("src",newString+"?"+wmode+"&"+oldString);
+        }
+        else $(this).attr("src",ifr_source+"?"+wmode);
+    });
+});
+  
+ </script>';
+ 
+
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
+$a->page['htmlhead'] .= '
+<script>
+
+ $(function() {
+	$(".oembed.photo img").aeImageResize({height: 400, width: 400});
+  });
+
+$("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/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index 10d395316..123834064 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -1,13 +1,8 @@
 {{ if $item.indent }}{{ else }}
 <div class="wall-item-decor">
-	<span class="icon star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
-	{{ 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 }}
-
-
-
 <div class="wall-item-container $item.indent">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
@@ -32,14 +27,12 @@
 			</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">
-			{{ 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-tags">
 			{{ for $item.tags as $tag }}
@@ -52,9 +45,10 @@
 
 		</div>
 		<div class="wall-item-actions">
-			<div class="wall-item-location">$item.location&nbsp;</div>
+
 			<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>
@@ -62,13 +56,22 @@
 						
 			{{ 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 }}		
-			
+			{{ endif }}	
+
+
 			{{ if $item.star }}
-				<a href="#" id="star-$item.id" class="icon star" onclick="dostar($item.id); return false;"  class="$item.star.classdo" title="$item.star.do">$item.star.do</a>
-				<a href="#" id="unstar-$item.id" class="icon unstarred" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
-				<a href="#" id="tagger-$item.id" class="icon tagged" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
-			{{ endif }}			
+				<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>
 			
@@ -82,7 +85,7 @@
 					<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">
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
new file mode 100644
index 000000000..bee75ad99
--- /dev/null
+++ b/view/theme/diabook/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/dispy-dark/comment_item.tpl b/view/theme/dispy-dark/comment_item.tpl
new file mode 100644
index 000000000..adf2772af
--- /dev/null
+++ b/view/theme/dispy-dark/comment_item.tpl
@@ -0,0 +1,36 @@
+		<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 }}
+                <div class="qcomment-wrapper">
+					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);">
+					<option value=""></option>
+				{{ for $qcomment as $qc }}
+					<option value="$qc">$qc</option>
+				{{ endfor }}
+					</select>
+				</div>
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;">
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl
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/connect.png b/view/theme/dispy-dark/connect.png
new file mode 100644
index 000000000..b76fc13dc
--- /dev/null
+++ b/view/theme/dispy-dark/connect.png
diff --git a/view/theme/dispy-dark/contact_template.tpl b/view/theme/dispy-dark/contact_template.tpl
new file mode 100644
index 000000000..04968bd07
--- /dev/null
+++ b/view/theme/dispy-dark/contact_template.tpl
@@ -0,0 +1,30 @@
+
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
+	<div class="contact-entry-photo-wrapper">
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
+		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
+		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)">
+
+			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
+
+			{{ if $contact.photo_menu }}
+			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
+                    <ul>
+                        $contact.photo_menu
+                    </ul>
+                </div>
+			{{ endif }}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+{{ if $contact.alt_text }}<div class="contact-entry-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
+	<div class="contact-entry-details" id="contact-entry-url-$contact.id" >
+		<a href="$contact.itemurl" title="$contact.itemurl">Profile URL</a></div>
+	<div class="contact-entry-details" id="contact-entry-network-$contact.id" >$contact.network</div>
+
+	<div class="contact-entry-end" ></div>
+</div>
+
diff --git a/view/theme/dispy-dark/conversation.tpl b/view/theme/dispy-dark/conversation.tpl
new file mode 100644
index 000000000..41b6aeadf
--- /dev/null
+++ b/view/theme/dispy-dark/conversation.tpl
@@ -0,0 +1,23 @@
+{{ for $threads as $thread }}
+<div id="tread-wrapper-$thread.id" class="tread-wrapper">
+	{{ for $thread.items as $item }}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
+			</div>
+			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
+		{{endif}}
+		{{if $item.comment_lastcollapsed}}</div>{{endif}}
+		
+		{{ inc $item.template }}{{ endinc }}
+		
+		
+	{{ endfor }}
+</div>
+{{ endfor }}
+
+{{ if $dropping }}
+<div class="delete-checked">
+<a href="#" onclick="deleteCheckedItems();return false;"><span class="icon delete"></span><span class="s22 text">$dropping</span></a>
+</div>
+{{ endif }}
diff --git a/view/theme/dispy-dark/default.php b/view/theme/dispy-dark/default.php
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/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/loozah/group_side.tpl b/view/theme/dispy-dark/group_side.tpl
index a1fc70a22..10ecec2e8 100755..100644
--- a/view/theme/loozah/group_side.tpl
+++ b/view/theme/dispy-dark/group_side.tpl
@@ -1,27 +1,29 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
+<div id="group-sidebar" class="widget">
+<h3 class="label">$title</h3>
 
 <div id="sidebar-group-list">
 	<ul id="sidebar-group-ul">
 		{{ for $groups as $group }}
 			<li class="sidebar-group-li">
+				<a href="$group.href" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}">$group.text</a>
+				{{ if $group.edit }}
+					<a 
+                        class="groupsideedit"
+                        href="$group.edit.href" title="$group.edit.title"><span class="icon small-pencil"></span></a>
+				{{ endif }}
 				{{ if $group.cid }}
 					<input type="checkbox" 
 						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
 						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
 						{{ if $group.ismember }}checked="checked"{{ endif }}
 					/>
-				{{ endif }}			
-				{{ 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>
+  <a href="group/new" title="$createtext"><span class="action text add">$createtext</span></a>
   </div>
 </div>
 
diff --git a/view/theme/dispy-dark/head.tpl b/view/theme/dispy-dark/head.tpl
new file mode 100644
index 000000000..cd6f5ca97
--- /dev/null
+++ b/view/theme/dispy-dark/head.tpl
@@ -0,0 +1,98 @@
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<base href="$baseurl/" />
+<meta name="generator" content="$generator" />
+<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
+
+<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
+
+<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
+<link rel="search"
+         href="$baseurl/opensearch" 
+         type="application/opensearchdescription+xml" 
+         title="Search in Friendica" />
+
+<!--[if IE]>
+<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
+<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
+<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js" ></script>
+<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>
+<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
+<script type="text/javascript" src="$baseurl/js/acl.js" ></script>
+<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script>
+<script type="text/javascript" src="$baseurl/js/main.js" ></script>
+<script>
+
+	var updateInterval = $update_interval;
+
+	function confirmDelete() { return confirm("$delitem"); }
+	function commentOpen(obj,id) {
+		if(obj.value == '$comment') {
+			obj.value = '';
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+		}
+	}
+	function commentClose(obj,id) {
+		if(obj.value == '') {
+			obj.value = '$comment';
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
+			closeMenu("comment-edit-submit-wrapper-" + id);
+		}
+	}
+
+
+	function commentInsert(obj,id) {
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == '$comment') {
+			tmpStr = '';
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+		}
+		var ins = $(obj).html();
+		ins = ins.replace('&lt;','<');
+		ins = ins.replace('&gt;','>');
+		ins = ins.replace('&amp;','&');
+		ins = ins.replace('&quot;','"');
+		$("#comment-edit-text-" + id).val(tmpStr + ins);
+	}
+
+	function qCommentInsert(obj,id) {
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == '$comment') {
+			tmpStr = '';
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+		}
+		var ins = $(obj).val();
+		ins = ins.replace('&lt;','<');
+		ins = ins.replace('&gt;','>');
+		ins = ins.replace('&amp;','&');
+		ins = ins.replace('&quot;','"');
+		$("#comment-edit-text-" + id).val(tmpStr + ins);
+	}
+
+	function showHideComments(id) {
+		if( $('#collapsed-comments-' + id).is(':visible')) {
+			$('#collapsed-comments-' + id).hide();
+			$('#hide-comments-' + id).html('$showmore');
+		}
+		else {
+			$('#collapsed-comments-' + id).show();
+			$('#hide-comments-' + id).html('$showfewer');
+		}
+	}
+
+
+</script>
+
+
diff --git a/view/theme/dispy-dark/icons.png b/view/theme/dispy-dark/icons.png
new file mode 100644
index 000000000..203568135
--- /dev/null
+++ b/view/theme/dispy-dark/icons.png
diff --git a/view/theme/dispy-dark/icons.svg b/view/theme/dispy-dark/icons.svg
new file mode 100644
index 000000000..2c4b3abd3
--- /dev/null
+++ b/view/theme/dispy-dark/icons.svg
@@ -0,0 +1,2113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="250"
+   height="200"
+   id="svg3403"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   sodipodi:docname="icons.svg"
+   inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy-dark/icons.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs3405">
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter4064">
+      <feBlend
+         inkscape:collect="always"
+         mode="lighten"
+         in2="BackgroundImage"
+         id="feBlend4066" />
+    </filter>
+    <inkscape:path-effect
+       effect="gears"
+       id="path-effect4050"
+       is_visible="true"
+       teeth="10"
+       phi="10" />
+    <inkscape:path-effect
+       effect="gears"
+       id="path-effect3436"
+       is_visible="true"
+       teeth="10"
+       phi="10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#454545"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.9403009"
+     inkscape:cx="95.950174"
+     inkscape:cy="115.58345"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false"
+     inkscape:window-width="1065"
+     inkscape:window-height="742"
+     inkscape:window-x="40"
+     inkscape:window-y="50"
+     inkscape:window-maximized="0"
+     width="0px"
+     height="0px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4016"
+       empspacing="5"
+       visible="true"
+       enabled="false"
+       snapvisiblegridlinesonly="false"
+       spacingx="20px"
+       spacingy="20px"
+       dotted="false"
+       units="px"
+       originx="50px"
+       originy="200px" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid4018"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="false"
+       color="#ff0000"
+       opacity="0.1254902"
+       empcolor="#ff0000"
+       empopacity="0.25098039"
+       originy="200px"
+       spacingx="22px"
+       spacingy="22px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3408">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-852.36218)">
+    <rect
+       transform="matrix(1,0,0,0.84848485,44,217.14578)"
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons.png"
+       y="852.36218"
+       x="1.5883562e-17"
+       height="132"
+       width="44"
+       id="rect185"
+       style="fill:#2e2f2e;fill-opacity:1;stroke:none;display:inline" />
+    <rect
+       style="fill:#2e2f2e;fill-opacity:1;stroke:none;display:inline"
+       id="rect4007"
+       width="44"
+       height="132"
+       x="1.5883562e-17"
+       y="852.36218"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       transform="matrix(1,0,0,1.5151515,0,-439.09566)" />
+    <rect
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="417.14285"
+       height="44.285713"
+       width="44.285713"
+       id="rect4011"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       transform="matrix(0.43114968,0,0,0.43114968,-178.47604,867.63556)" />
+    <rect
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4021"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6"
+       transform="matrix(0.43114968,0,0,0.43114968,-201.41936,889.63556)" />
+    <rect
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect4029"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       transform="matrix(0.43114968,0,0,0.43114968,-201.41936,845.63556)" />
+    <rect
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect4070"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       transform="matrix(0.43114968,0,0,0.43114968,-201.41936,911.63556)" />
+    <rect
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       id="rect4108"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6"
+       transform="matrix(0.43114968,0,0,0.43114968,-201.41936,933.6356)" />
+    <rect
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect3147"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       transform="matrix(0.43114968,0,0,0.43114968,-201.41936,955.6356)" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-201.41936,1022.6356)"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       id="rect192"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6" />
+    <rect
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect194"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       transform="matrix(0.43114968,0,0,0.43114968,-157.41936,1022.6356)" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-157.41936,999.6356)"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       id="rect196"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6" />
+    <rect
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect202"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       transform="matrix(0.43114968,0,0,0.43114968,-157.41936,933.6356)" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-157.41936,977.6356)"
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect1024"
+       style="fill:#1a1a1a;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-201.41936,977.6356)"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       id="rect188"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6" />
+    <rect
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect190"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       transform="matrix(0.43114968,0,0,0.43114968,-201.41936,999.6356)" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-157.41936,955.6356)"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       id="rect200"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6" />
+    <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"
+       id="rect3820"
+       width="44.285713"
+       height="44.285713"
+       x="417.14285"
+       y="18.790752"
+       rx="6"
+       ry="6"
+       transform="matrix(0.43114968,0,0,0.43114968,-156.47604,867.63556)" />
+    <path
+       id="path3830"
+       d="m 449.12191,27.281249 c -2.07646,0 -3.76352,1.688406 -3.76352,3.766518 0,2.078113 1.68706,3.766518 3.76352,3.766518 2.07646,0 3.76351,-1.688405 3.76351,-3.766518 0,-2.078112 -1.68705,-3.766518 -3.76351,-3.766518 z m 0,7.533036 c -5.23267,0 -9.47459,5.783883 -9.47459,12.932589 0,0.201529 0.0196,0.406525 0.0264,0.605804 l 18.89654,0 c 0.007,-0.199279 0.0264,-0.404275 0.0264,-0.605804 0,-7.148706 -4.24192,-12.932589 -9.47459,-12.932589 z"
+       style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.43114968,0,0,0.43114968,-157.03951,867.63556)" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 431.26477,26.924106 c -2.07646,0 -3.76352,1.688406 -3.76352,3.766518 0,2.078113 1.68706,3.766518 3.76352,3.766518 2.07646,0 3.76351,-1.688405 3.76351,-3.766518 0,-2.078112 -1.68705,-3.766518 -3.76351,-3.766518 z m 0,7.533036 c -5.23267,0 -9.47459,5.783883 -9.47459,12.932589 0,0.201529 0.0196,0.406525 0.0264,0.605804 l 18.89654,0 c 0.007,-0.199279 0.0264,-0.404275 0.0264,-0.605804 0,-7.148706 -4.24192,-12.932589 -9.47459,-12.932589 z"
+       id="path3832"
+       transform="matrix(0.43114968,0,0,0.43114968,-157.03951,867.63556)" />
+    <path
+       style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 439.46875,29.78125 C 437.00319,29.78125 435,31.784443 435,34.25 c 0,2.465557 2.00319,4.46875 4.46875,4.46875 2.46556,0 4.46875,-2.003193 4.46875,-4.46875 0,-2.465557 -2.00319,-4.46875 -4.46875,-4.46875 z m 0,8.9375 c -6.2132,0 -11.25,6.862234 -11.25,15.34375 0,0.239102 0.0233,0.482318 0.0313,0.71875 l 22.4375,0 c 0.008,-0.236432 0.0313,-0.479648 0.0313,-0.71875 0,-8.481516 -5.0368,-15.34375 -11.25,-15.34375 z"
+       id="path3822"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.43114968,0,0,0.43114968,-157.03951,867.63556)" />
+    <rect
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect3837"
+       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"
+       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,889.63556)" />
+    <path
+       style="fill:none;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 477.97758,26.469174 c -3.64342,3.88426 -3.47037,9.984211 0.41389,13.627637 3.52011,3.301856 8.87059,3.441123 12.55302,0.54905 -0.17428,0.682501 0.0188,1.431563 0.57086,1.949383 l 13.7666,12.913032 c 0.80813,0.75802 2.06896,0.717682 2.82698,-0.09044 l 0.68414,-0.729357 c 0.75802,-0.808126 0.71768,-2.06896 -0.0904,-2.82698 l -13.7666,-12.913032 c -0.55205,-0.51782 -1.31192,-0.66264 -1.98188,-0.445086 2.65077,-3.859767 2.16978,-9.190402 -1.35033,-12.492258 -3.88426,-3.643426 -9.9828,-3.426204 -13.62623,0.458055 z"
+       id="path3839"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.43114968,0,0,0.43114968,-201.41936,889.63556)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3844"
+       sodipodi:cx="485.17856"
+       sodipodi:cy="33.612183"
+       sodipodi:rx="7.3214288"
+       sodipodi:ry="7.3214288"
+       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"
+       id="rect3995"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6"
+       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,845.63556)" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4003"
+       d="M 504.69787,28.735741 480.30214,53.131477"
+       style="fill:#333333;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.31938004"
+       transform="matrix(0.43114968,0,0,0.43114968,-201.41936,845.63556)" />
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.31938004"
+       d="M 504.69787,53.131473 480.30214,28.735746"
+       id="path4005"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.43114968,0,0,0.43114968,-201.41936,845.63556)" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 449.12191,27.281249 c -2.07646,0 -3.76352,1.688406 -3.76352,3.766518 0,2.078113 1.68706,3.766518 3.76352,3.766518 2.07646,0 3.76351,-1.688405 3.76351,-3.766518 0,-2.078112 -1.68705,-3.766518 -3.76351,-3.766518 z m 0,7.533036 c -5.23267,0 -9.47459,5.783883 -9.47459,12.932589 0,0.201529 0.0196,0.406525 0.0264,0.605804 l 18.89654,0 c 0.007,-0.199279 0.0264,-0.404275 0.0264,-0.605804 0,-7.148706 -4.24192,-12.932589 -9.47459,-12.932589 z"
+       id="path4013"
+       transform="matrix(0.43114968,0,0,0.43114968,-178.91257,867.63556)" />
+    <path
+       id="path4015"
+       d="m 431.26477,26.924106 c -2.07646,0 -3.76352,1.688406 -3.76352,3.766518 0,2.078113 1.68706,3.766518 3.76352,3.766518 2.07646,0 3.76351,-1.688405 3.76351,-3.766518 0,-2.078112 -1.68705,-3.766518 -3.76351,-3.766518 z m 0,7.533036 c -5.23267,0 -9.47459,5.783883 -9.47459,12.932589 0,0.201529 0.0196,0.406525 0.0264,0.605804 l 18.89654,0 c 0.007,-0.199279 0.0264,-0.404275 0.0264,-0.605804 0,-7.148706 -4.24192,-12.932589 -9.47459,-12.932589 z"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.43114968,0,0,0.43114968,-178.91257,867.63556)" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4017"
+       d="M 439.46875,29.78125 C 437.00319,29.78125 435,31.784443 435,34.25 c 0,2.465557 2.00319,4.46875 4.46875,4.46875 2.46556,0 4.46875,-2.003193 4.46875,-4.46875 0,-2.465557 -2.00319,-4.46875 -4.46875,-4.46875 z m 0,8.9375 c -6.2132,0 -11.25,6.862234 -11.25,15.34375 0,0.239102 0.0233,0.482318 0.0313,0.71875 l 22.4375,0 c 0.008,-0.236432 0.0313,-0.479648 0.0313,-0.71875 0,-8.481516 -5.0368,-15.34375 -11.25,-15.34375 z"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       transform="matrix(0.43114968,0,0,0.43114968,-178.91257,867.63556)" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4023"
+       d="m 477.97758,26.469174 c -3.64342,3.88426 -3.47037,9.984211 0.41389,13.627637 3.52011,3.301856 8.87059,3.441123 12.55302,0.54905 -0.17428,0.682501 0.0188,1.431563 0.57086,1.949383 l 13.7666,12.913032 c 0.80813,0.75802 2.06896,0.717682 2.82698,-0.09044 l 0.68414,-0.729357 c 0.75802,-0.808126 0.71768,-2.06896 -0.0904,-2.82698 l -13.7666,-12.913032 c -0.55205,-0.51782 -1.31192,-0.66264 -1.98188,-0.445086 2.65077,-3.859767 2.16978,-9.190402 -1.35033,-12.492258 -3.88426,-3.643426 -9.9828,-3.426204 -13.62623,0.458055 z"
+       style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       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 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"
+       sodipodi:cx="485.17856"
+       id="path4025"
+       style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.31938004"
+       d="M 504.69787,28.735741 480.30214,53.131477"
+       id="path4031"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,845.63556)" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4033"
+       d="M 504.69787,53.131473 480.30214,28.735746"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.31938004"
+       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,845.63556)" />
+    <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;filter:url(#filter4064)"
+       id="rect4042"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6"
+       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,911.63556)" />
+    <path
+       inkscape:original-d="M 484.55417,49.762303 492.5,40.933609 504.27158,48.879434"
+       inkscape:path-effect="#path-effect4050"
+       inkscape:connector-curvature="0"
+       id="path4048"
+       d="m 484.90604,52.679071 c 0,0 -0.72327,1.028211 -2.88202,1.697409 -0.63474,-0.494653 -1.23439,-1.034334 -1.79294,-1.613646 0.43889,-2.217071 1.3855,-3.044283 1.3855,-3.044283 l 2.04237,-1.648571 c -0.73879,-0.915258 -1.3342,-1.946011 -1.75793,-3.043257 l -2.44847,0.945549 c 0,0 -1.18951,0.40671 -3.32932,-0.320779 -0.22277,-0.773276 -0.39067,-1.56235 -0.50204,-2.359331 1.65823,-1.535673 2.91028,-1.648499 2.91028,-1.648499 l 2.62132,-0.133248 c -0.0597,-1.174706 0.0645,-2.358577 0.36658,-3.495332 l -2.53663,-0.674208 c 0,0 -1.20139,-0.37014 -2.50493,-2.216441 0.2743,-0.756533 0.60227,-1.4936 0.98062,-2.20383 2.24419,-0.267701 3.32343,0.376954 3.32343,0.376954 l 2.19901,1.432971 c 0.64217,-0.985455 1.43848,-1.870246 2.35108,-2.612309 l -1.65589,-2.03644 c 0,0 -0.75438,-1.005609 -0.72373,-3.265497 0.66659,-0.45082 1.36515,-0.854347 2.08871,-1.206542 1.97294,1.102524 2.46715,2.258424 2.46715,2.258424 l 0.93675,2.451844 c 1.09876,-0.419794 2.26306,-0.667544 3.43754,-0.731472 l -0.14265,-2.620822 c 0,0 -0.0192,-1.25697 1.3339,-3.067245 0.80426,0.02709 1.6066,0.111239 2.39899,0.251604 0.94809,2.051624 0.66849,3.277254 0.66849,3.277254 l -0.6833,2.534196 c 1.13566,0.306213 2.22322,0.790136 3.21097,1.428761 l 1.42508,-2.204138 c 0,0 0.72327,-1.028211 2.88202,-1.697409 0.63474,0.494653 1.23439,1.034334 1.79294,1.613646 -0.43889,2.217071 -1.3855,3.044283 -1.3855,3.044283 l -2.04237,1.648571 c 0.73879,0.915258 1.3342,1.946011 1.75793,3.043257 l 2.44847,-0.945549 c 0,0 1.18951,-0.40671 3.32932,0.320779 0.22277,0.773276 0.39067,1.56235 0.50204,2.359331 -1.65823,1.535673 -2.91028,1.648499 -2.91028,1.648499 l -2.62132,0.133248 c 0.0597,1.174706 -0.0645,2.358577 -0.36658,3.495332 l 2.53663,0.674208 c 0,0 1.20139,0.37014 2.50493,2.216441 -0.2743,0.756533 -0.60227,1.4936 -0.98062,2.20383 -2.24419,0.267701 -3.32343,-0.376954 -3.32343,-0.376954 l -2.19901,-1.432971 c -0.64217,0.985455 -1.43848,1.870246 -2.35108,2.612309 l 1.65589,2.03644 c 0,0 0.75438,1.005609 0.72373,3.265497 -0.66659,0.45082 -1.36515,0.854347 -2.08871,1.206542 -1.97294,-1.102524 -2.46715,-2.258424 -2.46715,-2.258424 l -0.93675,-2.451844 c -1.09876,0.419794 -2.26306,0.667544 -3.43754,0.731472 l 0.14265,2.620822 c 0,0 0.0192,1.25697 -1.3339,3.067245 -0.80426,-0.02709 -1.6066,-0.111239 -2.39899,-0.251604 -0.94809,-2.051624 -0.66849,-3.277254 -0.66849,-3.277254 l 0.6833,-2.534196 c -1.13566,-0.306213 -2.22322,-0.790136 -3.21097,-1.428761 l -1.42508,2.204138"
+       style="fill:#333333;fill-opacity:1;stroke:#e6e6e6;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter4064)"
+       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,911.63556)" />
+    <path
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#d3d7cf;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter4064)"
+       d="m 484.90604,52.679071 c 0,0 -0.72327,1.028211 -2.88202,1.697409 -0.63474,-0.494653 -1.23439,-1.034334 -1.79294,-1.613646 0.43889,-2.217071 1.3855,-3.044283 1.3855,-3.044283 l 2.04237,-1.648571 c -0.73879,-0.915258 -1.3342,-1.946011 -1.75793,-3.043257 l -2.44847,0.945549 c 0,0 -1.18951,0.40671 -3.32932,-0.320779 -0.22277,-0.773276 -0.39067,-1.56235 -0.50204,-2.359331 1.65823,-1.535673 2.91028,-1.648499 2.91028,-1.648499 l 2.62132,-0.133248 c -0.0597,-1.174706 0.0645,-2.358577 0.36658,-3.495332 l -2.53663,-0.674208 c 0,0 -1.20139,-0.37014 -2.50493,-2.216441 0.2743,-0.756533 0.60227,-1.4936 0.98062,-2.20383 2.24419,-0.267701 3.32343,0.376954 3.32343,0.376954 l 2.19901,1.432971 c 0.64217,-0.985455 1.43848,-1.870246 2.35108,-2.612309 l -1.65589,-2.03644 c 0,0 -0.75438,-1.005609 -0.72373,-3.265497 0.66659,-0.45082 1.36515,-0.854347 2.08871,-1.206542 1.97294,1.102524 2.46715,2.258424 2.46715,2.258424 l 0.93675,2.451844 c 1.09876,-0.419794 2.26306,-0.667544 3.43754,-0.731472 l -0.14265,-2.620822 c 0,0 -0.0192,-1.25697 1.3339,-3.067245 0.80426,0.02709 1.6066,0.111239 2.39899,0.251604 0.94809,2.051624 0.66849,3.277254 0.66849,3.277254 l -0.6833,2.534196 c 1.13566,0.306213 2.22322,0.790136 3.21097,1.428761 l 1.42508,-2.204138 c 0,0 0.72327,-1.028211 2.88202,-1.697409 0.63474,0.494653 1.23439,1.034334 1.79294,1.613646 -0.43889,2.217071 -1.3855,3.044283 -1.3855,3.044283 l -2.04237,1.648571 c 0.73879,0.915258 1.3342,1.946011 1.75793,3.043257 l 2.44847,-0.945549 c 0,0 1.18951,-0.40671 3.32932,0.320779 0.22277,0.773276 0.39067,1.56235 0.50204,2.359331 -1.65823,1.535673 -2.91028,1.648499 -2.91028,1.648499 l -2.62132,0.133248 c 0.0597,1.174706 -0.0645,2.358577 -0.36658,3.495332 l 2.53663,0.674208 c 0,0 1.20139,0.37014 2.50493,2.216441 -0.2743,0.756533 -0.60227,1.4936 -0.98062,2.20383 -2.24419,0.267701 -3.32343,-0.376954 -3.32343,-0.376954 l -2.19901,-1.432971 c -0.64217,0.985455 -1.43848,1.870246 -2.35108,2.612309 l 1.65589,2.03644 c 0,0 0.75438,1.005609 0.72373,3.265497 -0.66659,0.45082 -1.36515,0.854347 -2.08871,1.206542 -1.97294,-1.102524 -2.46715,-2.258424 -2.46715,-2.258424 l -0.93675,-2.451844 c -1.09876,0.419794 -2.26306,0.667544 -3.43754,0.731472 l 0.14265,2.620822 c 0,0 0.0192,1.25697 -1.3339,3.067245 -0.80426,-0.02709 -1.6066,-0.111239 -2.39899,-0.251604 -0.94809,-2.051624 -0.66849,-3.277254 -0.66849,-3.277254 l 0.6833,-2.534196 c -1.13566,-0.306213 -2.22322,-0.790136 -3.21097,-1.428761 l -1.42508,2.204138"
+       id="path4072"
+       inkscape:connector-curvature="0"
+       inkscape:path-effect="#path-effect4050"
+       inkscape:original-d="M 484.55417,49.762303 492.5,40.933609 504.27158,48.879434"
+       transform="matrix(0.43114968,0,0,0.43114968,-201.41936,911.63556)" />
+    <rect
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect4076"
+       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;filter:url(#filter4064)"
+       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,933.6356)" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3839-4"
+       transform="translate(-856.62503,901.37504)"
+       d="m 871.875,46.1875 c -1.86715,0.0095 -3.39179,1.39545 -3.65625,3.1875 -0.13267,-0.238038 -0.39472,-0.407705 -0.6875,-0.40625 L 860.21875,49 c -0.42864,0.0022 -0.75216,0.352585 -0.75,0.78125 l 0,0.375 c 0.002,0.428643 0.35273,0.783324 0.78125,0.78125 l 0.71875,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.04661 -0.0143,-0.115964 -0.0313,-0.15625 l 1.25,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.05736 -0.006,-0.140333 -0.0313,-0.1875 l 2.1875,0 c 0.29284,-0.0015 0.55725,-0.166865 0.6875,-0.40625 0.28274,1.789274 1.85161,3.165775 3.71875,3.15625 2.0603,-0.01052 3.69802,-1.720959 3.6875,-3.78125 -0.0105,-2.060291 -1.68969,-3.698024 -3.75,-3.6875 z"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.79446769;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;filter:url(#filter4064)" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;fill-opacity:1;stroke:#d3d7cf;stroke-width:0.794;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;filter:url(#filter4064)"
+       d="m 871.875,46.1875 c -1.86715,0.0095 -3.39179,1.39545 -3.65625,3.1875 -0.13267,-0.238038 -0.39472,-0.407705 -0.6875,-0.40625 L 860.21875,49 c -0.42864,0.0022 -0.75216,0.352585 -0.75,0.78125 l 0,0.375 c 0.002,0.428643 0.35273,0.783324 0.78125,0.78125 l 0.71875,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.04661 -0.0143,-0.115964 -0.0313,-0.15625 l 1.25,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.05736 -0.006,-0.140333 -0.0313,-0.1875 l 2.1875,0 c 0.29284,-0.0015 0.55725,-0.166865 0.6875,-0.40625 0.28274,1.789274 1.85161,3.165775 3.71875,3.15625 2.0603,-0.01052 3.69802,-1.720959 3.6875,-3.78125 -0.0105,-2.060291 -1.68969,-3.698024 -3.75,-3.6875 z"
+       transform="translate(-834.62503,901.37504)"
+       id="path4110" />
+    <path
+       transform="matrix(1.2829201,1.9081591,-1.9081591,1.2829201,-436.65386,-211.76762)"
+       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"
+       sodipodi:cx="559.67499"
+       id="path4002-3"
+       style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+       id="path4004-9"
+       sodipodi:cx="559.67499"
+       sodipodi:cy="21.754047"
+       sodipodi:rx="0.88388348"
+       sodipodi:ry="0.88388348"
+       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 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"
+       sodipodi:cx="559.67499"
+       id="path4006-4"
+       style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4010-56"
+       d="m 563.21055,31.653543 4.41942,-6.187185 -7.6014,-6.187184"
+       style="fill:none;stroke:#e6e6e6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-2.7897502,485.71067)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+       id="path4008-8"
+       sodipodi:cx="559.67499"
+       sodipodi:cy="21.754047"
+       sodipodi:rx="0.88388348"
+       sodipodi:ry="0.88388348"
+       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"
+       id="path4012-5"
+       d="m 567.45319,25.466358 7.6014,-4.065864"
+       style="fill:none;stroke:#e6e6e6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-2.7897502,485.71067)" />
+    <path
+       style="fill:none;stroke:#e6e6e6;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       d="m 218.00001,881.25007 -5.8125,0 0,9.1875 10.53125,0 0,-5.2187"
+       id="rect4432"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       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"
+       x="173.12502"
+       y="858.11218"
+       rx="2.9268293"
+       ry="2.9268293"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       sodipodi:type="arc"
+       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"
+       sodipodi:rx="2.6875"
+       sodipodi:ry="2.71875"
+       d="m 411.5,220.26843 c 0,1.50153 -1.20323,2.71875 -2.6875,2.71875 -1.48427,0 -2.6875,-1.21722 -2.6875,-2.71875 0,-1.50152 1.20323,-2.71875 2.6875,-2.71875 1.48427,0 2.6875,1.21723 2.6875,2.71875 z"
+       transform="matrix(1.1489362,0,0,1.1489362,-286.13697,609.51131)"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       d="m 242.44524,860.13287 c -0.98011,0 -1.77562,0.6006 -1.77562,1.3586 l 0,1.5632 c 0,0.7581 0.79551,1.3733 1.77562,1.3733 l 4.53349,0 c 0.98012,0 1.77562,-0.6152 1.77562,-1.3733 l 0,-1.5632 c 0,-0.758 -0.7955,-1.3586 -1.77562,-1.3586 l -4.53349,0 z m 0.41557,1.0372 3.70235,0 c 0.51967,0 0.94448,0.2879 0.94448,0.6574 l 0,0.8912 c 0,0.3695 -0.42481,0.672 -0.94448,0.672 l -3.70235,0 c -0.51966,0 -0.94447,-0.3025 -0.94447,-0.672 l 0,-0.8912 c 0,-0.3695 0.42481,-0.6574 0.94447,-0.6574 z"
+       id="rect4397-0"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4418-4"
+       d="m 232.97199,860.13287 c -0.98011,0 -1.77562,0.6006 -1.77562,1.3586 l 0,1.5632 c 0,0.7581 0.79551,1.3733 1.77562,1.3733 l 4.53349,0 c 0.98012,0 1.77562,-0.6152 1.77562,-1.3733 l 0,-1.5632 c 0,-0.758 -0.7955,-1.3586 -1.77562,-1.3586 l -4.53349,0 z m 0.41557,1.0372 3.70236,0 c 0.51966,0 0.94447,0.2879 0.94447,0.6574 l 0,0.8912 c 0,0.3695 -0.42481,0.672 -0.94447,0.672 l -3.70236,0 c -0.51966,0 -0.94447,-0.3025 -0.94447,-0.672 l 0,-0.8912 c 0,-0.3695 0.42481,-0.6574 0.94447,-0.6574 z"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4395-0"
+       width="6.7246785"
+       height="1.6362466"
+       x="236.7028"
+       y="861.57312"
+       rx="1.0135853"
+       ry="0.81812328"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <g
+       id="g1037">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:nodetypes="csccccscc"
+         inkscape:connector-curvature="0"
+         id="rect4428-4"
+         d="m 118.03127,895.15627 0,0.3125 c 0,1.2601 -0.0643,3.4345 -0.35937,5.75 l -1.5625,1e-4 c -0.80183,0.011 -1.64766,4.0737 -1.60938,8.0625 l 8.25,0 c -0.057,-5.5479 1.56902,-11.5211 1.75,-5.6563 0.21453,6.9525 1.74237,-5.1823 1.75,-8.4687 z"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         inkscape:connector-curvature="0"
+         id="path4440-4"
+         d="m 124.78127,905.73727 -1.9375,-0.063"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4442-9"
+         d="m 117.59377,901.20597 6.4375,0"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="908.11218"
+         x="115.28126"
+         height="0.375"
+         width="1.0625"
+         id="rect4446-9"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4448-3"
+         width="1.0625"
+         height="0.375"
+         x="115.34376"
+         y="906.51843" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="904.89343"
+         x="115.50001"
+         height="0.375"
+         width="1.0625"
+         id="rect4450-6"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4452-0"
+         width="1.0625"
+         height="0.375"
+         x="115.81251"
+         y="903.42468" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="902.17468"
+         x="116.21876"
+         height="0.375"
+         width="1.0625"
+         id="rect4454-5"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4456-0"
+         width="1.0625"
+         height="0.375"
+         x="118.50001"
+         y="900.17468" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="898.70593"
+         x="118.68751"
+         height="0.375"
+         width="1.0625"
+         id="rect4458-2"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4460-9"
+         width="1.0625"
+         height="0.375"
+         x="118.75001"
+         y="897.20593" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="895.79968"
+         x="118.75001"
+         height="0.375"
+         width="1.0625"
+         id="rect4462-4"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4464-3"
+         width="1.0625"
+         height="0.375"
+         x="120.84376"
+         y="908.11218" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="906.51843"
+         x="120.90627"
+         height="0.375"
+         width="1.0625"
+         id="rect4466-5"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4468-1"
+         width="1.0625"
+         height="0.375"
+         x="121.06252"
+         y="904.89343" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="903.42468"
+         x="121.37502"
+         height="0.375"
+         width="1.0625"
+         id="rect4470-7"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4472-4"
+         width="1.0625"
+         height="0.375"
+         x="121.78127"
+         y="902.17468" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="900.17468"
+         x="124.06252"
+         height="0.375"
+         width="1.0625"
+         id="rect4474-3"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4476-1"
+         width="1.0625"
+         height="0.375"
+         x="124.25002"
+         y="898.70593" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="897.20593"
+         x="124.31252"
+         height="0.375"
+         width="1.0625"
+         id="rect4478-4"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4480-6"
+         width="1.0625"
+         height="0.375"
+         x="124.31252"
+         y="895.79968" />
+    </g>
+    <path
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.35579938;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 310.75659,223.79453 c 0.76095,-0.8373 1.2453,-2.02269 1.2453,-3.35786 0,-1.33796 -0.48156,-2.54257 -1.2453,-3.38009"
+       id="path4491-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csc"
+       transform="matrix(0.92823291,-0.48059851,0.48059851,0.92823291,-312.89954,806.76727)" />
+    <path
+       sodipodi:nodetypes="csc"
+       inkscape:connector-curvature="0"
+       id="path4496-2"
+       d="m 311.49266,224.75938 c 1.00712,-1.10816 1.64816,-2.67702 1.64816,-4.44411 0,-1.77079 -0.63735,-3.36509 -1.64816,-4.47354"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.47089946;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       transform="matrix(0.92823291,-0.48059851,0.48059851,0.92823291,-312.89954,806.76727)" />
+    <path
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.62789989;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 312.78041,226.18348 c 1.3429,-1.47763 2.19766,-3.56956 2.19766,-5.9258 0,-2.36118 -0.84984,-4.48703 -2.19766,-5.96505"
+       id="path4498-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csc"
+       transform="matrix(0.92823291,-0.48059851,0.48059851,0.92823291,-312.89954,806.76727)" />
+    <path
+       style="fill:none;stroke:#e6e6e6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 309.34375,224.125 0,-7.375 -3.78125,2.07812 -3.4375,-0.10937 0,3.46875 3.4375,-0.125 z"
+       id="path4500-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc"
+       transform="matrix(0.92823291,-0.48059851,0.48059851,0.92823291,-312.89954,806.76727)" />
+    <g
+       id="g1373"
+       style="stroke:#e6e6e6">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         transform="translate(-224.73743,661.76263)"
+         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"
+         sodipodi:ry="7.4246211"
+         sodipodi:rx="7.4246211"
+         sodipodi:cy="220.62782"
+         sodipodi:cx="284.78726"
+         id="path4515-2"
+         style="fill:none;stroke:#e6e6e6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:nodetypes="csc"
+         inkscape:connector-curvature="0"
+         id="path4517-8"
+         d="m 53.15626,883.15627 c 1.94168,0.712 4.31843,1.1563 6.90625,1.1563 2.58782,0 4.96457,-0.4443 6.90625,-1.1563"
+         style="fill:none;stroke:#e6e6e6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#e6e6e6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
+         d="m 60.45665,888.82867 c 0.71191,-1.9416 1.15625,-4.3184 1.15625,-6.9062 0,-2.5878 -0.44434,-4.9646 -1.15625,-6.9063"
+         id="path4528-8"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="csc" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-size:3.72799897px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#e6e6e6;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       x="51.803352"
+       y="859.21899"
+       id="text4532-2"
+       sodipodi:linespacing="100%"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"><tspan
+         sodipodi:role="line"
+         id="tspan4534-8"
+         x="51.803352"
+         y="859.21899"
+         style="font-weight:bold;fill:#e6e6e6;-inkscape-font-specification:Liberation Sans Bold">Lorem Ip</tspan></text>
+    <path
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#e6e6e6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
+       d="m 52.25001,862.61227 15.25,0"
+       id="path4536-8"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4538-8"
+       d="m 52.25001,864.86227 15.25,0"
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#e6e6e6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#e6e6e6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
+       d="m 52.25001,867.11227 15.25,0"
+       id="path4540-6"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.82322329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       d="m 242.49116,907.21887 5.125,-5.125 -5.125,-5.0937"
+       id="rect4544-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path4549-8"
+       d="m 237.98183,907.21887 -5.125,-5.125 5.125,-5.0937"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.82322329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       transform="matrix(0.92307692,0.3846154,-0.3846154,0.92307692,5.144234,833.96249)"
+       d="m 98.48214,-19.375 6.43972,2.66742 2.66742,6.439723 -2.66742,6.4397218 -6.439721,2.6674201 -6.439722,-2.6674204 -2.66742,-6.4397225 2.667421,-6.439722 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="true"
+       sodipodi:arg2="-1.1780972"
+       sodipodi:arg1="-1.5707963"
+       sodipodi:r2="8.4139032"
+       sodipodi:r1="9.1071424"
+       sodipodi:cy="-10.267858"
+       sodipodi:cx="98.48214"
+       sodipodi:sides="8"
+       id="path4802"
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#e6e6e6"
+       sodipodi:type="star" />
+    <path
+       sodipodi:type="star"
+       style="fill:none;stroke:#333333;stroke-width:2.47171569;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path4804"
+       sodipodi:sides="8"
+       sodipodi:cx="98.48214"
+       sodipodi:cy="-10.267858"
+       sodipodi:r1="9.1071424"
+       sodipodi:r2="8.4139032"
+       sodipodi:arg1="-1.5707963"
+       sodipodi:arg2="-1.1780972"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 98.48214,-19.375 6.43972,2.66742 2.66742,6.439723 -2.66742,6.4397218 -6.439721,2.6674201 -6.439722,-2.6674204 -2.66742,-6.4397225 2.667421,-6.439722 z"
+       transform="matrix(0.74691191,0.31121331,-0.31121331,0.74691191,23.247023,839.38239)" />
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="rect4806"
+       d="m 53.26552,1056.9525 -5.5,6.2008 5.5,6.2009"
+       style="fill:none;stroke:#e6e6e6;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       transform="translate(49.48448,-140.79121)" />
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#e6e6e6;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m 67.781143,1069.3407 5.46875,-6.2009 -5.46875,-6.1736"
+       id="path4812"
+       transform="translate(49.48448,-140.79121)" />
+    <path
+       style="fill:#e6e6e6;fill-opacity:1;stroke:none;display:inline"
+       id="path4257"
+       d="m 115.39024,855.00555 c 0.0904,0.0266 0.18708,0.0371 0.27111,0.0797 0.24682,0.12501 0.80382,0.53514 1.00046,0.67918 0.72548,0.53142 1.43751,1.08068 2.14837,1.63134 1.22364,0.99003 2.36274,2.09287 3.41202,3.2665 0.43117,0.4822 1.01205,1.207 1.42675,1.7166 0.97898,1.2314 2.022,2.4234 2.86791,3.7533 0.20576,0.2994 0.39551,0.6797 0.65579,0.9028 -0.10862,-0.1107 -0.10877,-0.099 0.0344,-0.01 0.19118,0.1291 -1.63528,2.8328 -1.82646,2.7036 l 0,0 c -0.18814,-0.022 -0.0511,0 -0.37755,-0.1793 -0.55628,-0.365 -1.09599,-0.7525 -1.61517,-1.1691 -1.27322,-1.0021 -2.36476,-2.2048 -3.47982,-3.3749 -1.53016,-1.5621 -3.0115,-3.1717 -4.57958,-4.6966 -0.94249,-1.01074 -1.92636,-2.0326 -2.54392,-3.28422 -0.14292,-0.18424 2.46273,-2.20539 2.60565,-2.02115 z"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="fill:#e6e6e6;fill-opacity:1;stroke:none;display:inline"
+       id="path4259"
+       d="m 112.109,867.43007 c 0.0548,-0.091 0.10266,-0.1866 0.16432,-0.2731 0.23235,-0.3261 0.52565,-0.6137 0.79275,-0.9102 0.42229,-0.4689 0.38553,-0.4337 0.82852,-0.9537 1.44214,-1.6363 3.06836,-3.0981 4.69856,-4.5425 1.63203,-1.40989 3.17698,-2.9167 4.78859,-4.3486 0.46305,-0.4369 0.97793,-0.80137 1.52221,-1.12653 0.15824,-0.21119 3.14491,2.0267 2.98666,2.23789 l 0,0 c -0.2952,0.52243 -0.62275,1.02042 -1.01852,1.47475 -0.88192,1.11919 -1.78212,2.22369 -2.79371,3.23049 -0.29346,0.2921 -0.60222,0.5684 -0.90606,0.8497 -0.31321,0.2899 -0.63003,0.5759 -0.94504,0.8639 -1.67153,1.4209 -3.37366,2.8163 -5.22715,3.9963 -0.49876,0.3405 -0.57121,0.3777 -1.0203,0.7266 -0.39341,0.3057 -0.75974,0.6889 -1.26518,0.7962 -0.14292,0.1842 -2.74857,-1.8369 -2.60565,-2.0212 z"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 135.39024,855.00555 c 0.0904,0.027 0.18708,0.037 0.27111,0.08 0.24682,0.125 0.80382,0.5352 1.00046,0.6792 0.72548,0.5314 1.43751,1.0807 2.14837,1.6314 1.22364,0.99 2.36274,2.0928 3.41202,3.26652 0.43117,0.4822 1.01205,1.207 1.42675,1.7166 0.97898,1.2314 2.022,2.4234 2.86791,3.7533 0.20576,0.2994 0.39551,0.6797 0.65579,0.9028 -0.10862,-0.1107 -0.10877,-0.099 0.0344,-0.01 0.19118,0.1291 -1.63528,2.8328 -1.82646,2.7036 l 0,0 c -0.18814,-0.022 -0.0511,0 -0.37755,-0.1793 -0.55628,-0.365 -1.09599,-0.7525 -1.61517,-1.1691 -1.27322,-1.0021 -2.36476,-2.2048 -3.47982,-3.3749 -1.53016,-1.5621 -3.0115,-3.1717 -4.57958,-4.6966 -0.94249,-1.01082 -1.92636,-2.03262 -2.54392,-3.28432 -0.14292,-0.1842 2.46273,-2.2054 2.60565,-2.0211 z"
+       id="path4263"
+       style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 132.109,867.43017 c 0.0548,-0.091 0.10266,-0.1866 0.16432,-0.2731 0.23235,-0.3261 0.52565,-0.6137 0.79275,-0.9102 0.42229,-0.4689 0.38553,-0.4337 0.82852,-0.9537 1.44214,-1.6363 3.06836,-3.0981 4.69856,-4.5425 1.63203,-1.40992 3.17698,-2.91672 4.78859,-4.34862 0.46305,-0.4369 0.97793,-0.8014 1.52221,-1.1266 0.15824,-0.2112 3.14491,2.0267 2.98666,2.2379 l 0,0 c -0.2952,0.5224 -0.62275,1.0204 -1.01852,1.4748 -0.88192,1.11922 -1.78212,2.22372 -2.79371,3.23052 -0.29346,0.2921 -0.60222,0.5684 -0.90606,0.8497 -0.31321,0.2899 -0.63003,0.5759 -0.94504,0.8639 -1.67153,1.4209 -3.37366,2.8163 -5.22715,3.9963 -0.49876,0.3405 -0.57121,0.3777 -1.0203,0.7266 -0.39341,0.3057 -0.75974,0.6889 -1.26518,0.7962 -0.14292,0.1842 -2.74857,-1.8369 -2.60565,-2.0212 z"
+       id="path4265"
+       style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m -44.467884,1107.2152 0,17.7252 1.161165,3.7983 c 1.200046,4.2782 1.065706,4.1105 2.322331,0 l 1.161165,-3.7983 0,-17.7252 z"
+       id="path4269"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc"
+       transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,294.0656)" />
+    <path
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m -44.467884,1124.9404 4.644661,0"
+       id="path4271"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,294.0656)" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4275"
+       d="m -42.239747,1107.2336 0,17.6813"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,294.0656)" />
+    <path
+       style="fill:#e6e6e6;stroke:#e6e6e6;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z"
+       id="path4279"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,294.0656)" />
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#e6e6e6"
+       id="rect4281"
+       width="5.1800866"
+       height="1.8614606"
+       x="-44.73621"
+       y="1105.3309"
+       rx="0.37616169"
+       ry="0.42804927"
+       transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,294.0656)" />
+    <rect
+       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"
+       x="174.89275"
+       y="859.06403"
+       rx="1"
+       ry="1"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="fill:none;stroke:#e6e6e6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+       d="m 214.75589,862.65317 c 3.31942,-0.632 4.06019,-2.1721 5.3033,-4.08897 0.42304,-0.6524 -0.64726,-2.63586 0,-3.13491 0.10703,-0.0825 0.93192,0 1.06066,0 2.52315,0 1.41421,3.50161 1.41421,4.77048 0,0.2317 -0.47723,0.6815 -0.17677,0.6815 2.44972,0 2.94209,0.3603 4.41942,1.4993 0.0697,0.054 0.31741,3.8443 0.17677,3.9527 -0.26074,0.201 -0.49042,0.5145 -0.7071,0.6815 -0.13627,0.105 0.38563,0.7684 0.17677,1.0904 -0.17664,0.2724 -0.85358,0.8061 -1.23743,0.9541 -0.36233,0.1398 -0.89015,0 -1.23744,0.1363 -1.96875,0.759 -2.1166,-0.9523 -3.18198,-1.363 -0.34866,-0.1344 -0.63592,-0.1088 -1.06066,-0.2726 -0.99671,-0.3842 -3.88909,0.6704 -3.88909,-0.2726 0,-1.2852 -0.2556,-3.5996 -1.06066,-4.6342 z"
+       id="path4292"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4294"
+       d="m 205.42921,862.12677 c -3.31942,0.632 -4.06019,2.1721 -5.3033,4.089 -0.42304,0.6524 0.64726,2.6358 0,3.1349 -0.10703,0.082 -0.93192,0 -1.06066,0 -2.52315,0 -1.41421,-3.5016 -1.41421,-4.7705 0,-0.2317 0.47723,-0.6815 0.17677,-0.6815 -2.44972,0 -2.94209,-0.3603 -4.41942,-1.4993 -0.0697,-0.054 -0.31741,-3.84428 -0.17677,-3.95268 0.26074,-0.201 0.49042,-0.5145 0.7071,-0.6815 0.13627,-0.105 -0.38563,-0.7684 -0.17677,-1.0904 0.17664,-0.2724 0.85358,-0.8061 1.23743,-0.9541 0.36233,-0.1398 0.89015,0 1.23744,-0.1363 1.96875,-0.759 2.1166,0.9523 3.18198,1.363 0.34866,0.1344 0.63592,0.1088 1.06066,0.2726 0.99671,0.3842 3.88909,-0.6704 3.88909,0.2726 0,1.2852 0.2556,3.59958 1.06066,4.63418 z"
+       style="fill:none;stroke:#e6e6e6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <g
+       id="g4683"
+       style="stroke:#808080">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:type="arc"
+         style="fill:none;stroke:#808080;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="path4298"
+         sodipodi:cx="284.78726"
+         sodipodi:cy="220.62782"
+         sodipodi:rx="7.4246211"
+         sodipodi:ry="7.4246211"
+         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"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#808080;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
+         d="m 73.15626,883.15627 c 1.94168,0.712 4.31843,1.1563 6.90625,1.1563 2.58782,0 4.96457,-0.4443 6.90625,-1.1563"
+         id="path4300"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="csc" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:nodetypes="csc"
+         inkscape:connector-curvature="0"
+         id="path4302"
+         d="m 80.45665,888.82867 c 0.71191,-1.9416 1.15625,-4.3184 1.15625,-6.9062 0,-2.5878 -0.44434,-4.9646 -1.15625,-6.9063"
+         style="fill:none;stroke:#808080;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline" />
+    </g>
+    <g
+       id="g277"
+       style="stroke:#e6e6e6">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:type="arc"
+         style="fill:none;stroke:#e6e6e6;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="path4306"
+         sodipodi:cx="284.78726"
+         sodipodi:cy="220.62782"
+         sodipodi:rx="7.4246211"
+         sodipodi:ry="7.4246211"
+         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(-184.73743,661.76263)" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         inkscape:connector-curvature="0"
+         id="path4308"
+         d="m 94.285536,887.89997 11.048544,-11.0485"
+         style="fill:none;stroke:#e6e6e6;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+    </g>
+    <rect
+       style="fill:#e6e6e6;stroke:none;display:inline"
+       id="rect4310"
+       width="3.3587573"
+       height="12.020815"
+       x="115.93771"
+       y="876.12292"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       y="876.12292"
+       x="120.53392"
+       height="12.020815"
+       width="3.3587573"
+       id="rect4312"
+       style="fill:#e6e6e6;stroke:none;display:inline"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="fill:#e6e6e6;stroke:none;display:inline"
+       d="m 134.32248,876.12297 11.31371,6.0104 -11.31371,6.0104 z"
+       id="rect4314"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       sodipodi:nodetypes="ccccccc"
+       inkscape:connector-curvature="0"
+       id="path4319"
+       d="m -44.467884,1107.2152 0,17.7252 1.161165,3.7983 c 1.200046,4.2782 1.065706,4.1105 2.322331,0 l 1.161165,-3.7983 0,-17.7252 z"
+       style="fill:none;stroke:#999999;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4321"
+       d="m -44.467884,1124.9404 4.644661,0"
+       style="fill:none;stroke:#999999;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" />
+    <path
+       style="fill:none;stroke:#999999;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m -42.239747,1107.2336 0,17.6813"
+       id="path4323"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" />
+    <path
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       id="path4325"
+       d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z"
+       style="fill:#999999;stroke:#999999;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" />
+    <rect
+       ry="0.42804927"
+       rx="0.37616169"
+       y="1105.3309"
+       x="-44.73621"
+       height="1.8614606"
+       width="5.1800866"
+       id="rect4327"
+       style="fill:#999999;fill-opacity:1;stroke:#999999"
+       transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" />
+    <path
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m -44.467884,1107.2152 0,17.7252 1.161165,3.7983 c 1.200046,4.2782 1.065706,4.1105 2.322331,0 l 1.161165,-3.7983 0,-17.7252 z"
+       id="path4331"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc"
+       transform="matrix(0.24508333,0.24508333,-0.24508333,0.24508333,461.00011,612.37085)" />
+    <path
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m -44.467884,1124.9404 4.644661,0"
+       id="path4333"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.24508333,0.24508333,-0.24508333,0.24508333,461.00011,612.37085)" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4335"
+       d="m -42.239747,1107.2336 0,17.6813"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       transform="matrix(0.24508333,0.24508333,-0.24508333,0.24508333,461.00011,612.37085)" />
+    <path
+       style="fill:#e6e6e6;stroke:#e6e6e6;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z"
+       id="path4337"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       transform="matrix(0.24508333,0.24508333,-0.24508333,0.24508333,461.00011,612.37085)" />
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#e6e6e6"
+       id="rect4339"
+       width="5.1800866"
+       height="1.8614606"
+       x="-44.73621"
+       y="1105.3309"
+       rx="0.37616169"
+       ry="0.42804927"
+       transform="matrix(0.24508333,0.24508333,-0.24508333,0.24508333,461.00011,612.37085)" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 264.62704,45.67985 56.31152,-101.021534 0.2677,36.946034 118.51291,-0.267671 c 21.1765,-2.244605 39.74272,-10.852596 53.18801,-27.040291 C 449.99593,42.074998 437.6363,104.18491 348.60347,104.22236 l -27.39721,0 -0.2677,41.05114 -56.31152,-99.59365 z M 128.9798,105.11479 C 65.618201,85.84639 36.055796,7.7860213 7.07577,-47.220709 c 13.282679,12.076484 38.139773,29.363022 52.577167,29.364467 27.689982,0.06456 55.380063,0.116317 83.070083,0.174562 l 83.88712,0 -0.26776,122.43949 -0.26771,0.35698 -97.09487,0 z M 2.5,-79.206629 42.995596,-161.8012 3.5060915,-183.49253 l 118.3343785,0 57.2039,103.877161 -38.79429,-23.228801 c -12.44295,26.27544 -24.88589,52.550878 -37.32884,78.826316 C 88.601045,-24.268303 74.280847,-24.518751 59.960649,-24.769199 32.037317,-31.279427 12.61125,-53.254123 2.5,-79.206629 z m 395.45406,53.939396 -52.29561,-96.380927 105.66215,-63.98618 51.13531,102.449252 c 1.54832,24.517706 -38.03694,58.635841 -62.6066,58.370427 l -41.89525,-0.452572 z M 88.64259,-250.78088 l 53.98405,-80.90589 c 52.35957,-19.50079 82.68955,22.59846 101.8318,49.13587 l -50.86768,97.63029 -104.94817,-65.86027 z m 204.54178,43.54987 c -10.85783,-25.59753 -25.36515,-54.87764 -43.50654,-80.336 -16.24176,-22.7925 -35.86597,-42.67852 -50.7326,-51.5631 l 136.53974,-0.26767 c 24.52088,2.20137 36.43539,16.49668 49.43976,36.05358 l 19.63307,34.53651 30.34224,-19.3654 -57.11457,101.73554 -123.15347,0.26768 38.55237,-21.06114 z"
+       style="fill:#ececec;fill-opacity:1"
+       id="path11522"
+       transform="matrix(0.03334717,0,0,0.03334717,191.57984,885.59897)" />
+    <path
+       style="fill:none;stroke:#e6e6e6;display:inline"
+       d="m 219.92452,876.86347 1.33532,1.5307 -5.05101,4.4063 4.00584,4.592 5.05101,-4.4063 1.29423,1.4837 1.19091,-7.757 z"
+       id="rect4425"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#e6e6e6;display:inline"
+       id="rect4564-9"
+       width="10.935946"
+       height="7.925663"
+       x="71.833412"
+       y="900.66992"
+       rx="1.9019035"
+       ry="2.3056474"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.69802254;display:inline"
+       id="rect4566-9"
+       width="7.7661061"
+       height="7.5413885"
+       x="73.447395"
+       y="896.3468"
+       rx="1.9019035"
+       ry="2.3056474"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       ry="2.3056474"
+       rx="1.9019035"
+       y="900.66992"
+       x="92.208412"
+       height="7.925663"
+       width="10.935946"
+       id="rect4506"
+       style="fill:#e6e6e6;fill-opacity:1;stroke:#e6e6e6;display:inline"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.69802254;display:inline"
+       d="m 108.78126,899.75007 0,-1.0938 c 0,-1.2773 -0.8526,-2.3124 -1.90625,-2.3124 l -3.96875,0 c -1.05366,0 -1.90625,1.0351 -1.90625,2.3124 l 0,2.9376"
+       id="rect4508"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssssc"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <g
+       id="g1060">
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         ry="2.9268293"
+         rx="2.9268293"
+         y="892.60608"
+         x="150.24391"
+         height="19.512196"
+         width="19.512196"
+         id="rect4514"
+         style="fill:#1a1a1a;stroke:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:#eeeeec;fill-opacity:1;stroke:none;display:inline"
+         id="rect4518"
+         width="10.935946"
+         height="7.925663"
+         x="151.83342"
+         y="900.66992"
+         rx="1.9019035"
+         ry="2.3056474" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#eeeeec;stroke-width:0.69802254;display:inline"
+         id="rect4520"
+         width="7.7661061"
+         height="7.5413885"
+         x="153.4474"
+         y="896.3468"
+         rx="1.9019035"
+         ry="2.3056474" />
+    </g>
+    <g
+       id="g1065">
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:#1a1a1a;stroke:none;display:inline"
+         id="rect4516"
+         width="19.512196"
+         height="19.512196"
+         x="170.24391"
+         y="892.60608"
+         rx="2.9268293"
+         ry="2.9268293" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         ry="2.3056474"
+         rx="1.9019035"
+         y="900.66992"
+         x="172.20842"
+         height="7.925663"
+         width="10.935946"
+         id="rect4522"
+         style="fill:#eeeeec;fill-opacity:1;stroke:none;display:inline" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#eeeeec;stroke-width:0.69802254;display:inline"
+         d="m 188.78127,899.75007 0,-1.0938 c 0,-1.2773 -0.85259,-2.3124 -1.90625,-2.3124 l -3.96875,0 c -1.05365,0 -1.90625,1.0351 -1.90625,2.3124 l 0,2.9376"
+         id="path4524"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cssssc" />
+    </g>
+    <path
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       d="m 61.2575,895.73577 c -0.85405,0.9453 -1.14575,2.2161 -0.88721,3.3884 l -8.17918,8.1791 c -0.14244,0.1425 -0.12201,0.3935 0.0507,0.5661 l 2.21807,2.2181 c 0.17268,0.1727 0.42791,0.1974 0.57035,0.055 l 8.13693,-8.1369 c 1.26093,0.3161 2.65155,-0.016 3.63762,-1.0013 0.66189,-0.6619 1.02334,-1.5095 1.09849,-2.3744 l -2.11666,2.1167 -3.2405,-0.8746 -0.87454,-3.2405 2.14201,-2.1419 c -0.88104,0.066 -1.74292,0.4331 -2.41663,1.1068 -0.0467,0.047 -0.0968,0.09 -0.13942,0.1395 z"
+       id="path4529"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsssscscccccsc"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.80000001;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
+       d="m 201.14016,895.80807 -8.25003,8.25 -0.94202,3.5156 2.58822,2.5882 3.10935,-0.8332 10.50754,-10.5075 -2e-5,-2.3881 -1.69404,-1.694 -1.94401,0 -9.97205,9.972 3e-5,1.972 0.61101,0.611 1.73597,0 9.36804,-9.368"
+       id="path3395"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccc"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       style="fill:#e6e6e6;stroke:none;display:inline"
+       id="rect3397"
+       width="19.512196"
+       height="19.512196"
+       x="210.24391"
+       y="892.60608"
+       rx="2.9268293"
+       ry="2.9268293"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="fill:none;stroke:#1a1a1a;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       d="m 214.67284,895.14537 c 7.11789,-1.5098 3.04383,2.9586 9.72807,1.6024 0.48786,-0.099 0.94287,0.3982 0.94287,0.8928 0,0 0,6.7482 0,6.9956 0,0.2473 -0.31338,0.7228 -0.94287,0.8928 -6.70194,1.3208 -2.58353,-3.1887 -9.72807,-1.6024 -0.39933,0.17 -0.94286,-0.3982 -0.94286,-0.8928 l 0,-6.9955 c 0,-0.4947 0.45501,-0.776 0.94286,-0.8929 z"
+       id="rect3409"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccscccssc"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       style="fill:none;stroke:#1a1a1a;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       id="rect4190"
+       width="1.125"
+       height="16.3125"
+       x="212.62502"
+       y="894.73718"
+       ry="0.40000001"
+       rx="0.40000001"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       transform="translate(-224.73743,701.76263)"
+       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"
+       sodipodi:ry="7.4246211"
+       sodipodi:rx="7.4246211"
+       sodipodi:cy="220.62782"
+       sodipodi:cx="284.78726"
+       id="path4020"
+       style="fill:none;stroke:#e6e6e6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ececec;fill-opacity:1;stroke:#e6e6e6;stroke-width:1.62554049;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="path4022"
+       sodipodi:cx="284.78726"
+       sodipodi:cy="220.62782"
+       sodipodi:rx="7.4246211"
+       sodipodi:ry="7.4246211"
+       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="matrix(0.61517998,0,0,0.61517998,-115.14559,786.66463)"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       sodipodi:type="arc"
+       style="fill:none;stroke:#e6e6e6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="path4024"
+       sodipodi:cx="284.78726"
+       sodipodi:cy="220.62782"
+       sodipodi:rx="7.4246211"
+       sodipodi:ry="7.4246211"
+       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,701.76269)" />
+    <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;filter:url(#filter4064)"
+       id="rect3141"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6"
+       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,955.6356)" />
+    <text
+       xml:space="preserve"
+       style="font-size:17.09149551px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#f2f2f2;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans Bold"
+       x="5.6234956"
+       y="979.64215"
+       id="text3151"
+       sodipodi:linespacing="100%"><tspan
+         sodipodi:role="line"
+         id="tspan3153"
+         x="5.6234956"
+         y="979.64215">?</tspan></text>
+    <text
+       sodipodi:linespacing="100%"
+       id="text3155"
+       y="979.64215"
+       x="27.623495"
+       style="font-size:17.09149551px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#d3d7cf;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans Bold"
+       xml:space="preserve"><tspan
+         y="979.64215"
+         x="27.623495"
+         id="tspan3157"
+         sodipodi:role="line">?</tspan></text>
+    <path
+       sodipodi:type="star"
+       style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path4061"
+       sodipodi:sides="5"
+       sodipodi:cx="133.6317"
+       sodipodi:cy="61.950726"
+       sodipodi:r1="8.4750214"
+       sodipodi:r2="4.2375107"
+       sodipodi:arg1="0.97074611"
+       sodipodi:arg2="1.5990646"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 138.41741,68.945222 -4.90548,-2.758679 -5.05353,2.47708 1.10779,-5.517867 -3.91747,-4.040728 5.59012,-0.651551 2.6324,-4.974387 2.34711,5.115187 5.54438,0.966388 -4.13954,3.812909 z"
+       transform="matrix(0.86880929,0,0,0.9052037,23.373259,866.40571)"
+       inkscape:transform-center-x="-0.064310184"
+       inkscape:transform-center-y="-0.6685783" />
+    <path
+       inkscape:transform-center-y="-0.6685783"
+       inkscape:transform-center-x="-0.064310184"
+       transform="matrix(0.86880929,0,0,0.9052037,43.373259,866.40571)"
+       d="m 138.41741,68.945222 -4.90548,-2.758679 -5.05353,2.47708 1.10779,-5.517867 -3.91747,-4.040728 5.59012,-0.651551 2.6324,-4.974387 2.34711,5.115187 5.54438,0.966388 -4.13954,3.812909 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="false"
+       sodipodi:arg2="1.5990646"
+       sodipodi:arg1="0.97074611"
+       sodipodi:r2="4.2375107"
+       sodipodi:r1="8.4750214"
+       sodipodi:cy="61.950726"
+       sodipodi:cx="133.6317"
+       sodipodi:sides="5"
+       id="path4063"
+       style="fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:1.19979274;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       sodipodi:type="star" />
+    <path
+       transform="matrix(0.83907455,0,0,0.82021694,132.45839,876.4664)"
+       inkscape:connector-curvature="0"
+       id="path4152"
+       d="m 53.921057,63.979016 -5.615027,-6.233401 9.206725,-9.241692 5.744016,0.08696 -0.101757,6.527264 z"
+       style="fill:#1a1a1a;fill-opacity:1"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       id="path4166"
+       transform="matrix(0.83907455,0,0,0.82021694,136.85379,871.82606)"
+       style="fill:#e6e6e6;fill-opacity:1"
+       d="m 54.67642,55.699012 2.077304,-0.01567 -0.06764,2.127228 -2.053363,0.03612 z m 3.043854,-0.97892 -5.97358,0.0021 -8.473421,8.656992 5.643707,5.967988 8.731922,-8.826384 z m 1.047484,5.977035 -9.907739,10.059911 -6.759792,-7.448518 9.288198,-9.605297 7.396851,-0.01484 z m -13.590285,2.754701 5.185415,-5.323903 3.948418,3.90828 -5.336087,5.379274 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccccc" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,1022.6356)"
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect214"
+       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;filter:url(#filter4064)" />
+    <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;filter:url(#filter4064)"
+       id="rect216"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6"
+       transform="matrix(0.43114968,0,0,0.43114968,-135.41936,1022.6356)" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-135.41936,999.6356)"
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect218"
+       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;filter:url(#filter4064)" />
+    <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;filter:url(#filter4064)"
+       id="rect224"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6"
+       transform="matrix(0.43114968,0,0,0.43114968,-135.41936,933.6356)" />
+    <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;filter:url(#filter4064)"
+       id="rect220"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6"
+       transform="matrix(0.43114968,0,0,0.43114968,-135.41936,977.6356)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#f2f2f2;stroke-width:0.55552751;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path231"
+       sodipodi:cx="56.797413"
+       sodipodi:cy="143.46553"
+       sodipodi:rx="5.5219707"
+       sodipodi:ry="5.2590199"
+       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" />
+    <path
+       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 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"
+       sodipodi:cx="56.797413"
+       id="path1003"
+       style="fill:none;stroke:#f2f2f2;stroke-width:0.55552751;stroke-miterlimit:4;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       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 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"
+       sodipodi:cx="56.797413"
+       id="path1026"
+       style="fill:none;stroke:#f2f2f2;stroke-width:0.55552751;stroke-miterlimit:4;stroke-dasharray:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#f2f2f2;stroke-width:0.55552751;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path1028"
+       sodipodi:cx="56.797413"
+       sodipodi:cy="143.46553"
+       sodipodi:rx="5.5219707"
+       sodipodi:ry="5.2590199"
+       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" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,977.6356)"
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect210"
+       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;filter:url(#filter4064)" />
+    <path
+       id="path1037"
+       transform="matrix(0.83752627,0,0,0.92659378,3.4546476,870.69518)"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:none;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;font-family:Verdana;-inkscape-font-specification:Verdana"
+       d="m 14.756588,131.15925 0,9.60545 -11.6032194,-0.0118 0,-9.58225 -2.73319221,0.79047 8.57645441,-3.98976 8.4702832,3.97497 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       sodipodi:nodetypes="cccccccc"
+       inkscape:connector-curvature="0"
+       d="m 14.756588,131.15925 0,9.60545 -11.6032194,-0.0118 0,-9.58225 -2.73319221,0.79047 8.57645441,-3.98976 8.4702832,3.97497 z"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:none;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;font-family:Verdana;-inkscape-font-specification:Verdana"
+       transform="matrix(0.83752627,0,0,0.92659378,25.454648,870.69518)"
+       id="path4158" />
+    <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;filter:url(#filter4064)"
+       id="rect212"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6"
+       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,999.6356)" />
+    <path
+       style="fill:none;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m 4.1190936,170.87651 1.316683,1.26576 1.7540206,0.003 5.5819788,-5.57043 3.523532,0.006 2.853557,-2.81689 0.0014,-1.68321 -1.169094,-1.16909 -2.365502,2.3822 -2.63185,-0.005 0.09078,-2.55314 2.365531,-2.36552 -1.277858,-1.27786 -1.648714,0.0359 -2.8505569,2.8535 0.00598,3.45613 -5.5530909,5.58201 z"
+       id="path4206"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.90433934,-0.00156352,-0.00156352,0.90433934,0.70503743,868.45488)"
+       sodipodi:nodetypes="cccccccccccccccccc" />
+    <path
+       sodipodi:nodetypes="cccccccccccccccccc"
+       transform="matrix(0.90433934,-0.00156352,-0.00156352,0.90433934,22.705037,868.45488)"
+       inkscape:connector-curvature="0"
+       id="path4208"
+       d="m 4.1190936,170.87651 1.316683,1.26576 1.7540206,0.003 5.5819788,-5.57043 3.523532,0.006 2.853557,-2.81689 0.0014,-1.68321 -1.169094,-1.16909 -2.365502,2.3822 -2.63185,-0.005 0.09078,-2.55314 2.365531,-2.36552 -1.277858,-1.27786 -1.648714,0.0359 -2.8505569,2.8535 0.00598,3.45613 -5.5530909,5.58201 z"
+       style="fill:none;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path4218"
+       sodipodi:cx="5.2590199"
+       sodipodi:cy="194.45924"
+       sodipodi:rx="2.0660436"
+       sodipodi:ry="1.5964882"
+       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"
+       y="0"
+       xlink:href="#path4218"
+       id="use4224"
+       transform="translate(5.3024129,-11.783217)"
+       width="250"
+       height="200" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#use4224"
+       id="use4226"
+       transform="translate(5.2368951,11.783217)"
+       width="250"
+       height="200" />
+    <path
+       transform="matrix(0.93050058,0,0,0.90640134,6.0478791,864.58985)"
+       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"
+       sodipodi:cx="5.2590199"
+       id="path4228"
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:nodetypes="cc"
+       style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m 10.902837,183.0346 0,3.66687"
+       id="path4230"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.93050058,0,0,0.90640134,0.75846434,870.02825)" />
+    <path
+       style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m 9.2894123,189.68386 -2.3956906,3.56909"
+       id="path4232"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.93050058,0,0,0.90640134,0.75846434,870.02825)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m 12.46737,189.68386 2.493472,3.5202"
+       id="path4234"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.93050058,0,0,0.90640134,0.75846434,870.02825)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m 12.467368,182.74125 4.009116,9.925"
+       id="path4236"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.93050058,0,0,0.90640134,0.75846434,870.02825)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m 9.4849789,182.83904 -4.2046813,9.87611"
+       id="path4238"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.93050058,0,0,0.90640134,0.75846434,870.02825)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m 7.4315299,194.71969 7.0403961,0"
+       id="path4240"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.93050058,0,0,0.90640134,0.75846434,870.02825)"
+       sodipodi:nodetypes="cc" />
+    <path
+       transform="matrix(0.93050058,0,0,0.90640134,22.758464,870.02825)"
+       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"
+       sodipodi:cx="5.2590199"
+       id="path4282"
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       sodipodi:type="arc" />
+    <use
+       style="fill:#1a1a1a"
+       height="200"
+       width="250"
+       transform="translate(5.3024129,-11.783217)"
+       id="use4284"
+       xlink:href="#path4282"
+       y="0"
+       x="0" />
+    <use
+       style="fill:#1a1a1a"
+       height="200"
+       width="250"
+       transform="translate(5.2368951,11.783217)"
+       id="use4286"
+       xlink:href="#use4284"
+       y="0"
+       x="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path4288"
+       sodipodi:cx="5.2590199"
+       sodipodi:cy="194.45924"
+       sodipodi:rx="2.0660436"
+       sodipodi:ry="1.5964882"
+       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)"
+       inkscape:connector-curvature="0"
+       id="path4290"
+       d="m 10.902837,183.0346 0,3.66687"
+       style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.93050058,0,0,0.90640134,22.758464,870.02825)"
+       inkscape:connector-curvature="0"
+       id="path4293"
+       d="m 9.2894123,189.68386 -2.3956906,3.56909"
+       style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.93050058,0,0,0.90640134,22.758464,870.02825)"
+       inkscape:connector-curvature="0"
+       id="path4295"
+       d="m 12.46737,189.68386 2.493472,3.5202"
+       style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.93050058,0,0,0.90640134,22.758464,870.02825)"
+       inkscape:connector-curvature="0"
+       id="path4297"
+       d="m 12.467368,182.74125 4.009116,9.925"
+       style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.93050058,0,0,0.90640134,22.758464,870.02825)"
+       inkscape:connector-curvature="0"
+       id="path4299"
+       d="m 9.4849789,182.83904 -4.2046813,9.87611"
+       style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.93050058,0,0,0.90640134,22.758464,870.02825)"
+       inkscape:connector-curvature="0"
+       id="path4301"
+       d="m 7.4315299,194.71969 7.0403961,0"
+       style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       inkscape:connector-curvature="0"
+       transform="matrix(0.95268982,0,0,1.0934812,2.5939281,843.09296)"
+       style="fill:none;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       d="m 47.594131,94.030746 14.462306,0 0,10.255094 -14.462306,0 z"
+       id="rect4303" />
+    <path
+       style="fill:none;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m 47.666782,94.03851 7.145333,5.307564 7.035032,-5.261579 z"
+       id="path4305"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.95268982,0,0,1.0934812,2.5939281,843.09296)"
+       sodipodi:nodetypes="cccc" />
+    <path
+       id="path4315"
+       d="m 47.594131,94.030746 14.462306,0 0,10.255094 -14.462306,0 z"
+       style="fill:none;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       transform="matrix(0.95268982,0,0,1.0934812,24.593928,843.09296)"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccc"
+       transform="matrix(0.95268982,0,0,1.0934812,24.593928,843.09296)"
+       inkscape:connector-curvature="0"
+       id="path4317"
+       d="m 47.666782,94.03851 7.145333,5.307564 7.035032,-5.261579 z"
+       style="fill:none;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-135.41936,955.6356)"
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect222"
+       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;filter:url(#filter4064)" />
+    <text
+       xml:space="preserve"
+       style="font-size:17px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Verdana;-inkscape-font-specification:Verdana Bold"
+       x="49.504551"
+       y="129.16422"
+       id="text247"
+       transform="translate(5.2683173,850.36218)"><tspan
+         sodipodi:role="line"
+         id="tspan249"
+         x="49.504551"
+         y="129.16422"
+         style="font-weight:bold;-inkscape-font-specification:Verdana Bold">!</tspan></text>
+    <use
+       x="0"
+       y="0"
+       xlink:href="#text247"
+       id="use251"
+       transform="translate(22.268317,0)"
+       width="250"
+       height="200" />
+    <path
+       sodipodi:type="star"
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.80864763;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path252"
+       sodipodi:sides="3"
+       sodipodi:cx="195.63554"
+       sodipodi:cy="63.26548"
+       sodipodi:r1="7.7793064"
+       sodipodi:r2="15.558613"
+       sodipodi:arg1="2.1025204"
+       sodipodi:arg2="3.1497179"
+       inkscape:flatsided="true"
+       inkscape:rounded="0.2"
+       inkscape:randomized="0"
+       d="m 191.69128,69.97073 c -2.32277,-1.366333 -2.23518,-12.1453 0.10948,-13.473709 2.34466,-1.328408 11.63573,4.136926 11.61383,6.831668 -0.0219,2.694741 -9.40054,8.008375 -11.72331,6.642041 z"
+       transform="matrix(1.043244,0,0,0.93815683,-5.0151639,863.01152)"
+       inkscape:transform-center-x="-4.0006141"
+       inkscape:transform-center-y="-0.059313251" />
+    <path
+       inkscape:transform-center-y="0.059308319"
+       inkscape:transform-center-x="4.0006111"
+       transform="matrix(-1.043244,0,0,-0.93815683,425.4058,981.67309)"
+       d="m 191.69128,69.97073 c -2.32277,-1.366333 -2.23518,-12.1453 0.10948,-13.473709 2.34466,-1.328408 11.63573,4.136926 11.61383,6.831668 -0.0219,2.694741 -9.40054,8.008375 -11.72331,6.642041 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0.2"
+       inkscape:flatsided="true"
+       sodipodi:arg2="3.1497179"
+       sodipodi:arg1="2.1025204"
+       sodipodi:r2="15.558613"
+       sodipodi:r1="7.7793064"
+       sodipodi:cy="63.26548"
+       sodipodi:cx="195.63554"
+       sodipodi:sides="3"
+       id="path254"
+       style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:0.80864763;stroke-miterlimit:4;stroke-dasharray:none"
+       sodipodi:type="star" />
+    <g
+       id="g1070"
+       transform="matrix(1.1035285,0,0,1.1035285,-14.308807,-95.610044)">
+      <path
+         sodipodi:nodetypes="cscsc"
+         inkscape:connector-curvature="0"
+         id="path262"
+         d="m 148.82687,49.85498 c 0,0 -3.94234,5.723921 -8.80546,5.723921 -4.86313,0 -8.80547,-5.723921 -8.80547,-5.723921 0,0 3.94234,-5.72392 8.80547,-5.72392 4.86312,0 8.80546,5.72392 8.80546,5.72392 z"
+         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.94912058;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         transform="matrix(0.79496097,0,0,0.9062729,26.90439,859.01012)" />
+      <path
+         transform="matrix(0.89659499,0,0,0.89659499,12.90165,857.69139)"
+         d="m 144.56282,51.877872 c 0,2.665109 -2.1605,4.825606 -4.82561,4.825606 -2.66511,0 -4.8256,-2.160497 -4.8256,-4.825606 0,-2.665108 2.16049,-4.825605 4.8256,-4.825605 2.66511,0 4.82561,2.160497 4.82561,4.825605 z"
+         sodipodi:ry="4.8256054"
+         sodipodi:rx="4.8256054"
+         sodipodi:cy="51.877872"
+         sodipodi:cx="139.73721"
+         id="path1033"
+         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.86699998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path1035"
+         sodipodi:cx="139.73721"
+         sodipodi:cy="51.877872"
+         sodipodi:rx="4.8256054"
+         sodipodi:ry="4.8256054"
+         d="m 144.56282,51.877872 c 0,2.665109 -2.1605,4.825606 -4.82561,4.825606 -2.66511,0 -4.8256,-2.160497 -4.8256,-4.825606 0,-2.665108 2.16049,-4.825605 4.8256,-4.825605 2.66511,0 4.82561,2.160497 4.82561,4.825605 z"
+         transform="matrix(0.37382862,0,0,0.37382862,85.950326,884.7403)" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       d="m 51.71875,158.125 0,7.65625 10.1875,0 0,-7.65625 z"
+       style="fill:none"
+       transform="translate(1,852.36218)"
+       id="path293" />
+    <path
+       id="path278"
+       transform="translate(1,852.36218)"
+       style="fill:#e6e6e6"
+       d="m 51.71875,158.125 0,7.65625 10.1875,0 0,-7.65625 z m 0.53125,0.625 9.03125,0 -0.03125,6.4375 -9,0 z m 0.71875,0.65625 0,5.03125 4.4375,0 -0.0625,-5.03125 z m 0.59375,0.625 3.25,0 0,2.5625 -0.8125,0 0,-1.9375 -1.727964,0 0,1.9375 -0.709536,0 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccccccc" />
+    <path
+       id="path4660"
+       transform="translate(-5,858.36218)"
+       style="fill:#1a1a1a;fill-opacity:1"
+       d="m 51.71875,158.125 0,7.65625 10.1875,0 0,-7.65625 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="cccccccccccccccccccccccc"
+       inkscape:connector-curvature="0"
+       d="m 51.71875,158.125 0,7.65625 10.1875,0 0,-7.65625 z m 0.53125,0.625 9.03125,0 -0.03125,6.4375 -9,0 z m 0.71875,0.65625 0,5.03125 4.4375,0 -0.0625,-5.03125 z m 0.59375,0.625 3.25,0 0,2.5625 -0.8125,0 0,-1.9375 -1.727964,0 0,1.9375 -0.709536,0 z"
+       style="fill:#e6e6e6"
+       transform="translate(-5,858.36218)"
+       id="path4662" />
+    <path
+       id="path333"
+       transform="translate(23,852.36218)"
+       style="fill:none"
+       d="m 51.71875,158.125 0,7.65625 10.1875,0 0,-7.65625 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="cccccccccccccccccccccccc"
+       inkscape:connector-curvature="0"
+       d="m 51.71875,158.125 0,7.65625 10.1875,0 0,-7.65625 z m 0.53125,0.625 9.03125,0 -0.03125,6.4375 -9,0 z m 0.71875,0.65625 0,5.03125 4.4375,0 -0.0625,-5.03125 z m 0.59375,0.625 3.25,0 0,2.5625 -0.8125,0 0,-1.9375 -1.727964,0 0,1.9375 -0.709536,0 z"
+       style="fill:#e6e6e6"
+       transform="translate(23,852.36218)"
+       id="path335" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       d="m 51.71875,158.125 0,7.65625 10.1875,0 0,-7.65625 z"
+       style="fill:#333333"
+       transform="translate(17,858.36218)"
+       id="path3865" />
+    <path
+       id="path3867"
+       transform="translate(17,858.36218)"
+       style="fill:#e6e6e6"
+       d="m 51.71875,158.125 0,7.65625 10.1875,0 0,-7.65625 z m 0.53125,0.625 9.03125,0 -0.03125,6.4375 -9,0 z m 0.71875,0.65625 0,5.03125 4.4375,0 -0.0625,-5.03125 z m 0.59375,0.625 3.25,0 0,2.5625 -0.8125,0 0,-1.9375 -1.727964,0 0,1.9375 -0.709536,0 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccccccc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+       id="path274"
+       sodipodi:cx="559.67499"
+       sodipodi:cy="21.754047"
+       sodipodi:rx="0.88388348"
+       sodipodi:ry="0.88388348"
+       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 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"
+       sodipodi:cx="559.67499"
+       id="path276"
+       style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+       id="path279"
+       sodipodi:cx="559.67499"
+       sodipodi:cy="21.754047"
+       sodipodi:rx="0.88388348"
+       sodipodi:ry="0.88388348"
+       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"
+       d="m 563.21055,31.653543 4.41942,-6.187185 -7.6014,-6.187184"
+       id="path281"
+       inkscape:connector-curvature="0"
+       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 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"
+       sodipodi:cx="559.67499"
+       id="path283"
+       style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <path
+       style="fill:none;stroke:#e6e6e6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 567.45319,25.466358 7.6014,-4.065864"
+       id="path285"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-187.51596,643.71067)" />
+    <g
+       transform="translate(-32.726207,8)"
+       id="use301">
+      <path
+         sodipodi:type="arc"
+         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+         id="path3845"
+         sodipodi:cx="559.67499"
+         sodipodi:cy="21.754047"
+         sodipodi:rx="0.88388348"
+         sodipodi:ry="0.88388348"
+         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,-566.65386,-61.76762)" />
+      <path
+         transform="matrix(0.96219008,1.4311194,-1.4311194,0.96219008,-391.29289,215.61485)"
+         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"
+         sodipodi:cx="559.67499"
+         id="path3847"
+         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+         id="path3849"
+         sodipodi:cx="559.67499"
+         sodipodi:cy="21.754047"
+         sodipodi:rx="0.88388348"
+         sodipodi:ry="0.88388348"
+         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,-421.03317,165.44683)" />
+      <path
+         style="fill:none;stroke:#e6e6e6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 563.21055,31.653543 4.41942,-6.187185 -7.6014,-6.187184"
+         id="path3851"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-132.78975,635.71067)" />
+      <path
+         transform="matrix(1.0996458,1.635565,-1.635565,1.0996458,-476.37171,94.687576)"
+         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"
+         sodipodi:cx="559.67499"
+         id="path3853"
+         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         style="fill:none;stroke:#e6e6e6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 567.45319,25.466358 7.6014,-4.065864"
+         id="path3855"
+         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
new file mode 100644
index 000000000..5838729cc
--- /dev/null
+++ b/view/theme/dispy-dark/jot-header.tpl
@@ -0,0 +1,349 @@
+<script type="text/javascript">
+var editor = false;
+var textlen = 0;
+var plaintext = '$editselect';
+
+function initEditor(cb) {
+	if (editor==false) {
+		$("#profile-jot-text-loading").show();
+		if(plaintext == 'none') {
+			$("#profile-jot-text-loading").hide();
+			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+			editor = true;
+			$("a#jot-perms-icon").fancybox({
+				'transitionIn' : 'elastic',
+				'transitionOut' : 'elastic'
+			});
+			$(".jothidden").show();
+			if (typeof cb!="undefined") cb();
+			return;
+		}
+		tinyMCE.init({
+			theme : "advanced",
+			mode : "specific_textareas",
+			editor_selector: $editselect,
+			auto_focus: "profile-jot-text",
+			plugins : "bbcode,paste,fullscreen,autoresize",
+			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
+			theme_advanced_buttons2 : "",
+			theme_advanced_buttons3 : "",
+			theme_advanced_toolbar_location : "top",
+			theme_advanced_toolbar_align : "center",
+			theme_advanced_blockformats : "blockquote,code",
+			gecko_spellcheck : true,
+			paste_text_sticky : true,
+			entity_encoding : "raw",
+			add_unload_trigger : false,
+			remove_linebreaks : false,
+			force_p_newlines : false,
+			force_br_newlines : true,
+			forced_root_block : '',
+			convert_urls: false,
+			content_css: "$baseurl/view/custom_tinymce.css",
+			theme_advanced_path : false,
+			setup : function(ed) {
+				cPopup = null;
+				ed.onKeyDown.add(function(ed,e) {
+					if(cPopup !== null)
+						cPopup.onkey(e);
+				});
+
+				ed.onKeyUp.add(function(ed, e) {
+					var txt = tinyMCE.activeEditor.getContent();
+					match = txt.match(/@([^ \n]+)$/);
+					if(match!==null) {
+						if(cPopup === null) {
+							cPopup = new ACPopup(this,baseurl+"/acl");
+						}
+						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+						if(! cPopup.ready) cPopup = null;
+					}
+					else {
+						if(cPopup !== null) { cPopup.close(); cPopup = null; }
+					}
+
+					textlen = txt.length;
+					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+						$('#profile-jot-desc').html(ispublic);
+					}
+					else {
+						$('#profile-jot-desc').html('&#160;');
+					}	 
+
+				 //Character count
+
+					if(textlen <= 140) {
+						$('#character-counter').removeClass('red');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('grey');
+					}
+					if((textlen > 140) && (textlen <= 420)) {
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('red');
+						$('#character-counter').addClass('orange');
+					}
+					if(textlen > 420) {
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('red');
+					}
+					$('#character-counter').text(textlen);
+				});
+
+				ed.onInit.add(function(ed) {
+					ed.pasteAsPlainText = true;
+					$("#profile-jot-text-loading").hide();
+					$(".jothidden").show();
+					if (typeof cb!="undefined") cb();
+				});
+
+			}
+		});
+		editor = true;
+		// setup acl popup
+		$("a#jot-perms-icon").fancybox({
+			'transitionIn' : 'elastic',
+			'transitionOut' : 'elastic'
+		}); 
+	} else {
+		if (typeof cb!="undefined") cb();
+	}
+}
+
+function enableOnUser(){
+	if (editor) return;
+	$(this).val("");
+	initEditor();
+}
+
+</script>
+<script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
+<script type="text/javascript">
+	var ispublic = '$ispublic';
+	var addtitle = '$addtitle';
+
+	$(document).ready(function() {
+		
+		/* enable tinymce on focus and click */
+		$("#profile-jot-text").focus(enableOnUser);
+		$("#profile-jot-text").click(enableOnUser);
+		/* enable character counter */
+		$("#profile-jot-text").focus(charCounter);
+		$("#profile-jot-text").click(charCounter);
+
+		var uploader = new window.AjaxUpload(
+			'wall-image-upload',
+			{ action: 'wall_upload/$nickname',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+		var file_uploader = new window.AjaxUpload(
+			'wall-file-upload',
+			{ action: 'wall_attach/$nickname',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+
+
+	});
+
+	function deleteCheckedItems() {
+		var checkedstr = '';
+
+		$('.item-select').each( function() {
+			if($(this).is(':checked')) {
+				if(checkedstr.length != 0) {
+					checkedstr = checkedstr + ',' + $(this).val();
+				}
+				else {
+					checkedstr = $(this).val();
+				}
+			}	
+		});
+		$.post('item', { dropitems: checkedstr }, function(data) {
+			window.location.reload();
+		});
+	}
+
+	function jotGetLink() {
+		reply = prompt("$linkurl");
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				addeditortext(data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function jotVideoURL() {
+		reply = prompt("$vidurl");
+		if(reply && reply.length) {
+			addeditortext('[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("$audurl");
+		if(reply && reply.length) {
+			addeditortext('[audio]' + reply + '[/audio]');
+		}
+	}
+
+
+	function jotGetLocation() {
+		reply = prompt("$whereareu", $('#jot-location').val());
+		if(reply && reply.length) {
+			$('#jot-location').val(reply);
+		}
+	}
+
+	function jotShare(id) {
+		if ($('#jot-popup').length != 0) $('#jot-popup').show();
+
+		$('#like-rotator-' + id).show();
+		$.get('share/' + id, function(data) {
+			if (!editor) $("#profile-jot-text").val("");
+			initEditor(function(){
+				addeditortext(data);
+				$('#like-rotator-' + id).hide();
+				$(window).scrollTop(0);
+			});
+
+		});
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				if (!editor) $("#profile-jot-text").val("");
+				initEditor(function(){
+					addeditortext(data);
+					$('#profile-rotator').hide();
+				});
+			});
+		}
+	}
+
+	function itemTag(id) {
+		reply = prompt("$term");
+		if(reply && reply.length) {
+			reply = reply.replace('#','');
+			if(reply.length) {
+
+				commentBusy = true;
+				$('body').css('cursor', 'wait');
+
+				$.get('tagger/' + id + '?term=' + reply);
+				if(timer) clearTimeout(timer);
+				timer = setTimeout(NavUpdate,3000);
+				liking = 1;
+			}
+		}
+	}
+
+	function itemFiler(id) {
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.fancybox(data);
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply);
+					if(timer) clearTimeout(timer);
+					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.fancybox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+		
+	}
+
+	function jotClearLocation() {
+		$('#jot-coord').val('');
+		$('#profile-nolocation-wrapper').hide();
+	}
+
+	function addeditortext(data) {
+		if(plaintext == 'none') {
+			var currentText = $("#profile-jot-text").val();
+			$("#profile-jot-text").val(currentText + data);
+		}
+		else
+			tinyMCE.execCommand('mceInsertRawHTML',false,data);
+	}	
+
+	$geotag
+
+	function charCounter() {
+		// character count part deux
+		//$(this).val().length is not a function Line 282(3)
+		$('#profile-jot-text').keyup(function() {
+			var textlen = 0;
+			var maxLen1 = 140;
+			var maxLen2 = 420;
+
+			$('#character-counter').removeClass('jothidden');
+
+			textLen = $(this).val().length;
+			if(textLen <= maxLen1) {
+				$('#character-counter').removeClass('red');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('grey');
+			}
+			if((textLen > maxLen1) && (textlen <= maxLen2)) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('red');
+				$('#character-counter').addClass('orange');
+			}
+			if(textLen > maxLen2) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('red');
+			}
+			$('#character-counter').text( textLen );
+		});
+		$('#profile-jot-text').keyup();
+	}
+
+</script>
+
diff --git a/view/theme/dispy-dark/jot.tpl b/view/theme/dispy-dark/jot.tpl
new file mode 100644
index 000000000..688ac1451
--- /dev/null
+++ b/view/theme/dispy-dark/jot.tpl
@@ -0,0 +1,72 @@
+<form id="profile-jot-form" action="$action" method="post">
+	<div id="jot">
+		<div id="profile-jot-desc" class="jothidden">&#160;</div>
+		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" />
+		<div id="character-counter" class="grey jothidden"></div>
+
+		<input type="hidden" name="type" value="$ptyp" />
+		<input type="hidden" name="profile_uid" value="$profile_uid" />
+		<input type="hidden" name="return" value="$return_path" />
+		<input type="hidden" name="location" id="jot-location" value="$defloc" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="$post_id" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}
+		</textarea>
+
+
+<div id="jot-tools" class="jothidden" style="display:none">
+	<div id="profile-jot-submit-wrapper" class="jothidden">
+
+		<div id="profile-upload-wrapper" style="display: $visitor;">
+			<div id="wall-image-upload-div"><a class="icon border camera" href="#" onclick="return false;" id="wall-image-upload" title="$upload"></a></div>
+		</div>
+		<div id="profile-attach-wrapper" style="display: $visitor;">
+			<div id="wall-file-upload-div"><a class="icon border attach" href="#" onclick="return false;" id="wall-file-upload" title="$attach"></a></div>
+		</div>
+		<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);">
+			<a class="icon border link" id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a>
+		</div>
+		<div id="profile-video-wrapper" style="display: $visitor;">
+			<a class="icon border video" id="profile-video" onclick="jotVideoURL();return false;" title="$video"></a>
+		</div>
+		<div id="profile-audio-wrapper" style="display: $visitor;">
+			<a class="icon border audio" id="profile-audio" onclick="jotAudioURL();return false;" title="$audio"></a>
+		</div>
+		<div id="profile-location-wrapper" style="display: $visitor;">
+			<a class="icon border globe" id="profile-location" onclick="jotGetLocation();return false;" title="$setloc"></a>
+		</div>
+		<div id="profile-nolocation-wrapper" style="display: none;">
+			<a class="icon border noglobe" id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc"></a>
+		</div>
+
+		<div id="profile-jot-plugin-wrapper">
+		$jotplugins
+		</div>
+
+	<a class="icon-text-preview pointer"></a><a id="jot-preview-link" class="pointer" onclick="preview_post(); return false;" title="$preview">$preview</a>
+	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
+	<div id="profile-jot-perms" class="profile-jot-perms">
+		<a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon $lockstate $bang" title="$permset"></a>
+	</div>
+	<span id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait" /></span>
+	</div>
+
+	</div> <!-- /#profile-jot-submit-wrapper -->
+</div> <!-- /#jot-tools -->
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			$acl
+			<hr style="clear:both" />
+			<div id="profile-jot-email-label">$emailcc</div>
+			<input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+			<div id="profile-jot-email-end"></div>
+			$jotnets
+		</div>
+	</div>
+
+</form>
+{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/loozah/login-bg.gif b/view/theme/dispy-dark/login-bg.gif
index cde836c89..cde836c89 100755..100644
--- a/view/theme/loozah/login-bg.gif
+++ b/view/theme/dispy-dark/login-bg.gif
diff --git a/view/theme/dispy-dark/mail_head.tpl b/view/theme/dispy-dark/mail_head.tpl
new file mode 100644
index 000000000..d49d7c1af
--- /dev/null
+++ b/view/theme/dispy-dark/mail_head.tpl
@@ -0,0 +1,5 @@
+<h3>$messages</h3>
+
+<div class="tabs-wrapper">
+$tab_content
+</div>
diff --git a/view/theme/dispy-dark/menu-user-pin.jpg b/view/theme/dispy-dark/menu-user-pin.jpg
new file mode 100644
index 000000000..26449569f
--- /dev/null
+++ b/view/theme/dispy-dark/menu-user-pin.jpg
diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl
new file mode 100644
index 000000000..34aba50de
--- /dev/null
+++ b/view/theme/dispy-dark/nav.tpl
@@ -0,0 +1,128 @@
+<nav>
+
+<span id="banner">$banner</span>
+
+<!-- yes, they're going the other way. seems that's how the template renderer
+works -->
+
+<div id="nav-floater">
+    <div id="nav-buttons">
+    {{ if $nav.help }}
+    <a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a>
+    {{ endif }}
+    {{ if $nav.community }}
+    <a id="nav-community-link" class="nav-link $nav.community.2"
+    href="$nav.community.0" title="$nav.community.1">$nav.community.1</a>
+    {{ endif }}
+    {{ if $nav.apps }}
+    <a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>
+    {{ endif }}
+    <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a>
+    <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a>
+    {{ if $nav.messages }}
+    <a id="nav-messages-link" class="nav-link $nav.messages.2"
+    href="$nav.messages.0" title="$nav.messages.1">$nav.messages.1</a>
+    {{ endif }}
+    {{ if $nav.notifications }}
+    <a id="nav-notifications-linkmenu" class="nav-link $nav.notifications.2" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
+    <ul id="nav-notifications-menu" class="menu-popup">
+        <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+        <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+        <li class="empty">$emptynotifications</li>
+    </ul>
+    {{ 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>
+    {{ 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>
+    {{ 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 }}
+	</div>
+
+	<div id="user-menu">
+        <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
+        <ul id="user-menu-popup"
+            onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
+            onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
+
+        {{ if $nav.register }}
+        <li>
+        <a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1"></a>
+        </li>
+        {{ endif }}
+        {{ if $nav.contacts }}
+        <li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li>
+        {{ endif }}
+		{{ if $nav.introductions }}
+	    <li><a id="nav-intro-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a></li>
+		{{ endif }}
+        {{ if $nav.profiles }}
+        <li><a id="nav-profiles-link" class="nav-commlink $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.1">$nav.profiles.1</a></li>
+        {{ endif }}
+        {{ if $nav.settings }}
+        <li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0" title="$nav.settings.1">$nav.settings.1</a></li>
+        {{ endif }}
+        {{ if $nav.manage }}
+        <li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.1">$nav.manage.1</a></li>
+        {{ endif }}
+        {{ if $nav.admin }}
+        <li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li>
+        {{ endif }}
+        {{ if $nav.login }}
+        <li><a id="nav-login-link" class="nav-commlink $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li>
+        {{ endif }}
+        {{ if $nav.logout }}
+        <li><a id="nav-logout-link" class="nav-commlink $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
+        {{ endif }}
+        </ul>
+    </div>
+
+{{ if $userinfo }}
+        <ul id="nav-user-menu" class="menu-popup">
+            {{ for $nav.usermenu as $usermenu }}
+                <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
+            {{ endfor }}
+        </ul>
+{{ endif }}
+
+    <div id="notifications">
+        {{ if $nav.home }}
+        <a id="home-update" class="nav-ajax-left" href="$nav.home.0" title="$nav.home.1"></a>
+        {{ endif }}
+        {{ if $nav.network }}
+        <a id="net-update" class="nav-ajax-left" href="$nav.network.0" title="$nav.network.1"></a>
+        {{ endif }}
+        {{ if $nav.notifications }}
+        <a id="notify-update" class="nav-ajax-left" href="$nav.notifications.0" title="$nav.notifications.1"></a>
+        {{ endif }}
+        {{ if $nav.messages }}
+        <a id="mail-update" class="nav-ajax-left" href="$nav.messages.0" title="$nav.messages.1"></a>
+        {{ endif }}
+		{{if $nav.introductions }}
+		<a id="intro-update" class="nav-ajax-left" href="$nav.introductions.0"></a>
+		{{ endif }}
+    </div>
+</div>
+    <a href="#" class="floaterflip"></a>
+</nav>
+
+<div id="lang-sel-wrap">
+$langselector
+</div>
+
+<div 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/duepuntozero/nets.tpl b/view/theme/dispy-dark/nets.tpl
index b0cb8890c..b0cb8890c 100755..100644
--- a/view/theme/duepuntozero/nets.tpl
+++ b/view/theme/dispy-dark/nets.tpl
diff --git a/view/theme/dispy-dark/next.png b/view/theme/dispy-dark/next.png
new file mode 100644
index 000000000..5e0067c4b
--- /dev/null
+++ b/view/theme/dispy-dark/next.png
diff --git a/view/theme/dispy-dark/notifications.png b/view/theme/dispy-dark/notifications.png
new file mode 100644
index 000000000..66c432eac
--- /dev/null
+++ b/view/theme/dispy-dark/notifications.png
diff --git a/view/theme/dispy-dark/notifications.svg b/view/theme/dispy-dark/notifications.svg
new file mode 100644
index 000000000..0ec2c0569
--- /dev/null
+++ b/view/theme/dispy-dark/notifications.svg
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg3486"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   width="148"
+   height="19"
+   sodipodi:docname="notifications.svg"
+   inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy-dark/notifications.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata3492">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3490" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1041"
+     inkscape:window-height="643"
+     id="namedview3488"
+     showgrid="false"
+     inkscape:zoom="4.2687885"
+     inkscape:cx="64.235788"
+     inkscape:cy="18.27268"
+     inkscape:window-x="0"
+     inkscape:window-y="48"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3486"
+     width="0px"
+     height="0px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <g
+     id="g4437"
+     transform="translate(0,-44)">
+    <path
+       sodipodi:nodetypes="ccccc"
+       transform="translate(0,44)"
+       style="fill:#6c99c9"
+       d="M 34.398531,19 30.225818,10.411298 47.864407,1.3368391 57.625819,19.010154 z"
+       id="path3506"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="ccccccccccccccc"
+       transform="translate(0,44)"
+       style="fill:#4e7db5"
+       d="m 45.148088,5.1797115 -9.353484,4.7866764 6.895762,1.5144501 z m -2.0018,7.2466465 -8.105899,-1.97793 3.232895,6.44678 11.074578,-5.648894 -3.366977,-6.4432724 z M 46.4192,3.6690997 50.56253,11.552848 38.044003,18.006578 33.98857,10.057271 z"
+       id="path3502"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g4441"
+     transform="translate(0,-44)">
+    <path
+       sodipodi:nodetypes="ccccc"
+       transform="translate(0,44)"
+       style="fill:#aa7ca5"
+       d="M 64.398531,19 60.225818,10.411298 77.725,2.013353 87.084493,18.988196 z"
+       id="path3504"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="sssssccccc"
+       transform="translate(-0.88048036,44.641441)"
+       style="fill:#75507b"
+       d="m 75,16 c -0.55,0 -1,-0.45 -1,-1 0,-0.55 0.45,-1 1,-1 0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1 z m -1.441718,-2.172038 c 0,0 -2.448135,-3.9460956 -3.558282,-6.0504682 0,-0.4276216 1.043961,-0.9072067 1.57461,-0.9072067 1.48457,2.2735627 3.276272,6.3043659 3.276272,6.3043659 -0.823179,-0.104873 -0.90154,-0.01483 -1.2926,0.653309 z"
+       id="path3498"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g4453"
+     transform="translate(0,-24)">
+    <path
+       sodipodi:nodetypes="ccccc"
+       transform="translate(0,24)"
+       style="fill:#f4ac42;fill-opacity:1"
+       d="M 4.3985314,19 0.19544564,10.348783 18,1.8695178 27,19 z"
+       id="path3508"
+       inkscape:connector-curvature="0" />
+    <g
+       transform="translate(0,-20)"
+       id="g4361">
+      <path
+         sodipodi:type="arc"
+         style="fill:#e98007;fill-opacity:1;stroke:none"
+         id="path274"
+         sodipodi:cx="559.67499"
+         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"
+         transform="matrix(1.0481621,1.5589904,-1.5589904,1.0481621,-539.42292,-838.01094)" />
+      <path
+         transform="matrix(0.78612158,1.1692428,-1.1692428,0.78612158,-396.15077,-611.38593)"
+         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"
+         sodipodi:ry="0.88388348"
+         sodipodi:rx="0.88388348"
+         sodipodi:cy="21.754047"
+         sodipodi:cx="559.67499"
+         id="path276"
+         style="fill:#e98007;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#e98007;fill-opacity:1;stroke:none"
+         id="path279"
+         sodipodi:cx="559.67499"
+         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"
+         transform="matrix(0.8235559,1.224921,-1.224921,0.8235559,-420.44896,-652.37384)" />
+      <path
+         style="fill:none;stroke:#e98007;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 563.21055,31.653543 4.41942,-6.187185 -7.6014,-6.187184"
+         id="path281"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.37434361,0.55678228,-0.55678228,0.37434361,-184.9504,-268.16228)" />
+      <path
+         transform="matrix(0.89842466,1.3362775,-1.3362775,0.89842466,-465.66125,-710.18506)"
+         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"
+         sodipodi:ry="0.88388348"
+         sodipodi:rx="0.88388348"
+         sodipodi:cy="21.754047"
+         sodipodi:cx="559.67499"
+         id="path283"
+         style="fill:#e98007;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         style="fill:none;stroke:#e98007;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 567.45319,25.466358 7.6014,-4.065864"
+         id="path285"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.37434361,0.55678228,-0.55678228,0.37434361,-184.9504,-268.16228)" />
+    </g>
+  </g>
+  <g
+     id="g4566"
+     transform="translate(0,-24)">
+    <path
+       sodipodi:nodetypes="ccccc"
+       transform="translate(0,24)"
+       style="fill:#6fcb15"
+       d="M 94.398531,19 90.225818,10.411298 108.5,1.9724323 117,19 z"
+       id="path3500"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccccccc"
+       inkscape:connector-curvature="0"
+       d="m 14.756588,131.15925 0,9.60545 -11.6032194,-0.0118 0,-9.58225 m -0.039261,-0.0651 5.8825232,-3.13423 5.9219702,3.25106 z"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:none;stroke:#428107;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;font-family:Verdana;-inkscape-font-specification:Verdana"
+       transform="matrix(0.55727141,-0.25996788,0.2876144,0.61653494,59.024831,-44.715085)"
+       id="path1037" />
+  </g>
+  <g
+     id="g4553"
+     transform="translate(0,-24)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path4471"
+       d="M 94.398531,19 90.225818,10.411298 108.5,1.9724323 117,19 z"
+       style="fill:#fb7b62;fill-opacity:1"
+       transform="translate(31,24)"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       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"
+       sodipodi:ry="1.5964882"
+       sodipodi:rx="2.0660436"
+       sodipodi:cy="194.45924"
+       sodipodi:cx="5.2590199"
+       id="path4218"
+       style="fill:#c32405;fill-opacity:1;fill-rule:nonzero;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       sodipodi:type="arc" />
+    <use
+       height="200"
+       width="250"
+       transform="translate(0.11687856,-8.4237924)"
+       id="use4224"
+       xlink:href="#path4218"
+       y="0"
+       x="0"
+       style="fill:#999999;stroke:#666666" />
+    <use
+       height="200"
+       width="250"
+       transform="translate(6.5982765,5.2049933)"
+       id="use4226"
+       xlink:href="#use4224"
+       y="0"
+       x="0"
+       style="fill:#999999;stroke:#c32405;stroke-opacity:1" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#c32405;fill-opacity:1;fill-rule:nonzero;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path4228"
+       sodipodi:cx="5.2590199"
+       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"
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,81.644877,-64.113316)" />
+    <path
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       inkscape:connector-curvature="0"
+       id="path4230"
+       d="m 10.902837,183.0346 0,3.66687"
+       style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       inkscape:connector-curvature="0"
+       id="path4232"
+       d="m 9.2894123,189.68386 -2.3956906,3.56909"
+       style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       inkscape:connector-curvature="0"
+       id="path4234"
+       d="m 12.46737,189.68386 2.493472,3.5202"
+       style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       inkscape:connector-curvature="0"
+       id="path4236"
+       d="m 12.467368,182.74125 4.009116,9.925"
+       style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       inkscape:connector-curvature="0"
+       id="path4238"
+       d="m 9.4849789,182.83904 -4.2046813,9.87611"
+       style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       inkscape:connector-curvature="0"
+       id="path4240"
+       d="m 7.4315299,194.71969 7.0403961,0"
+       style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+  </g>
+</svg>
diff --git a/view/theme/dispy-dark/photo-menu.jpg b/view/theme/dispy-dark/photo-menu.jpg
new file mode 100644
index 000000000..fde5eb535
--- /dev/null
+++ b/view/theme/dispy-dark/photo-menu.jpg
diff --git a/view/theme/dispy-dark/photo_view.tpl b/view/theme/dispy-dark/photo_view.tpl
new file mode 100644
index 000000000..732caf690
--- /dev/null
+++ b/view/theme/dispy-dark/photo_view.tpl
@@ -0,0 +1,37 @@
+<div id="live-display"></div>
+<h3><a href="$album.0">$album.1</a></h3>
+
+<div id="photo-edit-link-wrap">
+{{ if $tools }}
+<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
+|
+<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
+{{ endif }}
+{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
+</div>
+
+{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
+<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
+{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
+<div id="photo-photo-end"></div>
+<div id="photo-caption">$desc</div>
+{{ if $tags }}
+<div id="in-this-photo-text">$tags.0</div>
+<div id="in-this-photo">$tags.1</div>
+{{ endif }}
+{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
+
+{{ if $edit }}$edit{{ endif }}
+
+{{ if $likebuttons }}
+<div id="photo-like-div">
+	$likebuttons
+	$like
+	$dislike	
+</div>
+{{ endif }}
+
+$comments
+
+$paginate
+
diff --git a/view/theme/dispy-dark/premium.png b/view/theme/dispy-dark/premium.png
new file mode 100644
index 000000000..d2855a4f5
--- /dev/null
+++ b/view/theme/dispy-dark/premium.png
diff --git a/view/theme/dispy-dark/prev.png b/view/theme/dispy-dark/prev.png
new file mode 100644
index 000000000..10b10d74f
--- /dev/null
+++ b/view/theme/dispy-dark/prev.png
diff --git a/view/theme/dispy-dark/profile_vcard.tpl b/view/theme/dispy-dark/profile_vcard.tpl
new file mode 100644
index 000000000..f14ea7915
--- /dev/null
+++ b/view/theme/dispy-dark/profile_vcard.tpl
@@ -0,0 +1,82 @@
+<div class="vcard">
+
+	{{ if $profile.edit }}
+	<div class="action">
+	<span class="icon-profile-edit"></span>
+	<a href="#" rel="#profiles-menu" class="ttright" id="profiles-menu-trigger" title="$profile.edit.3">$profile.edit.1</a>
+	<ul id="profiles-menu" class="menu-popup">
+		{{ for $profile.menu.entries as $e }}
+		<li>
+			<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
+		</li>
+		{{ endfor }}
+		<li><a href="profile_photo">$profile.menu.chg_photo</a></li>
+		<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
+	</ul>
+	</div>
+	{{ endif }}
+
+	<div class="fn label">$profile.name</div>
+
+	{{ if $pdesc }}
+    <div class="title">$profile.pdesc</div>
+    {{ endif }}
+	<div id="profile-photo-wrapper">
+		<img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" />
+    </div>
+
+	{{ if $location }}
+		<div class="location">
+        <span class="location-label">$location</span>
+		<div class="adr">
+			{{ if $profile.address }}
+            <div class="street-address">$profile.address</div>{{ endif }}
+			<span class="city-state-zip">
+				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+				<span class="region">$profile.region</span>
+				<span class="postal-code">$profile.postal-code</span>
+			</span>
+			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+		</div>
+		</div>
+	{{ endif }}
+
+	{{ if $gender }}
+    <div class="mf">
+        <span class="gender-label">$gender</span>
+        <span class="x-gender">$profile.gender</span>
+    </div>
+    {{ endif }}
+	
+	{{ if $profile.pubkey }}
+    <div class="key" style="display:none;">$profile.pubkey</div>
+    {{ endif }}
+
+	{{ if $marital }}
+    <div class="marital">
+    <span class="marital-label">
+    <span class="heart">&hearts;</span>$marital</span>
+    <span class="marital-text">$profile.marital</span>
+    </div>
+    {{ endif }}
+
+	{{ if $homepage }}
+    <div class="homepage">
+    <span class="homepage-label">$homepage</span>
+    <span class="homepage-url"><a href="$profile.homepage"
+    target="external-link">$profile.homepage</a></span>
+    </div>{{ endif }}
+
+	{{ inc diaspora_vcard.tpl }}{{ endinc }}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{ if $connect }}
+				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
+			{{ endif }}
+		</ul>
+	</div>
+</div>
+
+$contact_block
+
diff --git a/view/theme/dispy-dark/saved_searches_aside.tpl b/view/theme/dispy-dark/saved_searches_aside.tpl
new file mode 100644
index 000000000..fb822fe5d
--- /dev/null
+++ b/view/theme/dispy-dark/saved_searches_aside.tpl
@@ -0,0 +1,14 @@
+<div class="widget" id="saved-search-list">
+	<h3 id="search">$title</h3>
+	$searchbox
+	
+	<ul id="saved-search-ul">
+		{{ for $saved as $search }}
+		<li class="saved-search-li clear">
+			<a title="$search.delete" onclick="return confirmDelete();" onmouseout="imgdull(this);" onmouseover="imgbright(this);" id="drop-saved-search-term-$search.id" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
+			<a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
+		</li>
+		{{ endfor }}
+	</ul>
+	<div class="clear"></div>
+</div>
diff --git a/view/theme/dispy-dark/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/duepuntozero/search_item.tpl b/view/theme/dispy-dark/search_item.tpl
index bfad1b7b7..bfad1b7b7 100755..100644
--- a/view/theme/duepuntozero/search_item.tpl
+++ b/view/theme/dispy-dark/search_item.tpl
diff --git a/view/theme/dispy-dark/star.png b/view/theme/dispy-dark/star.png
new file mode 100644
index 000000000..a327ba14e
--- /dev/null
+++ b/view/theme/dispy-dark/star.png
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
new file mode 100644
index 000000000..a3248c13c
--- /dev/null
+++ b/view/theme/dispy-dark/style.css
@@ -0,0 +1,2977 @@
+/*
+ * dispy-dark
+ *
+ * modernised, sort of, by simon <http://simon.kisikew.org/>
+ *
+ */
+
+/* from html5boilerplate */
+
+/* these are to tell browsers they should be displayed a certain way */
+article, aside, details, figcaption, figure, footer,
+header, hgroup, nav, section {
+    display: block;
+}
+audio, canvas, video, time {
+    display: inline-block;
+    *display: inline;
+    *zoom: 1;
+}
+audio:not([controls]) {
+    display: none;
+}
+[hidden] {
+    display: none;
+}
+
+/* 
+ *  Base
+ */
+
+/*
+ * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units
+ * 2. Force vertical scrollbar in non-IE
+ * 3. Prevent iOS text size adjust on device orientation change, without disabling user zoom: h5bp.com/g
+ */
+
+html {
+    font-size: 100%;
+    overflow-y: scroll;
+    -webkit-text-size-adjust: 100%;
+    -ms-text-size-adjust: 100%;
+}
+body {
+    margin: 0;
+    font-size: 16px;
+    line-height: 1.1em;
+}
+body, button, input, select, textarea {
+    font-family: sans-serif;
+    color: #eec;
+    background-color: #2e2f2e;
+}
+select {
+	border: 1px #555 dotted;
+	padding: 3px;
+	margin: 2px;
+	color: #eec;
+	background: #2e2f2e;
+}
+option {
+	padding: 3px;
+	vertical-align: middle;
+	color: #eec;
+	background: #2e2f2e;
+}
+ul, ol {
+	padding: 0;
+}
+/* remember to define focus styles! */
+:focus {
+    outline: 0;
+}
+
+/* remember to highlight inserts somehow! */
+ins {
+    background-color: #2e302e;
+    color: #ff9;
+    text-decoration: none;
+}
+mark {
+    background-color: #2e302e;
+    color: #ff9;
+    font-style: italic;
+    font-weight: bold;
+}
+/* Redeclare monospace font family: h5bp.com/j */
+pre, code, kbd, samp, .wall-item-body code {
+    font-family: monospace, monospace;
+    _font-family: monospace;
+    font-size: 1em; }
+
+/* Improve readability of pre-formatted text in all browsers */
+pre, .wall-item-body code {
+    white-space: pre;
+    white-space: pre-wrap;
+    word-wrap: break-word;
+}
+
+q {
+    quotes: none;
+}
+q:before, q:after {
+    content: "";
+    content: none;
+}
+small {
+    font-size: 85%;
+}
+
+/* Position subscript and superscript content without affecting line-height: h5bp.com/k */
+sub, sup {
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline;
+}
+sup {
+    top: -0.5em;
+}
+sub {
+    bottom: -0.25em;
+}
+img {
+    border: 0 none;
+    /*vertical-align: middle;*/
+}
+a {
+    color: #88a9d2;
+    text-decoration: none;
+    margin-bottom: 1px;
+}
+a:hover img {
+    text-decoration: none;
+}
+blockquote {
+    background: #444;
+	color: #eec;
+    text-indent: 5px;
+    padding: 5px;
+    border: 1px #aaa solid;
+    border-radius: 5px;
+}
+a:hover {
+    color: #729fcf;
+    border-bottom: 1px dotted #729fcf;
+}
+.required {
+    display: inline;
+    color: #ff0;
+    font-size: 16px;
+    font-weight: bold;
+    margin: 3px;
+}
+.fakelink, .lockview {
+    color: #729fcf;
+    cursor: pointer;
+}
+.fakelink:hover {
+    color: #729fcf;
+}
+input[type=submit] {
+    background-color: #eee;
+	color: #2e302e;
+	font-weight: bold;
+    margin-top: 10px;
+    height: 22px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 0;
+}
+.smalltext {
+    font-size: 0.7em;
+}
+#panel {
+	position: absolute;
+	font-size: 0.8em;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	border: 1px solid #fff;
+	background-color: #2e302e;
+	color: #eeeeec;
+	padding: 1em;
+}
+.pager {
+	margin-top: 60px;
+	display: block;
+	clear: both;
+	text-align: center;
+}
+.pager span {
+    padding: 4px;
+    margin: 4px;
+}
+.pager_current {
+    background-color: #729fcf;
+    color: #fff;
+}
+
+
+/**
+ * global
+ */
+/* .tool .action */
+.action {
+	margin: 5px 0;
+}
+.tool {
+	margin: 5px 0;
+	list-style: none;
+}
+
+
+/**
+ * 	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;
+}
+
+
+/**
+ * nav
+ */
+nav {
+	height: 60px;
+	display: block;
+	background-color: #1d1f1d;
+	color: #eeeeec;
+	position: relative;
+	padding: 20px 20px 10px 95px;
+    margin-left: auto;
+    margin-right: auto;
+}
+nav a {
+	text-decoration: none;
+	color: #eeeeec;
+	border: 0px;
+}
+nav a:hover {
+	text-decoration: none;
+	color: #eeeeec;
+    border: 0px;
+}
+nav #banner {
+	display: block;
+	position: absolute;
+	left: 51px;
+	top: 25px;
+}
+nav #banner #logo-text a {
+	font-size: 40px;
+	font-weight: bold;
+	margin-left: 3px;
+}
+ul#user-menu-popup {
+	display: none;
+	position: absolute;
+	background-color: #555753;
+	width: 100%;
+    padding: 10px 0px;
+    margin: 0px;
+	top: 20px;
+	left: 0;
+	-webkit-border-radius: 0 0 5px 5px;
+	-moz-border-radius: 0 0 5px 5px;
+	border-radius: 0 0 5px 5px;
+	z-index: 10000;
+}
+ul#user-menu-popup li {
+	display: block;
+}
+ul#user-menu-popup li a {
+	display: block;
+	padding: 5px;
+}
+ul#user-menu-popup li a:hover {
+	color: #2e302e;
+	background-color: #eeeeec;
+}
+ul#user-menu-popup li a.nav-sep {
+	border-top: 1px solid #eeeeec;
+}
+nav .nav-link {
+	float: right;
+	display: block;
+	width: 22px;
+	height: 22px;
+	overflow: hidden;
+	margin: 0px 5px 5px;
+	text-indent: 50px;
+	background: transparent url(icons.png) 0 0 no-repeat;
+}
+#nav-apps-link {
+	background-position: 0 -66px;
+}
+#nav-apps-link:hover {
+	background-position: -22px -66px;
+}
+#nav-community-link {
+    background-position: 0 -22px;
+}
+#nav-community-link:hover {
+    background-position: -22px -22px;
+}
+#nav-contacts-link {
+    background-position: 0 -22px;
+}
+#nav-contacts-link:hover {
+    background-position: -22px -22px;
+}
+#nav-directory-link {
+	background-position: -44px -154px;
+}
+#nav-directory-link:hover {
+	background-position: -66px -154px;
+}
+#nav-help-link {
+	background-position: 0 -110px;
+}
+#nav-help-link:hover {
+	background-position: -22px -110px;
+}
+#nav-home-link {
+    background-position: -44px -132px;
+}
+#nav-home-link:hover {
+    background-position: -66px -132px;
+}
+#nav-intro-link {
+	background-position: 0px -190px;
+}
+#nav-intro-link:hover {
+	background-position: -44px -190px;
+}
+#nav-login-link {
+	background-position: 0 -88px;
+}
+#nav-login-link:hover {
+	background-position: -22px -88px;
+}
+#nav-logout-link {
+	background-position: 0 -88px;
+}
+#nav-logout-link:hover {
+	background-position: -22px -88px;
+}
+#nav-messages-link {
+    background-position: -44px -88px;
+}
+#nav-messages-link:hover {
+    background-position: -66px -88px;
+}
+#nav-notify-link, #nav-notifications-linkmenu {
+    background-position: -44px -110px;
+}
+#nav-notify-link:hover {
+    background-position: -66px -110px;
+}
+#nav-network-link {
+    background-position: 0px -177px;
+}
+#nav-network-link:hover {
+    background-position: -22px -177px;
+}
+#nav-search-link {
+	background-position: 0 -44px;
+}
+#nav-search-link:hover {
+	background-position: -22px -44px;
+}
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#profile-attach-wrapper,
+#profile-audio,
+#profile-link,
+#profile-location,
+#profile-nolocation,
+#profile-title,
+#jot-title,
+#profile-upload-wrapper,
+#profile-video,
+#profile-jot-submit,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.icon, .hover, .focus, .pointer {
+    cursor: pointer;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+    background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+    color: #ffffff;
+    padding-left: 58px;
+}
+div.jGrowl div.info {
+    background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+    color: #ffffff;
+    padding-left: 58px;
+}
+#nav-notifications-menu {
+    margin: 30px 0 0 -20px;
+    width: 275px;
+    max-height: 300px;
+    overflow-y: auto;
+    font-size: 9pt;
+}
+#nav-notifications-menu .contactname {
+    font-weight: bold;
+    font-size: 0.9em;
+}
+#nav-notifications-menu img {
+    float: left;
+    margin-right: 5px;
+}
+#nav-notifications-menu .notif-when {
+    font-size: 0.8em;
+    display: block;
+}
+#nav-notifications-menu li {
+    padding: 7px 0px 7px 10px;
+    word-wrap: normal;
+    border-bottom: 1px solid #000;
+}
+#nav-notifications-menu li:hover {
+    color: black;
+}
+#nav-notifications-menu a:hover {
+    color: black;
+    text-decoration: underline;
+}
+nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+  background-image: url("../../../images/icons/22/notify_on.png");
+}
+.show {
+    display: block;
+}
+#notifications {
+	height: 20px;
+	width: 170px;
+	position: absolute;
+	top: -19px;
+	left: 7px;
+}
+#nav-floater {
+    position: fixed;
+    top: 20px;
+    right: 1%;
+    padding: 5px;
+    background: #1d1f1d;
+	color: transparent;
+    border-radius: 5px;
+    z-index: 100;
+	width: 300px;
+	height: 60px;
+}
+#nav-buttons {
+    clear: both;
+	list-style: none;
+	padding: 0px;
+	margin: 0 7px 0 0;
+	height: 25px;
+}
+#nav-buttons li {
+	padding: 0;
+}
+.floaterflip {
+	display: block;
+    position: fixed;
+    z-index: 110;
+    top: 56px;
+    right: 19px;
+	width: 22px;
+	height: 22px;
+	overflow: hidden;
+	margin: 0px;
+	background: transparent url(icons.png) -190px -60px no-repeat;
+}
+.search-box {
+	display: inline-block;
+	margin: 5px;
+	position: fixed;
+	right: 0px;
+	bottom: 0px;
+	z-index: 100;
+	background: #1d1f1d;
+	border-radius: 5px;
+}
+#search-text {
+	border: 1px #eec solid;
+	background: #2e2f2e;
+	color: #eec;
+}
+.search-box #search-text {
+	margin: 8px;
+	width: 10em;
+	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;
+	background: transparent url(notifications.png) 0 0 no-repeat;
+	color: #222;
+	font-weight: bold;
+	font-size: 0.8em;
+	padding-top: 0.2em;
+	text-align: center;
+	float: left;
+	margin: 0 -1px 0 3px;
+	display: block;
+	visibility: hidden;
+}
+.nav-ajax-update.show, .nav-ajax-left.show {
+    visibility: visible;
+}
+#net-update {
+	background-position: 0px 0px;
+}
+#mail-update {
+	background-position: -30px 0;
+}
+#notify-update {
+	background-position: -60px 0px;
+}
+#home-update {
+	background-position: -90px 0px;
+}
+#intro-update {
+	background-position: -120px 0px;
+}
+#lang-select-icon {
+	cursor: pointer;
+	position: fixed;
+	left: 28px;
+	bottom: 6px;
+	z-index: 10;
+}
+#language-selector {
+    position: fixed;
+    bottom: 2px;
+    left: 52px;
+	z-index: 10;
+}
+.menu-popup {
+    position: absolute;
+    display: none;
+    width: 11em;
+    background: #ffffff;
+    color: #2d2d2d;
+    margin: 0px;
+    padding: 0px;
+    list-style: none;
+    border: 3px solid #364e59;
+    z-index: 100000;
+    -webkit-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
+    -moz-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
+    box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
+}
+.menu-popup a {
+    display: block;
+    color: #2d2d2d;
+    padding: 5px 10px;
+    text-decoration: none;
+}
+.menu-popup a:hover {
+    background-color: #bdcdd4;
+}
+.menu-popup .menu-sep {
+    border-top: 1px solid #9eabb0;
+}
+.menu-popup li {
+    float: none;
+    overflow: auto;
+    height: auto;
+    display: block;
+}
+.menu-popup li img {
+    float: left;
+    width: 16px;
+    height: 16px;
+    padding-right: 5px;
+}
+.menu-popup .empty {
+    padding: 5px;
+    text-align: center;
+    color: #9eabb0;
+}
+.notif-item {
+    font-size: small;
+}
+.notif-item a {
+    vertical-align: middle;
+}
+.notif-image {
+    width: 32px;
+    height: 32px;
+    padding: 7px 7px 0px 0px;
+}
+.notify-seen {
+    background: #ddd;
+}
+
+
+/** sysmsg **/
+#sysmsg_info {
+	position: fixed;
+	bottom: 0;
+	-moz-box-shadow: 3px 3px 3px 10px 0 #000;
+	-webkit-box-shadow: 3px 3px 10px 0 #000;
+	box-shadow: 3px 3px 10px 0 #000;
+    padding: 10px;
+	background-color: #fcaf3e;
+	border:2px solid #f8911b;
+	border-bottom: 0;
+	padding-bottom: 50px;
+	z-index: 1000;
+}
+#sysmsg {
+	position: fixed;
+	bottom: 0;
+	-moz-box-shadow: 3px 3px 10px 0 #000;
+	-webkit-box-shadow: 3px 3px 10px 0 #000;
+	box-shadow: 3px 3px 10px 0 #000;
+    padding: 10px;
+	background-color: #fcaf3e;
+	border: 2px solid #f8911b;
+	border-bottom: 0;
+	padding-bottom: 50px;
+	z-index: 1000;
+}
+#sysmsg_info br,
+#sysmsg br {
+	display: block;
+	margin: 2px 0px;
+	border-top: 1px solid #ccccce;
+}
+
+
+/**
+* aside
+**/
+aside {
+    position: absolute;
+    right: 15px;
+    width: 245px;
+	padding-top: 15px;
+    font-size: smaller;
+}
+.vcard .fn {
+	font-size: 1.7em;
+	font-weight: bold;
+	border-bottom: 1px solid #729fcf;
+	padding-bottom: 3px;
+}
+.vcard #profile-photo-wrapper {
+	margin: 20px;
+}
+/* http://css-tricks.com/snippets/css/css-box-shadow/
+ * box-shadow:
+ * 1. The horizontal offset of the shadow, positive means
+ * the shadow will be on the right of the box, a negative
+ * offset will put the shadow on the left of the box.
+ * 2. The vertical offset of the shadow, a negative one
+ * means the box-shadow will be above the box, a
+ * positive one means the shadow will be below the box.
+ * 3. The blur radius (optional), if set to 0 the shadow
+ * will be sharp, the higher the number, the more blurred
+ * it will be.
+ * 4. The spread radius (optional), positive values increase
+ * the size of the shadow, negative values decrease the size.
+ * Default is 0 (the shadow is same size as blur).
+ * 5. Colo[u]r
+ */
+.vcard #profile-photo-wrapper img {
+	box-shadow: 3px 3px 10px 0 #000;
+}
+aside h4 {
+	font-size: 1.2em;
+}
+aside #viewcontacts {
+	text-align: right;
+}
+.aprofile dt {
+	background: #eec;
+	color: #2e2f2e;
+	font-weight: bold;
+    box-shadow: 1px 1px 5px 0 #000;
+    margin: 15px 0 5px;
+    padding-left: 5px;
+}
+#profile-extra-links ul {
+	margin-left: 0px;
+    padding-left: 0px;
+    list-style: none;
+}
+#dfrn-request-link {
+	background: #3465A4 url(connect.png) no-repeat 95% center;
+	border-radius: 5px 5px 5px 5px;
+	color: #eec;
+	display: block;
+	font-size: 1.2em;
+	padding: 0.2em 0.5em;
+}
+#wallmessage-link {
+	/*background: #3465A4 url(connect.png) no-repeat 95% center;*/
+	/*border-radius: 5px 5px 5px 5px;*/
+	color: #eee;
+	display: block;
+	font-size: 1.2em;
+	padding: 0.2em 0.5em;
+}
+#netsearch-box {
+	margin: 20px 0px 30px;
+    width: 150px;
+}
+#netsearch-box #search-submit {
+    margin: 5px 5px 0px 0px;
+}
+.ttright {
+	margin: 0px 0px 0px 0px;
+}
+
+
+/**
+* contacts block
+*/
+.contact-block-div {
+    width: 50px;
+    height: 50px;
+    float: left;
+}
+.contact-block-textdiv {
+    width: 150px;
+    height: 34px;
+    float: left;
+}
+#contact-block-end {
+    clear: both;
+}
+
+
+/**
+ * jot
+ **/
+#jot {
+  /*width: 785px;*/
+  margin: 10px 0 20px 0px;
+  width: 100%;
+}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 35px;
+  overflow: none;
+  width: 100%;
+  /*background-color: #0e232e;*/
+  /*border-bottom: 2px solid #9eabb0;*/
+}
+#jot #jot-tools span {
+    float: left;
+    margin: 10px 20px 2px 0px;
+}
+#jot #jot-tools span a {
+    display: block;
+}
+#jot #jot-tools .perms {
+    float: right;
+    width: 40px;
+}
+#jot #jot-tools li.loading {
+    float: right;
+    background-color: #ffffff;
+    width: 20px;
+    vertical-align: center;
+    text-align: center;
+    border-top: 2px solid #9eabb0;
+    height: 38px;
+}
+#jot #jot-tools li.loading img {
+    margin-top: 10px;
+}
+#jot #jot-title {
+	border: 1px solid #ccc;
+    margin: 0 0 5px;
+    height: 20px;
+    width: 90%;
+    font-weight: bold;
+    border-radius: 5px;
+	vertical-align: middle;
+}
+#jot-category {
+	margin: 5px 0;
+	border-radius: 5px;
+	border: 1px #999 solid;
+	color: #aaa;
+	font-size: smaller;
+}
+#jot-category:focus {
+	color: #eee;
+}
+#jot #character-counter {
+	width: 6%;
+	float: right;
+	text-align: right;
+	height: 15px;
+	line-height: 20px;
+	padding: 2px 20px 5px 0;
+}
+#profile-jot-text_tbl {
+	margin-bottom: 10px;
+}
+#profile-jot-text_ifr {
+	width:99.900002% !important;
+}
+[id$="jot-text_ifr"] {
+	width: 99.900002% !important;
+	color: #2e2f2e;
+	background: #eec;
+}
+[id$="jot-text_ifr"] .mceContentBody {
+	color: #2e2f2e;
+	background: #eec;
+}
+#profile-attach-wrapper,
+#profile-audio-wrapper,
+#profile-link-wrapper,
+#profile-location-wrapper,
+#profile-nolocation-wrapper,
+#profile-title-wrapper,
+#profile-upload-wrapper,
+#profile-video-wrapper {
+    float: left;
+	margin: 0 20px 0 0;
+}
+#profile-rotator-wrapper {
+	float: right; 
+}
+#profile-jot-tools-end,
+#profile-jot-banner-end {
+	clear: both;
+}
+#profile-jot-email-wrapper {
+	margin:10px 10% 0;
+	border:1px solid #555753;
+	border-bottom:0;
+}
+#profile-jot-email-label {
+	background-color:#555753;
+	color:#ccccce;
+	padding:5px;
+}
+#profile-jot-email {
+	width:90%;
+	margin:5px;
+}
+#profile-jot-networks {
+	margin: 0 10%;
+	border: 1px solid #555753;
+	border-top: 0;
+	border-bottom: 0;
+	padding: 5px;
+}
+#profile-jot-net {
+	margin: 5px 0;
+}
+#jot-preview-link {
+    margin: 0 0 0 10px;
+    border: 0;
+    text-decoration: none;
+	float: right;
+}
+.icon-text-preview {
+	margin: 0 0 -18px 0;
+	display: block;
+    width: 20px;
+    height: 20px;
+    background: url(icons.png) no-repeat -128px -40px;
+    border: 0;
+    text-decoration: none;
+	float: right;
+	cursor: pointer;
+}
+#profile-jot-perms { 
+	float: right;
+    background-color: #555753;
+    height: 22px;
+    width: 20px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;     
+    overflow: hidden;
+    border: 0px;
+    margin: 0 10px 0 10px;
+}
+#profile-jot-plugin-wrapper {
+	width: 1px;
+	margin: 10px 0 0 0;
+	float: right;
+}
+#profile-jot-submit-wrapper {
+	float: right;
+	width: 100%;
+	list-style: none;
+	margin: 10px 0 0 0;
+	padding: 0;
+}
+#profile-jot-submit {
+	height: 22px;
+	background-color: #555753;
+	color: #eeeeec;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	border: 0;
+	margin: 0;
+	float: right;
+}
+#jot-perms-icon {
+	height: 22px;
+	width: 20px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	overflow: hidden;
+	border: 0;
+}
+#profile-jot-acl-wrapper {
+	margin: 0 10px;
+	border: 1px solid #555753;
+	border-top: 0;
+	display: block !important;
+}
+#group_allow_wrapper,
+#group_deny_wrapper,
+#acl-permit-outer-wrapper {
+	width:47%;
+	float:left;
+}
+#contact_allow_wrapper,
+#contact_deny_wrapper,
+#acl-deny-outer-wrapper {
+	width:47%;
+	float:right;
+}
+#acl-permit-text {
+	background-color: #555753;
+	color: #ccccce;
+	padding: 5px;
+	float: left;
+}
+#jot-public {
+	background-color: #555753;
+	color: #ff0000;
+	padding: 5px;
+	float: left;
+}
+#acl-deny-text {
+	background-color: #555753;
+	color: #ccccce;
+	padding: 5px;
+	float: left;
+}
+#acl-permit-text-end,
+#acl-deny-text-end {
+	clear: both;
+}
+#jot-title-desc {
+	color: #ccc;
+}
+#profile-jot-desc {
+	color: #ff2000;
+	margin: 5px 0;
+}
+#jot-title-wrapper {
+	margin-bottom: 5px;
+}
+#jot-title-display {
+	font-weight: bold;
+}
+.jothidden {
+    display: none;
+}
+#jot-preview-content {
+    background-color: #3e3f3e;
+	color: #eec;
+    border: 1px #eec solid;
+    border-radius: 5px;
+    padding: 3px 3px 6px 10px;
+}
+#jot-preview-content .wall-item-outside-wrapper {
+	border: 0;
+	border-radius: 0px;
+}
+
+
+/**
+ * section
+ */
+section {
+    margin: 20px 9% 0 4%;
+    font-size: 0.8em;
+    padding-right: 230px;
+	min-width: 475px;
+	width: 65%;
+}
+
+/** tabs **/
+.tabs {
+    list-style: none;
+    margin: 10px 0;
+    padding: 0;
+}
+.tabs li {
+    display: inline;
+	font-size: smaller;
+	font-weight: bold;
+}
+.tab {
+    border: 1px solid #729fcf;
+	padding: 4px;
+}
+.tab:hover, .tab.active:hover {
+    background: #88a9d2;
+    color: #2e2f2e;
+}
+.tab:active {
+    background: #88a9d2;
+    color: #2e2f2e;
+}
+.tab.active {
+	background: #88a9d2;
+    color: #2e2f2e;
+}
+.tab.active a {
+	color: #2e2f2e;
+}
+.tab a {
+	border: 0;
+	text-decoration: none;
+}
+
+
+/**
+ * 	items
+ */
+.wall-item-outside-wrapper {
+	border: 1px solid #aaa;
+	border-radius: 5px;
+}
+.wall-item-outside-wrapper.comment {
+	margin-top: 5px;
+}
+.wall-item-outside-wrapper-end {
+    clear: both;
+}
+.wall-item-content-wrapper {
+    position: relative;
+	padding: 10px;
+	width: auto;
+}
+.wall-item-outside-wrapper .wall-item-comment-wrapper {
+    /*margin-left: 90px;*/
+}
+.shiny {
+    background: #2e3436;
+	border-radius: 5px;
+}
+.wall-outside-wrapper .shiny {
+	border-radius: 5px;
+}
+.heart {
+	color: red;
+}
+.wall-item-content {
+	overflow-x: auto;
+	margin: 0px 15px 0px 5px;
+}
+/* removing it from here, vs. putting it in .wall-item-content
+ * might break things for people. we shall see ;) */
+[id^="tread-wrapper"], [class^="tread-wrapper"] {
+    margin: 15px 0 0 0;
+    padding: 0px;
+	/*overflow-x: auto;*/
+}
+.wall-item-photo-menu {
+    display: none;
+}
+.wall-item-photo-menu-button {
+    display:none;
+    text-indent:-99999px;
+    background:#555753 url(menu-user-pin.jpg) no-repeat 75px center;
+    position:absolute;
+    overflow:hidden;
+    height:20px;
+    width:90px;
+    top:85px;
+    left:0;
+    -webkit-border-radius:0 0 5px 5px;
+    -moz-border-radius:0 0 5px 5px;
+    border-radius:0 0 5px 5px;
+}
+.wall-item-info {
+    float: left;
+    width: 110px;
+}
+.wall-item-photo-wrapper {
+    width: 80px;
+    height: 80px;
+    position: relative;
+    padding: 5px;
+    background-color: #555753;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+}
+[class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
+	/*margin: 0 0 5px 0;*/
+}
+.wall-item-tools {
+    float: right;
+    filter: alpha(opacity=35);
+    opacity: 0.4;
+    -webkit-transition: all 1s ease-in-out;
+    -moz-transition: all 1s ease-in-out;
+    -o-transition: all 1s ease-in-out;
+    -ms-transition: all 1s ease-in-out;
+    transition: all 1s ease-in-out;
+}
+.wall-item-tools:hover {
+    filter: alpha(opacity=100);
+    opacity: 1;
+    -webkit-transition: all 1s ease-in-out;
+    -moz-transition: all 1s ease-in-out;
+    -o-transition: all 1s ease-in-out;
+    -ms-transition: all 1s ease-in-out;
+    transition: all 1s ease-in-out;
+}
+.wall-item-subtools1 {
+    height: 30px;
+    list-style: none outside none;
+    margin: 20px 0 30px -20px;
+    padding: 0;
+    width: 30px;
+}
+.wall-item-subtools2 {
+    height: 25px;
+    list-style: none outside none;
+    margin: -75px 0 0 5px;
+    padding: 0;
+    width: 25px;
+}
+.wall-item-title {
+	font-size: 1.2em;
+	font-weight: bold;
+    margin-bottom: 1em;
+}
+.wall-item-body {
+	margin: 20px 20px 10px 0px;
+    text-align: left;
+	overflow-x: auto;
+}
+.wall-item-lock-wrapper {
+	float: right;
+    height: 22px;
+    margin: 0 -5px 0 0;
+    width: 22px;
+	opacity: 1;
+}
+.wall-item-dislike,
+.wall-item-like {
+	clear: left;
+	font-size: 0.8em;
+	color: #878883;
+	margin: 5px 0 5px 120px;
+}
+.wall-item-author, .wall-item-actions-author {
+	clear: left;
+	font-size: 0.8em;
+	color: #878883;
+	margin: 20px 20px 0 110px;
+}
+.wall-item-ago {
+	display: inline;
+	padding-left: 10px;
+}
+.wall-item-wrapper-end {
+	clear:both;
+}
+.wall-item-location {
+    margin-top: 15px;
+    width: 100px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+}
+.wall-item-location .icon {
+    float: left;
+}
+.wall-item-location > a {
+    margin-left: 25px;
+    font-size: 0.7em;
+    display: block;
+}
+.wall-item-location .smalltext {
+    margin-left: 25px;
+    font-size: 0.7em;
+    display: block;
+}
+.wall-item-location > br {
+    display: none;
+}
+.wallwall .wwto {
+    left: 5px;
+    margin: 0;
+    position: absolute;
+    top: 75px;
+    width: 30px;
+    z-index: 10001;
+    width: 30px;
+    height: 30px;
+}
+.wallwall .wwto img {
+    width: 30px !important;
+    height: 30px !important;
+}
+.wallwall .wall-item-photo-end {
+    clear: both;
+}
+.wall-item-arrowphoto-wrapper {
+    position: absolute;
+    left: 35px;
+    top: 80px;
+    z-index: 10002;
+}
+.wall-item-photo-menu {
+	min-width: 92px;
+	border: 2px solid #FFFFFF;
+	border-top: 0px;
+	background: #555753;
+	position: absolute;
+	left: -2px; top: 101px;
+	display: none;
+	z-index: 10003;
+	-webkit-border-radius: 0px 5px 5px 5px;
+	-moz-border-radius: 0px 5px 5px 5px;
+	border-radius: 0px 5px 5px 5px;
+}
+.wall-item-photo-menu ul {
+    margin:0px;
+    padding: 0px;
+    list-style: none;
+}
+.wall-item-photo-menu li a {
+    white-space: nowrap;
+    display: block;
+    padding: 5px 2px;
+    color: #eeeeec;
+}
+.wall-item-photo-menu li a:hover {
+    color: #555753;
+    background: #eeeeec;
+}
+#item-delete-selected {
+    overflow: auto;
+    width: 100%;
+}
+#connect-services-header {
+
+}
+#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;
+}
+
+
+/**
+ * 	comment
+ */
+.ccollapse-wrapper {
+    font-size: 0.9em;
+    margin-left: 80px;
+}
+
+.wall-item-outside-wrapper.comment {
+    margin-left: 80px;
+}
+.wall-item-outside-wrapper.comment .wall-item-photo {
+    width: 40px!important;
+    height: 40px!important;
+}
+.wall-item-outside-wrapper.comment .wall-item-photo-wrapper {
+    width: 40px;
+    height: 40px;
+}
+.wall-item-outside-wrapper.comment .wall-item-photo-menu-button {
+	width: 50px;
+    top: 45px;
+    background-position: 35px center;
+}
+.wall-item-outside-wrapper.comment .wall-item-info {
+    width: 60px;
+}
+.wall-item-outside-wrapper.comment .wall-item-body {
+    margin-left: 10px;
+}
+.wall-item-outside-wrapper.comment .wall-item-author {
+    margin-left: 50px;
+}
+
+.wall-item-outside-wrapper.comment .wall-item-photo-menu {
+    min-width: 50px;
+    top: 60px;
+}
+.comment-wwedit-wrapper {
+    /*margin: 30px 0px 0px 80px;*/
+}
+.comment-edit-wrapper {
+    border-top: 1px #aaa solid;
+}
+.comment-wwedit-wrapper img,
+.comment-edit-wrapper img {
+	width: 20px;
+	height: 20px;
+}
+.comment-edit-photo-link, .comment-edit-photo {
+	float: left;
+	margin-left: 10px;
+}
+.my-comment-photo {
+    width: 40px;
+    height: 40px;
+    padding: 5px;
+}
+[class^="comment-edit-text"] {
+    margin: 5px 0 10px 20px;
+    width: 84.5%;
+}
+.comment-edit-text-empty {
+	height: 20px;
+	border: 2px #c8bebe solid;
+	border-radius: 5px;
+	color: #c8bebe;
+	-webkit-transition: all 0.5s ease-in-out;
+	-moz-transition: all 0.5s ease-in-out;
+	-o-transition: all 0.5s ease-in-out;
+	-ms-transition: all 0.5s ease-in-out;
+	transition: all 0.5s ease-in-out;	
+}
+.comment-edit-text-empty:hover {
+	color: #999999;
+}
+.comment-edit-text-full {
+	height: 10em;
+    border-radius: 5px;
+	-webkit-transition: all 0.5s ease-in-out;
+	-moz-transition: all 0.5s ease-in-out;
+	-o-transition: all 0.5s ease-in-out;
+	-ms-transition: all 0.5s ease-in-out;
+	transition: all 0.5s ease-in-out;	
+}
+.comment-edit-submit-wrapper {
+	width: 90%;
+	margin: 5px 5px 10px 50px;
+	text-align: right;
+}
+.comment-edit-submit {
+    height: 22px;
+    background-color: #555753;
+    color: #eeeeec;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 0;
+}
+
+
+/**
+ * item text style
+ **/
+.wall-item-body code {
+	display: block;
+	padding: 0 0 10px 5px;
+	border-color: #ccc;
+	border-style: solid;
+	border-width: 1px 1px 1px 10px;
+	background: #eee;
+	color: #2e2f2e;
+	width: 95%;
+}
+
+
+/**
+ * profile
+ **/
+div[id$="text"] {
+    font-weight: bold;
+    border-bottom: 1px solid #ccc;
+}
+div[id$="wrapper"] {
+    height: 100%;
+    margin-bottom: 1em;
+}
+div[id$="wrapper"] br {
+    clear: left;
+}
+#advanced-profile-with {
+    margin-left: 200px;
+}
+
+
+/**
+ * photos
+ **/
+.photos {
+	height: auto;
+	overflow: auto;
+}
+#photo-top-links {
+    margin-bottom: 30px;
+}
+.photo-album-image-wrapper,
+.photo-top-image-wrapper {
+    float: left;
+    -moz-box-shadow: 3px 3px 10px 0 #000;
+    -webkit-box-shadow: 3px 3px 10px 0 #000;
+    box-shadow: 3px 3px 10px 0 #000;
+    background-color: #222;
+	color: #2e2f2e;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    padding-bottom: 30px;
+    position: relative;
+    margin: 0 10px 10px 0;
+}
+
+#photo-photo {
+    max-width: 100%;
+}
+#photo-photo img {
+    max-width: 100%;
+}
+.photo-top-image-wrapper a:hover,
+#photo-photo a:hover,
+.photo-album-image-wrapper a:hover {
+    border-bottom: 0;
+}
+.photo-top-photo,.photo-album-photo {
+    -webkit-border-radius:5px 5px 0 0;
+    -moz-border-radius:5px 5px 0 0;
+    border-radius:5px 5px 0 0;
+}
+.photo-top-album-name {
+    position: absolute;
+    bottom: 0;
+    padding: 0 5px;
+}
+.caption {
+    position: absolute;
+    bottom: 0;
+    margin: 0 5px;
+}
+#photo-photo {
+	position: relative;
+	float:left;
+}
+#photo-photo-end {
+    clear: both;
+}
+#photo-prev-link,
+#photo-next-link {
+    position:absolute;
+    width:30%;
+    height:100%;
+    background-color:rgba(255,255,255,0.5);
+    opacity:0;
+    -webkit-transition:all .2s ease-in-out;
+    -moz-transition:all .2s ease-in-out;
+    -o-transition:all .2s ease-in-out;
+    -ms-transition:all .2s ease-in-out;
+    transition:all .2s ease-in-out;
+    background-position:center center;
+    background-repeat:no-repeat;
+}
+#photo-prev-link {
+    left:0;
+    top:0;
+    background-image:url(prev.png);
+}
+#photo-next-link {
+    right:0;
+    top:0;
+    background-image:url(next.png);
+}
+
+#photo-prev-link a,#photo-next-link a {
+    display:block;
+    width:100%;
+    height:100%;
+    overflow:hidden;
+    text-indent:-900000px;
+}
+#photo-prev-link:hover,
+#photo-next-link:hover {
+    opacity:1;
+    -webkit-transition:all .2s ease-in-out;
+    -moz-transition:all .2s ease-in-out;
+    -o-transition:all .2s ease-in-out;
+    -ms-transition:all .2s ease-in-out;
+    transition:all .2s ease-in-out;
+}
+#photo-next-link .icon,
+#photo-prev-link .icon {
+    display: none;
+}
+#photos-upload-spacer,
+#photos-upload-new-wrapper,
+#photos-upload-exist-wrapper {
+    margin-bottom: 1em;
+}
+#photos-upload-existing-album-text,
+#photos-upload-newalbum-div {
+    background-color:#555753;
+    color:#eeeeec;
+    padding:1px;
+}
+#photos-upload-album-select,
+#photos-upload-newalbum {
+    width: 99%;
+}
+#photos-upload-perms-menu {
+    text-align: right;
+}
+#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
+    float: left;
+    margin-bottom: 25px;
+}
+#photo-edit-link-wrap {
+    margin-bottom: 15px;
+}
+#photo-edit-caption {
+	width: 100%;
+}
+#photo-edit-newtag {
+	width: 100%;
+}
+#photo-like-div {
+    margin-bottom: 25px;
+}
+#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end {
+    clear: both;
+}
+#photo-edit-delete-button {
+    margin-left: 200px;
+}
+#photo-edit-end {
+    margin-bottom: 35px;
+}
+#photo-caption {
+    font-size: 110%;
+    font-weight: bold;
+    margin-top: 15px;
+    margin-bottom: 15px;
+}
+
+/**
+ * 	message
+ */
+.prvmail-text {
+    width: 100%;
+}
+#prvmail-subject {
+    width: 100%;
+	color: #2e2f2e;
+	background: #eec;
+}
+#prvmail-submit-wrapper {
+    margin-top: 10px;
+}
+#prvmail-submit {
+    float:right;
+    margin-top: 0;
+}
+#prvmail-submit-wrapper > div {
+    margin-right:5px;
+    float:left;
+}
+.mail-list-outside-wrapper {
+    margin-top: 20px;
+}
+.mail-list-sender {
+    float: left;
+}
+.mail-list-detail {
+    margin-left: 90px;
+}
+.mail-list-sender-name {
+    display: inline;
+	font-size: 1.1em;
+}
+.mail-list-date {
+    display: inline;
+    font-size: 0.9em;
+    padding-left: 10px;
+}
+.mail-list-sender-name, .mail-list-date {
+	font-style: italic;
+}
+.mail-list-subject {
+    font-size: 1.2em;
+}
+.mail-list-delete-wrapper {
+    float: right;
+}
+.mail-list-outside-wrapper-end {
+    clear: both;
+	border-bottom: 1px #eec dotted;
+}
+.mail-conv-sender {
+    float: left;
+    margin: 0px 5px 5px 0px;
+}
+.mail-conv-sender-photo {
+    width: 32px;
+    height: 32px;
+}
+.mail-conv-sender-name {
+    float: left;
+}
+.mail-conv-date {
+    float: right;
+}
+.mail-conv-subject {
+    clear: right;
+    font-weight: bold;
+    font-size: 1.2em;
+}
+.mail-conv-body {
+    clear: both;
+}
+.mail-conv-delete-wrapper {
+    margin-top: 5px;
+}
+
+
+/**
+ * 	contacts
+ */
+.view-contact-wrapper,
+.contact-entry-wrapper {
+    float: left;
+    margin: 0 5px 40px 0;
+    width: 120px;
+	height: 120px;
+	padding: 3px;
+    position: relative;
+}
+.contact-direction-wrapper {
+    position: absolute;
+    top: 20px;
+}
+.contact-edit-links {
+    position: absolute;
+    top: 60px;
+}
+.contact-entry-photo-wrapper {
+
+}
+.contact-entry-photo {
+	margin-left: 20px;
+}
+.contact-entry-name {
+    width: 120px;
+    font-weight: bold;
+    /*overflow: hidden;*/
+}
+.contact-entry-photo {
+	position: relative;
+}
+.contact-entry-edit-links .icon {
+    border: 1px solid #babdb6;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+    background-color: #fff;
+}
+#contact-entry-url, [id^="contact-entry-url"] {
+    font-size: smaller;
+    /*overflow: scroll;*/
+}
+#contact-entry-network, [id^="contact-entry-network"] {
+    font-size: smaller;
+    font-style: italic;
+}
+#contact-edit-banner-name {
+    font-size: 1.5em;
+}
+#contact-edit-photo-wrapper {
+    position: relative;
+    float: left;
+    padding: 20px;
+}
+#contact-edit-direction-icon {
+    position:absolute;
+    top:60px;
+    left:0;
+}
+#contact-edit-nav-wrapper {
+    margin-left: 0px;
+}
+#contact-edit-links {
+    margin-top: 23px;
+}
+#contact-edit-links ul {
+    list-style-type: none;
+}
+#contact-drop-links {
+    margin-left:5px;
+}
+#contact-edit-nav-wrapper .icon {
+	border: 1px solid #babdb6;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;	
+}
+#contact-edit-poll-wrapper {
+    margin-left: 0px;
+}
+#contact-edit-last-update-text {
+    margin-bottom: 15px;
+}
+#contact-edit-last-updated {
+    font-weight: bold;
+}
+#contact-edit-poll-text {
+    display: inline;
+}
+#contact-edit-info_tbl, #contact-edit-info_parent {
+    width: 100%;
+}
+.mceLayout {
+    width: 100%;
+}
+#contact-edit-end {
+    clear: both;
+    margin-bottom: 65px;
+}
+
+.contact-photo-menu-button {
+    position: absolute;
+    background-image: url("photo-menu.jpg");
+    background-position: top left; 
+    background-repeat: no-repeat;
+    margin: 0px; padding: 0px;
+    width: 16px;
+    height: 16px;
+    top: 64px; left:0px;
+    overflow: hidden;
+    text-indent: 40px;
+    display: none;
+}
+.contact-photo-menu {
+    width: auto;
+    border: 2px solid #444;
+    background: #2e2f2e;
+	color: #eec;
+    position: absolute;
+    left: 0px; top: 90px;
+    display: none;
+    z-index: 10000;
+}
+.contact-photo-menu ul {
+    margin:0px;
+    padding: 0px;
+    list-style: none;
+}
+.contact-photo-menu li a {
+    display: block;
+    padding: 2px;
+}
+.contact-photo-menu li a:hover {
+    color: #fff;
+    background: #3465A4;
+    text-decoration: none;
+}
+
+
+/**
+ * 	register, settings & profile forms
+ */
+.openid {
+
+}
+#id_openid_url {
+    background:url(login-bg.gif) no-repeat;
+    background-position:0 50%;
+    padding-left:18px;
+}
+
+#settings-nickname-desc {
+    background-color: #eec;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    padding: 5px;
+	color: #111;
+}
+#settings-default-perms {
+    margin-bottom: 20px;
+}
+#register-form div,
+#profile-edit-form div {
+    clear: both;
+}
+
+/*#register-form label,     */
+/*#profile-edit-form label {*/
+/*    width: 300px;         */
+/*    float: left;          */
+/*}                         */
+
+/*#register-form span,     */
+/*#profile-edit-form span {*/
+/*    color: #555753;      */
+/*    display: block;      */
+/*    margin-bottom: 20px; */
+/*}                        */
+#profile-edit-marital-label span {
+	margin: -4px;
+}
+.settings-submit-wrapper,
+.profile-edit-submit-wrapper {
+    margin: 30px 0px;
+}
+.profile-edit-side-div {
+	display: none;
+}
+/*.profile-edit-side-div:hover {
+	display: block;
+}
+.profile-edit-side-link {
+	margin: 3px 0px 0px 70px;
+}*/
+#profiles-menu-trigger {
+	margin: 0px 0px 0px 25px;
+}
+.profile-listing {
+    float: left;
+    margin: 20px 20px 0px 0px;
+}
+.icon-profile-edit {
+    background: url("icons.png") -150px 0px no-repeat;
+    border: 0;
+	cursor: pointer;
+    display: block;
+    float: right;
+	width: 20px;
+    height: 20px;
+    margin: 0 0 -18px;
+	position: absolute;
+    text-decoration: none;
+	top: 18px;
+	right: 226px;
+}
+#profile-edit-links ul {
+    margin: 20px 0;
+    padding: 0;
+    list-style: none;
+}
+.marital {
+	margin-top: 5px;
+}
+#register-sitename {
+    display: inline;
+    font-weight: bold;
+}
+#advanced-expire-popup {
+	background: #2e2f2e;
+	color: #eec;
+}
+#id_ssl_policy {
+	width: 374px;
+}
+
+
+/**
+ * 	contacts selector
+ */
+.group-delete-wrapper {
+	margin: -31px 50px 0 0;
+    float: right;
+}
+/*.group-delete-icon {
+    margin: 0 0 0 10px;
+}*/
+#group-edit-submit-wrapper {
+    margin: 0 0 10px 0;
+    display: inline;
+}
+#group-edit-desc {
+    margin: 10px 0px;
+}
+#group-members,
+#prof-members {
+    height:200px;
+    overflow:auto;
+    border:1px solid #555753;
+    -webkit-border-radius:5px 5px 0 0;
+    -moz-border-radius:5px 5px 0 0;
+    border-radius:5px 5px 0 0;
+}
+#group-all-contacts,
+#prof-all-contacts {
+    height:200px;
+    overflow:auto;
+    border:1px solid #555753;
+    -webkit-border-radius:0 0 5px 5px;
+    -moz-border-radius:0 0 5px 5px;
+    border-radius:0 0 5px 5px;
+}
+#group-members h3,
+#group-all-contacts h3,
+#prof-members h3,
+#prof-all-contacts h3 {
+    color:#eeeeec;
+    background-color:#555753;
+    margin:0;
+    padding:5px;
+}
+#group-separator,
+#prof-separator {
+    display: none;
+}
+
+
+/**
+ * profile
+ */
+#cropimage-wrapper {
+    float:left;
+}
+#crop-image-form {
+    clear:both;
+}
+
+
+/**
+ * intros
+ */
+.intro-wrapper {
+    margin-top: 20px;
+}
+
+.intro-fullname {
+    font-size: 1.1em;
+    font-weight: bold;
+
+}
+.intro-desc {
+    margin-bottom: 20px;
+    font-weight: bold;
+}
+
+.intro-note {
+    padding: 10px;
+}
+
+.intro-end {
+    padding: 30px;
+}
+
+.intro-form {
+    float: left;
+}
+.intro-approve-form {
+    clear: both;
+}
+.intro-approve-as-friend-end {
+    clear: both;
+}
+.intro-submit-approve, .intro-submit-ignore {
+    margin-right: 20px;
+}
+.intro-submit-approve {
+    margin-top: 15px;
+}
+
+.intro-approve-as-friend-label, .intro-approve-as-fan-label {
+    float: left;
+}
+.intro-approve-as-friend, .intro-approve-as-fan {
+    float: left;
+}
+.intro-form-end {
+    clear: both;
+    margin-bottom: 10px;
+}
+.intro-approve-as-friend-desc {
+    margin-top: 10px;
+}
+.intro-approve-as-end {
+    clear: both;
+    margin-bottom: 10px;
+}
+
+.intro-end {
+    clear: both;
+}
+
+
+/**
+ * events
+ **/
+.clear { clear: both; }
+.eventcal {
+    float:left;
+    font-size:20px;
+}
+.event {
+	background: #2e2f2e;
+}
+.vevent {
+    border:1px solid #ccc;
+}
+.vevent .event-description, .vevent .event-location {
+	margin-left: 10px;
+	margin-right: 10px;
+}
+.vevent .event-start {
+	margin-left: 10px;
+	margin-right: 10px;
+}
+#new-event-link {
+	margin-bottom: 10px;
+}
+.edit-event-link, .plink-event-link {
+	/*float: left;      */
+	/*margin-top: 4px;  */
+	/*margin-right: 4px;*/
+	/*margin-bottom: 15px;*/
+}
+.event-description:before {
+	content: url('../../../images/calendar.png');
+	margin-right: 15px;
+}
+.event-start, .event-end {
+	margin-left: 10px;
+	width: 330px;
+	font-size: smaller;
+}
+.event-start .dtstart, .event-end .dtend {
+	float: right;
+}
+.event-list-date {
+	margin-bottom: 10px;
+}
+.prevcal, .nextcal {
+	float: left;
+	margin-left: 32px;
+	margin-right: 32px;
+	margin-top: 64px;
+}
+.event-calendar-end {
+	clear: both;
+}
+.calendar {
+    font-family: monospace;
+}
+.today {
+	font-weight: bold;
+	color: #FF0000;
+} 
+#event-start-text, 
+#event-finish-text {
+	margin-top: 10px;
+	margin-bottom: 5px;
+}
+#event-nofinish-checkbox,
+#event-nofinish-text,
+#event-adjust-checkbox,
+#event-adjust-text,
+#event-share-checkbox {
+    float:left;
+}
+#event-datetime-break {
+	margin-bottom: 10px;
+}
+#event-nofinish-break,
+#event-adjust-break,
+#event-share-break {
+	clear: both;
+}
+#event-desc-text, 
+#event-location-text {
+	margin-top: 10px;
+	margin-bottom: 5px;
+}
+#event-submit {
+	margin-top: 10px;
+}
+.body-tag {
+	margin: 10px 0;
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+}
+.body-tag:hover {
+	opacity: 1.0 !important;
+	filter:alpha(opacity=100) !important;
+}
+.filesavetags, .categorytags {
+	margin: 20px 0;
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+}
+.filesavetags:hover, .categorytags:hover {
+	margin: 20px 0;
+	opacity: 1.0 !important;
+	filter:alpha(opacity=100) !important;
+}
+.item-select {
+	opacity: 0.1;
+	filter:alpha(opacity=10);
+	float: right;
+	margin-right: 5px;
+}
+.item-select:hover, .checkeditem {
+	opacity: 1;
+	filter:alpha(opacity=100);
+}
+#item-delete-selected {
+	margin-top: 30px;
+}
+/* was tired of having no way of moving it around, so
+ * here's a little 'hook' to do so */
+.delete-checked {
+	position: absolute;
+	left: 35px;
+	margin-top: 20px;
+}
+#item-delete-selected-end {
+	clear: both;
+}
+#item-delete-selected-icon, #item-delete-selected-desc {
+	float: left;
+	margin-right: 5px;
+}
+#item-delete-selected-desc:hover {
+	text-decoration: underline;
+}
+.fc-state-highlight {
+    background: #eec;
+    color: #2e2f2e;
+}
+
+
+/**
+ * 	directory
+ */
+.directory-item {
+    float: left;
+	/*margin: 50px 50px 0px 0px;*/
+	margin: 0 5px 4px 0;
+	padding: 3px;
+	width: 180px;
+	height: 250px;
+    position: relative;
+}
+
+
+/**
+ * sidebar
+ */
+#group-sidebar {
+    margin-bottom: 10px;
+}
+.group-selected, .nets-selected, .fileas-selected {
+    padding: 3px;
+	color: #2e2f2e;
+    background: #88a9d2;
+    font-weight: bold;
+}
+.group-selected:hover, .nets-selected:hover, .fileas-selected:hover {
+	color: #2e2f2e;
+}
+.groupsideedit {
+    margin-right: 10px;
+}
+#sidebar-group-ul {
+    padding-left: 0;
+}
+#sidebar-group-list {
+    margin: 0 0 5px 0;
+}
+#sidebar-group-list ul {
+    list-style-type: none;
+    list-style-position: inside;
+}
+#sidebar-group-list li {
+    margin-top: 10px;
+}
+#sidebar-group-list .icon {
+    display: inline-block;
+    height: 12px;
+    width: 12px;
+}
+#sidebar-new-group {
+    margin: auto;
+    display: inline-block;
+    color: #efefef;
+    text-decoration: none;
+    text-align: center;
+}
+#peoplefind-sidebar form {
+	margin-bottom: 10px;
+}
+#sidebar-new-group:hover {
+    /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
+    /*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/
+    /*background-color: #b20202;*/
+}
+
+#sidebar-new-group:active {
+    position: relative;
+    top: 1px;
+}
+#side-peoplefind-url {
+    background-color: #2e2f2e;
+    color: #eec;
+	border: 1px 999 solid;
+	margin-right: 3px;
+	width: 75%;
+}
+#side-peoplefind-url:hover, #side-peoplefind-url:focus {
+    background-color: #efefef;
+    color: #222;
+	border: 1px 333 solid;
+}
+.nets-ul {
+    list-style-type: none;
+    padding-left: 0px;
+}
+.nets-ul li {
+    margin: 10px 0 0;
+}
+
+.nets-link {
+    margin-left: 0px;
+}
+.nets-all {
+    margin-left: 0px;
+}
+#netsearch-box {
+    margin-top: 20px;
+    width: 150px;   
+}
+#netsearch-box #search-submit {
+    margin: 5px 0px 0px 0px;
+}
+
+
+/**
+ * ADMIN
+ */
+#pending-update {
+    float:right;
+    color: #fff;
+    font-weight: bold;
+    background-color: #ff0000;
+    padding: 0 .3em;
+}
+.admin.linklist {
+    border: 0; padding: 0;
+}
+.admin.link {
+    list-style-position: inside;
+}
+#adminpage dl {
+    clear:left;
+    margin-bottom: 2px;
+    padding-bottom: 2px;
+    border-bottom: 1px solid #000;
+}
+#adminpage dt {
+    width: 250px;
+    float: left;
+    font-weight: bold;
+}
+#adminpage dd {
+	margin-left: 250px;
+}
+#adminpage h3 {
+    border-bottom:1px solid #ccc;
+}
+
+#adminpage .submit {
+	clear:left;
+}
+
+#adminpage #pluginslist {
+    margin: 0;
+    padding: 0;
+}
+#adminpage .plugin {
+    list-style: none;
+    display: block;
+    border: 1px solid #888;
+    padding: 1em;
+    margin-bottom: 5px;
+    clear: left;
+}
+#adminpage .toggleplugin {
+	float:left;
+	margin-right: 1em;
+}
+
+#adminpage table {
+    width: 100%;
+    border-bottom: 1px solid #000;
+    margin: 5px 0;
+}
+#adminpage table th {
+    text-align: left;
+}
+#adminpage td .icon {
+    float: left;
+}
+#adminpage table#users img {
+    width: 16px; height: 16px;
+}
+#adminpage table tr:hover {
+	color: #2e2f2e;
+    background-color: #eec;
+}
+#adminpage .selectall {
+    text-align: right;
+}
+#adminpage #users a {
+	color: #2e2f2e;
+	text-decoration: underline;
+}
+
+/**
+ * Form fields
+ */
+.field {
+	/*margin-bottom: 10px;*/
+	/*padding-bottom: 10px;*/
+	overflow: auto;
+    width: 100%;
+}
+.field label, label {
+    float: left;
+    width: 275px;
+	display: block;
+	font-size: 1.077em;
+	margin: 0 10px 0.5em 0;
+	border: 1px #2e2f2e solid;
+	padding: 5px;
+	background: #eec;
+	vertical-align: middle;
+	color: #111;
+}
+.field input, input[type="text"] {
+	width: 250px;
+	height: 25px;
+	border: 1px #999 solid;
+}
+.field textarea {
+    width: 80%;
+    height: 100px;
+}
+.field_help {
+    display: block;
+    margin-left: 297px;
+    color: #aaa;
+}
+.field .onoff {
+    float: left;
+    width: 80px;
+}
+.field .onoff a {
+    display: block;
+    border: 1px solid #666;
+    padding: 3px 6px 4px 10px;
+    height: 16px;
+    text-decoration: none;
+}
+.field .onoff .on {
+	background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
+    color: #111;
+    text-align: left;
+}
+.field .onoff .off {
+	background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
+    color: #333;
+    text-align: right;
+}
+.hidden {
+    display:none !important;
+}
+.field.radio .field_help {
+    margin-left: 297px;
+}
+
+
+/*
+ * UPDATE
+ */
+.popup { 	
+	width: 100%;
+    height: 100%;
+	top: 0px;
+    left: 0px;
+	position: absolute;
+	display: none;
+}
+.popup .background {
+	background-color: rgba(0,0,0,128);
+	opacity: 0.5;
+	width: 100%;
+    height: 100%;
+	position: absolute;
+	top:0px;
+    left:0px;
+}
+.popup .panel {
+	top: 25%;
+    left: 25%;
+    width: 50%;
+    height: 50%;
+	padding: 1em;
+	position: absolute;
+	border: 4px solid #000000;
+	background-color: #FFFFFF;
+}
+#panel {
+    z-index: 100;
+}
+.grey {
+    color: grey;
+}
+.orange {
+    color: orange;
+}
+.red {
+    color: red;
+}
+.popup .panel .panel_text {
+    display: block;
+    overflow: auto;
+    height: 80%;
+} 
+.popup .panel .panel_in {
+    width: 100%;
+    height: 100%;
+    position: relative;
+}
+.popup .panel .panel_actions {
+    width: 100%;
+    bottom: 4px;
+    left: 0px;
+    position: absolute;
+}
+.panel_text .progress {
+    width: 50%;
+    overflow: hidden;
+    height: auto;
+    border: 1px solid #cccccc;
+    margin-bottom: 5px;
+}
+.panel_text .progress span {
+    float: right;
+    display: block;
+    width: 25%;
+    background-color: #eeeeee;
+    text-align: right;
+}
+
+/**
+ * OAuth
+ */
+.oauthapp {
+	height: auto;
+    overflow: auto;
+	border-bottom: 2px solid #cccccc;
+	padding-bottom: 1em;
+	margin-bottom: 1em;	
+}
+.oauthapp img {
+	float: left;
+	width: 48px; height: 48px;
+	margin: 10px;
+}
+.oauthapp img.noicon {
+	background-image: url("../../../images/icons/48/plugin.png");
+	background-position: center center;
+	background-repeat: no-repeat;
+}
+.oauthapp a {
+	float: left;
+}
+
+
+/**
+ * ICONS
+ */
+.iconspacer {
+	display: block;
+    width: 16px;
+    height: 16px;
+}
+.icon {
+    display: block;
+    width: 20px;
+    height: 20px;
+    background: url(icons.png) no-repeat;
+    border: 0;
+    text-decoration: none;
+	border-radius: 5px;
+}
+.icon:hover {
+    border: 0;
+    text-decoration: none;
+}
+.icon.drop,
+.icon.drophide, .icon.delete {
+    float: right;
+	margin: 5px;
+}
+.icon.s22.delete {
+	display: block;
+	background-position: -110px 0;
+}
+.icon.s22.text {
+	padding: 10px 0px 0px 25px;
+	width: 200px;
+}
+.icon.text {
+    text-indent: 0px;
+}
+.icon.s16 {
+    min-width: 16px;
+    height: 16px;
+}
+.s16 .add {
+    background: url("../../../images/icons/16/add.png") no-repeat;
+}
+.add {
+    margin: 0px 5px;    
+}
+.article {
+	background-position: -50px 0;
+}
+.audio {
+	background-position: -70px 0;
+}
+.block {
+	background-position: -90px 0px;
+}
+.drop, .delete {
+	background-position: -110px 0;
+}
+.drophide {
+	background-position: -130px 0;
+}
+.edit {
+	background-position: -150px 0;
+}
+.camera {
+	background-position: -170px 0;
+}
+.dislike {
+	background-position: -190px 0;
+}
+.file-as {
+	background-position: -230px -60px;
+}
+.like {
+	background-position: -211px 0;
+}
+.link {
+	background-position: -230px 0;
+}
+.globe, .location {
+	background-position: -50px -20px;
+}
+.noglobe, .nolocation {
+	background-position: -70px -20px;
+}
+.no {
+	background-position: -90px -20px;
+}
+.pause {
+	background-position: -110px -20px;
+}
+.play {
+	background-position: -130px -20px;
+}
+.pencil {
+	background-position: -151px -18px;
+}
+.small-pencil {
+	background-position: -170px -20px;
+}
+.recycle {
+	background-position: -190px -20px;
+}
+.remote-link {
+	background-position: -210px -20px;
+}
+.share {
+	background-position: -230px -20px;
+}
+.tools {
+	background-position: -50px -40px;
+}
+.lock {
+	background-position: -70px -40px;
+}
+.unlock {
+	background-position: -88px -40px;
+}
+.video {
+	background-position: -110px -40px;
+}
+.attach {
+	background-position: -190px -40px;
+}
+.language {
+	background-position: -210px -40px;
+}
+.starred {
+	background-position: -130px -60px;
+}
+.unstarred {
+	background-position: -150px -60px;
+}
+.tagged {
+	background-position: -170px -60px;
+}
+.on {
+	background-position: -50px  -60px;
+}
+.off {
+	background-position: -70px  -60px;
+}
+.prev {
+	background-position: -90px  -60px;
+}
+.next {
+	background-position: -110px  -60px;
+}
+.icon.dim {
+	opacity: 0.3;
+	filter: alpha(opacity=30);
+}
+#pause {
+	position: fixed;
+	bottom: 5px;
+	right: 5px;
+}
+.border, .border:hover {
+	border: 1px solid #babdb6;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;	
+}
+.attachtype {
+    display: block;
+    width: 20px;
+    height: 23px;
+    background-image: url(../../../images/content-types.png);
+}
+.type-video {
+    background-position: 0px 0px;
+}
+.type-image {
+    background-position: -20px 0;
+}
+.type-audio {
+    background-position: -40px 0;
+}
+.type-text {
+    background-position: -60px 0px;
+}
+.type-unkn {
+    background-position: -80px 0;
+}
+
+
+/**
+ * 	footer
+ */
+.cc-license {
+    margin-top: 100px;
+    font-size: 0.7em;
+}
+footer {
+    display: block;
+    margin: 50px 20%;
+    clear: both;
+}
+#profile-jot-text {
+    height: 20px;
+    color: #eec;
+    border: 1px solid #eec;
+    border-radius: 5px;
+    width: 99.5%;
+}
+
+
+/** acl **/
+#photo-edit-perms-select,
+#photos-upload-permissions-wrapper,
+#profile-jot-acl-wrapper {
+    display: block !important;
+	background: #2e2f2e;
+	color: #eec;
+}
+#acl-wrapper {
+    width: 660px;
+	margin: 0 auto;
+}
+#acl-search {
+    float: right;
+    background: #fff url("../../../images/search_18.png") no-repeat right center;
+    padding-right: 20px;
+	margin: 6px;
+}
+#acl-showall {
+    float: left;
+    display: block;
+    width: auto;
+    height: 18px;
+    background: #eec url("../../../images/show_all_off.png") 8px 8px no-repeat;
+    padding: 7px 10px 7px 30px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    color: #999;
+	margin: 5px 0;
+}
+#acl-showall.selected {
+    color: #000;
+    background: #f90 url(../../../images/show_all_on.png) 8px 8px no-repeat;
+}
+#acl-list {
+    height: 210px;
+    border: 1px solid #ccc;
+    clear: both;
+    margin-top: 30px;
+    overflow: auto;
+}
+/*#acl-list-content {
+}*/
+.acl-list-item {
+	border: 1px solid #eec;
+    display: block;
+    float: left;
+    height: 110px;
+    margin: 3px 0 5px 5px;
+    width: 120px;
+}
+.acl-list-item img {
+    width: 22px;
+    height: 22px;
+    float: left;
+    margin: 5px 5px 20px;
+}
+.acl-list-item p {
+    height: 12px;
+    font-size: 10px;
+    margin: 0 0 22px;
+    padding: 2px 0 1px;
+}
+.acl-list-item a {
+    background: #eec 3px 3px no-repeat;
+    -webkit-border-radius: 2px;
+    -moz-border-radius: 2px;
+    border-radius: 2px;
+	clear: both;
+    font-size: 10px;
+    display: block;
+    width: 55px;
+    height: 20px;
+    color: #2e2f2e;
+    margin: 5px auto 0;
+	padding: 0 3px;
+	text-align: center;
+	vertical-align: middle;
+}
+#acl-wrapper a:hover {
+    text-decoration: none;
+    color: #2e2f2e;
+	border: 0;
+}
+.acl-button-show {
+    background-image: url('../../../images/show_off.png');
+	margin: 0 auto;
+}
+.acl-button-hide {
+    background-image: url('../../../images/hide_off.png');
+	margin: 0 auto;
+}
+.acl-button-show.selected {
+    color: #2e2f2e;
+    background-color: #9ade00;
+    background-image: url(../../../images/show_on.png);
+}
+.acl-button-hide.selected {
+    color: #2e2f2e;
+    background-color: #ff4141;
+    background-image: url(../../../images/hide_on.png);
+}
+.acl-list-item.groupshow {
+    border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+    border-color: #ff4141;
+}
+/** /acl **/
+
+
+/* autocomplete popup */
+.acpopup {
+	max-height: 175px;
+    max-width: 42%;
+	background-color: #555753;
+	color: #fff;
+	overflow: auto;
+	z-index: 100000;
+	border: 1px solid #cccccc;
+}
+.acpopupitem {
+	background-color: #555753;
+    padding: 4px;
+	clear: left;
+}
+.acpopupitem img {
+	float: left;
+	margin-right: 4px;
+}
+.acpopupitem.selected {
+	color: #2e302e;
+    background-color: #eeeeec;
+}
+.qcomment-wrapper {
+    padding: 0px;
+    margin: 5px 5px 5px 81%;
+}
+.qcomment {
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+}
+.qcomment:hover {
+	opacity: 1.0;
+	filter:alpha(opacity=100);
+}
+#network-star-link {
+    margin-top: 10px;
+}
+.network-star {
+    float: left;
+    margin-right: 5px;
+}
+.network-star.icon.starred {
+    display: inline-block;
+}
+#fileas-sidebar {
+	
+}
+.fileas-ul {
+	padding: 0;
+}
+
+
+
+/*
+ * ADDONS THEMING
+ */
+
+#sidebar-page-list {
+	
+}
+#sidebar-page-list ul {
+	padding: 0;
+	margin: 5px 0;
+}
+#sidebar-page-list li {
+	list-style: none;
+}
+
+
+@media handheld {
+	body {
+		font-size: 15pt;
+	}
+}
diff --git a/view/theme/dispy-dark/tag.png b/view/theme/dispy-dark/tag.png
new file mode 100644
index 000000000..9b5a7223e
--- /dev/null
+++ b/view/theme/dispy-dark/tag.png
diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
new file mode 100644
index 000000000..e1dc8ba0c
--- /dev/null
+++ b/view/theme/dispy-dark/theme.php
@@ -0,0 +1,152 @@
+<?php
+
+/*
+ * Name: Dispy Dark
+ * Description: Dispy Dark, Friendica theme
+ * 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() {
+    $('.group-edit-icon').hover(
+        function() {
+            $(this).addClass('icon');
+            $(this).removeClass('iconspacer'); },
+
+        function() {
+            $(this).removeClass('icon');
+            $(this).addClass('iconspacer'); }
+    );
+
+    $('.sidebar-group-element').hover(
+        function() {
+            id = $(this).attr('id');
+            $('#edit-' + id).addClass('icon');
+            $('#edit-' + id).removeClass('iconspacer'); },
+
+        function() {
+            id = $(this).attr('id');
+            $('#edit-' + id).removeClass('icon');
+            $('#edit-' + id).addClass('iconspacer'); }
+    );
+
+    $('.savedsearchdrop').hover(
+        function() {
+            $(this).addClass('drop');
+            $(this).addClass('icon');
+            $(this).removeClass('iconspacer'); },
+
+        function() {
+            $(this).removeClass('drop');
+            $(this).removeClass('icon');
+            $(this).addClass('iconspacer'); }
+    );
+
+    $('.savedsearchterm').hover(
+        function() {
+            id = $(this).attr('id');
+            $('#drop-' + id).addClass('icon');
+            $('#drop-' + id).addClass('drophide');
+            $('#drop-' + id).removeClass('iconspacer'); },
+
+        function() {
+            id = $(this).attr('id');
+            $('#drop-' + id).removeClass('icon');
+            $('#drop-' + id).removeClass('drophide');
+            $('#drop-' + id).addClass('iconspacer'); }
+        );
+
+	// click outside notifications menu closes it
+	$('html').click(function() {
+		$('#nav-notifications-linkmenu').removeClass('selected');
+		document.getElementById("nav-notifications-menu").style.display = "none";
+	});
+
+	$('#nav-notifications-linkmenu').click(function(event) {
+		event.stopPropagation();
+	});
+	// click outside profiles menu closes it
+	$('html').click(function() {
+		$('#profiles-menu-trigger').removeClass('selected');
+		document.getElementById("profiles-menu").style.display = "none";
+	});
+
+	$('#profiles-menu').click(function(event) {
+		event.stopPropagation();
+	});
+
+	// main function in toolbar functioning
+    function toggleToolbar() {
+        if ( $('#nav-floater').is(':visible') ) {
+            $('#nav-floater').slideUp('fast');
+            $('.floaterflip').css({
+                backgroundPosition: '-210px -60px' 
+            });
+			$('.search-box').slideUp('fast');
+        } else {
+            $('#nav-floater').slideDown('fast');
+            $('.floaterflip').css({
+                backgroundPosition: '-190px -60px'
+            });
+			$('.search-box').slideDown('fast');
+        }
+    };
+	// our trigger for the toolbar button
+    $('.floaterflip').click(function() {
+        toggleToolbar();
+        return false;
+    });
+
+	// (attempt) to change the text colour in a top post
+	$('#profile-jot-text').focusin(function() {
+		$(this).css({color: '#eec'});
+	});
+
+});
+</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
new file mode 100644
index 000000000..52af07532
--- /dev/null
+++ b/view/theme/dispy-dark/wall_item.tpl
@@ -0,0 +1,84 @@
+<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info" id="wall-item-info-$item.id">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
+				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+					<ul>
+						$item.item_photo_menu
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>
+			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>				
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			<div class="wall-item-lock-wrapper">
+				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+				{{ else }}<div class="wall-item-lock"></div>{{ endif }}
+			</div>
+			<ul class="wall-item-subtools1">
+				{{ if $item.star }}
+				<li>
+					<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+					<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+				</li>
+				{{ endif }}
+				{{ if $item.vote }}
+				<li class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+					<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+					<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+					{{ if $item.vote.share }}
+						<a href="#" id="share-$item.id"
+							class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+					<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+				</li>
+				{{ endif }}
+			</ul><br style="clear:left;" />
+			<ul class="wall-item-subtools2">
+				{{ if $item.filer }}
+				<li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
+				{{ endif }}
+				{{ if $item.plink }}
+				<li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
+				{{ endif }}
+				{{ if $item.edpost }}
+				<li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
+				{{ endif }}
+				<li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id">
+				{{ if $item.drop.dropping }}<div><a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>{{ endif }}
+				{{ if $item.drop.dropping }}<div><input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" /></div>{{ endif }}
+				</li>
+			</ul>
+			<div class="wall-item-delete-end"></div>
+		</div>
+		<div class="wall-item-content" id="wall-item-content-$item.id">
+			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-$item.id">
+				$item.body
+				<div class="body-tag">
+					{{ for $item.tags as $tag }}
+						<span class='tag'>$tag</span>
+					{{ endfor }}
+				</div>
+			</div>
+		</div>
+		<div class="wall-item-author">
+				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
+		</div>	
+	</div>
+	<div class="wall-item-wrapper-end"></div>
+	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+	<div class="wall-item-comment-wrapper">
+	$item.comment
+	</div>
+</div>
+
+<div class="wall-item-outside-wrapper-end$item.indent"></div>
+
diff --git a/view/theme/dispy-dark/wallwall_item.tpl b/view/theme/dispy-dark/wallwall_item.tpl
new file mode 100644
index 000000000..e8cbc2cd4
--- /dev/null
+++ b/view/theme/dispy-dark/wallwall_item.tpl
@@ -0,0 +1,90 @@
+<div class="wall-item-outside-wrapper$item.indent wallwall" id="wall-item-outside-wrapper-$item.id" >
+	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info wallwall" id="wall-item-info-$item.id">
+			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+				<a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id"><img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
+			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
+                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+                    <ul>
+                        $item.item_photo_menu
+                    </ul>
+                </div>
+
+			</div>
+			<div class="wall-item-photo-end"></div>
+			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>				
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			<div class="wall-item-lock-wrapper">
+				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+				{{ else }}<div class="wall-item-lock"></div>{{ endif }}
+			</div>
+			<ul class="wall-item-subtools1">
+				{{ if $item.star }}
+				<li>
+					<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+					<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+				</li>
+				{{ endif }}
+				{{ if $item.vote }}
+				<li class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+					<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+					<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+					{{ if $item.vote.share }}
+					<a href="#" id="share-$item.id"
+class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+					<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+				</li>
+				{{ endif }}
+			</ul><br style="clear:left;" />
+			<ul class="wall-item-subtools2">
+			{{ if $item.filer }}
+				<li class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
+			{{ endif }}
+			{{ if $item.plink }}
+				<li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
+			{{ endif }}
+			{{ if $item.edpost }}
+				<li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
+			{{ endif }}
+		
+			<li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+			</li>
+			</ul>
+			<div class="wall-item-delete-end"></div>
+		</div>
+		<div class="wall-item-content" id="wall-item-content-$item.id">
+			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-$item.id">
+				$item.body
+				<div class="body-tag">
+					{{ for $item.tags as $tag }}
+						<span class="tag">$tag</span>
+					{{ endfor }}
+				</div>			
+			</div>
+		</div>
+		<div class="wall-item-author">
+			<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+			<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
+		</div>	
+	</div>	
+	<div class="wall-item-wrapper-end"></div>
+	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+	<div class="wall-item-comment-wrapper">
+	$item.comment
+	</div>
+</div>
+
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+
diff --git a/view/theme/dispy/comment_item.tpl b/view/theme/dispy/comment_item.tpl
new file mode 100644
index 000000000..adf2772af
--- /dev/null
+++ b/view/theme/dispy/comment_item.tpl
@@ -0,0 +1,36 @@
+		<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 }}
+                <div class="qcomment-wrapper">
+					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);">
+					<option value=""></option>
+				{{ for $qcomment as $qc }}
+					<option value="$qc">$qc</option>
+				{{ endfor }}
+					</select>
+				</div>
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;">
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/dispy/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/contact_template.tpl b/view/theme/dispy/contact_template.tpl
index 48930b48a..04968bd07 100755..100644
--- a/view/theme/dispy/contact_template.tpl
+++ b/view/theme/dispy/contact_template.tpl
@@ -1,9 +1,9 @@
 
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
+	<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)" >
+		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>
 
@@ -20,6 +20,11 @@
 	</div>
 	<div class="contact-entry-photo-end" ></div>
 		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+{{ if $contact.alt_text }}<div class="contact-entry-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
+	<div class="contact-entry-details" id="contact-entry-url-$contact.id" >
+		<a href="$contact.itemurl" title="$contact.itemurl">Profile URL</a></div>
+	<div class="contact-entry-details" id="contact-entry-network-$contact.id" >$contact.network</div>
 
 	<div class="contact-entry-end" ></div>
 </div>
+
diff --git a/view/theme/dispy/conversation.tpl b/view/theme/dispy/conversation.tpl
new file mode 100644
index 000000000..41b6aeadf
--- /dev/null
+++ b/view/theme/dispy/conversation.tpl
@@ -0,0 +1,23 @@
+{{ for $threads as $thread }}
+<div id="tread-wrapper-$thread.id" class="tread-wrapper">
+	{{ for $thread.items as $item }}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
+			</div>
+			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
+		{{endif}}
+		{{if $item.comment_lastcollapsed}}</div>{{endif}}
+		
+		{{ inc $item.template }}{{ endinc }}
+		
+		
+	{{ endfor }}
+</div>
+{{ endfor }}
+
+{{ if $dropping }}
+<div class="delete-checked">
+<a href="#" onclick="deleteCheckedItems();return false;"><span class="icon delete"></span><span class="s22 text">$dropping</span></a>
+</div>
+{{ endif }}
diff --git a/view/theme/dispy/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/experimental b/view/theme/dispy/experimental
deleted file mode 100755
index e69de29bb..000000000
--- a/view/theme/dispy/experimental
+++ /dev/null
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/group_side.tpl b/view/theme/dispy/group_side.tpl
index a1fc70a22..10ecec2e8 100755..100644
--- a/view/theme/dispy/group_side.tpl
+++ b/view/theme/dispy/group_side.tpl
@@ -1,27 +1,29 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
+<div id="group-sidebar" class="widget">
+<h3 class="label">$title</h3>
 
 <div id="sidebar-group-list">
 	<ul id="sidebar-group-ul">
 		{{ for $groups as $group }}
 			<li class="sidebar-group-li">
+				<a href="$group.href" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}">$group.text</a>
+				{{ if $group.edit }}
+					<a 
+                        class="groupsideedit"
+                        href="$group.edit.href" title="$group.edit.title"><span class="icon small-pencil"></span></a>
+				{{ endif }}
 				{{ if $group.cid }}
 					<input type="checkbox" 
 						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
 						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
 						{{ if $group.ismember }}checked="checked"{{ endif }}
 					/>
-				{{ endif }}			
-				{{ 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>
+  <a href="group/new" title="$createtext"><span class="action text add">$createtext</span></a>
   </div>
 </div>
 
diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl
new file mode 100644
index 000000000..cd6f5ca97
--- /dev/null
+++ b/view/theme/dispy/head.tpl
@@ -0,0 +1,98 @@
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<base href="$baseurl/" />
+<meta name="generator" content="$generator" />
+<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
+
+<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
+
+<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
+<link rel="search"
+         href="$baseurl/opensearch" 
+         type="application/opensearchdescription+xml" 
+         title="Search in Friendica" />
+
+<!--[if IE]>
+<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
+<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
+<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js" ></script>
+<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>
+<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
+<script type="text/javascript" src="$baseurl/js/acl.js" ></script>
+<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script>
+<script type="text/javascript" src="$baseurl/js/main.js" ></script>
+<script>
+
+	var updateInterval = $update_interval;
+
+	function confirmDelete() { return confirm("$delitem"); }
+	function commentOpen(obj,id) {
+		if(obj.value == '$comment') {
+			obj.value = '';
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+		}
+	}
+	function commentClose(obj,id) {
+		if(obj.value == '') {
+			obj.value = '$comment';
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
+			closeMenu("comment-edit-submit-wrapper-" + id);
+		}
+	}
+
+
+	function commentInsert(obj,id) {
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == '$comment') {
+			tmpStr = '';
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+		}
+		var ins = $(obj).html();
+		ins = ins.replace('&lt;','<');
+		ins = ins.replace('&gt;','>');
+		ins = ins.replace('&amp;','&');
+		ins = ins.replace('&quot;','"');
+		$("#comment-edit-text-" + id).val(tmpStr + ins);
+	}
+
+	function qCommentInsert(obj,id) {
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == '$comment') {
+			tmpStr = '';
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+		}
+		var ins = $(obj).val();
+		ins = ins.replace('&lt;','<');
+		ins = ins.replace('&gt;','>');
+		ins = ins.replace('&amp;','&');
+		ins = ins.replace('&quot;','"');
+		$("#comment-edit-text-" + id).val(tmpStr + ins);
+	}
+
+	function showHideComments(id) {
+		if( $('#collapsed-comments-' + id).is(':visible')) {
+			$('#collapsed-comments-' + id).hide();
+			$('#hide-comments-' + id).html('$showmore');
+		}
+		else {
+			$('#collapsed-comments-' + id).show();
+			$('#hide-comments-' + id).html('$showfewer');
+		}
+	}
+
+
+</script>
+
+
diff --git a/view/theme/dispy/icons.png b/view/theme/dispy/icons.png
index bd52b62c8..f42330d65 100755..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 b435ba665..7b82b94ea 100755..100644
--- a/view/theme/dispy/icons.svg
+++ b/view/theme/dispy/icons.svg
@@ -7,15 +7,16 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="250"
    height="200"
    id="svg3403"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48+devel r"
    sodipodi:docname="icons.svg"
-   inkscape:export-filename="/home/fabio/public_html/friendika/view/theme/dispy/icons.png"
+   inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy/icons.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
@@ -50,19 +51,19 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.9899495"
-     inkscape:cx="43.010429"
-     inkscape:cy="-67.661177"
+     inkscape:zoom="1.9403009"
+     inkscape:cx="64.725266"
+     inkscape:cy="108.36719"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:snap-global="false"
-     inkscape:window-width="1534"
-     inkscape:window-height="1067"
-     inkscape:window-x="104"
-     inkscape:window-y="63"
+     inkscape:window-width="1065"
+     inkscape:window-height="742"
+     inkscape:window-x="40"
+     inkscape:window-y="50"
      inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -100,12 +101,12 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Livello 1"
+     inkscape:label="Layer1"
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-852.36218)">
@@ -118,11 +119,12 @@
        y="852.36218"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons.png"
        inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+       inkscape:export-ydpi="90"
+       transform="matrix(1,0,0,1.5151515,0,-439.09566)" />
     <g
        id="ico_dir"
        transform="matrix(0.43114968,0,0,0.43114968,-178.47604,867.63556)"
-       style="stroke:#888a85;display:inline"
+       style="fill:#333333;stroke:#e6e6e6;display:inline"
        inkscape:label="#g3846">
       <rect
          ry="6"
@@ -132,30 +134,30 @@
          height="44.285713"
          width="44.285713"
          id="rect3820"
-         style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
          inkscape:connector-curvature="0"
-         style="fill:#2e3436;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="m 449.12191,27.281249 c -2.07646,0 -3.76352,1.688406 -3.76352,3.766518 0,2.078113 1.68706,3.766518 3.76352,3.766518 2.07646,0 3.76351,-1.688405 3.76351,-3.766518 0,-2.078112 -1.68705,-3.766518 -3.76351,-3.766518 z m 0,7.533036 c -5.23267,0 -9.47459,5.783883 -9.47459,12.932589 0,0.201529 0.0196,0.406525 0.0264,0.605804 l 18.89654,0 c 0.007,-0.199279 0.0264,-0.404275 0.0264,-0.605804 0,-7.148706 -4.24192,-12.932589 -9.47459,-12.932589 z"
          id="path3830" />
       <path
          id="path3832"
          d="m 431.26477,26.924106 c -2.07646,0 -3.76352,1.688406 -3.76352,3.766518 0,2.078113 1.68706,3.766518 3.76352,3.766518 2.07646,0 3.76351,-1.688405 3.76351,-3.766518 0,-2.078112 -1.68705,-3.766518 -3.76351,-3.766518 z m 0,7.533036 c -5.23267,0 -9.47459,5.783883 -9.47459,12.932589 0,0.201529 0.0196,0.406525 0.0264,0.605804 l 18.89654,0 c 0.007,-0.199279 0.0264,-0.404275 0.0264,-0.605804 0,-7.148706 -4.24192,-12.932589 -9.47459,-12.932589 z"
-         style="fill:#2e3436;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          inkscape:connector-curvature="0" />
       <path
          inkscape:connector-curvature="0"
          id="path3822"
          d="M 439.46875,29.78125 C 437.00319,29.78125 435,31.784443 435,34.25 c 0,2.465557 2.00319,4.46875 4.46875,4.46875 2.46556,0 4.46875,-2.003193 4.46875,-4.46875 0,-2.465557 -2.00319,-4.46875 -4.46875,-4.46875 z m 0,8.9375 c -6.2132,0 -11.25,6.862234 -11.25,15.34375 0,0.239102 0.0233,0.482318 0.0313,0.71875 l 22.4375,0 c 0.008,-0.236432 0.0313,-0.479648 0.0313,-0.71875 0,-8.481516 -5.0368,-15.34375 -11.25,-15.34375 z"
-         style="fill:#2e3436;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <g
        id="ico_search"
        transform="matrix(0.43114968,0,0,0.43114968,-201.41936,889.63556)"
-       style="stroke:#888a85;display:inline"
+       style="fill:#333333;stroke:#e6e6e6;display:inline"
        inkscape:label="#g3852">
       <rect
-         style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="rect3837"
          width="44.285713"
          height="44.285713"
@@ -167,7 +169,7 @@
          inkscape:connector-curvature="0"
          id="path3839"
          d="m 477.97758,26.469174 c -3.64342,3.88426 -3.47037,9.984211 0.41389,13.627637 3.52011,3.301856 8.87059,3.441123 12.55302,0.54905 -0.17428,0.682501 0.0188,1.431563 0.57086,1.949383 l 13.7666,12.913032 c 0.80813,0.75802 2.06896,0.717682 2.82698,-0.09044 l 0.68414,-0.729357 c 0.75802,-0.808126 0.71768,-2.06896 -0.0904,-2.82698 l -13.7666,-12.913032 c -0.55205,-0.51782 -1.31192,-0.66264 -1.98188,-0.445086 2.65077,-3.859767 2.16978,-9.190402 -1.35033,-12.492258 -3.88426,-3.643426 -9.9828,-3.426204 -13.62623,0.458055 z"
-         style="fill:#2e3436;fill-opacity:1;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
          transform="translate(-0.21428562,-0.35714286)"
          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"
@@ -176,12 +178,12 @@
          sodipodi:cy="33.612183"
          sodipodi:cx="485.17856"
          id="path3844"
-         style="fill:#2e3436;fill-opacity:1;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:none;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          sodipodi:type="arc" />
     </g>
     <g
        inkscape:label="#g3852"
-       style="stroke:#888a85;display:inline"
+       style="fill:#333333;stroke:#e6e6e6;display:inline"
        transform="matrix(0.43114968,0,0,0.43114968,-201.41936,845.63556)"
        id="ico_logout">
       <rect
@@ -192,9 +194,9 @@
          height="44.285713"
          width="44.285713"
          id="rect3995"
-         style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:#555753;fill-opacity:1;stroke:#888a85;stroke-width:2.31938004"
+         style="fill:#333333;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.31938004"
          d="M 504.69787,28.735741 480.30214,53.131477"
          id="path4003"
          inkscape:connector-curvature="0" />
@@ -202,15 +204,15 @@
          inkscape:connector-curvature="0"
          id="path4005"
          d="M 504.69787,53.131473 480.30214,28.735746"
-         style="fill:#555753;fill-opacity:1;stroke:#888a85;stroke-width:2.31938004" />
+         style="fill:#333333;fill-opacity:1;stroke:#e6e6e6;stroke-width:2.31938004" />
     </g>
     <g
        inkscape:label="#g3846"
-       style="stroke:#d3d7cf;display:inline"
+       style="fill:#1a1a1a;stroke:#d3d7cf;display:inline"
        transform="matrix(0.43114968,0,0,0.43114968,-156.47604,867.63556)"
        id="ico_dir_on">
       <rect
-         style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="rect4011"
          width="44.285713"
          height="44.285713"
@@ -221,22 +223,22 @@
       <path
          id="path4013"
          d="m 449.12191,27.281249 c -2.07646,0 -3.76352,1.688406 -3.76352,3.766518 0,2.078113 1.68706,3.766518 3.76352,3.766518 2.07646,0 3.76351,-1.688405 3.76351,-3.766518 0,-2.078112 -1.68705,-3.766518 -3.76351,-3.766518 z m 0,7.533036 c -5.23267,0 -9.47459,5.783883 -9.47459,12.932589 0,0.201529 0.0196,0.406525 0.0264,0.605804 l 18.89654,0 c 0.007,-0.199279 0.0264,-0.404275 0.0264,-0.605804 0,-7.148706 -4.24192,-12.932589 -9.47459,-12.932589 z"
-         style="fill:#2e3436;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          inkscape:connector-curvature="0" />
       <path
          inkscape:connector-curvature="0"
-         style="fill:#2e3436;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="m 431.26477,26.924106 c -2.07646,0 -3.76352,1.688406 -3.76352,3.766518 0,2.078113 1.68706,3.766518 3.76352,3.766518 2.07646,0 3.76351,-1.688405 3.76351,-3.766518 0,-2.078112 -1.68705,-3.766518 -3.76351,-3.766518 z m 0,7.533036 c -5.23267,0 -9.47459,5.783883 -9.47459,12.932589 0,0.201529 0.0196,0.406525 0.0264,0.605804 l 18.89654,0 c 0.007,-0.199279 0.0264,-0.404275 0.0264,-0.605804 0,-7.148706 -4.24192,-12.932589 -9.47459,-12.932589 z"
          id="path4015" />
       <path
-         style="fill:#2e3436;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="M 439.46875,29.78125 C 437.00319,29.78125 435,31.784443 435,34.25 c 0,2.465557 2.00319,4.46875 4.46875,4.46875 2.46556,0 4.46875,-2.003193 4.46875,-4.46875 0,-2.465557 -2.00319,-4.46875 -4.46875,-4.46875 z m 0,8.9375 c -6.2132,0 -11.25,6.862234 -11.25,15.34375 0,0.239102 0.0233,0.482318 0.0313,0.71875 l 22.4375,0 c 0.008,-0.236432 0.0313,-0.479648 0.0313,-0.71875 0,-8.481516 -5.0368,-15.34375 -11.25,-15.34375 z"
          id="path4017"
          inkscape:connector-curvature="0" />
     </g>
     <g
        inkscape:label="#g3852"
-       style="stroke:#d3d7cf;display:inline"
+       style="fill:#1a1a1a;stroke:#d3d7cf;display:inline"
        transform="matrix(0.43114968,0,0,0.43114968,-179.41936,889.63556)"
        id="ico_search_on">
       <rect
@@ -247,15 +249,15 @@
          height="44.285713"
          width="44.285713"
          id="rect4021"
-         style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:#2e3436;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:none;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="m 477.97758,26.469174 c -3.64342,3.88426 -3.47037,9.984211 0.41389,13.627637 3.52011,3.301856 8.87059,3.441123 12.55302,0.54905 -0.17428,0.682501 0.0188,1.431563 0.57086,1.949383 l 13.7666,12.913032 c 0.80813,0.75802 2.06896,0.717682 2.82698,-0.09044 l 0.68414,-0.729357 c 0.75802,-0.808126 0.71768,-2.06896 -0.0904,-2.82698 l -13.7666,-12.913032 c -0.55205,-0.51782 -1.31192,-0.66264 -1.98188,-0.445086 2.65077,-3.859767 2.16978,-9.190402 -1.35033,-12.492258 -3.88426,-3.643426 -9.9828,-3.426204 -13.62623,0.458055 z"
          id="path4023"
          inkscape:connector-curvature="0" />
       <path
          sodipodi:type="arc"
-         style="fill:#2e3436;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:none;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="path4025"
          sodipodi:cx="485.17856"
          sodipodi:cy="33.612183"
@@ -267,10 +269,10 @@
     <g
        id="ico_logout_on"
        transform="matrix(0.43114968,0,0,0.43114968,-179.41936,845.63556)"
-       style="stroke:#d3d7cf;display:inline"
+       style="fill:#1a1a1a;stroke:#d3d7cf;display:inline"
        inkscape:label="#g3852">
       <rect
-         style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="rect4029"
          width="44.285713"
          height="44.285713"
@@ -282,16 +284,16 @@
          inkscape:connector-curvature="0"
          id="path4031"
          d="M 504.69787,28.735741 480.30214,53.131477"
-         style="fill:#555753;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.31938004" />
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.31938004" />
       <path
-         style="fill:#555753;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.31938004"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.31938004"
          d="M 504.69787,53.131473 480.30214,28.735746"
          id="path4033"
          inkscape:connector-curvature="0" />
     </g>
     <g
        inkscape:label="#g3852"
-       style="stroke:#888a85;display:inline;filter:url(#filter4064)"
+       style="fill:#333333;stroke:#e6e6e6;display:inline;filter:url(#filter4064)"
        transform="matrix(0.43114968,0,0,0.43114968,-201.41936,911.63556)"
        id="g4040">
       <rect
@@ -302,9 +304,9 @@
          height="44.285713"
          width="44.285713"
          id="rect4042"
-         style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:#2e3436;fill-opacity:1;stroke:#888a85;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         style="fill:#333333;fill-opacity:1;stroke:#e6e6e6;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
          d="m 484.90604,52.679071 c 0,0 -0.72327,1.028211 -2.88202,1.697409 -0.63474,-0.494653 -1.23439,-1.034334 -1.79294,-1.613646 0.43889,-2.217071 1.3855,-3.044283 1.3855,-3.044283 l 2.04237,-1.648571 c -0.73879,-0.915258 -1.3342,-1.946011 -1.75793,-3.043257 l -2.44847,0.945549 c 0,0 -1.18951,0.40671 -3.32932,-0.320779 -0.22277,-0.773276 -0.39067,-1.56235 -0.50204,-2.359331 1.65823,-1.535673 2.91028,-1.648499 2.91028,-1.648499 l 2.62132,-0.133248 c -0.0597,-1.174706 0.0645,-2.358577 0.36658,-3.495332 l -2.53663,-0.674208 c 0,0 -1.20139,-0.37014 -2.50493,-2.216441 0.2743,-0.756533 0.60227,-1.4936 0.98062,-2.20383 2.24419,-0.267701 3.32343,0.376954 3.32343,0.376954 l 2.19901,1.432971 c 0.64217,-0.985455 1.43848,-1.870246 2.35108,-2.612309 l -1.65589,-2.03644 c 0,0 -0.75438,-1.005609 -0.72373,-3.265497 0.66659,-0.45082 1.36515,-0.854347 2.08871,-1.206542 1.97294,1.102524 2.46715,2.258424 2.46715,2.258424 l 0.93675,2.451844 c 1.09876,-0.419794 2.26306,-0.667544 3.43754,-0.731472 l -0.14265,-2.620822 c 0,0 -0.0192,-1.25697 1.3339,-3.067245 0.80426,0.02709 1.6066,0.111239 2.39899,0.251604 0.94809,2.051624 0.66849,3.277254 0.66849,3.277254 l -0.6833,2.534196 c 1.13566,0.306213 2.22322,0.790136 3.21097,1.428761 l 1.42508,-2.204138 c 0,0 0.72327,-1.028211 2.88202,-1.697409 0.63474,0.494653 1.23439,1.034334 1.79294,1.613646 -0.43889,2.217071 -1.3855,3.044283 -1.3855,3.044283 l -2.04237,1.648571 c 0.73879,0.915258 1.3342,1.946011 1.75793,3.043257 l 2.44847,-0.945549 c 0,0 1.18951,-0.40671 3.32932,0.320779 0.22277,0.773276 0.39067,1.56235 0.50204,2.359331 -1.65823,1.535673 -2.91028,1.648499 -2.91028,1.648499 l -2.62132,0.133248 c 0.0597,1.174706 -0.0645,2.358577 -0.36658,3.495332 l 2.53663,0.674208 c 0,0 1.20139,0.37014 2.50493,2.216441 -0.2743,0.756533 -0.60227,1.4936 -0.98062,2.20383 -2.24419,0.267701 -3.32343,-0.376954 -3.32343,-0.376954 l -2.19901,-1.432971 c -0.64217,0.985455 -1.43848,1.870246 -2.35108,2.612309 l 1.65589,2.03644 c 0,0 0.75438,1.005609 0.72373,3.265497 -0.66659,0.45082 -1.36515,0.854347 -2.08871,1.206542 -1.97294,-1.102524 -2.46715,-2.258424 -2.46715,-2.258424 l -0.93675,-2.451844 c -1.09876,0.419794 -2.26306,0.667544 -3.43754,0.731472 l 0.14265,2.620822 c 0,0 0.0192,1.25697 -1.3339,3.067245 -0.80426,-0.02709 -1.6066,-0.111239 -2.39899,-0.251604 -0.94809,-2.051624 -0.66849,-3.277254 -0.66849,-3.277254 l 0.6833,-2.534196 c -1.13566,-0.306213 -2.22322,-0.790136 -3.21097,-1.428761 l -1.42508,2.204138"
          id="path4048"
          inkscape:connector-curvature="0"
@@ -314,10 +316,10 @@
     <g
        id="g4068"
        transform="matrix(0.43114968,0,0,0.43114968,-179.41936,911.63556)"
-       style="stroke:#d3d7cf;display:inline;filter:url(#filter4064)"
+       style="fill:#1a1a1a;stroke:#d3d7cf;display:inline;filter:url(#filter4064)"
        inkscape:label="#g3852">
       <rect
-         style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="rect4070"
          width="44.285713"
          height="44.285713"
@@ -331,15 +333,15 @@
          inkscape:connector-curvature="0"
          id="path4072"
          d="m 484.90604,52.679071 c 0,0 -0.72327,1.028211 -2.88202,1.697409 -0.63474,-0.494653 -1.23439,-1.034334 -1.79294,-1.613646 0.43889,-2.217071 1.3855,-3.044283 1.3855,-3.044283 l 2.04237,-1.648571 c -0.73879,-0.915258 -1.3342,-1.946011 -1.75793,-3.043257 l -2.44847,0.945549 c 0,0 -1.18951,0.40671 -3.32932,-0.320779 -0.22277,-0.773276 -0.39067,-1.56235 -0.50204,-2.359331 1.65823,-1.535673 2.91028,-1.648499 2.91028,-1.648499 l 2.62132,-0.133248 c -0.0597,-1.174706 0.0645,-2.358577 0.36658,-3.495332 l -2.53663,-0.674208 c 0,0 -1.20139,-0.37014 -2.50493,-2.216441 0.2743,-0.756533 0.60227,-1.4936 0.98062,-2.20383 2.24419,-0.267701 3.32343,0.376954 3.32343,0.376954 l 2.19901,1.432971 c 0.64217,-0.985455 1.43848,-1.870246 2.35108,-2.612309 l -1.65589,-2.03644 c 0,0 -0.75438,-1.005609 -0.72373,-3.265497 0.66659,-0.45082 1.36515,-0.854347 2.08871,-1.206542 1.97294,1.102524 2.46715,2.258424 2.46715,2.258424 l 0.93675,2.451844 c 1.09876,-0.419794 2.26306,-0.667544 3.43754,-0.731472 l -0.14265,-2.620822 c 0,0 -0.0192,-1.25697 1.3339,-3.067245 0.80426,0.02709 1.6066,0.111239 2.39899,0.251604 0.94809,2.051624 0.66849,3.277254 0.66849,3.277254 l -0.6833,2.534196 c 1.13566,0.306213 2.22322,0.790136 3.21097,1.428761 l 1.42508,-2.204138 c 0,0 0.72327,-1.028211 2.88202,-1.697409 0.63474,0.494653 1.23439,1.034334 1.79294,1.613646 -0.43889,2.217071 -1.3855,3.044283 -1.3855,3.044283 l -2.04237,1.648571 c 0.73879,0.915258 1.3342,1.946011 1.75793,3.043257 l 2.44847,-0.945549 c 0,0 1.18951,-0.40671 3.32932,0.320779 0.22277,0.773276 0.39067,1.56235 0.50204,2.359331 -1.65823,1.535673 -2.91028,1.648499 -2.91028,1.648499 l -2.62132,0.133248 c 0.0597,1.174706 -0.0645,2.358577 -0.36658,3.495332 l 2.53663,0.674208 c 0,0 1.20139,0.37014 2.50493,2.216441 -0.2743,0.756533 -0.60227,1.4936 -0.98062,2.20383 -2.24419,0.267701 -3.32343,-0.376954 -3.32343,-0.376954 l -2.19901,-1.432971 c -0.64217,0.985455 -1.43848,1.870246 -2.35108,2.612309 l 1.65589,2.03644 c 0,0 0.75438,1.005609 0.72373,3.265497 -0.66659,0.45082 -1.36515,0.854347 -2.08871,1.206542 -1.97294,-1.102524 -2.46715,-2.258424 -2.46715,-2.258424 l -0.93675,-2.451844 c -1.09876,0.419794 -2.26306,0.667544 -3.43754,0.731472 l 0.14265,2.620822 c 0,0 0.0192,1.25697 -1.3339,3.067245 -0.80426,-0.02709 -1.6066,-0.111239 -2.39899,-0.251604 -0.94809,-2.051624 -0.66849,-3.277254 -0.66849,-3.277254 l 0.6833,-2.534196 c -1.13566,-0.306213 -2.22322,-0.790136 -3.21097,-1.428761 l -1.42508,2.204138"
-         style="fill:#2e3436;fill-opacity:1;stroke:#d3d7cf;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#d3d7cf;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
     </g>
     <g
        id="g4074"
        transform="matrix(0.43114968,0,0,0.43114968,-201.41936,933.6356)"
-       style="stroke:#888a85;display:inline;filter:url(#filter4064)"
+       style="fill:#333333;stroke:#e6e6e6;display:inline;filter:url(#filter4064)"
        inkscape:label="#g3852">
       <rect
-         style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="rect4076"
          width="44.285713"
          height="44.285713"
@@ -348,33 +350,28 @@
          rx="6"
          ry="6" />
       <path
-         style="fill:#2e3436;fill-opacity:1;stroke:#888a85;stroke-width:0.79446769;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         style="fill:none;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.79446769;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
          d="m 871.875,46.1875 c -1.86715,0.0095 -3.39179,1.39545 -3.65625,3.1875 -0.13267,-0.238038 -0.39472,-0.407705 -0.6875,-0.40625 L 860.21875,49 c -0.42864,0.0022 -0.75216,0.352585 -0.75,0.78125 l 0,0.375 c 0.002,0.428643 0.35273,0.783324 0.78125,0.78125 l 0.71875,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.04661 -0.0143,-0.115964 -0.0313,-0.15625 l 1.25,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.05736 -0.006,-0.140333 -0.0313,-0.1875 l 2.1875,0 c 0.29284,-0.0015 0.55725,-0.166865 0.6875,-0.40625 0.28274,1.789274 1.85161,3.165775 3.71875,3.15625 2.0603,-0.01052 3.69802,-1.720959 3.6875,-3.78125 -0.0105,-2.060291 -1.68969,-3.698024 -3.75,-3.6875 z"
          transform="matrix(2.3193801,0,0,2.3193801,-1519.671,-74.824492)"
          id="path3839-4"
          inkscape:connector-curvature="0" />
     </g>
-    <g
-       inkscape:label="#g3852"
-       style="stroke:#d3d7cf;display:inline;filter:url(#filter4064)"
-       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,933.6356)"
-       id="g4106">
-      <rect
-         ry="6"
-         rx="6"
-         y="18.790752"
-         x="470.35715"
-         height="44.285713"
-         width="44.285713"
-         id="rect4108"
-         style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         id="path4110"
-         transform="matrix(2.3193801,0,0,2.3193801,-1519.671,-74.824492)"
-         d="m 871.875,46.1875 c -1.86715,0.0095 -3.39179,1.39545 -3.65625,3.1875 -0.13267,-0.238038 -0.39472,-0.407705 -0.6875,-0.40625 L 860.21875,49 c -0.42864,0.0022 -0.75216,0.352585 -0.75,0.78125 l 0,0.375 c 0.002,0.428643 0.35273,0.783324 0.78125,0.78125 l 0.71875,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.04661 -0.0143,-0.115964 -0.0313,-0.15625 l 1.25,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.05736 -0.006,-0.140333 -0.0313,-0.1875 l 2.1875,0 c 0.29284,-0.0015 0.55725,-0.166865 0.6875,-0.40625 0.28274,1.789274 1.85161,3.165775 3.71875,3.15625 2.0603,-0.01052 3.69802,-1.720959 3.6875,-3.78125 -0.0105,-2.060291 -1.68969,-3.698024 -3.75,-3.6875 z"
-         style="fill:#2e3436;fill-opacity:1;stroke:#d3d7cf;stroke-width:0.79446769;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
+    <rect
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       id="rect4108"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6"
+       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,933.6356)" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;fill-opacity:1;stroke:#d3d7cf;stroke-width:0.794;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;filter:url(#filter4064)"
+       d="m 871.875,46.1875 c -1.86715,0.0095 -3.39179,1.39545 -3.65625,3.1875 -0.13267,-0.238038 -0.39472,-0.407705 -0.6875,-0.40625 L 860.21875,49 c -0.42864,0.0022 -0.75216,0.352585 -0.75,0.78125 l 0,0.375 c 0.002,0.428643 0.35273,0.783324 0.78125,0.78125 l 0.71875,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.04661 -0.0143,-0.115964 -0.0313,-0.15625 l 1.25,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.05736 -0.006,-0.140333 -0.0313,-0.1875 l 2.1875,0 c 0.29284,-0.0015 0.55725,-0.166865 0.6875,-0.40625 0.28274,1.789274 1.85161,3.165775 3.71875,3.15625 2.0603,-0.01052 3.69802,-1.720959 3.6875,-3.78125 -0.0105,-2.060291 -1.68969,-3.698024 -3.75,-3.6875 z"
+       transform="translate(-834.62503,901.37504)"
+       id="path4110" />
     <g
        id="g4031-9"
        transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-2.7897502,485.71067)"
@@ -384,7 +381,7 @@
        inkscape:export-ydpi="90">
       <path
          sodipodi:type="arc"
-         style="fill:#555753;fill-opacity:1;stroke:none"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:none"
          id="path4002-3"
          sodipodi:cx="559.67499"
          sodipodi:cy="21.754047"
@@ -400,11 +397,11 @@
          sodipodi:cy="21.754047"
          sodipodi:cx="559.67499"
          id="path4004-9"
-         style="fill:#555753;fill-opacity:1;stroke:none"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:none"
          sodipodi:type="arc" />
       <path
          sodipodi:type="arc"
-         style="fill:#555753;fill-opacity:1;stroke:none"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:none"
          id="path4006-4"
          sodipodi:cx="559.67499"
          sodipodi:cy="21.754047"
@@ -413,7 +410,7 @@
          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(2.2,0,0,2.2,-671.07968,-28.226177)" />
       <path
-         style="fill:none;stroke:#555753;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 563.21055,31.653543 4.41942,-6.187185 -7.6014,-6.187184"
          id="path4010-56"
          inkscape:connector-curvature="0" />
@@ -425,16 +422,16 @@
          sodipodi:cy="21.754047"
          sodipodi:cx="559.67499"
          id="path4008-8"
-         style="fill:#555753;fill-opacity:1;stroke:none"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:none"
          sodipodi:type="arc" />
       <path
-         style="fill:none;stroke:#555753;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 567.45319,25.466358 7.6014,-4.065864"
          id="path4012-5"
          inkscape:connector-curvature="0" />
     </g>
     <path
-       style="fill:none;stroke:#555753;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        d="m 218.00001,881.25007 -5.8125,0 0,9.1875 10.53125,0 0,-5.2187"
        id="rect4432"
        inkscape:connector-curvature="0"
@@ -443,7 +440,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <rect
-       style="fill:none;stroke:#555753;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:#1a1a1a;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"
@@ -456,19 +453,19 @@
        inkscape:export-ydpi="90" />
     <path
        sodipodi:type="arc"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:#e6e6e6;stroke:#1a1a1a;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"
        sodipodi:rx="2.6875"
        sodipodi:ry="2.71875"
-       d="m 411.5,220.26843 a 2.6875,2.71875 0 1 1 -5.375,0 2.6875,2.71875 0 1 1 5.375,0 z"
+       d="m 411.5,220.26843 c 0,1.50153 -1.20323,2.71875 -2.6875,2.71875 -1.48427,0 -2.6875,-1.21722 -2.6875,-2.71875 0,-1.50152 1.20323,-2.71875 2.6875,-2.71875 1.48427,0 2.6875,1.21723 2.6875,2.71875 z"
        transform="matrix(1.1489362,0,0,1.1489362,-286.13697,609.51131)"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#555753;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:#ffffff;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        d="m 242.44524,860.13287 c -0.98011,0 -1.77562,0.6006 -1.77562,1.3586 l 0,1.5632 c 0,0.7581 0.79551,1.3733 1.77562,1.3733 l 4.53349,0 c 0.98012,0 1.77562,-0.6152 1.77562,-1.3733 l 0,-1.5632 c 0,-0.758 -0.7955,-1.3586 -1.77562,-1.3586 l -4.53349,0 z m 0.41557,1.0372 3.70235,0 c 0.51967,0 0.94448,0.2879 0.94448,0.6574 l 0,0.8912 c 0,0.3695 -0.42481,0.672 -0.94448,0.672 l -3.70235,0 c -0.51966,0 -0.94447,-0.3025 -0.94447,-0.672 l 0,-0.8912 c 0,-0.3695 0.42481,-0.6574 0.94447,-0.6574 z"
        id="rect4397-0"
        inkscape:connector-curvature="0"
@@ -479,12 +476,12 @@
        inkscape:connector-curvature="0"
        id="path4418-4"
        d="m 232.97199,860.13287 c -0.98011,0 -1.77562,0.6006 -1.77562,1.3586 l 0,1.5632 c 0,0.7581 0.79551,1.3733 1.77562,1.3733 l 4.53349,0 c 0.98012,0 1.77562,-0.6152 1.77562,-1.3733 l 0,-1.5632 c 0,-0.758 -0.7955,-1.3586 -1.77562,-1.3586 l -4.53349,0 z m 0.41557,1.0372 3.70236,0 c 0.51966,0 0.94447,0.2879 0.94447,0.6574 l 0,0.8912 c 0,0.3695 -0.42481,0.672 -0.94447,0.672 l -3.70236,0 c -0.51966,0 -0.94447,-0.3025 -0.94447,-0.672 l 0,-0.8912 c 0,-0.3695 0.42481,-0.6574 0.94447,-0.6574 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:#555753;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:#ffffff;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:#555753;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:#ffffff;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="rect4395-0"
        width="6.7246785"
        height="1.6362466"
@@ -495,243 +492,217 @@
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
-    <rect
-       style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
-       id="rect4416-1"
-       width="14.495689"
-       height="6.5407376"
-       x="132.5179"
-       y="901.32971"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <text
-       xml:space="preserve"
-       style="font-size:5.54432058px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
-       x="139.36653"
-       y="900.60059"
-       id="text4406-9"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan4408-6"
-         x="139.36653"
-         y="900.60059">You</tspan><tspan
-         sodipodi:role="line"
-         x="139.36653"
-         y="906.1449"
-         id="tspan4410-2"
-         style="fill:#eeeeec">Tube</tspan></text>
-    <path
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       d="m 118.03127,895.15627 0,0.3125 c 0,1.2601 -0.0643,3.4345 -0.35937,5.75 l -1.5625,1e-4 c -0.80183,0.011 -1.64766,4.0737 -1.60938,8.0625 l 8.25,0 c -0.057,-5.5479 1.56902,-11.5211 1.75,-5.6563 0.21453,6.9525 1.74237,-5.1823 1.75,-8.4687 z"
-       id="rect4428-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csccccscc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       d="m 124.78127,905.73727 -1.9375,-0.063"
-       id="path4440-4"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       d="m 117.59377,901.20597 6.4375,0"
-       id="path4442-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4446-9"
-       width="1.0625"
-       height="0.375"
-       x="115.28126"
-       y="908.11218"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="906.51843"
-       x="115.34376"
-       height="0.375"
-       width="1.0625"
-       id="rect4448-3"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4450-6"
-       width="1.0625"
-       height="0.375"
-       x="115.50001"
-       y="904.89343"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="903.42468"
-       x="115.81251"
-       height="0.375"
-       width="1.0625"
-       id="rect4452-0"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4454-5"
-       width="1.0625"
-       height="0.375"
-       x="116.21876"
-       y="902.17468"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="900.17468"
-       x="118.50001"
-       height="0.375"
-       width="1.0625"
-       id="rect4456-0"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4458-2"
-       width="1.0625"
-       height="0.375"
-       x="118.68751"
-       y="898.70593"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="897.20593"
-       x="118.75001"
-       height="0.375"
-       width="1.0625"
-       id="rect4460-9"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4462-4"
-       width="1.0625"
-       height="0.375"
-       x="118.75001"
-       y="895.79968"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="908.11218"
-       x="120.84376"
-       height="0.375"
-       width="1.0625"
-       id="rect4464-3"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4466-5"
-       width="1.0625"
-       height="0.375"
-       x="120.90627"
-       y="906.51843"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="904.89343"
-       x="121.06252"
-       height="0.375"
-       width="1.0625"
-       id="rect4468-1"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4470-7"
-       width="1.0625"
-       height="0.375"
-       x="121.37502"
-       y="903.42468"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="902.17468"
-       x="121.78127"
-       height="0.375"
-       width="1.0625"
-       id="rect4472-4"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4474-3"
-       width="1.0625"
-       height="0.375"
-       x="124.06252"
-       y="900.17468"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="898.70593"
-       x="124.25002"
-       height="0.375"
-       width="1.0625"
-       id="rect4476-1"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4478-4"
-       width="1.0625"
-       height="0.375"
-       x="124.31252"
-       y="897.20593"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="895.79968"
-       x="124.31252"
-       height="0.375"
-       width="1.0625"
-       id="rect4480-6"
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
     <g
-       style="display:inline"
+       id="g1037">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:nodetypes="csccccscc"
+         inkscape:connector-curvature="0"
+         id="rect4428-4"
+         d="m 118.03127,895.15627 0,0.3125 c 0,1.2601 -0.0643,3.4345 -0.35937,5.75 l -1.5625,1e-4 c -0.80183,0.011 -1.64766,4.0737 -1.60938,8.0625 l 8.25,0 c -0.057,-5.5479 1.56902,-11.5211 1.75,-5.6563 0.21453,6.9525 1.74237,-5.1823 1.75,-8.4687 z"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         inkscape:connector-curvature="0"
+         id="path4440-4"
+         d="m 124.78127,905.73727 -1.9375,-0.063"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4442-9"
+         d="m 117.59377,901.20597 6.4375,0"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="908.11218"
+         x="115.28126"
+         height="0.375"
+         width="1.0625"
+         id="rect4446-9"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4448-3"
+         width="1.0625"
+         height="0.375"
+         x="115.34376"
+         y="906.51843" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="904.89343"
+         x="115.50001"
+         height="0.375"
+         width="1.0625"
+         id="rect4450-6"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4452-0"
+         width="1.0625"
+         height="0.375"
+         x="115.81251"
+         y="903.42468" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="902.17468"
+         x="116.21876"
+         height="0.375"
+         width="1.0625"
+         id="rect4454-5"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4456-0"
+         width="1.0625"
+         height="0.375"
+         x="118.50001"
+         y="900.17468" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="898.70593"
+         x="118.68751"
+         height="0.375"
+         width="1.0625"
+         id="rect4458-2"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4460-9"
+         width="1.0625"
+         height="0.375"
+         x="118.75001"
+         y="897.20593" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="895.79968"
+         x="118.75001"
+         height="0.375"
+         width="1.0625"
+         id="rect4462-4"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4464-3"
+         width="1.0625"
+         height="0.375"
+         x="120.84376"
+         y="908.11218" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="906.51843"
+         x="120.90627"
+         height="0.375"
+         width="1.0625"
+         id="rect4466-5"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4468-1"
+         width="1.0625"
+         height="0.375"
+         x="121.06252"
+         y="904.89343" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="903.42468"
+         x="121.37502"
+         height="0.375"
+         width="1.0625"
+         id="rect4470-7"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4472-4"
+         width="1.0625"
+         height="0.375"
+         x="121.78127"
+         y="902.17468" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="900.17468"
+         x="124.06252"
+         height="0.375"
+         width="1.0625"
+         id="rect4474-3"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4476-1"
+         width="1.0625"
+         height="0.375"
+         x="124.25002"
+         y="898.70593" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="897.20593"
+         x="124.31252"
+         height="0.375"
+         width="1.0625"
+         id="rect4478-4"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect4480-6"
+         width="1.0625"
+         height="0.375"
+         x="124.31252"
+         y="895.79968" />
+    </g>
+    <g
+       style="stroke:#1a1a1a;display:inline"
        id="g4507-4"
        transform="matrix(0.92823291,-0.48059851,0.48059851,0.92823291,-312.89954,806.76727)"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
@@ -742,9 +713,9 @@
          inkscape:connector-curvature="0"
          id="path4491-2"
          d="m 310.75659,223.79453 c 0.76095,-0.8373 1.2453,-2.02269 1.2453,-3.35786 0,-1.33796 -0.48156,-2.54257 -1.2453,-3.38009"
-         style="fill:none;stroke:#555753;stroke-width:0.35579938;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.35579938;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:none;stroke:#555753;stroke-width:0.47089946;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.47089946;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="m 311.49266,224.75938 c 1.00712,-1.10816 1.64816,-2.67702 1.64816,-4.44411 0,-1.77079 -0.63735,-3.36509 -1.64816,-4.47354"
          id="path4496-2"
          inkscape:connector-curvature="0"
@@ -754,48 +725,52 @@
          inkscape:connector-curvature="0"
          id="path4498-6"
          d="m 312.78041,226.18348 c 1.3429,-1.47763 2.19766,-3.56956 2.19766,-5.9258 0,-2.36118 -0.84984,-4.48703 -2.19766,-5.96505"
-         style="fill:none;stroke:#555753;stroke-width:0.62789989;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.62789989;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
          sodipodi:nodetypes="ccccccc"
          inkscape:connector-curvature="0"
          id="path4500-4"
          d="m 309.34375,224.125 0,-7.375 -3.78125,2.07812 -3.4375,-0.10937 0,3.46875 3.4375,-0.125 z"
-         style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g1373"
+       style="stroke:#1a1a1a">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         transform="translate(-224.73743,661.76263)"
+         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"
+         sodipodi:ry="7.4246211"
+         sodipodi:rx="7.4246211"
+         sodipodi:cy="220.62782"
+         sodipodi:cx="284.78726"
+         id="path4515-2"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:nodetypes="csc"
+         inkscape:connector-curvature="0"
+         id="path4517-8"
+         d="m 53.15626,883.15627 c 1.94168,0.712 4.31843,1.1563 6.90625,1.1563 2.58782,0 4.96457,-0.4443 6.90625,-1.1563"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
+         d="m 60.45665,888.82867 c 0.71191,-1.9416 1.15625,-4.3184 1.15625,-6.9062 0,-2.5878 -0.44434,-4.9646 -1.15625,-6.9063"
+         id="path4528-8"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="csc" />
     </g>
-    <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="path4515-2"
-       sodipodi:cx="284.78726"
-       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"
-       transform="translate(-224.73743,661.76263)"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
-       d="m 53.15626,883.15627 c 1.94168,0.712 4.31843,1.1563 6.90625,1.1563 2.58782,0 4.96457,-0.4443 6.90625,-1.1563"
-       id="path4517-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       sodipodi:nodetypes="csc"
-       inkscape:connector-curvature="0"
-       id="path4528-8"
-       d="m 60.45665,888.82867 c 0.71191,-1.9416 1.15625,-4.3184 1.15625,-6.9062 0,-2.5878 -0.44434,-4.9646 -1.15625,-6.9063"
-       style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
     <text
        xml:space="preserve"
-       style="font-size:3.72799897px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#555753;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
+       style="font-size:3.72799897px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#1a1a1a;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
        x="51.803352"
        y="859.21899"
        id="text4532-2"
@@ -807,9 +782,9 @@
          id="tspan4534-8"
          x="51.803352"
          y="859.21899"
-         style="font-weight:bold;fill:#555753;-inkscape-font-specification:Liberation Sans Bold">Lorem Ip</tspan></text>
+         style="font-weight:bold;fill:#1a1a1a;-inkscape-font-specification:Liberation Sans Bold">Lorem Ip</tspan></text>
     <path
-       style="fill:#555753;fill-opacity:1;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
        d="m 52.25001,862.61227 15.25,0"
        id="path4536-8"
        inkscape:connector-curvature="0"
@@ -820,12 +795,12 @@
        inkscape:connector-curvature="0"
        id="path4538-8"
        d="m 52.25001,864.86227 15.25,0"
-       style="fill:#555753;fill-opacity:1;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
-       style="fill:#555753;fill-opacity:1;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
        d="m 52.25001,867.11227 15.25,0"
        id="path4540-6"
        inkscape:connector-curvature="0"
@@ -833,7 +808,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
-       style="fill:none;stroke:#555753;stroke-width:0.82322329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:0.82322329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        d="m 242.49116,907.21887 5.125,-5.125 -5.125,-5.0937"
        id="rect4544-3"
        inkscape:connector-curvature="0"
@@ -846,20 +821,15 @@
        inkscape:connector-curvature="0"
        id="path4549-8"
        d="m 237.98183,907.21887 -5.125,-5.125 5.125,-5.0937"
-       style="fill:none;stroke:#555753;stroke-width:0.82322329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:0.82322329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <g
-       style="display:inline"
-       id="g4213"
-       transform="translate(49.48448,-140.79121)"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
+       id="g4173">
       <path
          sodipodi:type="star"
-         style="fill:#555753;fill-opacity:1;stroke:none"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a"
          id="path4802"
          sodipodi:sides="8"
          sodipodi:cx="98.48214"
@@ -872,9 +842,9 @@
          inkscape:rounded="0"
          inkscape:randomized="0"
          d="m 98.48214,-19.375 6.43972,2.66742 2.66742,6.439723 -2.66742,6.4397218 -6.439721,2.6674201 -6.439722,-2.6674204 -2.66742,-6.4397225 2.667421,-6.439722 z"
-         transform="matrix(0.92307692,0.3846154,-0.3846154,0.92307692,-44.340246,974.7537)" />
+         transform="matrix(0.92307692,0.3846154,-0.3846154,0.92307692,5.144234,833.96249)" />
       <path
-         transform="matrix(0.74691191,0.31121331,-0.31121331,0.74691191,-26.237457,980.1736)"
+         transform="matrix(0.74691191,0.31121331,-0.31121331,0.74691191,23.247023,839.38239)"
          d="m 98.48214,-19.375 6.43972,2.66742 2.66742,6.439723 -2.66742,6.4397218 -6.439721,2.6674201 -6.439722,-2.6674204 -2.66742,-6.4397225 2.667421,-6.439722 z"
          inkscape:randomized="0"
          inkscape:rounded="0"
@@ -889,21 +859,23 @@
          id="path4804"
          style="fill:none;stroke:#d3d7cf;stroke-width:2.47171569;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          sodipodi:type="star" />
-      <path
-         style="fill:none;stroke:#555753;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-         d="m 53.26552,1056.9525 -5.5,6.2008 5.5,6.2009"
-         id="rect4806"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         id="path4812"
-         d="m 67.781143,1069.3407 5.46875,-6.2009 -5.46875,-6.1736"
-         style="fill:none;stroke:#555753;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
     </g>
     <path
-       style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="rect4806"
+       d="m 53.26552,1056.9525 -5.5,6.2008 5.5,6.2009"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       transform="translate(49.48448,-140.79121)" />
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m 67.781143,1069.3407 5.46875,-6.2009 -5.46875,-6.1736"
+       id="path4812"
+       transform="translate(49.48448,-140.79121)" />
+    <path
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none;display:inline"
        id="path4257"
        d="m 115.39024,855.00555 c 0.0904,0.0266 0.18708,0.0371 0.27111,0.0797 0.24682,0.12501 0.80382,0.53514 1.00046,0.67918 0.72548,0.53142 1.43751,1.08068 2.14837,1.63134 1.22364,0.99003 2.36274,2.09287 3.41202,3.2665 0.43117,0.4822 1.01205,1.207 1.42675,1.7166 0.97898,1.2314 2.022,2.4234 2.86791,3.7533 0.20576,0.2994 0.39551,0.6797 0.65579,0.9028 -0.10862,-0.1107 -0.10877,-0.099 0.0344,-0.01 0.19118,0.1291 -1.63528,2.8328 -1.82646,2.7036 l 0,0 c -0.18814,-0.022 -0.0511,0 -0.37755,-0.1793 -0.55628,-0.365 -1.09599,-0.7525 -1.61517,-1.1691 -1.27322,-1.0021 -2.36476,-2.2048 -3.47982,-3.3749 -1.53016,-1.5621 -3.0115,-3.1717 -4.57958,-4.6966 -0.94249,-1.01074 -1.92636,-2.0326 -2.54392,-3.28422 -0.14292,-0.18424 2.46273,-2.20539 2.60565,-2.02115 z"
        inkscape:connector-curvature="0"
@@ -911,7 +883,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
-       style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none;display:inline"
        id="path4259"
        d="m 112.109,867.43007 c 0.0548,-0.091 0.10266,-0.1866 0.16432,-0.2731 0.23235,-0.3261 0.52565,-0.6137 0.79275,-0.9102 0.42229,-0.4689 0.38553,-0.4337 0.82852,-0.9537 1.44214,-1.6363 3.06836,-3.0981 4.69856,-4.5425 1.63203,-1.40989 3.17698,-2.9167 4.78859,-4.3486 0.46305,-0.4369 0.97793,-0.80137 1.52221,-1.12653 0.15824,-0.21119 3.14491,2.0267 2.98666,2.23789 l 0,0 c -0.2952,0.52243 -0.62275,1.02042 -1.01852,1.47475 -0.88192,1.11919 -1.78212,2.22369 -2.79371,3.23049 -0.29346,0.2921 -0.60222,0.5684 -0.90606,0.8497 -0.31321,0.2899 -0.63003,0.5759 -0.94504,0.8639 -1.67153,1.4209 -3.37366,2.8163 -5.22715,3.9963 -0.49876,0.3405 -0.57121,0.3777 -1.0203,0.7266 -0.39341,0.3057 -0.75974,0.6889 -1.26518,0.7962 -0.14292,0.1842 -2.74857,-1.8369 -2.60565,-2.0212 z"
        inkscape:connector-curvature="0"
@@ -922,7 +894,7 @@
        inkscape:connector-curvature="0"
        d="m 135.39024,855.00555 c 0.0904,0.027 0.18708,0.037 0.27111,0.08 0.24682,0.125 0.80382,0.5352 1.00046,0.6792 0.72548,0.5314 1.43751,1.0807 2.14837,1.6314 1.22364,0.99 2.36274,2.0928 3.41202,3.26652 0.43117,0.4822 1.01205,1.207 1.42675,1.7166 0.97898,1.2314 2.022,2.4234 2.86791,3.7533 0.20576,0.2994 0.39551,0.6797 0.65579,0.9028 -0.10862,-0.1107 -0.10877,-0.099 0.0344,-0.01 0.19118,0.1291 -1.63528,2.8328 -1.82646,2.7036 l 0,0 c -0.18814,-0.022 -0.0511,0 -0.37755,-0.1793 -0.55628,-0.365 -1.09599,-0.7525 -1.61517,-1.1691 -1.27322,-1.0021 -2.36476,-2.2048 -3.47982,-3.3749 -1.53016,-1.5621 -3.0115,-3.1717 -4.57958,-4.6966 -0.94249,-1.01082 -1.92636,-2.03262 -2.54392,-3.28432 -0.14292,-0.1842 2.46273,-2.2054 2.60565,-2.0211 z"
        id="path4263"
-       style="fill:#d3d7cf;fill-opacity:1;stroke:none;display:inline"
+       style="fill:#666666;fill-opacity:1;stroke:none;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
@@ -930,12 +902,12 @@
        inkscape:connector-curvature="0"
        d="m 132.109,867.43017 c 0.0548,-0.091 0.10266,-0.1866 0.16432,-0.2731 0.23235,-0.3261 0.52565,-0.6137 0.79275,-0.9102 0.42229,-0.4689 0.38553,-0.4337 0.82852,-0.9537 1.44214,-1.6363 3.06836,-3.0981 4.69856,-4.5425 1.63203,-1.40992 3.17698,-2.91672 4.78859,-4.34862 0.46305,-0.4369 0.97793,-0.8014 1.52221,-1.1266 0.15824,-0.2112 3.14491,2.0267 2.98666,2.2379 l 0,0 c -0.2952,0.5224 -0.62275,1.0204 -1.01852,1.4748 -0.88192,1.11922 -1.78212,2.22372 -2.79371,3.23052 -0.29346,0.2921 -0.60222,0.5684 -0.90606,0.8497 -0.31321,0.2899 -0.63003,0.5759 -0.94504,0.8639 -1.67153,1.4209 -3.37366,2.8163 -5.22715,3.9963 -0.49876,0.3405 -0.57121,0.3777 -1.0203,0.7266 -0.39341,0.3057 -0.75974,0.6889 -1.26518,0.7962 -0.14292,0.1842 -2.74857,-1.8369 -2.60565,-2.0212 z"
        id="path4265"
-       style="fill:#d3d7cf;fill-opacity:1;stroke:none;display:inline"
+       style="fill:#666666;fill-opacity:1;stroke:none;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <g
-       style="display:inline"
+       style="stroke:#1a1a1a;display:inline"
        id="g4283"
        transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,294.0656)"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
@@ -946,14 +918,14 @@
          inkscape:connector-curvature="0"
          id="path4269"
          d="m -44.467884,1107.2152 0,17.7252 1.161165,3.7983 c 1.200046,4.2782 1.065706,4.1105 2.322331,0 l 1.161165,-3.7983 0,-17.7252 z"
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
          inkscape:connector-curvature="0"
          id="path4271"
          d="m -44.467884,1124.9404 4.644661,0"
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
       <path
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
          d="m -42.239747,1107.2336 0,17.6813"
          id="path4275"
          inkscape:connector-curvature="0" />
@@ -962,7 +934,7 @@
          inkscape:connector-curvature="0"
          id="path4279"
          d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z"
-         style="fill:#555753;stroke:#555753;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:#1a1a1a;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
       <rect
          ry="0.42804927"
          rx="0.37616169"
@@ -971,10 +943,10 @@
          height="1.8614606"
          width="5.1800866"
          id="rect4281"
-         style="fill:#555753;fill-opacity:1;stroke:none" />
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a" />
     </g>
     <rect
-       style="fill:none;stroke:#555753;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:#e6e6e6;stroke:#1a1a1a;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"
@@ -986,7 +958,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        d="m 214.75589,862.65317 c 3.31942,-0.632 4.06019,-2.1721 5.3033,-4.08897 0.42304,-0.6524 -0.64726,-2.63586 0,-3.13491 0.10703,-0.0825 0.93192,0 1.06066,0 2.52315,0 1.41421,3.50161 1.41421,4.77048 0,0.2317 -0.47723,0.6815 -0.17677,0.6815 2.44972,0 2.94209,0.3603 4.41942,1.4993 0.0697,0.054 0.31741,3.8443 0.17677,3.9527 -0.26074,0.201 -0.49042,0.5145 -0.7071,0.6815 -0.13627,0.105 0.38563,0.7684 0.17677,1.0904 -0.17664,0.2724 -0.85358,0.8061 -1.23743,0.9541 -0.36233,0.1398 -0.89015,0 -1.23744,0.1363 -1.96875,0.759 -2.1166,-0.9523 -3.18198,-1.363 -0.34866,-0.1344 -0.63592,-0.1088 -1.06066,-0.2726 -0.99671,-0.3842 -3.88909,0.6704 -3.88909,-0.2726 0,-1.2852 -0.2556,-3.5996 -1.06066,-4.6342 z"
        id="path4292"
        inkscape:connector-curvature="0"
@@ -997,84 +969,93 @@
        inkscape:connector-curvature="0"
        id="path4294"
        d="m 205.42921,862.12677 c -3.31942,0.632 -4.06019,2.1721 -5.3033,4.089 -0.42304,0.6524 0.64726,2.6358 0,3.1349 -0.10703,0.082 -0.93192,0 -1.06066,0 -2.52315,0 -1.41421,-3.5016 -1.41421,-4.7705 0,-0.2317 0.47723,-0.6815 0.17677,-0.6815 -2.44972,0 -2.94209,-0.3603 -4.41942,-1.4993 -0.0697,-0.054 -0.31741,-3.84428 -0.17677,-3.95268 0.26074,-0.201 0.49042,-0.5145 0.7071,-0.6815 0.13627,-0.105 -0.38563,-0.7684 -0.17677,-1.0904 0.17664,-0.2724 0.85358,-0.8061 1.23743,-0.9541 0.36233,-0.1398 0.89015,0 1.23744,-0.1363 1.96875,-0.759 2.1166,0.9523 3.18198,1.363 0.34866,0.1344 0.63592,0.1088 1.06066,0.2726 0.99671,0.3842 3.88909,-0.6704 3.88909,0.2726 0,1.2852 0.2556,3.59958 1.06066,4.63418 z"
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       transform="translate(-204.73743,661.76269)"
-       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"
-       sodipodi:ry="7.4246211"
-       sodipodi:rx="7.4246211"
-       sodipodi:cy="220.62782"
-       sodipodi:cx="284.78726"
-       id="path4298"
-       style="fill:none;stroke:#d3d7cf;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       sodipodi:type="arc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       sodipodi:nodetypes="csc"
-       inkscape:connector-curvature="0"
-       id="path4300"
-       d="m 73.15626,883.15627 c 1.94168,0.712 4.31843,1.1563 6.90625,1.1563 2.58782,0 4.96457,-0.4443 6.90625,-1.1563"
-       style="fill:none;stroke:#d3d7cf;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       style="fill:none;stroke:#d3d7cf;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
-       d="m 80.45665,888.82867 c 0.71191,-1.9416 1.15625,-4.3184 1.15625,-6.9062 0,-2.5878 -0.44434,-4.9646 -1.15625,-6.9063"
-       id="path4302"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       transform="translate(-184.73743,661.76263)"
-       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"
-       sodipodi:ry="7.4246211"
-       sodipodi:rx="7.4246211"
-       sodipodi:cy="220.62782"
-       sodipodi:cx="284.78726"
-       id="path4306"
-       style="fill:none;stroke:#555753;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       sodipodi:type="arc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       style="fill:none;stroke:#555753;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-       d="m 94.285536,887.89997 11.048544,-11.0485"
-       id="path4308"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:#555753;stroke:none;display:inline"
-       id="rect4310"
-       width="3.3587573"
-       height="12.020815"
-       x="115.93771"
-       y="876.12292"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       y="876.12292"
-       x="120.53392"
-       height="12.020815"
-       width="3.3587573"
-       id="rect4312"
-       style="fill:#555753;stroke:none;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
+    <g
+       id="g1378">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:type="arc"
+         style="fill:none;stroke:#666666;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="path4298"
+         sodipodi:cx="284.78726"
+         sodipodi:cy="220.62782"
+         sodipodi:rx="7.4246211"
+         sodipodi:ry="7.4246211"
+         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"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#666666;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
+         d="m 73.15626,883.15627 c 1.94168,0.712 4.31843,1.1563 6.90625,1.1563 2.58782,0 4.96457,-0.4443 6.90625,-1.1563"
+         id="path4300"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="csc" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:nodetypes="csc"
+         inkscape:connector-curvature="0"
+         id="path4302"
+         d="m 80.45665,888.82867 c 0.71191,-1.9416 1.15625,-4.3184 1.15625,-6.9062 0,-2.5878 -0.44434,-4.9646 -1.15625,-6.9063"
+         style="fill:none;stroke:#666666;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline" />
+    </g>
+    <g
+       id="g277">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:type="arc"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="path4306"
+         sodipodi:cx="284.78726"
+         sodipodi:cy="220.62782"
+         sodipodi:rx="7.4246211"
+         sodipodi:ry="7.4246211"
+         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(-184.73743,661.76263)" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         inkscape:connector-curvature="0"
+         id="path4308"
+         d="m 94.285536,887.89997 11.048544,-11.0485"
+         style="fill:none;stroke:#1a1a1a;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+    </g>
+    <g
+       id="g273">
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         y="876.12292"
+         x="115.93771"
+         height="12.020815"
+         width="3.3587573"
+         id="rect4310"
+         style="fill:#1a1a1a;stroke:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:#1a1a1a;stroke:none;display:inline"
+         id="rect4312"
+         width="3.3587573"
+         height="12.020815"
+         x="120.53392"
+         y="876.12292" />
+    </g>
     <path
-       style="fill:#555753;stroke:none;display:inline"
+       style="fill:#1a1a1a;stroke:none;display:inline"
        d="m 134.32248,876.12297 11.31371,6.0104 -11.31371,6.0104 z"
        id="rect4314"
        inkscape:connector-curvature="0"
@@ -1083,20 +1064,20 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <g
-       style="display:inline"
+       style="stroke:#1a1a1a;display:inline"
        transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)"
        id="g4317"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90">
       <path
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none"
          d="m -44.467884,1107.2152 0,17.7252 1.161165,3.7983 c 1.200046,4.2782 1.065706,4.1105 2.322331,0 l 1.161165,-3.7983 0,-17.7252 z"
          id="path4319"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="ccccccc" />
       <path
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
          d="m -44.467884,1124.9404 4.644661,0"
          id="path4321"
          inkscape:connector-curvature="0" />
@@ -1104,15 +1085,15 @@
          inkscape:connector-curvature="0"
          id="path4323"
          d="m -42.239747,1107.2336 0,17.6813"
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
       <path
-         style="fill:#555753;stroke:#555753;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         style="fill:#1a1a1a;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
          d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z"
          id="path4325"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cccc" />
       <rect
-         style="fill:#555753;fill-opacity:1;stroke:none"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a"
          id="rect4327"
          width="5.1800866"
          height="1.8614606"
@@ -1122,9 +1103,9 @@
          ry="0.42804927" />
     </g>
     <g
-       style="display:inline"
+       style="stroke:#1a1a1a;display:inline"
        id="g4329"
-       transform="matrix(0.24508333,0.24508333,-0.24508333,0.24508333,458.00011,612.37085)"
+       transform="matrix(0.24508333,0.24508333,-0.24508333,0.24508333,461.00011,612.37085)"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90">
@@ -1133,14 +1114,14 @@
          inkscape:connector-curvature="0"
          id="path4331"
          d="m -44.467884,1107.2152 0,17.7252 1.161165,3.7983 c 1.200046,4.2782 1.065706,4.1105 2.322331,0 l 1.161165,-3.7983 0,-17.7252 z"
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
          inkscape:connector-curvature="0"
          id="path4333"
          d="m -44.467884,1124.9404 4.644661,0"
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
       <path
-         style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
          d="m -42.239747,1107.2336 0,17.6813"
          id="path4335"
          inkscape:connector-curvature="0" />
@@ -1149,7 +1130,7 @@
          inkscape:connector-curvature="0"
          id="path4337"
          d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z"
-         style="fill:#555753;stroke:#555753;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:#1a1a1a;stroke:#1a1a1a;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
       <rect
          ry="0.42804927"
          rx="0.37616169"
@@ -1158,23 +1139,23 @@
          height="1.8614606"
          width="5.1800866"
          id="rect4339"
-         style="fill:#555753;fill-opacity:1;stroke:none" />
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a" />
     </g>
     <g
        id="layer1-2"
        transform="matrix(0.03334717,0,0,0.03334717,191.57984,885.59897)"
-       style="fill:#555753;display:inline"
+       style="fill:#1a1a1a;display:inline"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90">
       <path
          id="path11522"
-         style="fill:#555753;fill-opacity:1"
+         style="fill:#1a1a1a;fill-opacity:1"
          d="m 264.62704,45.67985 56.31152,-101.021534 0.2677,36.946034 118.51291,-0.267671 c 21.1765,-2.244605 39.74272,-10.852596 53.18801,-27.040291 C 449.99593,42.074998 437.6363,104.18491 348.60347,104.22236 l -27.39721,0 -0.2677,41.05114 -56.31152,-99.59365 z M 128.9798,105.11479 C 65.618201,85.84639 36.055796,7.7860213 7.07577,-47.220709 c 13.282679,12.076484 38.139773,29.363022 52.577167,29.364467 27.689982,0.06456 55.380063,0.116317 83.070083,0.174562 l 83.88712,0 -0.26776,122.43949 -0.26771,0.35698 -97.09487,0 z M 2.5,-79.206629 42.995596,-161.8012 3.5060915,-183.49253 l 118.3343785,0 57.2039,103.877161 -38.79429,-23.228801 c -12.44295,26.27544 -24.88589,52.550878 -37.32884,78.826316 C 88.601045,-24.268303 74.280847,-24.518751 59.960649,-24.769199 32.037317,-31.279427 12.61125,-53.254123 2.5,-79.206629 z m 395.45406,53.939396 -52.29561,-96.380927 105.66215,-63.98618 51.13531,102.449252 c 1.54832,24.517706 -38.03694,58.635841 -62.6066,58.370427 l -41.89525,-0.452572 z M 88.64259,-250.78088 l 53.98405,-80.90589 c 52.35957,-19.50079 82.68955,22.59846 101.8318,49.13587 l -50.86768,97.63029 -104.94817,-65.86027 z m 204.54178,43.54987 c -10.85783,-25.59753 -25.36515,-54.87764 -43.50654,-80.336 -16.24176,-22.7925 -35.86597,-42.67852 -50.7326,-51.5631 l 136.53974,-0.26767 c 24.52088,2.20137 36.43539,16.49668 49.43976,36.05358 l 19.63307,34.53651 30.34224,-19.3654 -57.11457,101.73554 -123.15347,0.26768 38.55237,-21.06114 z"
          inkscape:connector-curvature="0" />
     </g>
     <path
-       style="fill:none;stroke:#555753;display:inline"
+       style="fill:none;stroke:#1a1a1a;display:inline"
        d="m 219.92452,876.86347 1.33532,1.5307 -5.05101,4.4063 4.00584,4.592 5.05101,-4.4063 1.29423,1.4837 1.19091,-7.757 z"
        id="rect4425"
        inkscape:connector-curvature="0"
@@ -1182,122 +1163,134 @@
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
-    <rect
-       style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
-       id="rect4564-9"
-       width="10.935946"
-       height="7.925663"
-       x="71.833412"
-       y="900.66992"
-       rx="1.9019035"
-       ry="2.3056474"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:none;stroke:#555753;stroke-width:0.69802254;display:inline"
-       id="rect4566-9"
-       width="7.7661061"
-       height="7.5413885"
-       x="73.447395"
-       y="896.3468"
-       rx="1.9019035"
-       ry="2.3056474"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       ry="2.3056474"
-       rx="1.9019035"
-       y="900.66992"
-       x="92.208412"
-       height="7.925663"
-       width="10.935946"
-       id="rect4506"
-       style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       style="fill:none;stroke:#555753;stroke-width:0.69802254;display:inline"
-       d="m 108.78126,899.75007 0,-1.0938 c 0,-1.2773 -0.8526,-2.3124 -1.90625,-2.3124 l -3.96875,0 c -1.05366,0 -1.90625,1.0351 -1.90625,2.3124 l 0,2.9376"
-       id="rect4508"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cssssc"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:#555753;stroke:none;display:inline"
-       id="rect4514"
-       width="19.512196"
-       height="19.512196"
-       x="150.24391"
-       y="892.60608"
-       rx="2.9268293"
-       ry="2.9268293"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       ry="2.9268293"
-       rx="2.9268293"
-       y="892.60608"
-       x="170.24391"
-       height="19.512196"
-       width="19.512196"
-       id="rect4516"
-       style="fill:#555753;stroke:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       ry="2.3056474"
-       rx="1.9019035"
-       y="900.66992"
-       x="151.83342"
-       height="7.925663"
-       width="10.935946"
-       id="rect4518"
-       style="fill:#eeeeec;fill-opacity:1;stroke:none;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       ry="2.3056474"
-       rx="1.9019035"
-       y="896.3468"
-       x="153.4474"
-       height="7.5413885"
-       width="7.7661061"
-       id="rect4520"
-       style="fill:none;stroke:#eeeeec;stroke-width:0.69802254;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="fill:#eeeeec;fill-opacity:1;stroke:none;display:inline"
-       id="rect4522"
-       width="10.935946"
-       height="7.925663"
-       x="172.20842"
-       y="900.66992"
-       rx="1.9019035"
-       ry="2.3056474"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       sodipodi:nodetypes="cssssc"
-       inkscape:connector-curvature="0"
-       id="path4524"
-       d="m 188.78127,899.75007 0,-1.0938 c 0,-1.2773 -0.85259,-2.3124 -1.90625,-2.3124 l -3.96875,0 c -1.05365,0 -1.90625,1.0351 -1.90625,2.3124 l 0,2.9376"
-       style="fill:none;stroke:#eeeeec;stroke-width:0.69802254;display:inline"
-       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
+    <g
+       id="g269">
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         ry="2.3056474"
+         rx="1.9019035"
+         y="900.66992"
+         x="71.833412"
+         height="7.925663"
+         width="10.935946"
+         id="rect4564-9"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         ry="2.3056474"
+         rx="1.9019035"
+         y="896.3468"
+         x="73.447395"
+         height="7.5413885"
+         width="7.7661061"
+         id="rect4566-9"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.69802254;display:inline" />
+    </g>
+    <g
+       id="g265">
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;display:inline"
+         id="rect4506"
+         width="10.935946"
+         height="7.925663"
+         x="92.208412"
+         y="900.66992"
+         rx="1.9019035"
+         ry="2.3056474" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         sodipodi:nodetypes="cssssc"
+         inkscape:connector-curvature="0"
+         id="rect4508"
+         d="m 108.78126,899.75007 0,-1.0938 c 0,-1.2773 -0.8526,-2.3124 -1.90625,-2.3124 l -3.96875,0 c -1.05366,0 -1.90625,1.0351 -1.90625,2.3124 l 0,2.9376"
+         style="fill:none;stroke:#1a1a1a;stroke-width:0.69802254;display:inline" />
+    </g>
+    <g
+       id="g1060">
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         ry="2.9268293"
+         rx="2.9268293"
+         y="892.60608"
+         x="150.24391"
+         height="19.512196"
+         width="19.512196"
+         id="rect4514"
+         style="fill:#1a1a1a;stroke:none;display:inline" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:#eeeeec;fill-opacity:1;stroke:none;display:inline"
+         id="rect4518"
+         width="10.935946"
+         height="7.925663"
+         x="151.83342"
+         y="900.66992"
+         rx="1.9019035"
+         ry="2.3056474" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#eeeeec;stroke-width:0.69802254;display:inline"
+         id="rect4520"
+         width="7.7661061"
+         height="7.5413885"
+         x="153.4474"
+         y="896.3468"
+         rx="1.9019035"
+         ry="2.3056474" />
+    </g>
+    <g
+       id="g1065">
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:#1a1a1a;stroke:none;display:inline"
+         id="rect4516"
+         width="19.512196"
+         height="19.512196"
+         x="170.24391"
+         y="892.60608"
+         rx="2.9268293"
+         ry="2.9268293" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         ry="2.3056474"
+         rx="1.9019035"
+         y="900.66992"
+         x="172.20842"
+         height="7.925663"
+         width="10.935946"
+         id="rect4522"
+         style="fill:#eeeeec;fill-opacity:1;stroke:none;display:inline" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+         style="fill:none;stroke:#eeeeec;stroke-width:0.69802254;display:inline"
+         d="m 188.78127,899.75007 0,-1.0938 c 0,-1.2773 -0.85259,-2.3124 -1.90625,-2.3124 l -3.96875,0 c -1.05365,0 -1.90625,1.0351 -1.90625,2.3124 l 0,2.9376"
+         id="path4524"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cssssc" />
+    </g>
     <path
-       style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
        d="m 61.2575,895.73577 c -0.85405,0.9453 -1.14575,2.2161 -0.88721,3.3884 l -8.17918,8.1791 c -0.14244,0.1425 -0.12201,0.3935 0.0507,0.5661 l 2.21807,2.2181 c 0.17268,0.1727 0.42791,0.1974 0.57035,0.055 l 8.13693,-8.1369 c 1.26093,0.3161 2.65155,-0.016 3.63762,-1.0013 0.66189,-0.6619 1.02334,-1.5095 1.09849,-2.3744 l -2.11666,2.1167 -3.2405,-0.8746 -0.87454,-3.2405 2.14201,-2.1419 c -0.88104,0.066 -1.74292,0.4331 -2.41663,1.1068 -0.0467,0.047 -0.0968,0.09 -0.13942,0.1395 z"
        id="path4529"
        inkscape:connector-curvature="0"
@@ -1306,7 +1299,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
-       style="fill:none;stroke:#555753;stroke-width:0.80000001;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:0.80000001;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
        d="m 201.14016,895.80807 -8.25003,8.25 -0.94202,3.5156 2.58822,2.5882 3.10935,-0.8332 10.50754,-10.5075 -2e-5,-2.3881 -1.69404,-1.694 -1.94401,0 -9.97205,9.972 3e-5,1.972 0.61101,0.611 1.73597,0 9.36804,-9.368"
        id="path3395"
        inkscape:connector-curvature="0"
@@ -1315,7 +1308,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <rect
-       style="fill:#555753;stroke:none;display:inline"
+       style="fill:#333333;stroke:none;display:inline"
        id="rect3397"
        width="19.512196"
        height="19.512196"
@@ -1352,23 +1345,23 @@
        inkscape:export-xdpi="90"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        transform="translate(-224.73743,701.76263)"
-       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"
        sodipodi:ry="7.4246211"
        sodipodi:rx="7.4246211"
        sodipodi:cy="220.62782"
        sodipodi:cx="284.78726"
        id="path4020"
-       style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        sodipodi:type="arc" />
     <path
        sodipodi:type="arc"
-       style="fill:#555753;fill-opacity:1;stroke:#555753;stroke-width:1.62554049;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;stroke-width:1.62554049;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4022"
        sodipodi:cx="284.78726"
        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="matrix(0.61517998,0,0,0.61517998,-115.14559,786.66463)"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        inkscape:export-xdpi="90"
@@ -1378,20 +1371,18 @@
        inkscape:export-xdpi="90"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
        sodipodi:type="arc"
-       style="fill:none;stroke:#d3d7cf;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:none;stroke:#1a1a1a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="path4024"
        sodipodi:cx="284.78726"
        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,701.76269)" />
     <g
-       inkscape:label="#g3852"
-       style="stroke:#888a85;display:inline;filter:url(#filter4064)"
-       transform="matrix(0.43114968,0,0,0.43114968,-201.41936,955.6356)"
-       id="g3139">
+       id="g226">
       <rect
+         transform="matrix(0.43114968,0,0,0.43114968,-201.41936,955.6356)"
          ry="6"
          rx="6"
          y="18.790752"
@@ -1399,15 +1390,24 @@
          height="44.285713"
          width="44.285713"
          id="rect3141"
-         style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)" />
+      <text
+         sodipodi:linespacing="100%"
+         id="text3151"
+         y="979.64215"
+         x="5.6234956"
+         style="font-size:17.09149551px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#f2f2f2;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans Bold"
+         xml:space="preserve"><tspan
+           y="979.64215"
+           x="5.6234956"
+           id="tspan3153"
+           sodipodi:role="line">?</tspan></text>
     </g>
     <g
-       id="g3145"
-       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,955.6356)"
-       style="stroke:#d3d7cf;display:inline;filter:url(#filter4064)"
-       inkscape:label="#g3852">
+       id="g204">
       <rect
-         style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         transform="matrix(0.43114968,0,0,0.43114968,-179.41936,955.6356)"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
          id="rect3147"
          width="44.285713"
          height="44.285713"
@@ -1415,28 +1415,776 @@
          y="18.790752"
          rx="6"
          ry="6" />
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-size:17.09149551px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#888a85;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans Bold"
-       x="5.6234956"
-       y="979.64215"
-       id="text3151"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan3153"
-         x="5.6234956"
-         y="979.64215">?</tspan></text>
-    <text
-       sodipodi:linespacing="100%"
-       id="text3155"
-       y="979.64215"
-       x="27.623495"
-       style="font-size:17.09149551000000145px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#d3d7cf;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans Bold"
-       xml:space="preserve"><tspan
-         y="979.64215"
+      <text
+         xml:space="preserve"
+         style="font-size:17.09149551px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#d3d7cf;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans Bold"
          x="27.623495"
-         id="tspan3157"
-         sodipodi:role="line">?</tspan></text>
+         y="979.64215"
+         id="text3155"
+         sodipodi:linespacing="100%"><tspan
+           sodipodi:role="line"
+           id="tspan3157"
+           x="27.623495"
+           y="979.64215">?</tspan></text>
+    </g>
+    <path
+       sodipodi:type="star"
+       style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path4061"
+       sodipodi:sides="5"
+       sodipodi:cx="133.6317"
+       sodipodi:cy="61.950726"
+       sodipodi:r1="8.4750214"
+       sodipodi:r2="4.2375107"
+       sodipodi:arg1="0.97074611"
+       sodipodi:arg2="1.5990646"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 138.41741,68.945222 -4.90548,-2.758679 -5.05353,2.47708 1.10779,-5.517867 -3.91747,-4.040728 5.59012,-0.651551 2.6324,-4.974387 2.34711,5.115187 5.54438,0.966388 -4.13954,3.812909 z"
+       transform="matrix(0.86880929,0,0,0.9052037,23.373259,866.40571)"
+       inkscape:transform-center-x="-0.064310184"
+       inkscape:transform-center-y="-0.6685783" />
+    <path
+       inkscape:transform-center-y="-0.6685783"
+       inkscape:transform-center-x="-0.064310184"
+       transform="matrix(0.86880929,0,0,0.9052037,43.373259,866.40571)"
+       d="m 138.41741,68.945222 -4.90548,-2.758679 -5.05353,2.47708 1.10779,-5.517867 -3.91747,-4.040728 5.59012,-0.651551 2.6324,-4.974387 2.34711,5.115187 5.54438,0.966388 -4.13954,3.812909 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="false"
+       sodipodi:arg2="1.5990646"
+       sodipodi:arg1="0.97074611"
+       sodipodi:r2="4.2375107"
+       sodipodi:r1="8.4750214"
+       sodipodi:cy="61.950726"
+       sodipodi:cx="133.6317"
+       sodipodi:sides="5"
+       id="path4063"
+       style="fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1.19979274;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       sodipodi:type="star" />
+    <g
+       id="g4177"
+       transform="translate(0,0.22992881)">
+      <path
+         sodipodi:nodetypes="cccccc"
+         style="fill:#cccccc;fill-opacity:1"
+         d="m 53.921057,63.979016 -5.615027,-6.233401 9.206725,-9.241692 5.744016,0.08696 -0.101757,6.527264 z"
+         id="path4152"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.83907455,0,0,0.82021694,132.45839,876.23647)" />
+      <path
+         sodipodi:nodetypes="cccccccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         d="m 54.67642,55.699012 2.077304,-0.01567 -0.06764,2.127228 -2.053363,0.03612 z m 3.043854,-0.97892 -5.97358,0.0021 -8.473421,8.656992 5.643707,5.967988 8.731922,-8.826384 z m 1.047484,5.977035 -9.907739,10.059911 -6.759792,-7.448518 9.288198,-9.605297 7.396851,-0.01484 z m -13.590285,2.754701 5.185415,-5.323903 3.948418,3.90828 -5.336087,5.379274 z"
+         style="fill:#1a1a1a;fill-opacity:1"
+         transform="matrix(0.83907455,0,0,0.82021694,136.85379,871.59613)"
+         id="path4166" />
+    </g>
+    <rect
+       transform="matrix(1,0,0,0.84848485,44,217.14578)"
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons.png"
+       y="852.36218"
+       x="1.5883562e-17"
+       height="132"
+       width="44"
+       id="rect185"
+       style="fill:#2e3436;fill-opacity:1;stroke:none;display:inline" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-179.41936,1022.6356)"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       id="rect192"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6" />
+    <rect
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect194"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       transform="matrix(0.43114968,0,0,0.43114968,-135.41936,1022.6356)" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-135.41936,999.6356)"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       id="rect196"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6" />
+    <rect
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect202"
+       style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       transform="matrix(0.43114968,0,0,0.43114968,-135.41936,933.6356)" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-201.41936,1022.6356)"
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect214"
+       style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)" />
+    <rect
+       style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       id="rect216"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6"
+       transform="matrix(0.43114968,0,0,0.43114968,-157.41936,1022.6356)" />
+    <rect
+       transform="matrix(0.43114968,0,0,0.43114968,-157.41936,999.6356)"
+       ry="6"
+       rx="6"
+       y="18.790752"
+       x="470.35715"
+       height="44.285713"
+       width="44.285713"
+       id="rect218"
+       style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)" />
+    <rect
+       style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+       id="rect224"
+       width="44.285713"
+       height="44.285713"
+       x="470.35715"
+       y="18.790752"
+       rx="6"
+       ry="6"
+       transform="matrix(0.43114968,0,0,0.43114968,-157.41936,933.6356)" />
+    <g
+       id="g1005">
+      <desc
+         id="desc1016">alternate housing ;)</desc>
+      <title
+         id="title1014">wikuom/wigwam</title>
+      <rect
+         transform="matrix(0.43114968,0,0,0.43114968,-157.41936,977.6356)"
+         ry="6"
+         rx="6"
+         y="18.790752"
+         x="470.35715"
+         height="44.285713"
+         width="44.285713"
+         id="rect220"
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)" />
+      <path
+         sodipodi:end="6.2831853"
+         sodipodi:start="3.1415927"
+         transform="matrix(1.2380952,0,0,1.675,-15.523193,759.33575)"
+         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"
+         sodipodi:cx="56.797413"
+         id="path231"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5555275;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.55552751;stroke-miterlimit:4;stroke-dasharray:none"
+         id="path1003"
+         sodipodi:cx="56.797413"
+         sodipodi:cy="143.46553"
+         sodipodi:rx="5.5219707"
+         sodipodi:ry="5.2590199"
+         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,29.234821,888.45473)"
+         sodipodi:start="3.1415927"
+         sodipodi:end="6.2831853" />
+    </g>
+    <g
+       id="g1018"
+       transform="translate(22,0)"
+       style="fill:#1a1a1a">
+      <desc
+         id="desc1020">alternate housing ;)</desc>
+      <title
+         id="title1022">wikuom/wigwam</title>
+      <rect
+         style="fill:#1a1a1a;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+         id="rect1024"
+         width="44.285713"
+         height="44.285713"
+         x="470.35715"
+         y="18.790752"
+         rx="6"
+         ry="6"
+         transform="matrix(0.43114968,0,0,0.43114968,-157.41936,977.6356)" />
+      <path
+         sodipodi:type="arc"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.55552751;stroke-miterlimit:4;stroke-dasharray:none"
+         id="path1026"
+         sodipodi:cx="56.797413"
+         sodipodi:cy="143.46553"
+         sodipodi:rx="5.5219707"
+         sodipodi:ry="5.2590199"
+         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" />
+      <path
+         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 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"
+         sodipodi:cx="56.797413"
+         id="path1028"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.55552751;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g4160">
+      <rect
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+         id="rect210"
+         width="44.285713"
+         height="44.285713"
+         x="470.35715"
+         y="18.790752"
+         rx="6"
+         ry="6"
+         transform="matrix(0.43114968,0,0,0.43114968,-201.41936,977.6356)" />
+      <path
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         d="m 14.756588,131.15925 0,9.60545 -11.6032194,-0.0118 0,-9.58225 -2.73319221,0.79047 8.57645441,-3.98976 8.4702832,3.97497 z"
+         style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;font-family:Verdana;-inkscape-font-specification:Verdana"
+         transform="matrix(0.83752627,0,0,0.92659378,3.4546476,870.69518)"
+         id="path1037" />
+    </g>
+    <g
+       id="g4164">
+      <rect
+         ry="6"
+         rx="6"
+         y="18.790752"
+         x="470.35715"
+         height="44.285713"
+         width="44.285713"
+         id="rect188"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+         transform="matrix(0.43114968,0,0,0.43114968,-179.41936,977.6356)" />
+      <path
+         id="path4158"
+         transform="matrix(0.83752627,0,0,0.92659378,25.454648,870.69518)"
+         style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;font-family:Verdana;-inkscape-font-specification:Verdana"
+         d="m 14.756588,131.15925 0,9.60545 -11.6032194,-0.0118 0,-9.58225 -2.73319221,0.79047 8.57645441,-3.98976 8.4702832,3.97497 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc" />
+    </g>
+    <g
+       id="g4210">
+      <rect
+         transform="matrix(0.43114968,0,0,0.43114968,-201.41936,999.6356)"
+         ry="6"
+         rx="6"
+         y="18.790752"
+         x="470.35715"
+         height="44.285713"
+         width="44.285713"
+         id="rect212"
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)" />
+      <path
+         sodipodi:nodetypes="cccccccccccccccccc"
+         transform="matrix(0.90433934,-0.00156352,-0.00156352,0.90433934,0.70503743,868.45488)"
+         inkscape:connector-curvature="0"
+         id="path4206"
+         d="m 4.1190936,170.87651 1.316683,1.26576 1.7540206,0.003 5.5819788,-5.57043 3.523532,0.006 2.853557,-2.81689 0.0014,-1.68321 -1.169094,-1.16909 -2.365502,2.3822 -2.63185,-0.005 0.09078,-2.55314 2.365531,-2.36552 -1.277858,-1.27786 -1.648714,0.0359 -2.8505569,2.8535 0.00598,3.45613 -5.5530909,5.58201 z"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    </g>
+    <g
+       id="g4214">
+      <rect
+         transform="matrix(0.43114968,0,0,0.43114968,-179.41936,999.6356)"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+         id="rect190"
+         width="44.285713"
+         height="44.285713"
+         x="470.35715"
+         y="18.790752"
+         rx="6"
+         ry="6" />
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 4.1190936,170.87651 1.316683,1.26576 1.7540206,0.003 5.5819788,-5.57043 3.523532,0.006 2.853557,-2.81689 0.0014,-1.68321 -1.169094,-1.16909 -2.365502,2.3822 -2.63185,-0.005 0.09078,-2.55314 2.365531,-2.36552 -1.277858,-1.27786 -1.648714,0.0359 -2.8505569,2.8535 0.00598,3.45613 -5.5530909,5.58201 z"
+         id="path4208"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.90433934,-0.00156352,-0.00156352,0.90433934,22.705037,868.45488)"
+         sodipodi:nodetypes="cccccccccccccccccc" />
+    </g>
+    <g
+       id="g4242"
+       transform="matrix(0.93050058,0,0,0.90640134,0.75846434,97.446032)">
+      <path
+         transform="translate(0,852.36218)"
+         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"
+         sodipodi:cx="5.2590199"
+         id="path4218"
+         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+      <use
+         height="200"
+         width="250"
+         transform="translate(5.698452,-13)"
+         id="use4224"
+         xlink:href="#path4218"
+         y="0"
+         x="0" />
+      <use
+         height="200"
+         width="250"
+         transform="translate(5.6280407,13)"
+         id="use4226"
+         xlink:href="#use4224"
+         y="0"
+         x="0" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         id="path4228"
+         sodipodi:cx="5.2590199"
+         sodipodi:cy="194.45924"
+         sodipodi:rx="2.0660436"
+         sodipodi:ry="1.5964882"
+         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="translate(5.684483,846.36218)" />
+      <path
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4230"
+         d="m 10.902837,183.0346 0,3.66687"
+         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4232"
+         d="m 9.2894123,189.68386 -2.3956906,3.56909"
+         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <path
+         sodipodi:nodetypes="cc"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4234"
+         d="m 12.46737,189.68386 2.493472,3.5202"
+         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <path
+         sodipodi:nodetypes="cc"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4236"
+         d="m 12.467368,182.74125 4.009116,9.925"
+         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <path
+         sodipodi:nodetypes="cc"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4238"
+         d="m 9.4849789,182.83904 -4.2046813,9.87611"
+         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <path
+         sodipodi:nodetypes="cc"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4240"
+         d="m 7.4315299,194.71969 7.0403961,0"
+         style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    </g>
+    <g
+       transform="matrix(0.93050058,0,0,0.90640134,22.758464,97.446032)"
+       id="g4280"
+       style="fill:#1a1a1a">
+      <path
+         sodipodi:type="arc"
+         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         id="path4282"
+         sodipodi:cx="5.2590199"
+         sodipodi:cy="194.45924"
+         sodipodi:rx="2.0660436"
+         sodipodi:ry="1.5964882"
+         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="translate(0,852.36218)" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#path4282"
+         id="use4284"
+         transform="translate(5.698452,-13)"
+         width="250"
+         height="200"
+         style="fill:#1a1a1a" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#use4284"
+         id="use4286"
+         transform="translate(5.6280407,13)"
+         width="250"
+         height="200"
+         style="fill:#1a1a1a" />
+      <path
+         transform="translate(5.684483,846.36218)"
+         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"
+         sodipodi:cx="5.2590199"
+         id="path4288"
+         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 10.902837,183.0346 0,3.66687"
+         id="path4290"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)" />
+      <path
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 9.2894123,189.68386 -2.3956906,3.56909"
+         id="path4293"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 12.46737,189.68386 2.493472,3.5202"
+         id="path4295"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 12.467368,182.74125 4.009116,9.925"
+         id="path4297"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 9.4849789,182.83904 -4.2046813,9.87611"
+         id="path4299"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 7.4315299,194.71969 7.0403961,0"
+         id="path4301"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <g
+       id="g4309"
+       transform="matrix(0.95268982,0,0,1.0934812,2.5939281,-88.949056)">
+      <path
+         id="rect4303"
+         d="m 47.594131,94.030746 14.462306,0 0,10.255094 -14.462306,0 z"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccc"
+         transform="translate(0,852.36218)"
+         inkscape:connector-curvature="0"
+         id="path4305"
+         d="m 47.666782,94.03851 7.145333,5.307564 7.035032,-5.261579 z"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    </g>
+    <g
+       transform="matrix(0.95268982,0,0,1.0934812,24.593928,-88.949056)"
+       id="g4313"
+       style="fill:#1a1a1a">
+      <path
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+         d="m 47.594131,94.030746 14.462306,0 0,10.255094 -14.462306,0 z"
+         id="path4315" />
+      <path
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 47.666782,94.03851 7.145333,5.307564 7.035032,-5.261579 z"
+         id="path4317"
+         inkscape:connector-curvature="0"
+         transform="translate(0,852.36218)"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       id="g257">
+      <rect
+         style="fill:#333333;stroke:#e6e6e6;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+         id="rect222"
+         width="44.285713"
+         height="44.285713"
+         x="470.35715"
+         y="18.790752"
+         rx="6"
+         ry="6"
+         transform="matrix(0.43114968,0,0,0.43114968,-157.41936,955.6356)" />
+      <text
+         transform="translate(5.2683173,850.36218)"
+         id="text247"
+         y="129.16422"
+         x="49.504551"
+         style="font-size:17px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Verdana;-inkscape-font-specification:Verdana Bold"
+         xml:space="preserve"><tspan
+           style="font-weight:bold;-inkscape-font-specification:Verdana Bold"
+           y="129.16422"
+           x="49.504551"
+           id="tspan249"
+           sodipodi:role="line">!</tspan></text>
+    </g>
+    <g
+       id="g253">
+      <rect
+         ry="6"
+         rx="6"
+         y="18.790752"
+         x="470.35715"
+         height="44.285713"
+         width="44.285713"
+         id="rect200"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064)"
+         transform="matrix(0.43114968,0,0,0.43114968,-135.41936,955.6356)" />
+      <use
+         height="200"
+         width="250"
+         transform="translate(22.268317,0)"
+         id="use251"
+         xlink:href="#text247"
+         y="0"
+         x="0" />
+    </g>
+    <path
+       sodipodi:type="star"
+       style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.80864763;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path252"
+       sodipodi:sides="3"
+       sodipodi:cx="195.63554"
+       sodipodi:cy="63.26548"
+       sodipodi:r1="7.7793064"
+       sodipodi:r2="15.558613"
+       sodipodi:arg1="2.1025204"
+       sodipodi:arg2="3.1497179"
+       inkscape:flatsided="true"
+       inkscape:rounded="0.2"
+       inkscape:randomized="0"
+       d="m 191.69128,69.97073 c -2.32277,-1.366333 -2.23518,-12.1453 0.10948,-13.473709 2.34466,-1.328408 11.63573,4.136926 11.61383,6.831668 -0.0219,2.694741 -9.40054,8.008375 -11.72331,6.642041 z"
+       transform="matrix(1.043244,0,0,0.93815683,-5.0151639,863.01152)"
+       inkscape:transform-center-x="-4.0006141"
+       inkscape:transform-center-y="-0.059313251" />
+    <path
+       inkscape:transform-center-y="0.059308319"
+       inkscape:transform-center-x="4.0006111"
+       transform="matrix(-1.043244,0,0,-0.93815683,425.4058,981.67309)"
+       d="m 191.69128,69.97073 c -2.32277,-1.366333 -2.23518,-12.1453 0.10948,-13.473709 2.34466,-1.328408 11.63573,4.136926 11.61383,6.831668 -0.0219,2.694741 -9.40054,8.008375 -11.72331,6.642041 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0.2"
+       inkscape:flatsided="true"
+       sodipodi:arg2="3.1497179"
+       sodipodi:arg1="2.1025204"
+       sodipodi:r2="15.558613"
+       sodipodi:r1="7.7793064"
+       sodipodi:cy="63.26548"
+       sodipodi:cx="195.63554"
+       sodipodi:sides="3"
+       id="path254"
+       style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:0.80864763;stroke-miterlimit:4;stroke-dasharray:none"
+       sodipodi:type="star" />
+    <g
+       id="g1070"
+       transform="matrix(1.1035285,0,0,1.1035285,-14.308807,-95.610044)">
+      <path
+         sodipodi:nodetypes="cscsc"
+         inkscape:connector-curvature="0"
+         id="path262"
+         d="m 148.82687,49.85498 c 0,0 -3.94234,5.723921 -8.80546,5.723921 -4.86313,0 -8.80547,-5.723921 -8.80547,-5.723921 0,0 3.94234,-5.72392 8.80547,-5.72392 4.86312,0 8.80546,5.72392 8.80546,5.72392 z"
+         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.94912058;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         transform="matrix(0.79496097,0,0,0.9062729,26.90439,859.01012)" />
+      <path
+         transform="matrix(0.89659499,0,0,0.89659499,12.90165,857.69139)"
+         d="m 144.56282,51.877872 c 0,2.665109 -2.1605,4.825606 -4.82561,4.825606 -2.66511,0 -4.8256,-2.160497 -4.8256,-4.825606 0,-2.665108 2.16049,-4.825605 4.8256,-4.825605 2.66511,0 4.82561,2.160497 4.82561,4.825605 z"
+         sodipodi:ry="4.8256054"
+         sodipodi:rx="4.8256054"
+         sodipodi:cy="51.877872"
+         sodipodi:cx="139.73721"
+         id="path1033"
+         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:0.86699998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path1035"
+         sodipodi:cx="139.73721"
+         sodipodi:cy="51.877872"
+         sodipodi:rx="4.8256054"
+         sodipodi:ry="4.8256054"
+         d="m 144.56282,51.877872 c 0,2.665109 -2.1605,4.825606 -4.82561,4.825606 -2.66511,0 -4.8256,-2.160497 -4.8256,-4.825606 0,-2.665108 2.16049,-4.825605 4.8256,-4.825605 2.66511,0 4.82561,2.160497 4.82561,4.825605 z"
+         transform="matrix(0.37382862,0,0,0.37382862,85.950326,884.7403)" />
+    </g>
+    <g
+       id="g321">
+      <g
+         id="g315">
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           d="m 51.71875,158.125 0,7.65625 10.1875,0 0,-7.65625 z"
+           style="fill:#333333"
+           transform="translate(1,852.36218)"
+           id="path293" />
+        <path
+           id="path278"
+           transform="translate(1,852.36218)"
+           style="fill:#e6e6e6"
+           d="m 51.71875,158.125 0,7.65625 10.1875,0 0,-7.65625 z m 0.53125,0.625 9.03125,0 -0.03125,6.4375 -9,0 z m 0.71875,0.65625 0,5.03125 4.4375,0 -0.0625,-5.03125 z m 0.59375,0.625 3.25,0 0,2.5625 -0.8125,0 0,-1.9375 -1.727964,0 0,1.9375 -0.709536,0 z"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccccccccccccccccccc" />
+      </g>
+      <use
+         height="200"
+         width="250"
+         transform="translate(-6,6)"
+         id="use319"
+         xlink:href="#g315"
+         y="0"
+         x="0" />
+    </g>
+    <g
+       id="g353">
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         d="m 51.71875,158.125 0,7.65625 10.1875,0 0,-7.65625 z"
+         style="fill:#1a1a1a"
+         transform="translate(23,852.36218)"
+         id="path333" />
+      <path
+         id="path335"
+         transform="translate(23,852.36218)"
+         style="fill:#e6e6e6"
+         d="m 51.71875,158.125 0,7.65625 10.1875,0 0,-7.65625 z m 0.53125,0.625 9.03125,0 -0.03125,6.4375 -9,0 z m 0.71875,0.65625 0,5.03125 4.4375,0 -0.0625,-5.03125 z m 0.59375,0.625 3.25,0 0,2.5625 -0.8125,0 0,-1.9375 -1.727964,0 0,1.9375 -0.709536,0 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccccccccccccccccc" />
+    </g>
+    <use
+       x="0"
+       y="0"
+       xlink:href="#g353"
+       id="use357"
+       transform="translate(-6,6)"
+       width="250"
+       height="200" />
+    <g
+       id="g293"
+       transform="translate(-54.726207,8)">
+      <path
+         transform="matrix(1.2829201,1.9081591,-1.9081591,1.2829201,-566.65386,-61.76762)"
+         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"
+         sodipodi:cx="559.67499"
+         id="path274"
+         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+         id="path276"
+         sodipodi:cx="559.67499"
+         sodipodi:cy="21.754047"
+         sodipodi:rx="0.88388348"
+         sodipodi:ry="0.88388348"
+         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,-391.29289,215.61485)" />
+      <path
+         transform="matrix(1.0080086,1.4992679,-1.4992679,1.0080086,-421.03317,165.44683)"
+         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"
+         sodipodi:cx="559.67499"
+         id="path279"
+         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-132.78975,635.71067)"
+         inkscape:connector-curvature="0"
+         id="path281"
+         d="m 563.21055,31.653543 4.41942,-6.187185 -7.6014,-6.187184"
+         style="fill:none;stroke:#e6e6e6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
+         id="path283"
+         sodipodi:cx="559.67499"
+         sodipodi:cy="21.754047"
+         sodipodi:rx="0.88388348"
+         sodipodi:ry="0.88388348"
+         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,-476.37171,94.687576)" />
+      <path
+         transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-132.78975,635.71067)"
+         inkscape:connector-curvature="0"
+         id="path285"
+         d="m 567.45319,25.466358 7.6014,-4.065864"
+         style="fill:none;stroke:#e6e6e6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <use
+       x="0"
+       y="0"
+       xlink:href="#g293"
+       id="use301"
+       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 8dccf71ed..5838729cc 100755..100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -1,157 +1,136 @@
-
-<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 editor=false;
+<script type="text/javascript">
+var editor = false;
 var textlen = 0;
+var plaintext = '$editselect';
 
 function initEditor(cb) {
-    if (editor==false) {
-        $("#profile-jot-text-loading").show();
-		$("#jot-title-desc").show();
- if(plaintext == 'none') {
-            $("#profile-jot-text-loading").hide();
-            $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-            $(".jothidden").show();
-            editor = true;
-            $("a#jot-perms-icon").fancybox({
-                'transitionIn' : 'elastic',
-                'transitionOut' : 'elastic'
-            });
-	                            $("#profile-jot-submit-wrapper").show();
-								{{ if $newpost }}
-    	                            $("#profile-upload-wrapper").show();
-        	                        $("#profile-attach-wrapper").show();
-            	                    $("#profile-link-wrapper").show();
-                	                $("#profile-video-wrapper").show();
-                    	            $("#profile-audio-wrapper").show();
-                        	        $("#profile-location-wrapper").show();
-                            	    $("#profile-nolocation-wrapper").show();
-                                	$("#profile-title-wrapper").show();
-	                                $("#profile-jot-plugin-wrapper").show();
-	                                $("#jot-preview-link").show();
-								{{ endif }}   
-
-
-            if (typeof cb!="undefined") cb();
-            return;
-        }
-        tinyMCE.init({
-                theme : "advanced",
-                mode : "specific_textareas",
-                editor_selector: /(profile-jot-text|prvmail-text)/,
-                plugins : "bbcode,paste,fullscreen,autoresize",
-                theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
-                theme_advanced_buttons2 : "",
-                theme_advanced_buttons3 : "",
-                theme_advanced_toolbar_location : "top",
-                theme_advanced_toolbar_align : "center",
-                theme_advanced_blockformats : "blockquote,code",
-                //theme_advanced_resizing : true,
-                //theme_advanced_statusbar_location : "bottom",
-                paste_text_sticky : true,
-                entity_encoding : "raw",
-                add_unload_trigger : false,
-                remove_linebreaks : false,
-                force_p_newlines : false,
-                force_br_newlines : true,
-                forced_root_block : '',
-                convert_urls: false,
-                content_css: "$baseurl/view/custom_tinymce.css",
-                theme_advanced_path : false,
-                setup : function(ed) {
-                     //Character count
-                        ed.onKeyUp.add(function(ed, e) {
-                                var txt = tinyMCE.activeEditor.getContent();
-                                textlen = txt.length;
-                                if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-                                        $('#profile-jot-desc').html(ispublic);
-                                }
-                                else {
-                                        $('#profile-jot-desc').html('&nbsp;');
-                                }
-
-                                if(textlen <= 140) {
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('grey');
-                                }
-                                if((textlen > 140) && (textlen <= 420)) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').addClass('orange');
-                                }
-                                if(textlen > 420) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('red');
-                                }
-                                $('#character-counter').text(textlen);
-                        });
-                        ed.onInit.add(function(ed) {
-                                ed.pasteAsPlainText = true;
-                                $("#profile-jot-text-loading").hide();
-                                $("#profile-jot-submit-wrapper").show();
-                                $("#profile-upload-wrapper").show();
-                                $("#profile-attach-wrapper").show();
-                                $("#profile-link-wrapper").show();
-                                $("#profile-youtube-wrapper").show();
-                                $("#profile-video-wrapper").show();
-                                $("#profile-audio-wrapper").show();
-                                $("#profile-location-wrapper").show();
-                                $("#profile-nolocation-wrapper").show();
-                                $("#profile-title-wrapper").show();
-                                $("#profile-jot-plugin-wrapper").show();
-                                $("#character-counter").show();
-                                if (typeof cb!="undefined") cb();
-                        });
-                }
-        });
-        editor = true;
-        // setup acl popup
-        $("a#jot-perms-icon").fancybox({
-            'transitionIn' : 'none',
-            'transitionOut' : 'none'
-        }); 
-    } else {
-        if (typeof cb!="undefined") cb();
-    }
-} // initEditor
-</script>
-<script type="text/javascript" src="js/ajaxupload.js" ></script>
-<script>
-    var ispublic = '$ispublic';
-	$(document).ready(function() {
-                /* enable tinymce on focus */
-                $("#profile-jot-text").focus(function(){
-                    if (editor) return;
-                    $(this).val("");
-                    initEditor();
-                }); 
-
-		$("#jot-title").mouseout(function() {
-			$("#jot-title").hide();
-			var ttl = $("#jot-title").val();
-			$('#jot-title-display').html(ttl);
-			if(ttl.length) {
-				$("#jot-title-display").show();
-			}
-			else {
-				$("#jot-title-desc").show();
+	if (editor==false) {
+		$("#profile-jot-text-loading").show();
+		if(plaintext == 'none') {
+			$("#profile-jot-text-loading").hide();
+			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+			editor = true;
+			$("a#jot-perms-icon").fancybox({
+				'transitionIn' : 'elastic',
+				'transitionOut' : 'elastic'
+			});
+			$(".jothidden").show();
+			if (typeof cb!="undefined") cb();
+			return;
+		}
+		tinyMCE.init({
+			theme : "advanced",
+			mode : "specific_textareas",
+			editor_selector: $editselect,
+			auto_focus: "profile-jot-text",
+			plugins : "bbcode,paste,fullscreen,autoresize",
+			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
+			theme_advanced_buttons2 : "",
+			theme_advanced_buttons3 : "",
+			theme_advanced_toolbar_location : "top",
+			theme_advanced_toolbar_align : "center",
+			theme_advanced_blockformats : "blockquote,code",
+			gecko_spellcheck : true,
+			paste_text_sticky : true,
+			entity_encoding : "raw",
+			add_unload_trigger : false,
+			remove_linebreaks : false,
+			force_p_newlines : false,
+			force_br_newlines : true,
+			forced_root_block : '',
+			convert_urls: false,
+			content_css: "$baseurl/view/custom_tinymce.css",
+			theme_advanced_path : false,
+			setup : function(ed) {
+				cPopup = null;
+				ed.onKeyDown.add(function(ed,e) {
+					if(cPopup !== null)
+						cPopup.onkey(e);
+				});
+
+				ed.onKeyUp.add(function(ed, e) {
+					var txt = tinyMCE.activeEditor.getContent();
+					match = txt.match(/@([^ \n]+)$/);
+					if(match!==null) {
+						if(cPopup === null) {
+							cPopup = new ACPopup(this,baseurl+"/acl");
+						}
+						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+						if(! cPopup.ready) cPopup = null;
+					}
+					else {
+						if(cPopup !== null) { cPopup.close(); cPopup = null; }
+					}
+
+					textlen = txt.length;
+					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+						$('#profile-jot-desc').html(ispublic);
+					}
+					else {
+						$('#profile-jot-desc').html('&#160;');
+					}	 
+
+				 //Character count
+
+					if(textlen <= 140) {
+						$('#character-counter').removeClass('red');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('grey');
+					}
+					if((textlen > 140) && (textlen <= 420)) {
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('red');
+						$('#character-counter').addClass('orange');
+					}
+					if(textlen > 420) {
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('red');
+					}
+					$('#character-counter').text(textlen);
+				});
+
+				ed.onInit.add(function(ed) {
+					ed.pasteAsPlainText = true;
+					$("#profile-jot-text-loading").hide();
+					$(".jothidden").show();
+					if (typeof cb!="undefined") cb();
+				});
+
 			}
 		});
+		editor = true;
+		// setup acl popup
+		$("a#jot-perms-icon").fancybox({
+			'transitionIn' : 'elastic',
+			'transitionOut' : 'elastic'
+		}); 
+	} else {
+		if (typeof cb!="undefined") cb();
+	}
+}
 
-		$("#jot-title-display").hover(function() {
-			$("#jot-title-display").hide();
-			$("#jot-title").show();
-			$("#jot-title").focus();
-		});		
+function enableOnUser(){
+	if (editor) return;
+	$(this).val("");
+	initEditor();
+}
+
+</script>
+<script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
+<script type="text/javascript">
+	var ispublic = '$ispublic';
+	var addtitle = '$addtitle';
 
-		$("#jot-title-desc").click(function() {
-			$("#jot-title-desc").hide();
-			$("#jot-title").show();
-			$("#jot-title").focus();
-		});		
+	$(document).ready(function() {
+		
+		/* enable tinymce on focus and click */
+		$("#profile-jot-text").focus(enableOnUser);
+		$("#profile-jot-text").click(enableOnUser);
+		/* enable character counter */
+		$("#profile-jot-text").focus(charCounter);
+		$("#profile-jot-text").click(charCounter);
 
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
@@ -174,22 +153,8 @@ function initEditor(cb) {
 					$('#profile-rotator').hide();
 				}				 
 			}
-		);		
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').hide();
-				$('.profile-jot-net input').attr('disabled', 'disabled');
-			});
-			if(selstr == null) { 
-				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').show();
-				$('.profile-jot-net input').attr('disabled', false);
-			}
+		);
 
-		}).trigger('change');
 
 	});
 
@@ -223,13 +188,6 @@ function initEditor(cb) {
 		}
 	}
 
-	function jotGetVideo() {
-		reply = prompt("$utubeurl");
-		if(reply && reply.length) {
-			addeditortext('[youtube]' + reply + '[/youtube]');
-		}
-	}
-
 	function jotVideoURL() {
 		reply = prompt("$vidurl");
 		if(reply && reply.length) {
@@ -252,22 +210,18 @@ function initEditor(cb) {
 		}
 	}
 
-	function jotTitle() {
-		reply = prompt("$title", $('#jot-title').val());
-		if(reply && reply.length) {
-			$('#jot-title').val(reply);
-		}
-	}
-
 	function jotShare(id) {
+		if ($('#jot-popup').length != 0) $('#jot-popup').show();
+
 		$('#like-rotator-' + id).show();
 		$.get('share/' + id, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#like-rotator-' + id).hide();
-					$(window).scrollTop(0);
-				});
+			if (!editor) $("#profile-jot-text").val("");
+			initEditor(function(){
+				addeditortext(data);
+				$('#like-rotator-' + id).hide();
+				$(window).scrollTop(0);
+			});
+
 		});
 	}
 
@@ -294,21 +248,102 @@ function initEditor(cb) {
 		}
 	}
 
+	function itemTag(id) {
+		reply = prompt("$term");
+		if(reply && reply.length) {
+			reply = reply.replace('#','');
+			if(reply.length) {
+
+				commentBusy = true;
+				$('body').css('cursor', 'wait');
+
+				$.get('tagger/' + id + '?term=' + reply);
+				if(timer) clearTimeout(timer);
+				timer = setTimeout(NavUpdate,3000);
+				liking = 1;
+			}
+		}
+	}
+
+	function itemFiler(id) {
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.fancybox(data);
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply);
+					if(timer) clearTimeout(timer);
+					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.fancybox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+		
+	}
+
 	function jotClearLocation() {
 		$('#jot-coord').val('');
 		$('#profile-nolocation-wrapper').hide();
 	}
 
-  function addeditortext(data) {
-        if(plaintext == 'none') {
-            var currentText = $("#profile-jot-text").val();
-            $("#profile-jot-text").val(currentText + data);
-        }
-        else
-            tinyMCE.execCommand('mceInsertRawHTML',false,data);
-    }
+	function addeditortext(data) {
+		if(plaintext == 'none') {
+			var currentText = $("#profile-jot-text").val();
+			$("#profile-jot-text").val(currentText + data);
+		}
+		else
+			tinyMCE.execCommand('mceInsertRawHTML',false,data);
+	}	
 
 	$geotag
 
+	function charCounter() {
+		// character count part deux
+		//$(this).val().length is not a function Line 282(3)
+		$('#profile-jot-text').keyup(function() {
+			var textlen = 0;
+			var maxLen1 = 140;
+			var maxLen2 = 420;
+
+			$('#character-counter').removeClass('jothidden');
+
+			textLen = $(this).val().length;
+			if(textLen <= maxLen1) {
+				$('#character-counter').removeClass('red');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('grey');
+			}
+			if((textLen > maxLen1) && (textlen <= maxLen2)) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('red');
+				$('#character-counter').addClass('orange');
+			}
+			if(textLen > maxLen2) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('red');
+			}
+			$('#character-counter').text( textLen );
+		});
+		$('#profile-jot-text').keyup();
+	}
+
 </script>
 
diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl
index c312d221a..688ac1451 100755..100644
--- a/view/theme/dispy/jot.tpl
+++ b/view/theme/dispy/jot.tpl
@@ -1,14 +1,9 @@
+<form id="profile-jot-form" action="$action" method="post">
+	<div id="jot">
+		<div id="profile-jot-desc" class="jothidden">&#160;</div>
+		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" />
+		<div id="character-counter" class="grey jothidden"></div>
 
-<div id="profile-jot-wrapper" > 
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey" style="display: none;">0</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>
-
-	<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" />
@@ -16,60 +11,62 @@
 		<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-wrapper">
-		<span id="jot-title-desc" style="display: none;">$addtitle</span>
-		<span id="jot-title-display" style="display: none;"></span>
-		<input type="text" name="title" id="jot-title" value="" 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>
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}
+		</textarea>
 
-                <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="jot-tools" class="jothidden" style="display:none">
+	<div id="profile-jot-submit-wrapper" class="jothidden">
 
-<div id="profile-jot-submit-wrapper" style="display:none">
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" >
-            <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang</div>
-	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-</div>
+		<div id="profile-upload-wrapper" style="display: $visitor;">
+			<div id="wall-image-upload-div"><a class="icon border camera" href="#" onclick="return false;" id="wall-image-upload" title="$upload"></a></div>
+		</div>
+		<div id="profile-attach-wrapper" style="display: $visitor;">
+			<div id="wall-file-upload-div"><a class="icon border attach" href="#" onclick="return false;" id="wall-file-upload" title="$attach"></a></div>
+		</div>
+		<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);">
+			<a class="icon border link" id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a>
+		</div>
+		<div id="profile-video-wrapper" style="display: $visitor;">
+			<a class="icon border video" id="profile-video" onclick="jotVideoURL();return false;" title="$video"></a>
+		</div>
+		<div id="profile-audio-wrapper" style="display: $visitor;">
+			<a class="icon border audio" id="profile-audio" onclick="jotAudioURL();return false;" title="$audio"></a>
+		</div>
+		<div id="profile-location-wrapper" style="display: $visitor;">
+			<a class="icon border globe" id="profile-location" onclick="jotGetLocation();return false;" title="$setloc"></a>
+		</div>
+		<div id="profile-nolocation-wrapper" style="display: none;">
+			<a class="icon border noglobe" id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc"></a>
+		</div>
 
-	<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="$upload"></a></div>
-	</div>
-	<div id="profile-attach-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="$attach"></a></div>
-	</div>  
-	<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon border  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" class="jot-tool" style="display: none;" >
-		<a id="profile-video" class="icon border  video" title="$video" onclick="jotVideoURL(); return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-audio" class="icon border  audio" title="$audio" onclick="jotAudioURL(); return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-location" class="icon border  globe" title="$setloc" onclick="jotGetLocation(); return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-nolocation" class="icon border  noglobe" title="$noloc" onclick="jotClearLocation(); return false;"></a>
-	</div> 
+		<div id="profile-jot-plugin-wrapper">
+		$jotplugins
+		</div>
 
-	<div id="profile-jot-plugin-wrapper" style="display: none;">
-  	$jotplugins
+	<a class="icon-text-preview pointer"></a><a id="jot-preview-link" class="pointer" onclick="preview_post(); return false;" title="$preview">$preview</a>
+	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
+	<div id="profile-jot-perms" class="profile-jot-perms">
+		<a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon $lockstate $bang" title="$permset"></a>
 	</div>
-	<div id="profile-jot-tools-end"></div>
+	<span id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait" /></span>
+	</div>
+
+	</div> <!-- /#profile-jot-submit-wrapper -->
+</div> <!-- /#jot-tools -->
 	
-        <div style="display: none;">
-            <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-                $acl
-                <hr style="clear:both"/>
-                <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-                <div id="profile-jot-email-end"></div>
-                $jotnets
-            </div>
-        </div>
+	<div id="jot-preview-content" style="display:none;"></div>
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			$acl
+			<hr style="clear:both" />
+			<div id="profile-jot-email-label">$emailcc</div>
+			<input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+			<div id="profile-jot-email-end"></div>
+			$jotnets
+		</div>
+	</div>
 
-<div id="profile-jot-end"></div>
 </form>
-</div>
-                {{ if $content }}<script>initEditor();</script>{{ endif }}
+{{ if $content }}<script>initEditor();</script>{{ endif }}
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/mail_head.tpl b/view/theme/dispy/mail_head.tpl
index 89615cbd0..d49d7c1af 100755..100644
--- a/view/theme/dispy/mail_head.tpl
+++ b/view/theme/dispy/mail_head.tpl
@@ -1,7 +1,5 @@
 <h3>$messages</h3>
 
-<ul class="tabs-wrapper">
-<li><a href="message" class="tabs">$inbox</a></li>
-<li><a href="message/sent" class="tabs">$outbox</a></li>
-<li><a href="message/new" class="tabs">$new</a></li>
-</ul>
+<div class="tabs-wrapper">
+$tab_content
+</div>
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 79852217f..e38b2bbe2 100755..100644
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -1,57 +1,131 @@
 <nav>
-  $langselector
-
-  <span id="banner">$banner</span>
-
-  {{ if $nav.help }}<a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a>{{ endif }}
-  {{ if $nav.login }}<a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a> {{ endif }}
-  <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a>
-  <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a>
-
-  <div id="user-menu" >
-	  <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
-      
-      <ul id="user-menu-popup" 
-           onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" 
-           onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
-
-
-		  {{ if $nav.register }}<li><a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0"  title="$nav.register.1">$nav.register.1</a></li>{{ endif }}
-	      
-	      {{ if $nav.home }}<li><a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0">$nav.home.1</a></li>{{ endif }}
-	
-	      {{ if $nav.network }}<li><a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0">$nav.network.1</a></li>{{ endif }}
-	
-              {{ if $nav.community }}
-              <li><a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
-              {{ endif }}
-	
-	      {{ if $nav.notifications }}<li><a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0">$nav.notifications.1</a></li>{{ endif }}
-	      {{ if $nav.messages }}<li><a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a></li>{{ endif }}
-	      {{ if $nav.contacts }}<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0">$nav.contacts.1</a></li>{{ endif }}
-	
-	      {{ if $nav.profiles }}<li><a id="nav-profiles-link" class="nav-commlink nav-sep $nav.profiles.2" href="$nav.profiles.0">$nav.profiles.1</a></li>{{ endif }}
-	      {{ if $nav.settings }}<li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0">$nav.settings.1</a></li>{{ endif }}
-	      
-	      {{ if $nav.manage }}<li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0">$nav.manage.1</a></li>{{ endif }}
-	
-		  {{ if $nav.admin }}<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0">$nav.admin.1</a></li>{{ endif }}
-	
-
-	      {{ if $nav.logout }}<li><a id="nav-logout-link" class="nav-commlink nav-sep $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a></li> {{ endif }}
-      </ul>
-
-	  <div id="notifications">
-      {{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
-      {{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
-      {{ if $nav.notifications }}<a id="notify-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }}
-      {{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
-	  </div>
-
-  </div>
-
-
-  {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>{{ endif }}
+
+<span id="banner">$banner</span>
+
+<!-- yes, they're going the other way. seems that's how the template renderer
+works -->
+
+<div id="nav-floater">
+    <div id="nav-buttons">
+    {{ if $nav.help }}
+    <a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a>
+    {{ endif }}
+    {{ if $nav.community }}
+    <a id="nav-community-link" class="nav-link $nav.community.2"
+    href="$nav.community.0" title="$nav.community.1">$nav.community.1</a>
+    {{ endif }}
+    {{ if $nav.apps }}
+    <a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>
+    {{ endif }}
+    <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a>
+    <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a>
+    {{ if $nav.messages }}
+    <a id="nav-messages-link" class="nav-link $nav.messages.2"
+    href="$nav.messages.0" title="$nav.messages.1">$nav.messages.1</a>
+    {{ endif }}
+    {{ if $nav.notifications }}
+    <a id="nav-notifications-linkmenu" class="nav-link $nav.notifications.2" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
+    <ul id="nav-notifications-menu" class="menu-popup">
+        <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+        <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+        <li class="empty">$emptynotifications</li>
+    </ul>
+    {{ 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>
+    {{ 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>
+    {{ 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 }}
+	</div>
+
+	<div id="user-menu">
+        <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
+        <ul id="user-menu-popup"
+            onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
+            onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
+
+        {{ if $nav.register }}
+        <li>
+        <a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1"></a>
+        </li>
+        {{ endif }}
+
+        {{ if $nav.contacts }}
+        <li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li>
+        {{ endif }}
+		{{ if $nav.introductions }}
+	    <li><a id="nav-intro-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a></li>
+		{{ endif }}
+        {{ if $nav.profiles }}
+        <li><a id="nav-profiles-link" class="nav-commlink $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.1">$nav.profiles.1</a></li>
+        {{ endif }}
+        {{ if $nav.settings }}
+        <li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0" title="$nav.settings.1">$nav.settings.1</a></li>
+        {{ endif }}
+        {{ if $nav.manage }}
+        <li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.1">$nav.manage.1</a></li>
+        {{ endif }}
+        {{ if $nav.admin }}
+        <li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li>
+        {{ endif }}
+
+        {{ if $nav.login }}
+        <li><a id="nav-login-link" class="nav-commlink $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li>
+        {{ endif }}
+
+        {{ if $nav.logout }}
+        <li><a id="nav-logout-link" class="nav-commlink $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
+        {{ endif }}
+        </ul>
+    </div>
+
+{{ if $userinfo }}
+        <ul id="nav-user-menu" class="menu-popup">
+            {{ for $nav.usermenu as $usermenu }}
+                <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
+            {{ endfor }}
+        </ul>
+{{ endif }}
+
+    <div id="notifications">
+        {{ if $nav.home }}
+        <a id="home-update" class="nav-ajax-left" href="$nav.home.0" title="$nav.home.1"></a>
+        {{ endif }}
+        {{ if $nav.network }}
+        <a id="net-update" class="nav-ajax-left" href="$nav.network.0" title="$nav.network.1"></a>
+        {{ endif }}
+        {{ if $nav.notifications }}
+        <a id="notify-update" class="nav-ajax-left" href="$nav.notifications.0" title="$nav.notifications.1"></a>
+        {{ endif }}
+        {{ if $nav.messages }}
+        <a id="mail-update" class="nav-ajax-left" href="$nav.messages.0" title="$nav.messages.1"></a>
+        {{ endif }}
+		{{if $nav.introductions }}
+		<a id="intro-update" class="nav-ajax-left" href="$nav.introductions.0"></a>
+		{{ endif }}
+    </div>
+</div>
+    <a href="#" class="floaterflip"></a>
 </nav>
 
+<div id="lang-sel-wrap">
+$langselector
+</div>
+
+<div 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 b0cb8890c..b0cb8890c 100755..100644
--- a/view/theme/dispy/nets.tpl
+++ b/view/theme/dispy/nets.tpl
diff --git a/view/theme/dispy/next.png b/view/theme/dispy/next.png
index 353e2e72a..5e0067c4b 100755..100644
--- a/view/theme/dispy/next.png
+++ b/view/theme/dispy/next.png
diff --git a/view/theme/dispy/notifications.png b/view/theme/dispy/notifications.png
index f0f6a90e8..66c432eac 100755..100644
--- a/view/theme/dispy/notifications.png
+++ b/view/theme/dispy/notifications.png
diff --git a/view/theme/dispy/notifications.svg b/view/theme/dispy/notifications.svg
new file mode 100644
index 000000000..eccc54457
--- /dev/null
+++ b/view/theme/dispy/notifications.svg
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg3486"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   width="148"
+   height="19"
+   sodipodi:docname="notifications.svg"
+   inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy/notifications.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata3492">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3490" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1041"
+     inkscape:window-height="643"
+     id="namedview3488"
+     showgrid="false"
+     inkscape:zoom="4.2687885"
+     inkscape:cx="64.235788"
+     inkscape:cy="18.27268"
+     inkscape:window-x="0"
+     inkscape:window-y="48"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3486"
+     width="0px"
+     height="0px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <g
+     id="g4437"
+     transform="translate(0,-44)">
+    <path
+       sodipodi:nodetypes="ccccc"
+       transform="translate(0,44)"
+       style="fill:#6c99c9"
+       d="M 34.398531,19 30.225818,10.411298 47.864407,1.3368391 57.625819,19.010154 z"
+       id="path3506"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="ccccccccccccccc"
+       transform="translate(0,44)"
+       style="fill:#4e7db5"
+       d="m 45.148088,5.1797115 -9.353484,4.7866764 6.895762,1.5144501 z m -2.0018,7.2466465 -8.105899,-1.97793 3.232895,6.44678 11.074578,-5.648894 -3.366977,-6.4432724 z M 46.4192,3.6690997 50.56253,11.552848 38.044003,18.006578 33.98857,10.057271 z"
+       id="path3502"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g4441"
+     transform="translate(0,-44)">
+    <path
+       sodipodi:nodetypes="ccccc"
+       transform="translate(0,44)"
+       style="fill:#aa7ca5"
+       d="M 64.398531,19 60.225818,10.411298 77.725,2.013353 87.084493,18.988196 z"
+       id="path3504"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="sssssccccc"
+       transform="translate(-0.88048036,44.641441)"
+       style="fill:#75507b"
+       d="m 75,16 c -0.55,0 -1,-0.45 -1,-1 0,-0.55 0.45,-1 1,-1 0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1 z m -1.441718,-2.172038 c 0,0 -2.448135,-3.9460956 -3.558282,-6.0504682 0,-0.4276216 1.043961,-0.9072067 1.57461,-0.9072067 1.48457,2.2735627 3.276272,6.3043659 3.276272,6.3043659 -0.823179,-0.104873 -0.90154,-0.01483 -1.2926,0.653309 z"
+       id="path3498"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g4453"
+     transform="translate(0,-24)">
+    <path
+       sodipodi:nodetypes="ccccc"
+       transform="translate(0,24)"
+       style="fill:#f4ac42;fill-opacity:1"
+       d="M 4.3985314,19 0.19544564,10.348783 18,1.8695178 27,19 z"
+       id="path3508"
+       inkscape:connector-curvature="0" />
+    <g
+       transform="translate(0,-20)"
+       id="g4361">
+      <path
+         sodipodi:type="arc"
+         style="fill:#e98007;fill-opacity:1;stroke:none"
+         id="path274"
+         sodipodi:cx="559.67499"
+         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"
+         transform="matrix(1.0481621,1.5589904,-1.5589904,1.0481621,-539.42292,-838.01094)" />
+      <path
+         transform="matrix(0.78612158,1.1692428,-1.1692428,0.78612158,-396.15077,-611.38593)"
+         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"
+         sodipodi:ry="0.88388348"
+         sodipodi:rx="0.88388348"
+         sodipodi:cy="21.754047"
+         sodipodi:cx="559.67499"
+         id="path276"
+         style="fill:#e98007;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#e98007;fill-opacity:1;stroke:none"
+         id="path279"
+         sodipodi:cx="559.67499"
+         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"
+         transform="matrix(0.8235559,1.224921,-1.224921,0.8235559,-420.44896,-652.37384)" />
+      <path
+         style="fill:none;stroke:#e98007;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 563.21055,31.653543 4.41942,-6.187185 -7.6014,-6.187184"
+         id="path281"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.37434361,0.55678228,-0.55678228,0.37434361,-184.9504,-268.16228)" />
+      <path
+         transform="matrix(0.89842466,1.3362775,-1.3362775,0.89842466,-465.66125,-710.18506)"
+         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"
+         sodipodi:ry="0.88388348"
+         sodipodi:rx="0.88388348"
+         sodipodi:cy="21.754047"
+         sodipodi:cx="559.67499"
+         id="path283"
+         style="fill:#e98007;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         style="fill:none;stroke:#e98007;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 567.45319,25.466358 7.6014,-4.065864"
+         id="path285"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.37434361,0.55678228,-0.55678228,0.37434361,-184.9504,-268.16228)" />
+    </g>
+  </g>
+  <g
+     id="g4566"
+     transform="translate(0,-24)">
+    <path
+       sodipodi:nodetypes="ccccc"
+       transform="translate(0,24)"
+       style="fill:#6fcb15"
+       d="M 94.398531,19 90.225818,10.411298 108.5,1.9724323 117,19 z"
+       id="path3500"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccccccc"
+       inkscape:connector-curvature="0"
+       d="m 14.756588,131.15925 0,9.60545 -11.6032194,-0.0118 0,-9.58225 m -0.039261,-0.0651 5.8825232,-3.13423 5.9219702,3.25106 z"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:none;stroke:#428107;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;font-family:Verdana;-inkscape-font-specification:Verdana"
+       transform="matrix(0.55727141,-0.25996788,0.2876144,0.61653494,59.024831,-44.715085)"
+       id="path1037" />
+  </g>
+  <g
+     id="g4553"
+     transform="translate(0,-24)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path4471"
+       d="M 94.398531,19 90.225818,10.411298 108.5,1.9724323 117,19 z"
+       style="fill:#fb7b62;fill-opacity:1"
+       transform="translate(31,24)"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       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"
+       sodipodi:ry="1.5964882"
+       sodipodi:rx="2.0660436"
+       sodipodi:cy="194.45924"
+       sodipodi:cx="5.2590199"
+       id="path4218"
+       style="fill:#c32405;fill-opacity:1;fill-rule:nonzero;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       sodipodi:type="arc" />
+    <use
+       height="200"
+       width="250"
+       transform="translate(0.11687856,-8.4237924)"
+       id="use4224"
+       xlink:href="#path4218"
+       y="0"
+       x="0"
+       style="fill:#999999;stroke:#666666" />
+    <use
+       height="200"
+       width="250"
+       transform="translate(6.5982765,5.2049933)"
+       id="use4226"
+       xlink:href="#use4224"
+       y="0"
+       x="0"
+       style="fill:#999999;stroke:#c32405;stroke-opacity:1" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#c32405;fill-opacity:1;fill-rule:nonzero;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path4228"
+       sodipodi:cx="5.2590199"
+       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"
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,81.644877,-64.113316)" />
+    <path
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       inkscape:connector-curvature="0"
+       id="path4230"
+       d="m 10.902837,183.0346 0,3.66687"
+       style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       inkscape:connector-curvature="0"
+       id="path4232"
+       d="m 9.2894123,189.68386 -2.3956906,3.56909"
+       style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       inkscape:connector-curvature="0"
+       id="path4234"
+       d="m 12.46737,189.68386 2.493472,3.5202"
+       style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       inkscape:connector-curvature="0"
+       id="path4236"
+       d="m 12.467368,182.74125 4.009116,9.925"
+       style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       inkscape:connector-curvature="0"
+       id="path4238"
+       d="m 9.4849789,182.83904 -4.2046813,9.87611"
+       style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="cc"
+       transform="matrix(0.59287153,-0.28418321,0.25089012,0.52341448,79.780054,-59.357394)"
+       inkscape:connector-curvature="0"
+       id="path4240"
+       d="m 7.4315299,194.71969 7.0403961,0"
+       style="fill:none;stroke:#c32405;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+  </g>
+</svg>
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/photo_view.tpl b/view/theme/dispy/photo_view.tpl
index 4582751c6..732caf690 100755..100644
--- a/view/theme/dispy/photo_view.tpl
+++ b/view/theme/dispy/photo_view.tpl
@@ -4,20 +4,17 @@
 <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" title="$photo.title"><img src="$photo.src" /></a>
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
+{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
 </div>
 
+{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
+<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
+{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
 <div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
+<div id="photo-caption">$desc</div>
 {{ if $tags }}
 <div id="in-this-photo-text">$tags.0</div>
 <div id="in-this-photo">$tags.1</div>
diff --git a/view/theme/dispy/premium.png b/view/theme/dispy/premium.png
index 1ad601c0f..d2855a4f5 100755..100644
--- a/view/theme/dispy/premium.png
+++ b/view/theme/dispy/premium.png
diff --git a/view/theme/dispy/prev.png b/view/theme/dispy/prev.png
index 0ae6022af..10b10d74f 100755..100644
--- a/view/theme/dispy/prev.png
+++ b/view/theme/dispy/prev.png
diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl
index b3f5cc50d..f14ea7915 100755..100644
--- a/view/theme/dispy/profile_vcard.tpl
+++ b/view/theme/dispy/profile_vcard.tpl
@@ -1,35 +1,71 @@
 <div class="vcard">
 
-	<div class="fn label">$profile.name</div>
-	
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name"></div>
+	{{ if $profile.edit }}
+	<div class="action">
+	<span class="icon-profile-edit"></span>
+	<a href="#" rel="#profiles-menu" class="ttright" id="profiles-menu-trigger" title="$profile.edit.3">$profile.edit.1</a>
+	<ul id="profiles-menu" class="menu-popup">
+		{{ for $profile.menu.entries as $e }}
+		<li>
+			<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
+		</li>
+		{{ endfor }}
+		<li><a href="profile_photo">$profile.menu.chg_photo</a></li>
+		<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
+	</ul>
+	</div>
+	{{ endif }}
 
+	<div class="fn label">$profile.name</div>
 
+	{{ if $pdesc }}
+    <div class="title">$profile.pdesc</div>
+    {{ endif }}
+	<div id="profile-photo-wrapper">
+		<img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" />
+    </div>
 
 	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
+		<div class="location">
+        <span class="location-label">$location</span>
+		<div class="adr">
+			{{ if $profile.address }}
+            <div class="street-address">$profile.address</div>{{ endif }}
 			<span class="city-state-zip">
 				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
 				<span class="region">$profile.region</span>
 				<span class="postal-code">$profile.postal-code</span>
 			</span>
 			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</dd>
-		</dl>
+		</div>
+		</div>
 	{{ endif }}
 
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
+	{{ if $gender }}
+    <div class="mf">
+        <span class="gender-label">$gender</span>
+        <span class="x-gender">$profile.gender</span>
+    </div>
+    {{ endif }}
 	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
+	{{ if $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 $marital }}
+    <div class="marital">
+    <span class="marital-label">
+    <span class="heart">&hearts;</span>$marital</span>
+    <span class="marital-text">$profile.marital</span>
+    </div>
+    {{ endif }}
 
-	{{ if $homepage }}<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 }}
+	{{ if $homepage }}
+    <div class="homepage">
+    <span class="homepage-label">$homepage</span>
+    <span class="homepage-url"><a href="$profile.homepage"
+    target="external-link">$profile.homepage</a></span>
+    </div>{{ endif }}
 
 	{{ inc diaspora_vcard.tpl }}{{ endinc }}
 	
@@ -44,4 +80,3 @@
 
 $contact_block
 
-
diff --git a/view/theme/dispy/saved_searches_aside.tpl b/view/theme/dispy/saved_searches_aside.tpl
index e2aae1e77..fb822fe5d 100755..100644
--- a/view/theme/dispy/saved_searches_aside.tpl
+++ b/view/theme/dispy/saved_searches_aside.tpl
@@ -5,8 +5,8 @@
 	<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 7f563293a..622cf5734 100755..100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -1,479 +1,1305 @@
-body {
-	margin: 0px;
-	padding: 0px;
-	font-family: freesans,helvetica,arial,clean,sans-serif;
-	font-size: 16px;
-}
-img {  border: 0 none; }
+/*
+ * dispy
+ *
+ * modernised, sort of, by simon <http://simon.kisikew.org/>
+ *
+ */
 
-a { color: #3465a4; text-decoration: none; margin-bottom:1px;}
-a:hover { color: #729fcf; padding-bottom: 0px; border-bottom: 1px dotted #729fcf;}
+/* from html5boilerplate */
 
+/* these are to tell browsers they should be displayed a certain way */
+article, aside, details, figcaption, figure, footer,
+header, hgroup, nav, section {
+    display: block;
+}
+audio, canvas, video, time {
+    display: inline-block;
+    *display: inline;
+    *zoom: 1;
+}
+audio:not([controls]) {
+    display: none;
+}
+[hidden] {
+    display: none;
+}
+
+/* 
+ *  Base
+ */
 
-.required { display: inline; color: #ff0000;}
-.fakelink { color: #3465a4; cursor: pointer; }
-.fakelink :hover{ color: #729fcf; }
+/*
+ * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units
+ * 2. Force vertical scrollbar in non-IE
+ * 3. Prevent iOS text size adjust on device orientation change, without disabling user zoom: h5bp.com/g
+ */
 
+html {
+    font-size: 100%;
+    overflow-y: scroll;
+    -webkit-text-size-adjust: 100%;
+    -ms-text-size-adjust: 100%;
+}
+body {
+    margin: 0;
+    font-size: 16px;
+    line-height: 1.1em;
+}
+body, button, input, select, textarea {
+    font-family: sans-serif;
+    color: #222;
+    background-color: #efefef;
+}
+select {
+	border: 1px #555 dotted;
+	padding: 3px;
+	margin: 2px;
+	color: #222;
+	background: #efefef;
+}
+option {
+	padding: 3px;
+	vertical-align: middle;
+	color: #222;
+	background: #efefef;
+}
+ul, ol {
+	padding: 0;
+}
+/* remember to define focus styles! */
+:focus {
+    outline: 0;
+}
+
+/* remember to highlight inserts somehow! */
+ins {
+    background-color: #ff9;
+    color: #000;
+    text-decoration: none;
+}
+mark {
+    background-color: #ff9;
+    color: #000;
+    font-style: italic;
+    font-weight: bold;
+}
+/* Redeclare monospace font family: h5bp.com/j */
+pre, code, kbd, samp, .wall-item-body code {
+    font-family: monospace, monospace;
+    _font-family: monospace;
+    font-size: 1em; }
+
+/* Improve readability of pre-formatted text in all browsers */
+pre, .wall-item-body code {
+    white-space: pre;
+    white-space: pre-wrap;
+    word-wrap: break-word;
+}
+
+q {
+    quotes: none;
+}
+q:before, q:after {
+    content: "";
+    content: none;
+}
+small {
+    font-size: 85%;
+}
+
+/* Position subscript and superscript content without affecting line-height: h5bp.com/k */
+sub, sup {
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline;
+}
+sup {
+    top: -0.5em;
+}
+sub {
+    bottom: -0.25em;
+}
+img {
+    border: 0 none;
+    /*vertical-align: middle;*/
+}
+a {
+    color: #3465a4;
+    text-decoration: none;
+    margin-bottom: 1px;
+}
+a:hover img {
+    text-decoration: none;
+}
+blockquote {
+    background: #eee;
+	color: #111;
+    text-indent: 5px;
+    padding: 5px;
+    border: 1px #aaa solid;
+    border-radius: 5px;
+}
+a:hover {
+    color: #729fcf;
+    border-bottom: 1px dotted #729fcf;
+}
+.required {
+    display: inline;
+    color: #f00;
+    font-size: 16px;
+    font-weight: bold;
+    margin: 3px;
+}
+.fakelink, .lockview {
+    color: #3465a4;
+    cursor: pointer;
+}
+.fakelink:hover {
+    color: #729fcf;
+}
 input[type=submit] {
-	margin-top: 20px;
-	height: 22px;
-	background-color: #555753;
+    background-color: #555753;
 	color: #eeeeec;
-	-webkit-border-radius: 5px ;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border: 0px;	
+	font-weight: bold;
+    margin-top: 10px;
+    height: 22px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 0;
+}
+.smalltext {
+    font-size: 0.7em;
 }
-
-.smalltext { font-size: 0.7em }
-
 #panel {
 	position: absolute;
-	font-size:0.8em;
-	-webkit-border-radius: 5px ;
+	font-size: 0.8em;
+	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	border-radius: 5px;
-	border: 1px solid #ffffff;
+	border: 1px solid #fff;
 	background-color: #2e3436;
 	color: #eeeeec;
-	padding:1em;
+	padding: 1em;
 }
-
 .pager {
-	padding-top: 30px;
-	display:block;
+	margin-top: 60px;
+	display: block;
 	clear: both;
 	text-align: center;
 }
+.pager span {
+    padding: 4px;
+    margin: 4px;
+}
+.pager_current {
+    background-color: #729fcf;
+    color: #fff;
+}
+
+
+/**
+ * global
+ */
+/* .tool .action */
+.action {
+	margin: 5px 0;
+}
+.tool {
+	margin: 5px 0;
+	list-style: none;
+}
 
-.pager span { padding: 4px; margin:4px; }
-.pager_current { background-color: #729fcf; color: #ffffff; }
 
 /**
  * 	login
  */
-#login-extra-links a { margin-right: 20px; }
+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;
+}
 
-/*********
-* nav
-*********/
 
+/**
+ * nav
+ */
 nav {
-	height: 50px;
+	height: 60px;
 	display: block;
 	background-color: #2e3436;
 	color: #eeeeec;
 	position: relative;
-	padding: 0px 10%;
+	padding: 20px 20px 10px 95px;
+    margin-left: auto;
+    margin-right: auto;
+}
+nav a {
+	text-decoration: none;
+	color: #eeeeec;
+	border: 0px;
+}
+nav a:hover {
+	text-decoration: none;
+	color: #eeeeec;
+    border: 0px;
 }
-nav a { text-decoration: none;	color: #eeeeec; border:0px;}
-nav a:hover { text-decoration: none;	color: #eeeeec; border:0px;}
-
 nav #banner {
 	display: block;
 	position: absolute;
-	margin-left: 20px;	
+	left: 51px;
+	top: 25px;
 }
 nav #banner #logo-text a {
 	font-size: 40px;
 	font-weight: bold;
 	margin-left: 3px;
 }
-
-nav #user-menu {
+ul#user-menu-popup {
+	display: none;
+	position: absolute;
+	background-color: #555753;
+	width: 100%;
+    padding: 10px 0px;
+    margin: 0px;
+	top: 20px;
+	left: 0;
+	-webkit-border-radius: 0 0 5px 5px;
+	-moz-border-radius: 0 0 5px 5px;
+	border-radius: 0 0 5px 5px;
+	z-index: 10000;
+}
+ul#user-menu-popup li {
+	display: block;
+}
+ul#user-menu-popup li a {
+	display: block;
+	padding: 5px;
+}
+ul#user-menu-popup li a:hover {
+	color: #2e3436;
+	background-color: #eeeeec;
+}
+ul#user-menu-popup li a.nav-sep {
+	border-top: 1px solid #eeeeec;
+}
+nav .nav-link {
+	float: right;
+	display: block;
+	width: 22px;
+	height: 22px;
+	overflow: hidden;
+	margin: 0px 5px 5px;
+	text-indent: 50px;
+	background: transparent url(icons.png) 0 0 no-repeat;
+}
+#nav-apps-link {
+	background-position: 0 -66px;
+}
+#nav-apps-link:hover {
+	background-position: -22px -66px;
+}
+#nav-community-link {
+    background-position: 0 -22px;
+}
+#nav-community-link:hover {
+    background-position: -22px -22px;
+}
+#nav-contacts-link {
+    background-position: 0 -22px;
+}
+#nav-contacts-link:hover {
+    background-position: -22px -22px;
+}
+#nav-directory-link {
+	background-position: -44px -154px;
+}
+#nav-directory-link:hover {
+	background-position: -66px -154px;
+}
+#nav-help-link {
+	background-position: 0 -110px;
+}
+#nav-help-link:hover {
+	background-position: -22px -110px;
+}
+#nav-home-link {
+    background-position: -44px -132px;
+}
+#nav-home-link:hover {
+    background-position: -66px -132px;
+}
+#nav-intro-link {
+	background-position: 0px -190px;
+}
+#nav-intro-link:hover {
+	background-position: -44px -190px;
+}
+#nav-login-link {
+	background-position: 0 -88px;
+}
+#nav-login-link:hover {
+	background-position: -22px -88px;
+}
+#nav-logout-link {
+	background-position: 0 -88px;
+}
+#nav-logout-link:hover {
+	background-position: -22px -88px;
+}
+#nav-messages-link {
+    background-position: -44px -88px;
+}
+#nav-messages-link:hover {
+    background-position: -66px -88px;
+}
+#nav-notify-link, #nav-notifications-linkmenu {
+    background-position: -44px -110px;
+}
+#nav-notify-link:hover {
+    background-position: -66px -110px;
+}
+#nav-network-link {
+    background-position: 0px -177px;
+}
+#nav-network-link:hover {
+    background-position: -22px -177px;
+}
+#nav-search-link {
+	background-position: 0 -44px;
+}
+#nav-search-link:hover {
+	background-position: -22px -44px;
+}
+#profile-link,
+#profile-title, 
+#wall-image-upload,
+#wall-file-upload,
+#profile-attach-wrapper,
+#profile-audio,
+#profile-link,
+#profile-location,
+#profile-nolocation,
+#profile-title,
+#jot-title,
+#profile-upload-wrapper,
+#profile-video,
+#profile-jot-submit,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.icon, .hover, .focus, .pointer {
+    cursor: pointer;
+}
+/* popup notifications */
+div.jGrowl div.notice {
+    background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+    color: #ffffff;
+    padding-left: 58px;
+}
+div.jGrowl div.info {
+    background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+    color: #ffffff;
+    padding-left: 58px;
+}
+#nav-notifications-menu {
+    margin: 30px 0 0 -20px;
+    width: 275px;
+    max-height: 300px;
+    overflow-y: auto;
+    font-size: 9pt;
+}
+#nav-notifications-menu .contactname {
+    font-weight: bold;
+    font-size: 0.9em;
+}
+#nav-notifications-menu img {
+    float: left;
+    margin-right: 5px;
+}
+#nav-notifications-menu .notif-when {
+    font-size: 0.8em;
+    display: block;
+}
+#nav-notifications-menu li {
+    padding: 7px 0px 7px 10px;
+    word-wrap: normal;
+    border-bottom: 1px solid #000;
+}
+#nav-notifications-menu li:hover {
+    color: black;
+}
+#nav-notifications-menu a:hover {
+    color: black;
+    text-decoration: underline;
+}
+nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+  background-image: url("../../../images/icons/22/notify_on.png");
+}
+.show {
+    display: block;
+}
+#notifications {
+	height: 20px;
+	width: 170px;
+	position: absolute;
+	top: -19px;
+	left: 7px;
+}
+#nav-floater {
+    position: fixed;
+    top: 20px;
+    right: 1%;
+    padding: 5px;
+    background: #2e3436;
+	color: transparent;
+    border-radius: 5px;
+    z-index: 100;
+	width: 300px;
+	height: 60px;
+}
+#nav-buttons {
+    clear: both;
+	list-style: none;
+	padding: 0px;
+	margin: 0 7px 0 0;
+	height: 25px;
+}
+#nav-buttons li {
+	padding: 0;
+}
+.floaterflip {
+	display: block;
+    position: fixed;
+    z-index: 110;
+    top: 56px;
+    right: 19px;
+	width: 22px;
+	height: 22px;
+	overflow: hidden;
+	margin: 0px;
+	background: transparent url(icons.png) -190px -60px no-repeat;
+}
+.search-box {
+	display: inline-block;
+	margin: 5px;
+	position: fixed;
+	right: 0px;
+	bottom: 0px;
+	z-index: 100;
+	background: #1d1f1d;
+	border-radius: 5px;
+}
+#search-text {
+	border: 1px #eec solid;
+	background: #2e3436;
+	color: #eec;
+}
+.search-box #search-text {
+	margin: 8px;
+	width: 10em;
+	color: #eec;
+}
+#user-menu {
     display: block;	
-	width: auto;
-    float: right;
-    margin-top: 22px;
-    margin-right: 10px;
+    width: 75%;
+    margin: 3px 0 0 0;
     position: relative;
-    vertical-align: middle;
-
 	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;
 }
-nav #user-menu-label {
-	float: left;
+#user-menu > a {
+	vertical-align: top;
+}
+#user-menu-label {
    	font-size: 12px;
     padding: 3px 20px 9px 5px;
     height: 10px;
 }
-
-ul#user-menu-popup {
-    display: none;
-    position: absolute;
-    background-color: #555753;
-    width: 100%;
-    padding: 10px 0px;
-    margin: 0px;
-    top: 20px;
-	left: 0px;
-
-    -webkit-border-radius: 0px 0px 5px 5px;
-    -moz-border-radius: 0px 0px 5px 5px;    
-    border-radius: 0px 0px 5px 5px;
-    
-    z-index: 10000;
-}
-
-ul#user-menu-popup li { display: block; }
-ul#user-menu-popup li a { display: block; padding: 5px; }
-ul#user-menu-popup li a:hover { color: #2e3436; background-color: #eeeeec; }
-ul#user-menu-popup li a.nav-sep { border-top: 1px solid #eeeeec; }
-nav .nav-link {
-    float: right;
-    display: block;
-    width: 22px;
-    height: 22px;
-    /*border: 1px solid #eeeeec;*/
-    overflow: hidden;
-    margin-top: 22px;
-    margin-right: 10px;
-    text-indent: 50px;
-    background: transparent url('icons.png') 0px 0px no-repeat; 
-}
-
-#nav-directory-link 		{ background-position: 0px -22px }
-#nav-directory-link:hover	{ background-position: -22px -22px;}
-#nav-search-link 			{ background-position: 0px -44px }
-#nav-search-link:hover 		{ background-position: -22px -44px;}
-#nav-apps-link 				{ background-position: 0px -66px }
-#nav-apps-link:hover		{ background-position: -22px -66px;}
-#nav-login-link 			{ background-position: 0px -88px }
-#nav-login-link:hover 		{ background-position: -22px -88px;}
-#nav-help-link 				{ background-position: 0px -110px }
-#nav-help-link:hover 		{ background-position: -22px -110px;}
-
-
-#notifications {
-	height: 20px; width: 100%;
-	position: absolute;
-	top:-19px; left: 0px;
-}
-.nav-ajax-update {
+.nav-ajax-update, .nav-ajax-left {
 	width: 30px;
 	height: 19px;
-	background: transparent url('notifications.png') 0px 0px no-repeat; 
-	color: #ffffff;
+	background: transparent url(notifications.png) 0 0 no-repeat;
+	color: #222;
 	font-weight: bold;
 	font-size: 0.8em;
 	padding-top: 0.2em;
 	text-align: center;
 	float: left;
-	margin-right: -4px;
-    display: none;
+	margin: 0 -1px 0 3px;
+	display: block;
+	visibility: hidden;
+}
+.nav-ajax-update.show, .nav-ajax-left.show {
+    visibility: visible;
+}
+#net-update {
+	background-position: 0px 0px;
+}
+#mail-update {
+	background-position: -30px 0;
+}
+#notify-update {
+	background-position: -60px 0px;
+}
+#home-update {
+	background-position: -90px 0px;
+}
+#intro-update {
+	background-position: -120px 0px;
 }
-#net-update { background-position: 0px 0px; }
-#mail-update { background-position: -30px 0px; }
-#notify-update { background-position: -60px 0px; }
-#home-update { background-position: -90px 0px; }
-
 #lang-select-icon {
 	cursor: pointer;
-	position: absolute;
-	left: 0px;
-	top: 0px;
+	position: fixed;
+	left: 28px;
+	bottom: 6px;
+	z-index: 10;
 }
-
 #language-selector {
-	position: absolute;
-	top: 0;
-	left: 16px;
+    position: fixed;
+    bottom: 2px;
+    left: 52px;
+	z-index: 10;
+}
+.menu-popup {
+    position: absolute;
+    display: none;
+    width: 11em;
+    background: #ffffff;
+    color: #2d2d2d;
+    margin: 0px;
+    padding: 0px;
+    list-style: none;
+    border: 3px solid #364e59;
+    z-index: 100000;
+    -webkit-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
+    -moz-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
+    box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7);
+}
+.menu-popup a {
+    display: block;
+    color: #2d2d2d;
+    padding: 5px 10px;
+    text-decoration: none;
+}
+.menu-popup a:hover {
+    background-color: #bdcdd4;
+}
+.menu-popup .menu-sep {
+    border-top: 1px solid #9eabb0;
+}
+.menu-popup li {
+    float: none;
+    overflow: auto;
+    height: auto;
+    display: block;
+}
+.menu-popup li img {
+    float: left;
+    width: 16px;
+    height: 16px;
+    padding-right: 5px;
+}
+.menu-popup .empty {
+    padding: 5px;
+    text-align: center;
+    color: #9eabb0;
+}
+.notif-item {
+    font-size: small;
+}
+.notif-item a {
+    vertical-align: middle;
+}
+.notif-image {
+    width: 32px;
+    height: 32px;
+    padding: 7px 7px 0px 0px;
+}
+.notify-seen {
+    background: #ddd;
 }
 
 
 /** sysmsg **/
-#sysmsg_info{
-	position:fixed; 
-	bottom: 0px; right:20%; 
-	-moz-box-shadow: 0px 0px 5px #888;
-	-webkit-box-shadow: 0px 0px 5px #888;
-	box-shadow: 0px 0px 5px #888;
-	padding: 10px; 
-	background-color: #fcaf3e; border:2px solid #f8911b;
-	border-bottom:0px;
-	padding-bottom: 50px;	
+#sysmsg_info {
+	position: fixed;
+	bottom: 0;
+	-moz-box-shadow: 3px 3px 3px 10px 0 #000;
+	-webkit-box-shadow: 3px 3px 10px 0 #000;
+	box-shadow: 3px 3px 10px 0 #000;
+    padding: 10px;
+	background-color: #fcaf3e;
+	border:2px solid #f8911b;
+	border-bottom: 0;
+	padding-bottom: 50px;
 	z-index: 1000;
 }
-#sysmsg { 
-	position:fixed; 
-	bottom: 0px; right:10%; 
-	-moz-box-shadow: 0px 0px 5px #888;
-	-webkit-box-shadow: 0px 0px 5px #888;
-	box-shadow: 0px 0px 5px #888;
-	padding: 10px; 
-	background-color: #fcaf3e; border:2px solid #f8911b;
-	border-bottom:0px;
-	padding-bottom: 50px;	
+#sysmsg {
+	position: fixed;
+	bottom: 0;
+	-moz-box-shadow: 3px 3px 10px 0 #000;
+	-webkit-box-shadow: 3px 3px 10px 0 #000;
+	box-shadow: 3px 3px 10px 0 #000;
+    padding: 10px;
+	background-color: #fcaf3e;
+	border: 2px solid #f8911b;
+	border-bottom: 0;
+	padding-bottom: 50px;
 	z-index: 1000;
 }
 #sysmsg_info br,
 #sysmsg br {
-	display:block;
-	margin:2px 0px;
+	display: block;
+	margin: 2px 0px;
 	border-top: 1px solid #ccccce;
 }
 
 
-
 /**
 * aside
 **/
-
 aside {
     position: absolute;
-    right: 11%;
-    width: 200px;
-    font-size: 0.7em;
-
+    right: 15px;
+    width: 245px;
+	padding-top: 15px;
+    font-size: smaller;
+}
+.vcard .fn {
+	font-size: 1.7em;
+	font-weight: bold;
+	border-bottom: 1px solid #729fcf;
+	padding-bottom: 3px;
+}
+.vcard #profile-photo-wrapper {
+	margin: 20px;
+}
+/* http://css-tricks.com/snippets/css/css-box-shadow/
+ * box-shadow:
+ * 1. The horizontal offset of the shadow, positive means
+ * the shadow will be on the right of the box, a negative
+ * offset will put the shadow on the left of the box.
+ * 2. The vertical offset of the shadow, a negative one
+ * means the box-shadow will be above the box, a
+ * positive one means the shadow will be below the box.
+ * 3. The blur radius (optional), if set to 0 the shadow
+ * will be sharp, the higher the number, the more blurred
+ * it will be.
+ * 4. The spread radius (optional), positive values increase
+ * the size of the shadow, negative values decrease the size.
+ * Default is 0 (the shadow is same size as blur).
+ * 5. Colo[u]r
+ */
+.vcard #profile-photo-wrapper img {
+	box-shadow: 3px 3px 10px 0 #000;
+}
+aside h4 {
+	font-size: 1.2em;
+}
+aside #viewcontacts {
+	text-align: right;
+}
+.aprofile dt {
+    color: #666666;
+	background: transparent;
+	font-weight: bold;
+    box-shadow: 1px 1px 5px 0 #000;
+    margin: 15px 0 5px;
+    padding-left: 5px;
+}
+#profile-extra-links ul {
+	margin-left: 0px;
+    padding-left: 0px;
+    list-style: none;
 }
-.vcard .fn { font-size: 1.7em; font-weight: bold; border-bottom: 1px solid #729fcf; padding-top: 1px;}
-
-.vcard #profile-photo-wrapper { margin: 10px 0px }
-
-aside h4 { font-size: 1.2em; }
-
-aside #viewcontacts { text-align: right;}
-
-#profile-extra-links ul { margin-left: 0px; padding-left: 0px; list-style: none; }
-
 #dfrn-request-link {
-    background: #3465A4 url('connect.png') no-repeat 95% center;
-    border-radius: 5px 5px 5px 5px;
-    color: #FFFFFF;
-    display: block;
-    font-size: 1.2em;
-    padding: 0.2em 0.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
 */
-.contact-block-div { width: 50px; height: 50px; float: left; }
-.contact-block-textdiv { width: 150px; height: 34px; float: left; }
-#contact-block-end { clear: both; }
+.contact-block-div {
+    width: 50px;
+    height: 50px;
+    float: left;
+}
+.contact-block-textdiv {
+    width: 150px;
+    height: 34px;
+    float: left;
+}
+#contact-block-end {
+    clear: both;
+}
+
 
 /**
  * jot
- **/ 
-#profile-jot-text_tbl { margin-bottom: 10px; }
-#profile-jot-text_ifr { width: 99.9%!important }
-#profile-jot-submit-wrapper { float: right;}
-#profile-jot-perms { 
- 	float: right;
- 	background-color: #555753;
- 	height: 22px; width: 20px;
-    -webkit-border-radius: 0px 5px 5px 0px;
-    -moz-border-radius: 0px 5px 5px 0px;
-    border-radius: 0px 5px 5px 0px; 	
- 	overflow: hidden;
- 	border: 0px;
- 	margin-left:2px;
-}
-#profile-jot-submit { 
+ **/
+#jot {
+  /*width: 785px;*/
+  margin: 10px 0 20px 0px;
+  width: 100%;
+}
+#jot #jot-tools {
+  margin: 0px;
+  padding: 0px;
+  height: 35px;
+  overflow: none;
+  width: 100%;
+  /*background-color: #0e232e;*/
+  /*border-bottom: 2px solid #9eabb0;*/
+}
+#jot #jot-tools span {
+    float: left;
+    margin: 10px 20px 2px 0px;
+}
+#jot #jot-tools span a {
+    display: block;
+}
+#jot #jot-tools .perms {
+    float: right;
+    width: 40px;
+}
+#jot #jot-tools li.loading {
+    float: right;
+    background-color: #ffffff;
+    width: 20px;
+    vertical-align: center;
+    text-align: center;
+    border-top: 2px solid #9eabb0;
+    height: 38px;
+}
+#jot #jot-tools li.loading img {
+    margin-top: 10px;
+}
+#jot #jot-title {
+	border: 1px solid #ccc;
+    margin: 0 0 5px;
+    height: 20px;
+    width: 90%;
+    font-weight: bold;
+    border-radius: 5px;
+	vertical-align: middle;
+}
+#jot-category {
+	margin: 5px 0;
+	border-radius: 5px;
+	border: 1px #ccc solid;
+	color: #666;
+	font-size: small;
+}
+#jot-category:focus {
+	color: #111;
+}
+#jot #character-counter {
+	width: 6%;
 	float: right;
-	height: 22px;
-	background-color: #555753;
-	color: #eeeeec;
-	-webkit-border-radius: 5px 0px 0px  5px;
-	-moz-border-radius: 5px 0px 0px  5px;
-	border-radius: 5px 0px 0px  5px;
-	border: 0px;
-	margin-top: 0px;
+	text-align: right;
+	height: 15px;
+	line-height: 20px;
+	padding: 2px 20px 5px 0;
 }
-#character-counter {
- float: right; padding: 8px 10px; 
+#profile-jot-text_tbl {
+	margin-bottom: 10px;
 }
-#profile-rotator-wrapper {
- float: right; 
+#profile-jot-text_ifr {
+	width:99.900002% !important;
+}
+[id$="jot-text_ifr"] {
+	width: 99.900002% !important;
+	color: #2e2f2e;
+	background: #eec;
+}
+[id$="jot-text_ifr"] .mceContentBody {
+	color: #2e2f2e;
+	background: #eec;
+}
+#profile-attach-wrapper,
+#profile-audio-wrapper,
+#profile-link-wrapper,
+#profile-location-wrapper,
+#profile-nolocation-wrapper,
+#profile-title-wrapper,
+#profile-upload-wrapper,
+#profile-video-wrapper {
+    float: left;
+	margin: 0 20px 0 0;
 }
-
-.jot-tool {
-	float: left;
-	margin-right: 5px;
+#profile-rotator-wrapper {
+	float: right; 
 }
 #profile-jot-tools-end,
-#profile-jot-banner-end { clear: both; }
-
+#profile-jot-banner-end {
+	clear: both;
+}
 #profile-jot-email-wrapper {
-	margin: 10px 10% 0px 10%;
-	border: 1px solid #555753;
-	border-bottom: 0px;
+	margin:10px 10% 0;
+	border:1px solid #555753;
+	border-bottom:0;
+}
+#profile-jot-email-label {
+	background-color:#555753;
+	color:#ccccce;
+	padding:5px;
+}
+#profile-jot-email {
+	width:90%;
+	margin:5px;
 }
-#profile-jot-email-label { background-color: #555753; color: #ccccce; 	padding: 5px;}
-#profile-jot-email { margin: 5px; width: 90%; }
-	
 #profile-jot-networks {
-	margin: 0px 10%;
+	margin: 0 10%;
 	border: 1px solid #555753;
-	border-top: 0px;
-	border-bottom: 0px;
+	border-top: 0;
+	border-bottom: 0;
 	padding: 5px;
 }
+#profile-jot-net {
+	margin: 5px 0;
+}
+#jot-preview-link {
+    margin: 0 0 0 10px;
+    border: 0;
+    text-decoration: none;
+	float: right;
+}
+.icon-text-preview {
+	margin: 0 0 -18px 0;
+	display: block;
+    width: 20px;
+    height: 20px;
+    background: url(icons.png) no-repeat -128px -40px;
+    border: 0;
+    text-decoration: none;
+	float: right;
+	cursor: pointer;
+}
+#profile-jot-perms { 
+	float: right;
+    background-color: #555753;
+    height: 22px;
+    width: 20px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;     
+    overflow: hidden;
+    border: 0px;
+    margin: 0 10px 0 10px;
+}
+#profile-jot-plugin-wrapper {
+	width: 1px;
+	margin: 10px 0 0 0;
+	float: right;
+}
+#profile-jot-submit-wrapper {
+	float: right;
+	width: 100%;
+	list-style: none;
+	margin: 10px 0 0 0;
+	padding: 0;
+}
+#profile-jot-submit {
+	height: 22px;
+	background-color: #555753;
+	color: #eeeeec;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	border: 0;
+	margin: 0;
+	float: right;
+}
+#jot-perms-icon {
+	height: 22px;
+	width: 20px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	overflow: hidden;
+	border: 0;
+}
 #profile-jot-acl-wrapper {
-	margin: 0px 10px;
+	margin: 0 10px;
 	border: 1px solid #555753;
-	border-top: 0px;
-        display:block!important;
+	border-top: 0;
+	display: block !important;
 }
 #group_allow_wrapper,
 #group_deny_wrapper,
-#acl-permit-outer-wrapper { width: 47%; float: left; }
-
+#acl-permit-outer-wrapper {
+	width:47%;
+	float:left;
+}
 #contact_allow_wrapper,
 #contact_deny_wrapper,
-#acl-deny-outer-wrapper { width: 47%; float: right; }
-
-#acl-permit-text {background-color: #555753; color: #ccccce; padding: 5px; float: left;}
-#jot-public {background-color: #555753; color: #ff0000; padding: 5px; float: left;}
-#acl-deny-text {background-color: #555753; color: #ccccce; padding: 5px; float: left;}
-
+#acl-deny-outer-wrapper {
+	width:47%;
+	float:right;
+}
+#acl-permit-text {
+	background-color: #555753;
+	color: #ccccce;
+	padding: 5px;
+	float: left;
+}
+#jot-public {
+	background-color: #555753;
+	color: #ff0000;
+	padding: 5px;
+	float: left;
+}
+#acl-deny-text {
+	background-color: #555753;
+	color: #ccccce;
+	padding: 5px;
+	float: left;
+}
 #acl-permit-text-end,
-#acl-deny-text-end { clear: both; }
-
-
+#acl-deny-text-end {
+	clear: both;
+}
 #jot-title-desc {
-	color: #cccccc;
+	color: #ccc;
+}
+#profile-jot-desc {
+	color: #a00;
+	margin: 5px 0;
 }
-
 #jot-title-wrapper {
 	margin-bottom: 5px;
 }
-
-#jot-title {
-	border: 1px solid #cccccc;
-	width: 530px;
-}
 #jot-title-display {
 	font-weight: bold;
 }
+.jothidden {
+    display: none;
+}
+#jot-preview-content {
+    background-color: #ffffe0;
+	color: #111;
+    border: 1px #aa0 solid;
+    border-radius: 5px;
+    padding: 3px 3px 6px 10px;
+}
+#jot-preview-content .wall-item-outside-wrapper {
+	border: 0;
+	border-radius: 0px;
+}
 
 
 /**
  * section
  */
-section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
+section {
+    margin: 20px 9% 0 4%;
+    font-size: 0.8em;
+    padding-right: 230px;
+	min-width: 475px;
+	width: 65%;
+}
 
 /** tabs **/
-.tabs {list-style: none; padding: 0px; margin: 0px; border-bottom: 1px solid #729fcf; }
-.tabs li { display: inline;}
-.tab { padding: 0px 5px; margin-right: 10px; }
-.tab:hover { background-color: #729fcf; color: #eeeeec; border: 0px; }
-.tab.active { background-color: #729fcf; color: #eeeeec; border: 0px; }
+.tabs {
+    list-style: none;
+    margin: 10px 0;
+    padding: 0;
+}
+.tabs li {
+    display: inline;
+	font-size: smaller;
+	font-weight: bold;
+}
+.tab {
+    border: 1px solid #729fcf;
+	padding: 4px;
+}
+.tab:hover, .tab.active:hover {
+    background: #729fcf;
+    color: #eeeeec;
+}
+.tab:active {
+    background: #729fcf;
+    color: #eeeeec;
+}
+.tab.active {
+	background: #729fcf;
+    color: #eeeeec;
+}
+.tab.active a {
+	color: #729fcf;
+}
+.tab a {
+	border: 0;
+	text-decoration: none;
+}
 
 
 /**
  * 	items
  */
-.wall-item-outside-wrapper { 
-	margin-top: 50px;
+.wall-item-outside-wrapper {
+	border: 1px solid #aaa;
+	border-radius: 5px;
+}
+.wall-item-outside-wrapper.comment {
+	margin-top: 5px;
+}
+.wall-item-outside-wrapper-end {
+    clear: both;
+}
+.wall-item-content-wrapper {
+    position: relative;
+	padding: 10px;
+	width: auto;
+}
+.wall-item-outside-wrapper .wall-item-comment-wrapper {
+    /*margin-left: 90px;*/
+}
+.shiny {
+    background: #efefdf;
+	border-radius: 5px;
+}
+.wall-outside-wrapper .shiny {
+	border-radius: 5px;
+}
+.heart {
+	color: red;
+}
+.wall-item-content {
+	overflow-x: auto;
+	margin: 0px 15px 0px 5px;
+}
+/* removing it from here, vs. putting it in .wall-item-content
+ * might break things for people. we shall see ;) */
+[id^="tread-wrapper"], [class^="tread-wrapper"] {
+    margin: 15px 0 0 0;
+    padding: 0px;
+	/*overflow-x: auto;*/
+}
+.wall-item-photo-menu {
+    display: none;
 }
-.wall-item-outside-wrapper-end { clear: both;}
-.wall-item-content-wrapper { position: relative; }
-.wall-item-photo-menu { display: none;}
 .wall-item-photo-menu-button {
-	display:none;
-	text-indent: -99999px;
-	background: #555753 url("menu-user-pin.jpg") no-repeat 75px center;
-	position: absolute;
-	overflow: hidden;
-	height: 20px; width: 90px; 
-	top: 85px;	left: 0px;
-	-webkit-border-radius: 0px 0px 5px  5px;
-	-moz-border-radius: 0px 0px 5px  5px;
-	border-radius: 0px 0px 5px  5px;
-	
-	
+    display:none;
+    text-indent:-99999px;
+    background:#555753 url(menu-user-pin.jpg) no-repeat 75px center;
+    position:absolute;
+    overflow:hidden;
+    height:20px;
+    width:90px;
+    top:85px;
+    left:0;
+    -webkit-border-radius:0 0 5px 5px;
+    -moz-border-radius:0 0 5px 5px;
+    border-radius:0 0 5px 5px;
+}
+.wall-item-info {
+    float: left;
+    width: 110px;
+}
+.wall-item-photo-wrapper {
+    width: 80px;
+    height: 80px;
+    position: relative;
+    padding: 5px;
+    background-color: #555753;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
 }
-
-.wall-item-info { float: left; width: 140px; }
-.wall-item-photo-wrapper { 
-	width: 80px; height: 80px;  
-	position: relative;
-	padding: 5px;
-	background-color: #555753;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;	
+[class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
+	/*margin: 0 0 5px 0;*/
 }
-
-
-.wall-item-tools { 
-	float: right; 
-	/*height: 0px;
-	padding-top: 20px;
-	overflow:hidden;
-	background: #ffffff url("icons.png") no-repeat  -50px  -40px;*/
-	filter: alpha(opacity=20);
-	opacity: 0.2;
-	-webkit-transition: all 1s ease-in-out;
-	-moz-transition: all 1s ease-in-out;
-	-o-transition: all 1s ease-in-out;
-	-ms-transition: all 1s ease-in-out;
-	transition: all 1s ease-in-out;	
+.wall-item-tools {
+    float: right;
+    filter: alpha(opacity=35);
+    opacity: 0.4;
+    -webkit-transition: all 1s ease-in-out;
+    -moz-transition: all 1s ease-in-out;
+    -o-transition: all 1s ease-in-out;
+    -ms-transition: all 1s ease-in-out;
+    transition: all 1s ease-in-out;
 }
 .wall-item-tools:hover {
-	/*height:auto;*/
-	filter: alpha(opacity=100);
+    filter: alpha(opacity=100);
+    opacity: 1;
+    -webkit-transition: all 1s ease-in-out;
+    -moz-transition: all 1s ease-in-out;
+    -o-transition: all 1s ease-in-out;
+    -ms-transition: all 1s ease-in-out;
+    transition: all 1s ease-in-out;
+}
+.wall-item-subtools1 {
+    height: 30px;
+    list-style: none outside none;
+    margin: 20px 0 30px -20px;
+    padding: 0;
+    width: 30px;
+}
+.wall-item-subtools2 {
+    height: 25px;
+    list-style: none outside none;
+    margin: -75px 0 0 5px;
+    padding: 0;
+    width: 25px;
+}
+.wall-item-title {
+	font-size: 1.2em;
+	font-weight: bold;
+    margin-bottom: 1em;
+}
+.wall-item-body {
+	margin: 20px 20px 10px 0px;
+    text-align: left;
+	overflow-x: auto;
+}
+.wall-item-lock-wrapper {
+	float: right;
+    height: 22px;
+    margin: 0 -5px 0 0;
+    width: 22px;
 	opacity: 1;
-	-webkit-transition: all 1s ease-in-out;
-	-moz-transition: all 1s ease-in-out;
-	-o-transition: all 1s ease-in-out;
-	-ms-transition: all 1s ease-in-out;
-	transition: all 1s ease-in-out;	
-	
 }
-
-.wall-item-title { font-size: 1.2em; font-weight: bold;}
-.wall-item-body { margin-left: 140px;}
-.wall-item-lock-wrapper { float: right; }
 .wall-item-dislike,
-.wall-item-like,
-.wall-item-author { clear: left; font-size: 0.8em; margin: 10px 0px 0px 140px; color: #babdb6;}
-.wall-item-ago { display: inline; padding-left: 10px;} 
-.wall-item-wrapper-end { clear:both; }
+.wall-item-like {
+	clear: left;
+	font-size: 0.8em;
+	color: #878883;
+	margin: 5px 0 5px 120px;
+}
+.wall-item-author, .wall-item-actions-author {
+	clear: left;
+	font-size: 0.8em;
+	color: #878883;
+	margin: 20px 20px 0 110px;
+}
+.wall-item-ago {
+	display: inline;
+	padding-left: 10px;
+}
+.wall-item-wrapper-end {
+	clear:both;
+}
 .wall-item-location {
-	margin-top:5px;
-	width: 100px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	-o-text-overflow: ellipsis;
+    margin-top: 15px;
+    width: 100px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+}
+.wall-item-location .icon {
+    float: left;
+}
+.wall-item-location > a {
+    margin-left: 25px;
+    font-size: 0.7em;
+    display: block;
+}
+.wall-item-location .smalltext {
+    margin-left: 25px;
+    font-size: 0.7em;
+    display: block;
+}
+.wall-item-location > br {
+    display: none;
 }
-.wall-item-location .icon { float: left; }
-.wall-item-location > a { margin-left: 25px;  font-size: 0.7em; display: block;}
-.wall-item-location .smalltext { margin-left: 25px;  font-size: 0.7em; display: block;}
-.wall-item-location > br { display: none; }
-
 .wallwall .wwto {
-    left: -10px;
+    left: 5px;
     margin: 0;
     position: absolute;
-    top: 65px;
+    top: 75px;
     width: 30px;
     z-index: 10001;
-	width: 30px;
-	height: 30px;
-    
+    width: 30px;
+    height: 30px;
+}
+.wallwall .wwto img {
+    width: 30px !important;
+    height: 30px !important;
+}
+.wallwall .wall-item-photo-end {
+    clear: both;
 }
-.wallwall .wwto img { width: 30px!important; height: 30px!important;}
-.wallwall .wall-item-photo-end { clear: both; }
 .wall-item-arrowphoto-wrapper {
     position: absolute;
-    left: 20px;
-    top: 70px;
+    left: 35px;
+    top: 80px;
     z-index: 10002;
 }
-
 .wall-item-photo-menu {
 	min-width: 92px;
 	border: 2px solid #FFFFFF;
@@ -482,90 +1308,184 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
 	position: absolute;
 	left: -2px; top: 101px;
 	display: none;
-	z-index: 10000;
+	z-index: 10003;
 	-webkit-border-radius: 0px 5px 5px 5px;
 	-moz-border-radius: 0px 5px 5px 5px;
 	border-radius: 0px 5px 5px 5px;
 }
-.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.wall-item-photo-menu li a { white-space: nowrap;  display: block; padding: 5px 2px; 	color: #eeeeec;	 }
-.wall-item-photo-menu li a:hover { color: #555753; background: #eeeeec; }
+.wall-item-photo-menu ul {
+    margin:0px;
+    padding: 0px;
+    list-style: none;
+}
+.wall-item-photo-menu li a {
+    white-space: nowrap;
+    display: block;
+    padding: 5px 2px;
+    color: #eeeeec;
+}
+.wall-item-photo-menu li a:hover {
+    color: #555753;
+    background: #eeeeec;
+}
+#item-delete-selected {
+    overflow: auto;
+    width: 100%;
+}
+#connect-services-header {
+
+}
+#connect-services {
+	margin: 5px 0 0 0;
+}
+#extra-help-header {
+
+}
+#extra-help {
+	margin: 5px 0 0 0;
+}
+#postit-header {
+
+}
+#postit {
+	margin: 5px 0 0 0;
+}
+
 
-.icon.drop,
-.icon.drophide { float: left; }
-#item-delete-selected {	overflow: auto;	width: 100%}
 /**
  * 	comment
  */
- 
- .ccollapse-wrapper { font-size: 0.9em; margin-left: 80px; }
- 
-.wall-item-outside-wrapper.comment { margin-left: 80px; }
-.wall-item-outside-wrapper.comment .wall-item-photo { width: 40px!important; height: 40px!important;}
-.wall-item-outside-wrapper.comment .wall-item-photo-wrapper {width: 40px; height: 40px; }
+.ccollapse-wrapper {
+    font-size: 0.9em;
+    margin-left: 80px;
+}
+
+.wall-item-outside-wrapper.comment {
+    margin-left: 80px;
+}
+.wall-item-outside-wrapper.comment .wall-item-photo {
+    width: 40px!important;
+    height: 40px!important;
+}
+.wall-item-outside-wrapper.comment .wall-item-photo-wrapper {
+    width: 40px;
+    height: 40px;
+}
 .wall-item-outside-wrapper.comment .wall-item-photo-menu-button {
-	width: 50px; top: 45px; background-position: 35px center;
+	width: 50px;
+    top: 45px;
+    background-position: 35px center;
+}
+.wall-item-outside-wrapper.comment .wall-item-info {
+    width: 60px;
+}
+.wall-item-outside-wrapper.comment .wall-item-body {
+    margin-left: 10px;
+}
+.wall-item-outside-wrapper.comment .wall-item-author {
+    margin-left: 50px;
 }
-.wall-item-outside-wrapper.comment .wall-item-info { width: 60px; }
-.wall-item-outside-wrapper.comment .wall-item-body { margin-left: 60px;}
-.wall-item-outside-wrapper.comment .wall-item-author { margin-left: 60px;}
 
 .wall-item-outside-wrapper.comment .wall-item-photo-menu {
-	min-width: 50px;
-	top: 60px;
+    min-width: 50px;
+    top: 60px;
+}
+.comment-wwedit-wrapper {
+    /*margin: 30px 0px 0px 80px;*/
+}
+.comment-edit-wrapper {
+    border-top: 1px #aaa solid;
 }
-
-
-.comment-wwedit-wrapper,
-.comment-edit-wrapper { margin: 30px 0px 0px 80px;}
 .comment-wwedit-wrapper img,
-.comment-edit-wrapper img { width: 20px; height: 20px; }
-.comment-edit-photo-link { float: left; width: 40px;}
-.comment-edit-text-empty {  width: 80%; height: 20px; border: 0px; color: #babdb6;
+.comment-edit-wrapper img {
+	width: 20px;
+	height: 20px;
+}
+.comment-edit-photo-link, .comment-edit-photo {
+	float: left;
+	margin-left: 10px;
+}
+.my-comment-photo {
+    width: 40px;
+    height: 40px;
+    padding: 5px;
+}
+[class^="comment-edit-text"] {
+    margin: 5px 0 10px 20px;
+    width: 84.5%;
+}
+.comment-edit-text-empty {
+	height: 20px;
+	border: 2px #babdd6 solid;
+	border-radius: 5px;
+	color: #babdb6;
 	-webkit-transition: all 0.5s ease-in-out;
 	-moz-transition: all 0.5s ease-in-out;
 	-o-transition: all 0.5s ease-in-out;
 	-ms-transition: all 0.5s ease-in-out;
 	transition: all 0.5s ease-in-out;	
 }
-.comment-edit-text-empty:hover { color: #999999;}
-.comment-edit-text-full { width: 80%; height: 6em;
+.comment-edit-text-empty:hover {
+	color: #999999;
+}
+.comment-edit-text-full {
+	height: 10em;
+    border-radius: 5px;
 	-webkit-transition: all 0.5s ease-in-out;
 	-moz-transition: all 0.5s ease-in-out;
 	-o-transition: all 0.5s ease-in-out;
 	-ms-transition: all 0.5s ease-in-out;
 	transition: all 0.5s ease-in-out;	
 }
-.comment-edit-submit-wrapper { width: 80%; margin-left: 40px; text-align: right; }
+.comment-edit-submit-wrapper {
+	width: 90%;
+	margin: 5px 5px 10px 50px;
+	text-align: right;
+}
 .comment-edit-submit {
-	height: 22px;
-	background-color: #555753;
-	color: #eeeeec;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border: 0px;
+    height: 22px;
+    background-color: #555753;
+    color: #eeeeec;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 0;
 }
 
+
 /**
  * item text style
  **/
 .wall-item-body code {
-    border-color: #CCCCCC;
-    border-style: solid;
-    border-width: 1px 1px 1px 10px;
-    display: block;
-    padding-left: 10px;
+	display: block;
+	padding: 0 0 10px 5px;
+	border-color: #ccc;
+	border-style: solid;
+	border-width: 1px 1px 1px 10px;
+	background: #eee;
+	color: #444;
+	width: 95%;
 }
 
+
 /**
  * profile
  **/
- 
-div[id$="text"] { font-weight: bold; border-bottom: 1px solid #cccccc; } 
-div[id$="wrapper"] { height: 100%; margin-bottom: 1em; } 
-div[id$="wrapper"] br { clear: left; }
-#advanced-profile-with { margin-left: 200px; }
+div[id$="text"] {
+    font-weight: bold;
+    border-bottom: 1px solid #ccc;
+}
+div[id$="wrapper"] {
+    height: 100%;
+    margin-bottom: 1em;
+}
+div[id$="wrapper"] br {
+    clear: left;
+}
+#advanced-profile-with {
+    margin-left: 200px;
+}
+
 
 /**
  * photos
@@ -575,300 +1495,611 @@ div[id$="wrapper"] br { clear: left; }
 	overflow: auto;
 }
 #photo-top-links {
-	margin-bottom:30px;
+    margin-bottom: 30px;
 }
 .photo-album-image-wrapper,
-.photo-top-image-wrapper { 
-	float: left; 
-	margin: 0px 10px 10px 0px;
-	-moz-box-shadow: 0px 0px 5px #888;
-	-webkit-box-shadow: 0px 0px 5px #888;
-	box-shadow: 0px 0px 5px #888;
-	background-color: #eeeeee;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-
-	padding-bottom: 30px; 
-	position:relative;
-	
+.photo-top-image-wrapper {
+    float: left;
+    -moz-box-shadow: 3px 3px 10px 0 #000;
+    -webkit-box-shadow: 3px 3px 10px 0 #000;
+    box-shadow: 3px 3px 10px 0 #000;
+    background-color: #eee;
+	color: #111;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    padding-bottom: 30px;
+    position: relative;
+    margin: 0 10px 10px 0;
 }
 
-#photo-photo { max-width: 100% }
-#photo-photo img { max-width: 100% }
-
+#photo-photo {
+    max-width: 100%;
+}
+#photo-photo img {
+    max-width: 100%;
+}
 .photo-top-image-wrapper a:hover,
 #photo-photo a:hover,
-.photo-album-image-wrapper a:hover { 
-	border-bottom: 0px; 
+.photo-album-image-wrapper a:hover {
+    border-bottom: 0;
 }
-
-.photo-top-photo,
-.photo-album-photo {
-    -webkit-border-radius: 5px 5px 0px 0px;
-    -moz-border-radius: 5px 5px 0px 0px;
-    border-radius: 5px 5px 0px 0px;
- } 
-
-.photo-top-album-name { position: absolute; bottom: 0px; padding: 0px 5px;} 
-.caption { position: absolute; bottom: 0px; margin: 0px 5px}
-
-
-#photo-photo{
+.photo-top-photo,.photo-album-photo {
+    -webkit-border-radius:5px 5px 0 0;
+    -moz-border-radius:5px 5px 0 0;
+    border-radius:5px 5px 0 0;
+}
+.photo-top-album-name {
+    position: absolute;
+    bottom: 0;
+    padding: 0 5px;
+}
+.caption {
+    position: absolute;
+    bottom: 0;
+    margin: 0 5px;
+}
+#photo-photo {
 	position: relative;
 	float:left;
 }
-#photo-photo-end { clear: both; }
-#photo-prev-link,
-#photo-next-link{
-	position: absolute;
-	width:30%;
-	height: 100%;
-	background-color: rgba(255,255,255,0.5);
-	opacity: 0;
-	-webkit-transition: all 0.2s ease-in-out;
-	-moz-transition: all 0.2s ease-in-out;
-	-o-transition: all 0.2s ease-in-out;
-	-ms-transition: all 0.2s ease-in-out;
-	transition: all 0.2s ease-in-out;
-	background-position: center center;
-	background-repeat: no-repeat;
-	
+#photo-photo-end {
+    clear: both;
 }
-#photo-prev-link { left:0px; top:0px; background-image: url('prev.png'); }
-#photo-next-link { right:0px; top:0px; background-image: url('next.png');}
-
-#photo-prev-link a,
-#photo-next-link a{
- display: block; width: 100%; height: 100%;
- overflow: hidden;
- text-indent: -900000px;		 
+#photo-prev-link,
+#photo-next-link {
+    position:absolute;
+    width:30%;
+    height:100%;
+    background-color:rgba(255,255,255,0.5);
+    opacity:0;
+    -webkit-transition:all .2s ease-in-out;
+    -moz-transition:all .2s ease-in-out;
+    -o-transition:all .2s ease-in-out;
+    -ms-transition:all .2s ease-in-out;
+    transition:all .2s ease-in-out;
+    background-position:center center;
+    background-repeat:no-repeat;
+}
+#photo-prev-link {
+    left:0;
+    top:0;
+    background-image:url(prev.png);
+}
+#photo-next-link {
+    right:0;
+    top:0;
+    background-image:url(next.png);
+}
+
+#photo-prev-link a,#photo-next-link a {
+    display:block;
+    width:100%;
+    height:100%;
+    overflow:hidden;
+    text-indent:-900000px;
 }
-
 #photo-prev-link:hover,
-#photo-next-link:hover{
-	opacity: 1;
-	-webkit-transition: all 0.2s ease-in-out;
-	-moz-transition: all 0.2s ease-in-out;
-	-o-transition: all 0.2s ease-in-out;
-	-ms-transition: all 0.2s ease-in-out;
-	transition: all 0.2s ease-in-out;		
+#photo-next-link:hover {
+    opacity:1;
+    -webkit-transition:all .2s ease-in-out;
+    -moz-transition:all .2s ease-in-out;
+    -o-transition:all .2s ease-in-out;
+    -ms-transition:all .2s ease-in-out;
+    transition:all .2s ease-in-out;
 }
-
 #photo-next-link .icon,
-#photo-prev-link .icon { display: none }
-
+#photo-prev-link .icon {
+    display: none;
+}
 #photos-upload-spacer,
 #photos-upload-new-wrapper,
-#photos-upload-exist-wrapper { margin-bottom: 1em; }
+#photos-upload-exist-wrapper {
+    margin-bottom: 1em;
+}
 #photos-upload-existing-album-text,
-#photos-upload-newalbum-div { 
-	background-color: #555753;
-	color: #eeeeec;
-	padding: 1px;
+#photos-upload-newalbum-div {
+    background-color:#555753;
+    color:#eeeeec;
+    padding:1px;
 }
 #photos-upload-album-select,
-#photos-upload-newalbum { width: 99% }
-#photos-upload-perms-menu { text-align: right; }
+#photos-upload-newalbum {
+    width: 99%;
+}
+#photos-upload-perms-menu {
+    text-align: right;
+}
+#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
+    float: left;
+    margin-bottom: 25px;
+}
+#photo-edit-link-wrap {
+    margin-bottom: 15px;
+}
+#photo-edit-caption {
+	width: 100%;
+}
+#photo-edit-newtag {
+	width: 100%;
+}
+#photo-like-div {
+    margin-bottom: 25px;
+}
+#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end {
+    clear: both;
+}
+#photo-edit-delete-button {
+    margin-left: 200px;
+}
+#photo-edit-end {
+    margin-bottom: 35px;
+}
+#photo-caption {
+    font-size: 110%;
+    font-weight: bold;
+    margin-top: 15px;
+    margin-bottom: 15px;
+}
 
 /**
  * 	message
  */
-.prvmail-text { width: 100%;}
-#prvmail-subject { width: 100%;}
-#prvmail-submit-wrapper { margin-top: 10px; }
+.prvmail-text {
+    width: 100%;
+}
+#prvmail-subject {
+    width: 100%;
+	color: #eec;
+	background: #444;
+}
+#prvmail-submit-wrapper {
+    margin-top: 10px;
+}
 #prvmail-submit {
-	float: right;
-	margin-top: 0px;
+    float:right;
+    margin-top: 0;
 }
 #prvmail-submit-wrapper > div {
-	margin-right: 5px;
-	float: left;
+    margin-right:5px;
+    float:left;
+}
+.mail-list-outside-wrapper {
+    margin-top: 20px;
+}
+.mail-list-sender {
+    float: left;
+}
+.mail-list-detail {
+    margin-left: 90px;
+}
+.mail-list-sender-name {
+    display: inline;
+	font-size: 1.1em;
+}
+.mail-list-date {
+    display: inline;
+    font-size: 0.9em;
+    padding-left: 10px;
+}
+.mail-list-sender-name, .mail-list-date {
+	font-style: italic;
+}
+.mail-list-subject {
+    font-size: 1.2em;
+}
+.mail-list-delete-wrapper {
+    float: right;
+}
+.mail-list-outside-wrapper-end {
+    clear: both;
+	border-bottom: 1px #eec dotted;
+}
+.mail-conv-sender {
+    float: left;
+    margin: 0px 5px 5px 0px;
+}
+.mail-conv-sender-photo {
+    width: 32px;
+    height: 32px;
+}
+.mail-conv-sender-name {
+    float: left;
+}
+.mail-conv-date {
+    float: right;
+}
+.mail-conv-subject {
+    clear: right;
+    font-weight: bold;
+    font-size: 1.2em;
+}
+.mail-conv-body {
+    clear: both;
+}
+.mail-conv-delete-wrapper {
+    margin-top: 5px;
 }
-.mail-list-outside-wrapper { margin-top: 20px;}
-.mail-list-sender {	float: left; }
-.mail-list-detail {	margin-left: 90px; }
-.mail-list-sender-name { display: inline; }
-.mail-list-date { display: inline; font-size: 0.8em; padding-left: 10px;}
-.mail-list-subject { font-size: 1.5em;}
-.mail-list-delete-wrapper { float: right; }
-.mail-list-outside-wrapper-end { clear: both;}
-
-.mail-conv-sender {float: left; margin: 0px 5px 5px 0px }
-.mail-conv-sender-photo { width: 32px; height: 32px }
-.mail-conv-sender-name { float: left }
-.mail-conv-date { float: right }
-.mail-conv-subject { clear: right; font-weight: bold; font-size: 1.2em }
-.mail-conv-body { clear: both; }
-.mail-conv-delete-wrapper { margin-top: 5px; }
 
 
 /**
  * 	contacts
  */
-
 .view-contact-wrapper,
-.contact-entry-wrapper { float: left; margin-right: 20px; margin-bottom: 20px; width: 120px; height: 120px; position: relative;}
-.contact-entry-direction-wrapper {position: absolute; top: 20px;}
-.contact-entry-edit-links { position: absolute; top: 60px; }
+.contact-entry-wrapper {
+    float: left;
+    margin: 0 5px 40px 0;
+    width: 120px;
+	height: 120px;
+	padding: 3px;
+    position: relative;
+}
+.contact-direction-wrapper {
+    position: absolute;
+    top: 20px;
+}
+.contact-edit-links {
+    position: absolute;
+    top: 60px;
+}
+.contact-entry-photo-wrapper {
+
+}
 .contact-entry-photo {
-	margin-left:20px;
+	margin-left: 20px;
+}
+.contact-entry-name {
+    width: 120px;
+    font-weight: bold;
+    /*overflow: hidden;*/
 }
-.contact-entry-name { width: 120px; overflow: hidden; }
 .contact-entry-photo {
 	position: relative;
 }
-
-.contact-entry-edit-links .icon {	
-	border: 1px solid #babdb6;
+.contact-entry-edit-links .icon {
+    border: 1px solid #babdb6;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
-    border-radius: 3px;	
-	background-color: #ffffff;
+    border-radius: 3px;
+    background-color: #fff;
+}
+#contact-entry-url, [id^="contact-entry-url"] {
+    font-size: smaller;
+    /*overflow: scroll;*/
+}
+#contact-entry-network, [id^="contact-entry-network"] {
+    font-size: smaller;
+    font-style: italic;
+}
+#contact-edit-banner-name {
+    font-size: 1.5em;
+}
+#contact-edit-photo-wrapper {
+    position: relative;
+    float: left;
+    padding: 20px;
+}
+#contact-edit-direction-icon {
+    position:absolute;
+    top:60px;
+    left:0;
+}
+#contact-edit-nav-wrapper {
+    margin-left: 0px;
+}
+#contact-edit-links {
+    margin-top: 23px;
+}
+#contact-edit-links ul {
+    list-style-type: none;
+}
+#contact-drop-links {
+    margin-left:5px;
 }
-
-#contact-edit-banner-name { font-size: 1.5em; }
-#contact-edit-photo-wrapper {position: relative; float: left; padding: 20px;}
-#contact-edit-direction-icon { position: absolute; top: 60px; left:0px;}
-#contact-edit-nav-wrapper { margin-left: 210px; }
-#contact-edit-links { float: left; margin-top: 23px; }
-#contact-drop-links { margin-left: 5px; }
 #contact-edit-nav-wrapper .icon {
 	border: 1px solid #babdb6;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;	
 }
-#contact-edit-poll-wrapper { margin-left: 50px; }
-#contact-edit-last-update-text { margin-bottom: 15px; }
-#contact-edit-last-updated { font-weight: bold; }
-#contact-edit-poll-text { display: inline; }
-#contact-edit-end { clear: both; margin-bottom: 65px;}
+#contact-edit-poll-wrapper {
+    margin-left: 0px;
+}
+#contact-edit-last-update-text {
+    margin-bottom: 15px;
+}
+#contact-edit-last-updated {
+    font-weight: bold;
+}
+#contact-edit-poll-text {
+    display: inline;
+}
+#contact-edit-info_tbl, #contact-edit-info_parent {
+    width: 100%;
+}
+.mceLayout {
+    width: 100%;
+}
+#contact-edit-end {
+    clear: both;
+    margin-bottom: 65px;
+}
 
 .contact-photo-menu-button {
-       position: absolute;
-       background-image: url("photo-menu.jpg");
-       background-position: top left; 
-       background-repeat: no-repeat;
-       margin: 0px; padding: 0px;
-       width: 16px;
-       height: 16px;
-       top: 64px; left:0px;
-       overflow: hidden;
-       text-indent: 40px;
-       display: none;
-       
+    position: absolute;
+    background-image: url("photo-menu.jpg");
+    background-position: top left; 
+    background-repeat: no-repeat;
+    margin: 0px; padding: 0px;
+    width: 16px;
+    height: 16px;
+    top: 64px; left:0px;
+    overflow: hidden;
+    text-indent: 40px;
+    display: none;
 }
 .contact-photo-menu {
-       width: auto;
-       border: 2px solid #444444;
-       background: #FFFFFF;
-       position: absolute;
-       left: 0px; top: 90px;
-       display: none;
-       z-index: 10000;
+    width: auto;
+    border: 2px solid #444;
+    background: #eee;
+	color: #111;
+    position: absolute;
+    left: 0px; top: 90px;
+    display: none;
+    z-index: 10000;
+}
+.contact-photo-menu ul {
+    margin:0px;
+    padding: 0px;
+    list-style: none;
+}
+.contact-photo-menu li a {
+    display: block;
+    padding: 2px;
+}
+.contact-photo-menu li a:hover {
+    color: #fff;
+    background: #3465A4;
+    text-decoration: none;
 }
-.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; }
-
 
 
 /**
  * 	register, settings & profile forms
  */
-#id_openid_url,
 .openid {
-   background: url(login-bg.gif) no-repeat;
-   background-position: 0 50%;
-   padding-left: 18px;
+
 }
- 
+#id_openid_url {
+    background:url(login-bg.gif) no-repeat;
+    background-position:0 50%;
+    padding-left:18px;
+}
+
 #settings-nickname-desc {
-	background-color: #DDEFFF;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
+    background-color: #eee;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
     border-radius: 5px;
     padding: 5px;
+	color: #111;
+}
+#settings-default-perms {
+    margin-bottom: 20px;
 }
-
 #register-form div,
-#profile-edit-form div { 
-	clear: both;
+#profile-edit-form div {
+    clear: both;
 }
 
-#register-form label,
-#profile-edit-form label {
-	width: 300px; float: left;
-}
+/*#register-form label,     */
+/*#profile-edit-form label {*/
+/*    width: 300px;         */
+/*    float: left;          */
+/*}                         */
 
-#register-form span,
-#profile-edit-form span  {
-	color: #555753;
-	display:block;
-	margin-bottom: 20px;
+/*#register-form span,     */
+/*#profile-edit-form span {*/
+/*    color: #555753;      */
+/*    display: block;      */
+/*    margin-bottom: 20px; */
+/*}                        */
+#profile-edit-marital-label span {
+	margin: -4px;
 }
 .settings-submit-wrapper,
-.profile-edit-submit-wrapper { margin: 30px 0px;}
-.profile-listing { float: left; margin: 20px 20px 0px 0px}
-
-#profile-edit-links ul { margin: 20px 0px; padding: 0px; list-style: none; }
-
+.profile-edit-submit-wrapper {
+    margin: 30px 0px;
+}
+.profile-edit-side-div {
+	display: none;
+}
+/*.profile-edit-side-div:hover {
+	display: block;
+}
+.profile-edit-side-link {
+	margin: 3px 0px 0px 70px;
+}*/
+#profiles-menu-trigger {
+	margin: 0px 0px 0px 25px;
+}
+.profile-listing {
+    float: left;
+    margin: 20px 20px 0px 0px;
+}
+.icon-profile-edit {
+    background: url("icons.png") -150px 0px no-repeat;
+    border: 0;
+	cursor: pointer;
+    display: block;
+    float: right;
+	width: 20px;
+    height: 20px;
+    margin: 0 0 -18px;
+	position: absolute;
+    text-decoration: none;
+	top: 18px;
+	right: 226px;
+}
+#profile-edit-links ul {
+    margin: 20px 0;
+    padding: 0;
+    list-style: none;
+}
+.marital {
+	margin-top: 5px;
+}
+#register-sitename {
+    display: inline;
+    font-weight: bold;
+}
+#advanced-expire-popup {
+	background: #2e2f2e;
+	color: #eec;
+}
+#id_ssl_policy {
+	width: 374px;
+}
 
-#register-sitename { display: inline; font-weight: bold;}
 
 /**
  * 	contacts selector
  */
-#group-edit-desc { margin: 10px 0xp; }
+.group-delete-wrapper {
+	margin: -31px 50px 0 0;
+    float: right;
+}
+/*.group-delete-icon {
+    margin: 0 0 0 10px;
+}*/
+#group-edit-submit-wrapper {
+    margin: 0 0 10px 0;
+    display: inline;
+}
+#group-edit-desc {
+    margin: 10px 0px;
+}
 #group-members,
 #prof-members {
-	height: 200px; 
-	overflow: auto;
-	border: 1px solid #555753;
-    -webkit-border-radius: 5px 5px 0px 0px;
-    -moz-border-radius: 5px 5px 0px 0px;
-    border-radius: 5px 5px 0px 0px;
+    height:200px;
+    overflow:auto;
+    border:1px solid #555753;
+    -webkit-border-radius:5px 5px 0 0;
+    -moz-border-radius:5px 5px 0 0;
+    border-radius:5px 5px 0 0;
 }
 #group-all-contacts,
-#prof-all-contacts { 
-	height: 200px;
-    overflow: auto;	
-	border: 1px solid #555753;
-    -webkit-border-radius: 0px 0px 5px 5px;
-    -moz-border-radius: 0px 0px 5px 5px;
-    border-radius: 0px 0px 5px 5px;
+#prof-all-contacts {
+    height:200px;
+    overflow:auto;
+    border:1px solid #555753;
+    -webkit-border-radius:0 0 5px 5px;
+    -moz-border-radius:0 0 5px 5px;
+    border-radius:0 0 5px 5px;
 }
 #group-members h3,
 #group-all-contacts h3,
 #prof-members h3,
-#prof-all-contacts h3{
-	color: #eeeeec;
-	background-color: #555753;
-	margin: 0px;
-	padding: 5px;
+#prof-all-contacts h3 {
+    color:#eeeeec;
+    background-color:#555753;
+    margin:0;
+    padding:5px;
 }
 #group-separator,
-#prof-separator { display: none;}
+#prof-separator {
+    display: none;
+}
+
 
 /**
  * profile
  */
-#cropimage-wrapper { float:left; }
-#crop-image-form { clear:both; }
+#cropimage-wrapper {
+    float:left;
+}
+#crop-image-form {
+    clear:both;
+}
+
+
+/**
+ * intros
+ */
+.intro-wrapper {
+    margin-top: 20px;
+}
+
+.intro-fullname {
+    font-size: 1.1em;
+    font-weight: bold;
+
+}
+.intro-desc {
+    margin-bottom: 20px;
+    font-weight: bold;
+}
+
+.intro-note {
+    padding: 10px;
+}
+
+.intro-end {
+    padding: 30px;
+}
+
+.intro-form {
+    float: left;
+}
+.intro-approve-form {
+    clear: both;
+}
+.intro-approve-as-friend-end {
+    clear: both;
+}
+.intro-submit-approve, .intro-submit-ignore {
+    margin-right: 20px;
+}
+.intro-submit-approve {
+    margin-top: 15px;
+}
+
+.intro-approve-as-friend-label, .intro-approve-as-fan-label {
+    float: left;
+}
+.intro-approve-as-friend, .intro-approve-as-fan {
+    float: left;
+}
+.intro-form-end {
+    clear: both;
+    margin-bottom: 10px;
+}
+.intro-approve-as-friend-desc {
+    margin-top: 10px;
+}
+.intro-approve-as-end {
+    clear: both;
+    margin-bottom: 10px;
+}
+
+.intro-end {
+    clear: both;
+}
+
 
 /**
  * events
  **/
- 
 .clear { clear: both; }
 .eventcal {
-	float: left;
-	font-size: 20px;
+    float:left;
+    font-size:20px;
+}
+.event {
+	background: #2e2f2e;
 }
-
 .vevent {
-	border: 1px solid #CCCCCC;
+    border:1px solid #ccc;
 }
 .vevent .event-description, .vevent .event-location {
 	margin-left: 10px;
@@ -878,36 +2109,30 @@ div[id$="wrapper"] br { clear: left; }
 	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');
 	margin-right: 15px;
 }
-
 .event-start, .event-end {
 	margin-left: 10px;
 	width: 330px;
+	font-size: smaller;
 }
-
 .event-start .dtstart, .event-end .dtend {
 	float: right;
 }
-
 .event-list-date {
 	margin-bottom: 10px;
 }
-
 .prevcal, .nextcal {
 	float: left;
 	margin-left: 32px;
@@ -917,40 +2142,33 @@ div[id$="wrapper"] br { clear: left; }
 .event-calendar-end {
 	clear: both;
 }
-
- 
 .calendar {
-	font-family: Courier, monospace;
+    font-family: monospace;
 }
 .today {
 	font-weight: bold;
 	color: #FF0000;
 } 
- 
 #event-start-text, 
 #event-finish-text {
 	margin-top: 10px;
 	margin-bottom: 5px;
 }
-
-#event-nofinish-checkbox, 
-#event-nofinish-text, 
-#event-adjust-checkbox, 
+#event-nofinish-checkbox,
+#event-nofinish-text,
+#event-adjust-checkbox,
 #event-adjust-text,
-#event-share-checkbox
-{
-	float: left;
+#event-share-checkbox {
+    float:left;
 }
 #event-datetime-break {
 	margin-bottom: 10px;
 }
-
-#event-nofinish-break, 
+#event-nofinish-break,
 #event-adjust-break,
 #event-share-break {
 	clear: both;
 }
-
 #event-desc-text, 
 #event-location-text {
 	margin-top: 10px;
@@ -959,45 +2177,198 @@ div[id$="wrapper"] br { clear: left; }
 #event-submit {
 	margin-top: 10px;
 }
+.body-tag {
+	margin: 10px 0;
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+}
+.body-tag:hover {
+	opacity: 1.0 !important;
+	filter:alpha(opacity=100) !important;
+}
+.filesavetags, .categorytags {
+	margin: 20px 0;
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+}
+.filesavetags:hover, .categorytags:hover {
+	margin: 20px 0;
+	opacity: 1.0 !important;
+	filter:alpha(opacity=100) !important;
+}
+.item-select {
+	opacity: 0.1;
+	filter:alpha(opacity=10);
+	float: right;
+	margin-right: 5px;
+}
+.item-select:hover, .checkeditem {
+	opacity: 1;
+	filter:alpha(opacity=100);
+}
+#item-delete-selected {
+	margin-top: 30px;
+}
+/* was tired of having no way of moving it around, so
+ * here's a little 'hook' to do so */
+.delete-checked {
+	position: absolute;
+	left: 35px;
+	margin-top: 20px;
+}
+#item-delete-selected-end {
+	clear: both;
+}
+#item-delete-selected-icon, #item-delete-selected-desc {
+	float: left;
+	margin-right: 5px;
+}
+#item-delete-selected-desc:hover {
+	text-decoration: underline;
+}
+.fc-state-highlight {
+    background: #eec;
+    color: #2e2f2e;
+}
+
 
 /**
  * 	directory
  */
-.directory-item {float: left; margin: 50px 50px 0px 0px;}
+.directory-item {
+    float: left;
+	/*margin: 50px 50px 0px 0px;*/
+	margin: 0 5px 4px 0;
+	padding: 3px;
+	width: 180px;
+	height: 250px;
+    position: relative;
+}
+
+
+/**
+ * sidebar
+ */
+#group-sidebar {
+    margin-bottom: 10px;
+}
+.group-selected, .nets-selected, .fileas-selected {
+    padding: 3px;
+	color: #111;
+    background: #f8f8f8;
+    font-weight: bold;
+}
+.group-selected:hover, .nets-selected:hover, .fileas-selected:hover {
+	color: #111;
+}
+.groupsideedit {
+    margin-right: 10px;
+}
+#sidebar-group-ul {
+    padding-left: 0;
+}
+#sidebar-group-list {
+    margin: 0 0 5px 0;
+}
+#sidebar-group-list ul {
+    list-style-type: none;
+    list-style-position: inside;
+}
+#sidebar-group-list li {
+    margin-top: 10px;
+}
+#sidebar-group-list .icon {
+    display: inline-block;
+    height: 12px;
+    width: 12px;
+}
+#sidebar-new-group {
+    margin: auto;
+    display: inline-block;
+    color: #efefef;
+    text-decoration: none;
+    text-align: center;
+}
+#peoplefind-sidebar form {
+	margin-bottom: 10px;
+}
+#sidebar-new-group:hover {
+    /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
+    /*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/
+    /*background-color: #b20202;*/
+}
+
+#sidebar-new-group:active {
+    position: relative;
+    top: 1px;
+}
+#side-peoplefind-url {
+    background-color: #e5e0cf;
+    color: #666;
+	border: 1px 666 solid;
+	margin-right: 3px;
+	width: 75%;
+}
+#side-peoplefind-url:hover, #side-peoplefind-url:focus {
+    background-color: #efefef;
+    color: #222;
+	border: 1px 333 solid;
+}
+.nets-ul {
+    list-style-type: none;
+    padding-left: 0px;
+}
+.nets-ul li {
+    margin: 10px 0 0;
+}
+
+.nets-link {
+    margin-left: 0px;
+}
+.nets-all {
+    margin-left: 0px;
+}
+#netsearch-box {
+    margin-top: 20px;
+    width: 150px;   
+}
+#netsearch-box #search-submit {
+    margin: 5px 0px 0px 0px;
+}
+
 
 /**
  * ADMIN
  */
 #pending-update {
-	float:right;
-	color: #ffffff;
-	font-weight: bold;
-	background-color: #FF0000;
-	padding: 0em 0.3em;
+    float:right;
+    color: #fff;
+    font-weight: bold;
+    background-color: #ff0000;
+    padding: 0 .3em;
 }
 .admin.linklist {
-	border: 0px; padding: 0px;
+    border: 0; padding: 0;
 }
 .admin.link {
-	list-style-position: inside;
+    list-style-position: inside;
 }
-
 #adminpage dl {
-	clear: left;
-	margin-bottom: 2px;
-	padding-bottom: 2px;
-	border-bottom: 1px solid black;
+    clear:left;
+    margin-bottom: 2px;
+    padding-bottom: 2px;
+    border-bottom: 1px solid #000;
 }
 #adminpage dt {
-	width: 200px;
-	float: left;
-	font-weight: bold;
+    width: 250px;
+    float: left;
+    font-weight: bold;
 }
 #adminpage dd {
-	margin-left: 200px;
+	margin-left: 250px;
 }
 #adminpage h3 {
-	border-bottom: 1px solid #cccccc;
+    border-bottom:1px solid #ccc;
 }
 
 #adminpage .submit {
@@ -1005,312 +2376,602 @@ div[id$="wrapper"] br { clear: left; }
 }
 
 #adminpage #pluginslist {
-	margin: 0px; padding: 0px;
+    margin: 0;
+    padding: 0;
 }
 #adminpage .plugin {
-	list-style: none;
-	display: block;
-	border: 1px solid #888888;
-	padding: 1em;
-	margin-bottom: 5px;
-	clear: left;
+    list-style: none;
+    display: block;
+    border: 1px solid #888;
+    padding: 1em;
+    margin-bottom: 5px;
+    clear: left;
 }
 #adminpage .toggleplugin {
 	float:left;
 	margin-right: 1em;
 }
 
-#adminpage table {width:100%; border-bottom: 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; }
+#adminpage table {
+    width: 100%;
+    border-bottom: 1px solid #000;
+    margin: 5px 0;
+}
+#adminpage table th {
+    text-align: left;
+}
+#adminpage td .icon {
+    float: left;
+}
+#adminpage table#users img {
+    width: 16px; height: 16px;
+}
+#adminpage table tr:hover {
+/*	color: ;*/
+    background-color: #bbc7d7;
+}
+#adminpage .selectall {
+    text-align: right;
+}
+#adminpage #users a {
+/*	color: #;*/
+	text-decoration: underline;
+}
 
 /**
  * Form fields
  */
 .field {
-	margin-bottom: 10px;
-	padding-bottom: 10px;
+	/*margin-bottom: 10px;*/
+	/*padding-bottom: 10px;*/
 	overflow: auto;
-	width: 100%
+    width: 100%;
 }
-
-.field label {
-	float: left;
-	width: 200px;
+.field label, label {
+    float: left;
+    width: 275px;
+	display: block;
+	font-size: 1.077em;
+	margin: 0 10px 0.5em 0;
+	border: 1px #999 solid;
+	padding: 5px;
+	background: #ccc;
+	vertical-align: middle;
+	color: #111;
+}
+.field input, input[type="text"] {
+	width: 250px;
+	height: 25px;
+	border: 1px #999 solid;
 }
-
-.field input,
 .field textarea {
-	width: 400px;
+    width: 80%;
+    height: 100px;
 }
-.field textarea { height: 100px; }
 .field_help {
-	display: block;
-	margin-left: 200px;
-	color: #666666;
-	
+    display: block;
+    margin-left: 297px;
+    color: #666;
 }
-
-
 .field .onoff {
-	float: left;
-	width: 80px;
+    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;
+    display: block;
+    border: 1px solid #666;
+    padding: 3px 6px 4px 10px;
+    height: 16px;
+    text-decoration: none;
+}
+.field .onoff .on {
+	background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
+    color: #111;
+    text-align: left;
 }
 .field .onoff .off {
-	border-color:#666666;
-	padding-left: 40px;
-	background-position: left center;
-	background-color: #cccccc;
-	color: #666666;
-	text-align: right;
+	background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
+    color: #333;
+    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: 297px;
+}
+
+
+/*
+ * UPDATE
+ */
+.popup { 	
+	width: 100%;
+    height: 100%;
+	top: 0px;
+    left: 0px;
+	position: absolute;
+	display: none;
+}
+.popup .background {
+	background-color: rgba(0,0,0,128);
+	opacity: 0.5;
+	width: 100%;
+    height: 100%;
+	position: absolute;
+	top:0px;
+    left:0px;
+}
+.popup .panel {
+	top: 25%;
+    left: 25%;
+    width: 50%;
+    height: 50%;
+	padding: 1em;
+	position: absolute;
+	border: 4px solid #000000;
+	background-color: #FFFFFF;
+}
+#panel {
+    z-index: 100;
+}
+.grey {
+    color: grey;
+}
+.orange {
+    color: orange;
+}
+.red {
+    color: red;
+}
+.popup .panel .panel_text {
+    display: block;
+    overflow: auto;
+    height: 80%;
+} 
+.popup .panel .panel_in {
+    width: 100%;
+    height: 100%;
+    position: relative;
+}
+.popup .panel .panel_actions {
+    width: 100%;
+    bottom: 4px;
+    left: 0px;
+    position: absolute;
+}
+.panel_text .progress {
+    width: 50%;
+    overflow: hidden;
+    height: auto;
+    border: 1px solid #cccccc;
+    margin-bottom: 5px;
+}
+.panel_text .progress span {
+    float: right;
+    display: block;
+    width: 25%;
+    background-color: #eeeeee;
+    text-align: right;
+}
+
+/**
+ * OAuth
+ */
+.oauthapp {
+	height: auto;
+    overflow: auto;
+	border-bottom: 2px solid #cccccc;
+	padding-bottom: 1em;
+	margin-bottom: 1em;	
+}
+.oauthapp img {
+	float: left;
+	width: 48px; height: 48px;
+	margin: 10px;
+}
+.oauthapp img.noicon {
+	background-image: url("../../../images/icons/48/plugin.png");
+	background-position: center center;
+	background-repeat: no-repeat;
+}
+.oauthapp a {
+	float: left;
 }
-.hidden { display: none!important; }
 
-.field.radio .field_help { margin-left: 0px; }
 
 /**
  * ICONS
  */
+.iconspacer {
+	display: block;
+    width: 16px;
+    height: 16px;
+}
 .icon {
-	display: block; width: 20px; height: 20px;
-	background-image: url('icons.png');
+    display: block;
+    width: 20px;
+    height: 20px;
+    background: url(icons.png) no-repeat;
+    border: 0;
+    text-decoration: none;
+	border-radius: 5px;
 }
-/*.icon:hover {
-	border-bottom: 0px;
-}*/
-
-.starred { 
-	background-image: url("star.png"); 
-	repeat: no-repeat;
+.icon:hover {
+    border: 0;
+    text-decoration: none;
+}
+.icon.drop,
+.icon.drophide, .icon.delete {
+    float: right;
+	margin: 5px;
 }
-.unstarred { 
-	background-image: url("premium.png");
-	repeat: no-repeat;
+.icon.s22.delete {
+	display: block;
+	background-position: -110px 0;
+}
+.icon.s22.text {
+	padding: 10px 0px 0px 25px;
+	width: 200px;
+}
+.icon.text {
+    text-indent: 0px;
+}
+.icon.s16 {
+    min-width: 16px;
+    height: 16px;
+}
+.s16 .add {
+    background: url("../../../images/icons/16/add.png") no-repeat;
+}
+.add {
+    margin: 0px 5px;    
+}
+.article {
+	background-position: -50px 0;
+}
+.audio {
+	background-position: -70px 0;
+}
+.block {
+	background-position: -90px 0px;
+}
+.drop, .delete {
+	background-position: -110px 0;
+}
+.drophide {
+	background-position: -130px 0;
+}
+.edit {
+	background-position: -150px 0;
+}
+.camera {
+	background-position: -170px 0;
+}
+.dislike {
+	background-position: -190px 0;
+}
+.file-as {
+	background-position: -230px -60px;
+}
+.like {
+	background-position: -211px 0;
+}
+.link {
+	background-position: -230px 0;
+}
+.globe, .location {
+	background-position: -50px -20px;
+}
+.noglobe, .nolocation {
+	background-position: -70px -20px;
+}
+.no {
+	background-position: -90px -20px;
+}
+.pause {
+	background-position: -110px -20px;
+}
+.play {
+	background-position: -130px -20px;
+}
+.pencil {
+	background-position: -151px -18px;
+}
+.small-pencil {
+	background-position: -170px -20px;
+}
+.recycle {
+	background-position: -190px -20px;
+}
+.remote-link {
+	background-position: -210px -20px;
+}
+.share {
+	background-position: -230px -20px;
+}
+.tools {
+	background-position: -50px -40px;
+}
+.lock {
+	background-position: -70px -40px;
+}
+.unlock {
+	background-position: -88px -40px;
+}
+.video {
+	background-position: -110px -40px;
+}
+.attach {
+	background-position: -190px -40px;
+}
+.language {
+	background-position: -210px -40px;
+}
+.starred {
+	background-position: -130px -60px;
+}
+.unstarred {
+	background-position: -150px -60px;
 }
-
 .tagged {
-	background-image: url("tag.png");
-	repeat: no-repeat;
+	background-position: -170px -60px;
 }
-
-
-
-.border {
+.on {
+	background-position: -50px  -60px;
+}
+.off {
+	background-position: -70px  -60px;
+}
+.prev {
+	background-position: -90px  -60px;
+}
+.next {
+	background-position: -110px  -60px;
+}
+.icon.dim {
+	opacity: 0.3;
+	filter: alpha(opacity=30);
+}
+#pause {
+	position: fixed;
+	bottom: 5px;
+	right: 5px;
+}
+.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;	
 }
-
-.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;}
-.unlock 	{ background-position: -90px  -40px;}
-.video 		{ background-position: -110px -40px;}
-.youtube 	{ background-position: -130px -40px;}
-
-.attach 	{ background-position: -190px -40px;}
-.language 	{ background-position: -210px -40px;}
-
-
-.on 		{ background-position: -50px  -60px;}
-.off 		{ background-position: -70px  -60px;}
-.prev 		{ background-position: -90px  -60px;}
-.next 		{ background-position: -110px  -60px;}
-
-
-.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
-
 .attachtype {
-	display: block; width: 20px; height: 23px;
-	background-image: url('../../../images/content-types.png');
+    display: block;
+    width: 20px;
+    height: 23px;
+    background-image: url(../../../images/content-types.png);
+}
+.type-video {
+    background-position: 0px 0px;
+}
+.type-image {
+    background-position: -20px 0;
+}
+.type-audio {
+    background-position: -40px 0;
+}
+.type-text {
+    background-position: -60px 0px;
+}
+.type-unkn {
+    background-position: -80px 0;
 }
-
-.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; }
-
 
 
 /**
  * 	footer
- */                                  
- .cc-license { margin-top: 100px; font-size: 0.7em; }                                  
-footer { display: block; margin: 50px 20%; clear: both; }
-                                  
+ */
+.cc-license {
+    margin-top: 100px;
+    font-size: 0.7em;
+}
+footer {
+    display: block;
+    margin: 50px 20%;
+    clear: both;
+}
 #profile-jot-text {
     height: 20px;
-    color:#cccccc;
-    border: 1px solid #cccccc;
+    color: #666;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    width: 99.5%;
 }
+
+
 /** acl **/
 #photo-edit-perms-select,
 #photos-upload-permissions-wrapper,
-#profile-jot-acl-wrapper{
-	display:block!important;
+#profile-jot-acl-wrapper {
+    display: block !important;
+	background: #eec;
+	color: #2e2f2e;
 }
-
 #acl-wrapper {
-	width: 690px;
-	float:left;
+    width: 660px;
+	margin: 0 auto;
 }
 #acl-search {
-	float:right;
-	background: #ffffff url("../../../images/search_18.png") no-repeat right center;
-	padding-right:20px;
+    float: right;
+    background: #fff url("../../../images/search_18.png") no-repeat right center;
+    padding-right: 20px;
+	margin: 6px;
 }
 #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 10px 7px 30px;
-	-webkit-border-radius: 5px ;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	color: #999999;
+    float: left;
+    display: block;
+    width: auto;
+    height: 18px;
+    background: #eec url("../../../images/show_all_off.png") 8px 8px no-repeat;
+    padding: 7px 10px 7px 30px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    color: #999;
+	margin: 5px 0;
 }
 #acl-showall.selected {
-	color: #000000;
-	background-color: #ff9900;
-	background-image: url("../../../images/show_all_on.png");
+    color: #000;
+    background: #f90 url(../../../images/show_all_on.png) 8px 8px no-repeat;
 }
-
 #acl-list {
-	height: 210px;
-	border: 1px solid #cccccc;
-	clear: both;
-	margin-top: 30px;
-	overflow: auto;
-}
-#acl-list-content {
+    height: 210px;
+    border: 1px solid #ccc;
+    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;
+	border: 1px solid #ccc;
+    display: block;
+    float: left;
+    height: 110px;
+    margin: 3px 0 5px 5px;
+    width: 120px;
 }
-.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-list-item img {
+    width: 22px;
+    height: 22px;
+    float: left;
+    margin: 5px 5px 20px;
+}
+.acl-list-item p {
+    height: 12px;
+    font-size: 10px;
+    margin: 0 0 22px;
+    padding: 2px 0 1px;
+}
+.acl-list-item a {
+    background: #ccc 3px 3px no-repeat;
+    -webkit-border-radius: 2px;
+    -moz-border-radius: 2px;
+    border-radius: 2px;
+	clear: both;
+    font-size: 10px;
+    display: block;
+    width: 55px;
+    height: 20px;
+    color: #999;
+    margin: 5px auto 0;
+	padding: 0 3px;
+	text-align: center;
+	vertical-align: middle;
 }
 #acl-wrapper a:hover {
-	text-decoration: none;
-	color:#000000;
+    text-decoration: none;
+    color: #000;
+	border: 0;
+}
+.acl-button-show {
+    background-image: url('../../../images/show_off.png');
+	margin: 0 auto;
+}
+.acl-button-hide {
+    background-image: url('../../../images/hide_off.png');
+	margin: 0 auto;
 }
-.acl-button-show { 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");
+    color: #000;
+    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");
+    color: #000;
+    background-color: #ff4141;
+    background-image: url(../../../images/hide_on.png);
+}
+.acl-list-item.groupshow {
+    border-color: #9ade00;
+}
+.acl-list-item.grouphide {
+    border-color: #ff4141;
 }
-.acl-list-item.groupshow { border-color: #9ade00; }
-.acl-list-item.grouphide { border-color: #ff4141; }
 /** /acl **/
 
 
 /* autocomplete popup */
 .acpopup {
-	max-height:150px;
-	background-color:#555753;
-	color: #FFFFFF;
-	overflow:auto;
-	z-index:100000;
-	border:1px solid #cccccc;
+	max-height: 175px;
+    max-width: 42%;
+	background-color: #555753;
+	color: #fff;
+	overflow: auto;
+	z-index: 100000;
+	border: 1px solid #cccccc;
 }
 .acpopupitem {
-	background-color:#555753; padding: 4px;
-	clear:left;
+	background-color: #555753;
+    padding: 4px;
+	clear: left;
 }
 .acpopupitem img {
 	float: left;
 	margin-right: 4px;
 }
-
 .acpopupitem.selected {
-	color: #2e3436; background-color: #eeeeec;
+	color: #2e3436;
+    background-color: #eeeeec;
+}
+.qcomment-wrapper {
+    padding: 0px;
+    margin: 5px 5px 5px 81%;
 }
 .qcomment {
-	opacity: 0;
-	filter:alpha(opacity=0);
+	opacity: 0.5;
+	filter:alpha(opacity=50);
 }
 .qcomment:hover {
 	opacity: 1.0;
 	filter:alpha(opacity=100);
 }
+#network-star-link {
+    margin-top: 10px;
+}
+.network-star {
+    float: left;
+    margin-right: 5px;
+}
+.network-star.icon.starred {
+    display: inline-block;
+}
+#fileas-sidebar {
+	
+}
+.fileas-ul {
+	padding: 0;
+}
+
+
+
+/*
+ * ADDONS THEMING
+ */
+
+#sidebar-page-list {
+	
+}
+#sidebar-page-list ul {
+	padding: 0;
+	margin: 5px 0;
+}
+#sidebar-page-list li {
+	list-style: none;
+}
+
+
+@media handheld {
+	body {
+		font-size: 15pt;
+	}
+}
diff --git a/view/theme/dispy/tag.png b/view/theme/dispy/tag.png
index aca10707a..9b5a7223e 100644
--- a/view/theme/dispy/tag.png
+++ b/view/theme/dispy/tag.png
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
new file mode 100644
index 000000000..d0f6797cb
--- /dev/null
+++ b/view/theme/dispy/theme.php
@@ -0,0 +1,147 @@
+<?php
+
+/*
+ * Name: Dispy
+ * Description: Dispy, Friendica theme
+ * 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() {
+    $('.group-edit-icon').hover(
+        function() {
+            $(this).addClass('icon');
+            $(this).removeClass('iconspacer'); },
+
+        function() {
+            $(this).removeClass('icon');
+            $(this).addClass('iconspacer'); }
+    );
+
+    $('.sidebar-group-element').hover(
+        function() {
+            id = $(this).attr('id');
+            $('#edit-' + id).addClass('icon');
+            $('#edit-' + id).removeClass('iconspacer'); },
+
+        function() {
+            id = $(this).attr('id');
+            $('#edit-' + id).removeClass('icon');
+            $('#edit-' + id).addClass('iconspacer'); }
+    );
+
+    $('.savedsearchdrop').hover(
+        function() {
+            $(this).addClass('drop');
+            $(this).addClass('icon');
+            $(this).removeClass('iconspacer'); },
+
+        function() {
+            $(this).removeClass('drop');
+            $(this).removeClass('icon');
+            $(this).addClass('iconspacer'); }
+    );
+
+    $('.savedsearchterm').hover(
+        function() {
+            id = $(this).attr('id');
+            $('#drop-' + id).addClass('icon');
+            $('#drop-' + id).addClass('drophide');
+            $('#drop-' + id).removeClass('iconspacer'); },
+
+        function() {
+            id = $(this).attr('id');
+            $('#drop-' + id).removeClass('icon');
+            $('#drop-' + id).removeClass('drophide');
+            $('#drop-' + id).addClass('iconspacer'); }
+        );
+
+	// click outside notifications menu closes it
+	$('html').click(function() {
+		$('#nav-notifications-linkmenu').removeClass('selected');
+		document.getElementById("nav-notifications-menu").style.display = "none";
+	});
+
+	$('#nav-notifications-linkmenu').click(function(event) {
+		event.stopPropagation();
+	});
+	// click outside profiles menu closes it
+	$('html').click(function() {
+		$('#profiles-menu-trigger').removeClass('selected');
+		document.getElementById("profiles-menu").style.display = "none";
+	});
+
+	$('#profiles-menu').click(function(event) {
+		event.stopPropagation();
+	});
+
+	// main function in toolbar functioning
+    function toggleToolbar() {
+        if ( $('#nav-floater').is(':visible') ) {
+            $('#nav-floater').slideUp('fast');
+            $('.floaterflip').css({
+                backgroundPosition: '-210px -60px' 
+            });
+			$('.search-box').slideUp('fast');
+        } else {
+            $('#nav-floater').slideDown('fast');
+            $('.floaterflip').css({
+                backgroundPosition: '-190px -60px'
+            });
+			$('.search-box').slideDown('fast');
+        }
+    };
+	// our trigger for the toolbar button
+    $('.floaterflip').click(function() {
+        toggleToolbar();
+        return false;
+    });
+
+	// (attempt) to change the text colour in a top post
+	$('#profile-jot-text').focusin(function() {
+		$(this).css({color: '#eec'});
+	});
+
+});
+</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 09cf64397..8acaeaf02 100755..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,36 +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="#" 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>
@@ -62,16 +71,15 @@
 		<div class="wall-item-author">
 				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
 				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-				
 		</div>	
 	</div>
 	<div class="wall-item-wrapper-end"></div>
 	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
 	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
-	<div class="wall-item-comment-wrapper" >
+	<div class="wall-item-comment-wrapper">
 	$item.comment
 	</div>
 </div>
 
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+<div class="wall-item-outside-wrapper-end$item.indent"></div>
 
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index c3638094c..421cddadf 100755..100644
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -22,36 +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="#" 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>
@@ -59,7 +69,7 @@
 			<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>
+							<span class="tag">$tag</span>
 						{{ endfor }}
 					</div>			
 			</div>
@@ -72,7 +82,7 @@
 	<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" >
+	<div class="wall-item-comment-wrapper">
 	$item.comment
 	</div>
 </div>
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/file.gif b/view/theme/duepuntozero/file.gif
new file mode 100644
index 000000000..7885b998d
--- /dev/null
+++ b/view/theme/duepuntozero/file.gif
diff --git a/view/theme/duepuntozero/friendika-16.png b/view/theme/duepuntozero/friendika-16.png
index 1a742ecdc..1a742ecdc 100755..100644
--- a/view/theme/duepuntozero/friendika-16.png
+++ b/view/theme/duepuntozero/friendika-16.png
diff --git a/view/theme/duepuntozero/head.jpg b/view/theme/duepuntozero/head.jpg
index 6210b76be..6210b76be 100755..100644
--- a/view/theme/duepuntozero/head.jpg
+++ b/view/theme/duepuntozero/head.jpg
diff --git a/view/theme/duepuntozero/lock.cur b/view/theme/duepuntozero/lock.cur
index 892c5e851..892c5e851 100755..100644
--- a/view/theme/duepuntozero/lock.cur
+++ b/view/theme/duepuntozero/lock.cur
diff --git a/view/theme/duepuntozero/login-bg.gif b/view/theme/duepuntozero/login-bg.gif
index cde836c89..cde836c89 100755..100644
--- a/view/theme/duepuntozero/login-bg.gif
+++ b/view/theme/duepuntozero/login-bg.gif
diff --git a/view/theme/duepuntozero/photo-menu.jpg b/view/theme/duepuntozero/photo-menu.jpg
index fde5eb535..fde5eb535 100755..100644
--- a/view/theme/duepuntozero/photo-menu.jpg
+++ b/view/theme/duepuntozero/photo-menu.jpg
diff --git a/view/theme/duepuntozero/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/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 938fbe471..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 {
+.group-selected, .nets-selected, .fileas-selected, .categories-selected {
 	padding: 3px;
 	-moz-border-radius: 3px;
 	border-radius: 3px;	
@@ -1024,6 +1041,10 @@ input#dfrn-url {
 	float: left;	
 }
 
+.filer-item {
+	margin-left: 10px;
+	float: left;
+}
 
 .wall-item-links-wrapper {
 	float: left;
@@ -1864,11 +1885,11 @@ a.mail-list-link {
 	margin-top: 10px;
 }
 
-.nets-ul {
+.nets-ul, .fileas-ul, .categories-ul {
 	list-style-type: none;
 }
 
-.nets-ul li {
+.nets-ul li, .fileas-ul li, .categories-ul li {
 	margin-top: 10px;
 }
 
@@ -1879,6 +1900,14 @@ a.mail-list-link {
 	margin-left: 42px;
 }
 
+.fileas-link, .categories-link {
+	margin-left: 24px;
+}
+
+.fileas-all, .categories-all {
+	margin-left: 0px;
+}
+
 #search-save {
 	margin-left: 5px;
 }
@@ -2603,12 +2632,12 @@ aside input[type='text'] {
 	margin-top: 10px;
 }
 
-.body-tag {
+.body-tag, .filesavetags, .categorytags {
 	opacity: 0.5;
 	filter:alpha(opacity=50);
 }
 
-.body-tag:hover {
+.body-tag:hover, .filesavetags:hover, .categorytags:hover {
 	opacity: 1.0 !important;
 	filter:alpha(opacity=100) !important;
 }
@@ -2902,6 +2931,11 @@ aside input[type='text'] {
 .tagged { background-position: -48px -48px; }
 
 
+.filer-icon {
+	display: block; width: 16px; height: 16px;
+	background-image: url('file.gif');
+}
+
 .icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
 
 .attachtype {
@@ -2953,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;
@@ -3036,4 +3083,11 @@ 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 7d919fedc..701fb1349 100755..100644
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
@@ -5,6 +5,8 @@ $a->page['htmlhead'] .= <<< EOT
 <script>
 $(document).ready(function() {
 
+$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+
 $('.group-edit-icon').hover(
 	function() {
 		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
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
new file mode 100644
index 000000000..034a1cb63
--- /dev/null
+++ b/view/theme/facepark/border.jpg
diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/facepark/comment_item.tpl
index 3503c3843..3503c3843 100755..100644
--- a/view/theme/duepuntozero/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
new file mode 100644
index 000000000..48930b48a
--- /dev/null
+++ b/view/theme/facepark/contact_template.tpl
@@ -0,0 +1,25 @@
+
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
+	<div class="contact-entry-photo-wrapper" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
+		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
+		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
+
+			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
+
+			{{ if $contact.photo_menu }}
+			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
+                    <ul>
+                        $contact.photo_menu
+                    </ul>
+                </div>
+			{{ endif }}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+
+	<div class="contact-entry-end" ></div>
+</div>
diff --git a/view/theme/duepuntozero/conversation.tpl b/view/theme/facepark/conversation.tpl
index 43bb1dd47..43bb1dd47 100755..100644
--- a/view/theme/duepuntozero/conversation.tpl
+++ b/view/theme/facepark/conversation.tpl
diff --git a/view/theme/loozah/ff-16.jpg b/view/theme/facepark/ff-16.jpg
index 3621f5914..3621f5914 100755..100644
--- a/view/theme/loozah/ff-16.jpg
+++ b/view/theme/facepark/ff-16.jpg
diff --git a/view/theme/facepark/file.gif b/view/theme/facepark/file.gif
new file mode 100644
index 000000000..7885b998d
--- /dev/null
+++ b/view/theme/facepark/file.gif
diff --git a/view/theme/loozah/friendika-16.png b/view/theme/facepark/friendika-16.png
index 1a742ecdc..1a742ecdc 100755..100644
--- a/view/theme/loozah/friendika-16.png
+++ b/view/theme/facepark/friendika-16.png
diff --git a/view/theme/duepuntozero/group_side.tpl b/view/theme/facepark/group_side.tpl
index 0353b1d2c..0353b1d2c 100755..100644
--- a/view/theme/duepuntozero/group_side.tpl
+++ b/view/theme/facepark/group_side.tpl
diff --git a/view/theme/diabook/icons/head.jpg b/view/theme/facepark/head.jpg
index 6210b76be..6210b76be 100644
--- a/view/theme/diabook/icons/head.jpg
+++ b/view/theme/facepark/head.jpg
diff --git a/view/theme/duepuntozero/jot.tpl b/view/theme/facepark/jot.tpl
index e356d1d8f..5fe1f954e 100755..100644
--- a/view/theme/duepuntozero/jot.tpl
+++ b/view/theme/facepark/jot.tpl
@@ -14,10 +14,11 @@
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+		<div id="jot-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">
 		<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" />
diff --git a/view/theme/loozah/lock.cur b/view/theme/facepark/lock.cur
index 892c5e851..892c5e851 100755..100644
--- a/view/theme/loozah/lock.cur
+++ b/view/theme/facepark/lock.cur
diff --git a/view/theme/facepark/login-bg.gif b/view/theme/facepark/login-bg.gif
new file mode 100644
index 000000000..cde836c89
--- /dev/null
+++ b/view/theme/facepark/login-bg.gif
diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/facepark/nav.tpl
index 4675c3e5c..4675c3e5c 100755..100644
--- a/view/theme/duepuntozero/nav.tpl
+++ b/view/theme/facepark/nav.tpl
diff --git a/view/theme/loozah/nets.tpl b/view/theme/facepark/nets.tpl
index b0cb8890c..b0cb8890c 100755..100644
--- a/view/theme/loozah/nets.tpl
+++ b/view/theme/facepark/nets.tpl
diff --git a/view/theme/facepark/photo-menu.jpg b/view/theme/facepark/photo-menu.jpg
new file mode 100644
index 000000000..fde5eb535
--- /dev/null
+++ b/view/theme/facepark/photo-menu.jpg
diff --git a/view/theme/duepuntozero/profile_vcard.tpl b/view/theme/facepark/profile_vcard.tpl
index 154f22363..154f22363 100755..100644
--- a/view/theme/duepuntozero/profile_vcard.tpl
+++ b/view/theme/facepark/profile_vcard.tpl
diff --git a/view/theme/duepuntozero/saved_searches_aside.tpl b/view/theme/facepark/saved_searches_aside.tpl
index e6a0d6278..e6a0d6278 100755..100644
--- a/view/theme/duepuntozero/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
new file mode 100644
index 000000000..bfad1b7b7
--- /dev/null
+++ b/view/theme/facepark/search_item.tpl
@@ -0,0 +1,54 @@
+<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/facepark/shiny.png b/view/theme/facepark/shiny.png
new file mode 100644
index 000000000..994c0d05d
--- /dev/null
+++ b/view/theme/facepark/shiny.png
diff --git a/view/theme/loozah/style.css b/view/theme/facepark/style.css
index 73c8639b1..6680a6434 100755..100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/facepark/style.css
@@ -1,67 +1,50 @@
-/*
-	Loozah CSS - Emmanuel Revah manurevah.com
-	Copy, Paste, Send - Free
-
-	this is still considered as messy :]
-*/
+/**
+ * duepuntozero Frindika style
+ * Fabio Comuni <fabrix.xm@gmail.com>
+ */
 
-/** {*/
-	/*margin: 0;*/
-	/*padding: 0;*/
-/*}*/
 
-/* GENERIC STUFF */
+/* generals */
 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;
+	font-family: helvetica,arial,freesans,clean,sans-serif;
+	font-size: 12px;
+	background-color: #ffffff;
+	/*background-image: url(head.jpg);*/
+	background-repeat: repeat-x;
+	color: #000000;
+	margin: 0px;
 }
-input:hover {
 
-	background-color: #0CBEFE;
-/*	background-color: #49dbFa; */
-	color: black;
-/*	color: #F5F6FB; */
-/*	border: 1px solid #F5F6FB; */
-	cursor: pointer;
+
+a, a:visited, a:link { color: #0B4E7A; text-decoration: none; }
+a:hover {text-decoration: underline; }
+
+input {
+	/*border: 1px solid #666666;*/
+	/*-moz-border-radius: 3px;*/
+	border-radius: 3px;	
+	padding: 3px;
+	background-color: #0B4E7A;
+	color: #ffffff;
+	font-size: 12px;
+	font-weight: bold;
 }
 
-.openid input{
-   background-color: #ECECEC !important;
+img { border :1px; }
+
+#id_openid_url, .openid input {
    background: url(login-bg.gif) no-repeat;
    background-position: 0 50%;
    padding-left: 18px;
-   width: 385px !important;
 }
+.openid:hover {
 
-.openid input:hover {
-	background-color: #0CBEFE !important;
 }
 
-
-
-
-option {
-	background-color: #ECD6D2;
-}
-img {
-	border: none;
+#id_openid_url {
+	width: 384px;
 }
+
 code {
 	font-family: Courier, monospace;
 	white-space: pre;
@@ -71,367 +54,293 @@ code {
 	background: #EEE;
 	color: #444;
 	padding: 10px;
-	margin-top: 20px;
-}
-blockquote:before {
-	content: '>> ';
+	margin-top: 20px; 
 }
 
-#site-location {
-	position: absolute;
-	right: 5px;
-	top: 3px;
-	color: white;
-	font-size: 60%;
+blockquote {
+	background-color: #f4f8f9;
+	border-left: 4px solid #dae4ee;
+	padding: 0.4em;
 }
 
-.shiny {
-	border-color: orange !important;
+.icollapse-wrapper, .ccollapse-wrapper {
+	border: 1px solid #CCC;
+	padding: 5px;
 }
 
-.nav-login-link {
-	float: right;
-	margin-left: 0px;
-	margin-right: 3px;
-	padding: 3px;
-	font-size: 70%;
+.hide-comments {
+	margin-left: 5px;
 }
 
-/* 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;
+#panel {
+	background-color: ivory;
+	position: absolute;
+	z-index: 2;
+	width: 30%;
+	padding: 25px;
+	border: 1px solid #444;
 }
 
-#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;
+.heart {
+	color: #FF0000;
+	font-size: 100%;
 }
 
-#jot-perms-icon {
-	float: left;
-}
 
-#jot-title-desc {
-	color: #cccccc;
-}
 
-#jot-title-wrapper {
-	margin-bottom: 5px;
+/* nav */
+nav {
+	height: 94px;
+	display: block;
+	margin: 0px 10%;
+	border-bottom: 1px solid #0B4E7A;
 }
+nav #site-location {
+	color: ##0B4E7A;
+	font-size:12px;
+	position: absolute;
+	font-weight: bold;
 
-#jot-title {
-	border: 1px solid #cccccc;
-	width: 530px;
 }
 
-#jot-title-display {
+.error-message {
+	color: #245f6e;
+	font-size: 1.1em;
+	/*border: 1px solid #245f6e;*/
+	background-color: #FFFFFF;
+	padding: 10px;
 	font-weight: bold;
 }
 
-.fakelink, .fakelink:visited {
-	color: #15607B;
-	text-decoration: none;
-	cursor: pointer;
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-.lockview {
-	cursor: pointer;
+.info-message {
+	color: #204a87;
+	font-size: 1.1em;
+	border: 1px solid #3465a4;
+	background-color: #d7e3f1;
+	padding: 10px;
 }
 
 
-#group-sidebar {
-    margin-bottom: 10px;
+nav #banner {
+	display: block;
+    margin-top: 14px;
+	position: absolute;
 }
+nav #banner #logo-text a {
+	font-size: 40px;
+	font-weight: bold;
+	margin-left: 3px;
+ 	color: #0B4E7A;
 
-.group-selected, .nets-selected {
-    padding: 3px;
-    border: 1px solid #CCCCCC;
-    background: #F8F8F8;
-    font-weight: bold;
 }
+nav #banner #logo-text a:hover { text-decoration: none; }
 
-.fakelink:hover {
-	color: #0CBEFE;
-	text-decoration: none;
-	cursor: pointer;
-}
-.smalltext {
-	font-size: 0.7em;
-}
-#sysmsg {
-	width: 600px;
-	margin-bottom: 10px;
-}
 
-#top-margin {
-	height: 20px;
+.nav-commlink, .nav-login-link {
+    display: block;
+    height: 15px;
+	margin-top: 67px;
+	margin-right: 2px;
+	padding: 6px 10px;
+	float: left;
+	bottom: 140px;
+	border: 1px solid #0B4E7A;
+	border-bottom: 0px;
+	background-color: #FFFFFF;
+	/*font-weight: bold;*/
+	color: #FFFFFF;		
+	-moz-border-radius: 3px 3px 0px 0px;
+	border-radius: 3px 3px 0px 0px;	
 }
-
-#logo-img {
-	margin-top: 3px;
-
+nav .nav-link {
+	float: right;
+	margin: 0.2em 0em;
+	padding: 0em 0.5em;
+	background-color: transparent !important;
 }
 
-#logo-text {
-	font-family: "gill sans MT bold", "lucida grande",tahoma,verdana,arial,sans-serif;
-	margin-left: 3px;
-	vertical-align: top;
+.nav-commlink.selected {
+	background-color: #ffffff;
+	border-bottom: 1px solid #ffffff;
+	color: #000000 !important;
+	margin-top: 64px;
+	padding-top: 6px;
+	padding-bottom: 8px;
 }
-
-#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;
+.nav-ajax-left {
+	/*font-size: 0.8em;*/
+	font-size:12px ;
+	font-weight: bold;
+	float: left;
+	margin-top: 62px;	
 }
 
 
-#banner {
-	color: #F5F6FB;
-	font-family: "lucida grande",tahoma,verdana,arial,sans-serif;
-	font-size: 2.0em;
-	position: absolute;
-	top: 5px;
-	left: 39%;
+nav #nav-link-wrapper .nav-link {
+	border-right: 1px solid #babdb6;
 }
 
-#panel {
-	background-color: ivory;
+/* aside */
+aside {
+	display: block;
+	min-height: 112px;
+	width: 200px;
+	margin-left: 10%;
+	padding: 1em;
+	float: left;
+	background-image: url(border.jpg);
+	background-position: top left;
+	background-repeat: no-repeat;
 	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;
+#dfrn-request-link {
+	display: block;
+	color: #FFFFFF;
+	-webkit-border-radius: 5px ;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	padding: 5px;
 	font-weight: bold;
-	margin-left: 280px;
+	background: #3465a4 url('friendika-16.png') no-repeat 95% center;
 }
 
-/*
- * #page-footer {
- *	height: 20px;
- *
- * }
- */
-
-.heart {
-	color: #FF0000;
-	font-size: 100%;
+/* section */
+section {
+	margin: 0px 10%;
+	padding-top: 1em;
+	padding-left: 250px;
+	padding-right: 1em;
+	display: block;
+	background-color: #FFFFFF;
+	background-image: url(border.jpg);
+	background-position: top right;
+	background-repeat: no-repeat;
+	min-height: 112px;
+	
 }
-
-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;
+.tabs {
+	height: 27px;
+	background-image: url(head.jpg);
+	background-repeat: repeat-x;	
+	background-position: 0px -20px;
+	border-bottom: 1px solid #babdb6;
+	padding:0px;
 }
-section {
-	position: absolute;
-	left: 250px;
-	top: 60px;
-	margin-top: 25px;
-	margin-left: 20px;
-	margin-right: 20px;
-	right: 0px;
+.tabs li { margin: 0px; list-style: none; }
+.tab {
+	display:block;
+	float:left;
+	padding: 0.4em;
+	margin-right: 1em;
 }
-h1 {
-	font-size: 1.6em;
+.tab.active {
+	font-weight: bold;
 }
 
-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%;
- * }
- */
+/* footer */
+footer {
+    display: none;
 
-.fn {
-	font-size: 1.4em;
-	margin-bottom: 5px;
-	line-height: 1.5;
 }
 
-.vcard .title {
-	margin-bottom: 5px;
+.birthday-today, .event-today {
+	font-weight: bold;
 }
 
-.vcard dl {
-	clear: both;
+div.wall-item-content-wrapper.shiny {
+  background-image: url('shiny.png');
+  background-position: -5px 30px;
+  background-repeat:no-repeat;
 }
 
-.powered {
-	font-size: 0.6em;
-	color: black;
-}
-.powered a {
-	color: #EBF3F3;
-	font-weight: bold;
-}
-.powered a:hover {
-	color: #FFC019;
+.preview {
+	background: #FFFFC8;
 }
-.error-message {
-	color: #FF0000;
-	font-size: 1.1em;
-	border: 1px solid #FF8888;
-	background-color: #FFEEEE;
-	padding: 10px;
+
+/* from default */
+#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;
 }
-.info-message {
-	color: #204a87;
-	font-size: 1.1em;
-	border: 1px solid #3465a4;
-	background-color: #d7e3f1;
-	padding: 10px;
+
+#jot-perms-icon {
+	float: left;
 }
 
 
-.nav-link {
-	float: right;
-	margin-left: 0px;
-	margin-right: 3px;
-	margin-top: 20px;
-	padding: 6px;
-	/*border: 2px solid #000000;*/
-	background: #D5D5D5;
-	font-size: 80%;
+#jot-title {
+	border: 0px;
+	margin: 0px;
+	height: 20px;
+	width: 530px;
+	margin-bottom: 5px;
 	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;
+	border: 1px solid #ffffff;
 }
-.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;*/
+#jot-title::-webkit-input-placeholder{font-weight: normal;}
+#jot-title:-moz-placeholder{font-weight: normal;}
+		
+	
+#jot-title:hover,
+#jot-title:focus {
+	border: 1px solid #cccccc; 
 }
 
+.jothidden { display:none; }
 
 
-.nav-selected {
-	border-bottom: none !important;
-	background: #F5F6FB !important;
-	padding: 8px 6px 6px 6px !important;
-	color: #000 !important;
+.fakelink, .fakelink:visited, .fakelink:link {
+	color: #3465a4;
+	text-decoration: none;
+	cursor: pointer;
+	margin-top: 15px;
+	margin-bottom: 15px;
 }
-
-
-.nav-ajax-left:hover {
-	font-size: 1.5em;
+.lockview {
+	cursor: pointer;
 }
 
-.nav-ajax-right {
-	margin-left: 1px;
-	float: right;
-	font-size: 0.6em;
-	font-weight: bold;
-	color: #FF0000;
+#group-sidebar {
+	margin-bottom: 10px;
 }
 
-.nav-commlink {
-	float: left;
-	margin-left: 3px;
-	margin-right: 0px;
-	margin-top: 20px;
-	padding: 6px;
-	/*border: 2px solid #000000;*/
-	background: #D5D5D5;
-	font-size: 80%;
+.group-selected, .nets-selected {
+	padding: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;	
+	border: 1px solid #CCCCCC;
+	background: #F8F8F8;
 	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;
+.fakelink:hover {
+	color: #3465a4;
+	text-decoration: underline;
+	cursor: pointer;
 }
-
-.login-extra-links {
+.smalltext {
 	font-size: 0.7em;
 }
-
-#profile-extra-links {
-	clear: both;
-	margin-top: 20px;
-	margin-bottom: 20px;
-	margin-left: 20px;
-	margin-right: 20px;
+#sysmsg {
+	/*width: 600px;*/
+	margin-bottom: 10px;
 }
+
 #register-fill-ext {
 	margin-bottom: 25px;
 }
@@ -471,33 +380,58 @@ nav {
 	margin-top: 10px;
 }
 
+
 #login_standard {
-	width: 480px;
+	width: 210px;
 	float: left;
 }
 #login_openid {
-	width: 480px;
-	margin-left: 490px;
+	width: 210px;
+	margin-left: 250px;
 }
 
 #login_standard input,
 #login_openid input {
-	width: 180px!important;
+	width: 180px;
+}
+
+#login-extra-links {
+	clear: both;
 }
-#login-extra-links { clear: both; }
 
 #register-link, #lost-password-link {
-	float: left;
-	font-size: 80%;
+	/*float: left;*/
+	/*font-size: 80%;*/
 	margin-right: 15px;
 }
 
+#login-name-end, #login-password-end, #login-extra-end, #login-submit-end {
+	height: 50px;
+}
 
 #login-submit-button {
 /*	margin-top: 10px; */
-	margin-left: 200px;
+/*	margin-left: 200px; */
+	-moz-box-shadow:inset 0px 1px 0px 0px #ffffff;
+	-webkit-box-shadow:inset 0px 1px 0px 0px #ffffff;
+	box-shadow:inset 0px 1px 0px 0px #ffffff;
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #0b4e7a), color-stop(1, #165db3) );
+	background:-moz-linear-gradient( center top, #0b4e7a 5%, #165db3 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0b4e7a', endColorstr='#165db3');
+	background-color:#0b4e7a;
+	border:3px solid #f2eff2;
+	display:inline-block;
+	color:#ffffff;
+	font-family:arial;
+	font-size:14px;
+	font-weight:bold;
+	padding:4px 11px;
+	text-decoration:none;
+	text-shadow:0px 0px 0px #ffffff;
+
 }
 
+
 input#dfrn-url {
 	float: left;
 	background: url(friendika-16.png) no-repeat;
@@ -551,6 +485,7 @@ input#dfrn-url {
 }
 
 
+
 #cropimage-wrapper, #cropimage-preview-wrapper {
 	float: left;
 	padding: 30px;
@@ -623,8 +558,14 @@ input#dfrn-url {
 	margin-bottom: 30px;
 }
 
+#profile-extra-links {
+	clear: both;
+	margin-top: 10px;
+}
+
 #profile-extra-links ul {
 	list-style-type: none;
+	padding: 0px;
 }
 
 
@@ -639,10 +580,17 @@ input#dfrn-url {
 #profile-edit-links li {
 	margin-top: 10px;
 }
-
 .profile-edit-side-div {
 	float: right;
 }
+.profile-edit-side-link {
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+}
+.profile-edit-side-link:hover {
+	opacity: 1.0;
+	filter:alpha(opacity=100);
+}
 
 .view-contact-wrapper {
 	margin-top: 20px;
@@ -650,9 +598,19 @@ input#dfrn-url {
 	margin-left: 20px;
 	width: 180px;
 }
+
+.contact-wrapper {
+	float: left;
+	width: 150px;
+	height: 150px;
+	overflow: auto;
+}
+
 #view-contact-end {
 	clear: both;
 }
+
+
 #viewcontacts {
 	margin-top: 15px;
 }
@@ -670,13 +628,12 @@ input#dfrn-url {
 	width: 300px;
 }
 
-#profile-edit-drop-link-wrapper {
-	float: left;
-}
 
 #profile-edit-links-end {
 	clear: both;
+	margin-bottom: 15px;
 }
+
 .profile-listing-photo {
 	border: none;
 }
@@ -689,9 +646,15 @@ input#dfrn-url {
 #profile-photo-link-select-wrapper {
 	margin-top: 2em;
 }
+
+#profile-photo-submit-wrapper {
+	margin-top: 10px;
+}
+
 #profile-photo-wrapper img {
 	width:175px;
 	height:175px;
+	padding: 12px;
 }
 
 #profile-edit-profile-name-label,
@@ -738,15 +701,18 @@ input#dfrn-url {
 #hide-wall-yes,
 #hide-wall-no,
 #hide-friends-yes,
-#hide-friends-no,
+#hide-friends-no {
+	float: left;
+	margin-bottom: 20px;
+}
 #settings-normal,
 #settings-soapbox,
-#settings-community,
-#settings-freelove {
+#settings-freelove,
+#settings-community {
 	float: left;
-	margin-bottom: 20px;
 }
 
+
 #profile-in-dir-yes-label,
 #profile-in-dir-no-label,
 #profile-in-netdir-yes-label,
@@ -765,31 +731,32 @@ input#dfrn-url {
 	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;
+	float: left;
+	margin-bottom: 10px;
 }
 
 #profile-publish-yes-label-reg,
 #profile-publish-no-label-reg {
-       margin-left: 350px;
-       float: left;
-       width: 50px;
+	margin-left: 350px;
+	float: left;
+	width: 50px;
 }
 
 #profile-publish-break-reg,
 #profile-publish-end-reg {
-       clear: both;
+	clear: both;
 }
 
 
+#profile-edit-pdesc-desc,
+#profile-edit-pubkeywords-desc,
+#profile-edit-prvkeywords-desc {
+	float: left;
+	margin-left: 20px;
+}
+
 
 #profile-edit-homepage {
 	float: left;
@@ -806,8 +773,12 @@ input#dfrn-url {
 #settings-soapbox-desc,
 #settings-community-desc,
 #settings-freelove-desc {
-	float: left;
-	margin-left: 75px;
+	/*float: left;
+	margin-left: 75px;*/
+    clear: left;
+    color: #666666;
+    display: block;
+    margin-bottom: 20px	
 }
 
 #profile-edit-profile-name-end,
@@ -865,6 +836,9 @@ input#dfrn-url {
 	width: 120px;
 	height: 120px;
 }
+#contacts-search-end {
+	margin-bottom: 10px;
+}
 
 .contact-entry-direction-icon {
 	margin-top: 24px;
@@ -880,8 +854,9 @@ input#dfrn-url {
 .contact-entry-name {
 	float: left;
 	margin-left: 0px;
+	margin-right: 10px;
 	width: 120px;
-	oveflow: hidden;
+	overflow: hidden;
 }
 .contact-entry-edit-links {
 	margin-top: 6px;
@@ -905,54 +880,44 @@ input#dfrn-url {
 	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;
 }
 
+#network-star-link{
+	margin-top: 10px;
+}
+.network-star {
+	float: left;
+	margin-right: 5px;
+}
+#network-bmark-link {
+	margin-top: 10px;
+}
 
 .wall-item-content-wrapper {
 	margin-top: 10px;
-	border: 1px solid #CCC;
+	/*border: 1px solid #CCC;*/
 	position: relative;
+	-moz-border-radius: 3px;
+	/*border-radius: 3px; */	
+
 }
 
 .wall-item-content-wrapper.comment {
-	margin-left: 50px;
-	background: #CCCCCC;
+	margin-left: 0px;
+	background: #ededed;
+}
+
+.wall-item-info {
+	display: block;
+	float: left;
+	width:110px;
+	margin-right:10px;
+}
+.comment .wall-item-info {
+	width: 70px;
 }
 
 .wall-item-photo-wrapper {
@@ -960,9 +925,7 @@ input#dfrn-url {
 	margin-left: 10px;
 	margin-bottom: 10px;
 	width: 100px;
-	float: left;
 }
-
 .wall-item-photo-menu-button {
 	display: block;
 	position: absolute;
@@ -976,6 +939,7 @@ input#dfrn-url {
 	overflow: hidden;
 	text-indent: 40px;
 	display: none;
+	
 }
 .wall-item-photo-menu {
 	width: auto;
@@ -991,36 +955,87 @@ input#dfrn-url {
 .wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
 
 
+.comment .wall-item-photo-menu-button {	top: 44px;}
+.comment .wall-item-photo-menu { top: 60px; }
+
+.wallwall .wwto {
+    left: 50px;
+    margin: 0;
+    position: absolute;
+    top: 70px;
+    width: 30px
+}
+.wallwall .wwto img {
+	width: 30px !important;
+	height: 30px !important;
+}
+
+.wallwall .wall-item-photo-end {
+	clear: both;
+}
+
 .wall-item-arrowphoto-wrapper {
-	margin-top: 40px;
+    position: absolute;
+    left: 75px;
+    top: 70px;
+    z-index: 100;
 }
 .wall-item-wrapper {
-	margin-left: 10px;;
+	/*float: left;
+    margin-right: 5px;
+    width: 250px;*/
+    margin-left:10px;
 }
-
 .wall-item-lock {
-	position: absolute;
-	left: 105px;
-	top: 1px;
+	/*height: 20px;*/
+	/*margin-top: 10px;*/
+    left: 105px;
+    position: absolute;
+    top: 1px;	
+}
+.comment .wall-item-lock {
+	left: 65px;
 }
 
 .wall-item-ago {
 	color: #888888;
 	font-size: 0.8em;
 }
+
+.wall-item-location {
+	overflow: hidden;
+	/* add ellipsis on text overflow               */
+	/* this work on safari, opera, ie, chrome.     */
+	/* firefox users have to wait support or we    */
+	/* can use a jquery plugin http://bit.ly/zJskg */
+	text-overflow: ellipsis;
+	-o-text-overflow: ellipsis;
+	width: 100%;
+}
+
 .wall-item-like-buttons {
-    float: left;
-    margin-right: 10px;
-    padding-right: 10px;
-    border-right: 2px solid #fff;
+	float: left;
+	margin-right: 10px;
+/*	padding-right: 10px; */
+/*	border-right: 2px solid #fff; */
 }
+
+.like-rotator {
+	margin-left: 5px;
+}
+
 .wall-item-like-buttons > a,
 .wall-item-like-buttons > img {
 	float: left;
 }
 
+.wall-item-like-buttons img {
+	cursor: pointer;
+}
+
 .wall-item-share-buttons {
-	margin-left: 5px;
+	margin-left: 10px;
+	margin-right: 10px;
 }
 
 .editpost {
@@ -1031,46 +1046,22 @@ input#dfrn-url {
 	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;
+.tag-item {
+	margin-left: 10px;
+	float: left;	
 }
 
 
 .wall-item-links-wrapper {
-    float: left;
+	float: left;
 }
 
 .wall-item-delete-wrapper {
-    float: right;
+	float: right;
 }
 
 .wall-item-delete-end {
-    clear: both;
-}
-
-
-.wall-item-like-buttons img {
-	cursor: pointer;
+	clear: both;
 }
 
 .wall-item-delete-icon {
@@ -1089,55 +1080,61 @@ input#dfrn-url {
 .wall-item-photo {
 	border: none;
 }
+.comment .wall-item-photo {
+	width: 50px !important; 
+	height: 50px !important;
+}
 .wall-item-content {
-	float: left;
-	width: 450px;
+	/*float: left;*/
+	/*width: 450px;*/
 	margin-left: 10px;
-	margin-bottom: 20px;
-	padding: 20px;
+	/*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;
+	/*width: 450px;*/
+}
+
+.wall-item-title-end {
+	clear: both;
 }
 
 .wall-item-body {
 	float: left;
-	width: 450px;
+	/*width: 450px;*/
 	margin-top: 10px;
 }
 
+.wall-item-tools {
+	/*clear: both;*/
+	/*background-image: url("head.jpg");*/
+    /*background-position: 0 -20px;*/
+    /*background-repeat: repeat-x;*/
+   	padding: 5px 10px 0px;
+}
+.wall-item-author {
+	margin-top: 10px;
+}
+
+.comment .wall-item-tools {
+	background:none;
+} 
+
 .comment-edit-wrapper {
 	margin-top: 15px;
-	background: #CCCCCC;
+	background: #f3f3f3;
 	margin-left: 50px;
 }
 
 .comment-wwedit-wrapper {
-	margin-top: 15px;
-	background: #CCCCCC;
-	margin-left: 250px;
+	margin-top: 5px;
+	background: #ededed;
+	/*margin-left: 50px;*/
 }
 
 .comment-edit-photo {
@@ -1147,18 +1144,25 @@ padding: 5px 10px 0px;
 	width: 100px;
 	float: left;
 }
+.comment-edit-photo img {
+	width: 25px;
+}
 .comment-edit-text-empty, .comment-edit-text-full {
 	float: left;
-	margin-top: 40px;
+	margin-top: 10px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;	
+	border: 1px solid #cccccc;
+	padding: 3px 1px 1px 3px;
 }
 .comment-edit-text-end {
 	clear: both;
 }
 
 .comment-edit-submit {
-	margin-left: 110px;
-	margin-top: 10px;
+	margin: 10px 0px 10px 110px;
 }
+
 #profile-jot-plugin-wrapper,
 #profile-jot-submit-wrapper {
 	margin-top: 15px;
@@ -1172,8 +1176,8 @@ padding: 5px 10px 0px;
 	margin-left: 30px;
 }
 #profile-attach-wrapper {
-    float: left;
-    margin-left: 30px;
+	float: left;
+	margin-left: 30px;
 }
 #profile-rotator {
 	float: left;
@@ -1199,11 +1203,17 @@ padding: 5px 10px 0px;
 	float: left;
 	margin-left: 15px;
 }
+#jot-preview-link {
+	float: left;
+	margin-left: 45px;
+	margin-top: 0px !important;
+}
+
+
 #profile-nolocation-wrapper {
 	float: left;
 	margin-left: 15px;
 }
-
 #profile-title-wrapper {
 	float: left;
 	margin-left: 15px;
@@ -1216,21 +1226,14 @@ padding: 5px 10px 0px;
 	font-size: 1.2em;
 }
 
-#jot-preview-link {
-	margin-left: 45px;
-}
-
-.preview {
-	background: #FFFFC8;
-}
-
-
 
 #profile-jot-perms-end {
-	clear: both;
+	/*clear: left;*/
+	height: 30px;
 }
-#profile-jot-plugin-end {
-  clear:both;
+
+#profile-jot-plugin-end{
+  clear: both;
 }
 .profile-jot-net {
 	float: left;
@@ -1244,7 +1247,7 @@ padding: 5px 10px 0px;
 }
 
 #profile-jot-end {
-	clear: both;
+	/*clear: both;*/
 	margin-bottom: 30px;
 }
 #about-jot-submit-wrapper {
@@ -1425,7 +1428,7 @@ padding: 5px 10px 0px;
 #advanced-profile-homepage-end,
 #advanced-profile-politic-end,
 #advanced-profile-religion-end {
-	clear: both;
+	height: 10px;
 }
 
 #advanced-profile-about-end,
@@ -1479,24 +1482,18 @@ padding: 5px 10px 0px;
 }
 
 #contact-edit-wrapper {
-	margin-top: 50px;
+	margin-top: 10px;
 }
 
 #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;
+	margin-top: 15px;
 }
+
 #contact-edit-poll-text {
 	margin-top: 15px;
 	margin-bottom: 5px;
@@ -1506,57 +1503,37 @@ padding: 5px 10px 0px;
 	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 {
+#contact-edit-links{
 	clear: both;
 }
 
-#contact-edit-direction-icon {
-	float: left;
-	margin-top: 70px;
-	margin-right: 2px;
+#contact-edit-links ul {
+	list-style: none;
+	list-style-type: none;
+	margin-left: 0px;
+	padding-left: 0px;
 }
 
-#contact-edit-photo {
-	float: left;
+#contact-edit-links li {
+	margin-top: 5px;
 }
 
-#contact-edit-photo-end {
-	clear: both;
+#contact-edit-drop-link {
+	float: right;
+	margin-right: 20px;
 }
 
-#contact-edit-photo-wrapper {
-	float: left;
+#contact-edit-nav-end {
+	clear: both;
 }
 
-#contact-edit-nav-wrapper {
-	float: left;
+#contact-edit-wrapper {
+	width: 100%;
 }
 
 #contact-edit-end {
 	clear: both;
+	margin-top: 15px;
 }
 
 #contact-profile-selector {
@@ -1564,78 +1541,61 @@ padding: 5px 10px 0px;
 	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;
+.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;
+	
 }
-
-#profile-edit-insecure {
-	width: 600px;
+.contact-photo-menu {
+	width: auto;
+	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; }
 
-.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;
+#block-message, #ignore-message {
+	color: #FF0000;
 }
 
-.comment-edit-text-full {
-	color: black;
-	height: 150px;
-	width: 350px;
-	overflow: auto;
+#profile-edit-insecure {
+	margin-top: 20px;
+	color: #FF0000;
+	font-size: 1.1em;
+	border: 1px solid #FF8888;
+	background-color: #FFEEEE;
+	padding-left: 5px;
+	/*: 3px 3px 3px 5px; */
+	width: 587px;
 }
 
 #profile-jot-text {
 	height: 20px;
 	color:#cccccc;
 	border: 1px solid #cccccc;
+	padding: 3px 0px 0px 5px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;	
 }
 
 
@@ -1647,6 +1607,7 @@ padding: 5px 10px 0px;
 }
 
 
+
 #acl-wrapper {
 	width: 690px;
 	float:left;
@@ -1660,12 +1621,12 @@ padding: 5px 10px 0px;
 	float: left;
 	display: block;
 	width: auto;
-	height: 20px;
+	height: 18px;
 	background-color: #cccccc;
 	background-image: url("../../../images/show_all_off.png");
 	background-position: 7px 7px;
 	background-repeat: no-repeat;
-	padding: 5px 5px 0px 30px;
+	padding: 7px 5px 0px 30px;
 	-webkit-border-radius: 5px ;
 	-moz-border-radius: 5px;
 	border-radius: 5px;
@@ -1677,7 +1638,6 @@ padding: 5px 10px 0px;
 	background-image: url("../../../images/show_all_on.png");
 }
 
-
 #acl-list {
 	height: 210px;
 	border: 1px solid #cccccc;
@@ -1686,7 +1646,7 @@ padding: 5px 10px 0px;
 	overflow: auto;
 }
 #acl-list-content {
-
+	
 }
 .acl-list-item {
 	display: block;
@@ -1711,6 +1671,8 @@ padding: 5px 10px 0px;
 	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;
@@ -1738,6 +1700,22 @@ padding: 5px 10px 0px;
 .acl-list-item.grouphide { border-color: #ff4141; }
 /** /acl **/
 
+
+.comment-edit-text-empty {
+	/*color: black;*/
+	height: 30px;
+	width: 300px;
+	overflow: auto;
+	margin-bottom: 10px;
+}
+
+.comment-edit-text-full {
+	color: black;
+	height: 150px;
+	width: 350px;
+	overflow: auto;
+}
+
 #group-new-submit-wrapper {
 	margin-top: 30px;
 }
@@ -1817,8 +1795,9 @@ padding: 5px 10px 0px;
 	margin-top: 10px;
 }
 a.mail-list-link {
-	display: block;
-	padding: 4px 5px;
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
 }
 
 /*
@@ -1856,8 +1835,8 @@ a.mail-list-link {
 }
 
 .mail-conv-subject {
-	font-size: 1.1em;
-	margin-top: 10px;
+    font-size: 1.4em;
+    margin: 10px 0;
 }
 
 .mail-conv-outside-wrapper-end {
@@ -1873,6 +1852,9 @@ a.mail-list-link {
 	margin-right: 30px;
 	margin-top: 15px;
 }
+.mail-conv-break {
+	clear: both;
+}
 
 .mail-conv-delete-icon {
 	border: none;
@@ -1880,37 +1862,35 @@ a.mail-list-link {
 
 .message-links ul {
 	list-style-type: none;
+	padding: 0px;
 }
 
 .message-links li {
 	margin-top: 10px;
+	float: left;
 }
 .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;*/
+
+.message-links-end {
+	clear: both;
 }
 
 #sidebar-group-list ul {
 	list-style-type: none;
 }
 
-#sidebar-group-list li {
-	margin-top: 10px;
-}
-
-#sidebar-group-list .icon {
+#sidebar-group-list .icon, #sidebar-group-list .iconspacer {
 	display: inline-block;
 	height: 12px;
 	width: 12px;
 }
 
+#sidebar-group-list li {
+	margin-top: 10px;
+}
+
 .nets-ul {
 	list-style-type: none;
 }
@@ -1927,33 +1907,52 @@ a.mail-list-link {
 }
 
 #search-save {
-    margin-left: 5px;
+	margin-left: 5px;
 }
 .groupsideedit {
-    margin-right: 10px;
+	margin-right: 10px;
 }
 #saved-search-ul {
-    list-style-type: none;
+	list-style-type: none;
 }
 .savedsearchdrop, .savedsearchterm {
-    float: left;
-    margin-top: 10px;
+	float: left;
+	margin-top: 10px;
 }
 .savedsearchterm {
-    margin-left: 10px;
+	margin-left: 10px;
 }
 
 
 #side-follow-wrapper {
 	margin-top: 20px;
 }
-#side-follow-url {
+#side-follow-url, #side-peoplefind-url {
 	margin-top: 5px;
 }
-#side-follow-submit {
+#side-follow-submit, #side-peoplefind-submit {
 	margin-top: 15px;
 }
 
+#side-match-link {
+	margin-top: 10px;
+}
+
+aside input[type='text'] {
+ width: 174px;
+}
+
+.widget {
+	border: 1px solid #DDDDDD;
+	padding: 8px;
+	margin-top: 5px;
+	-moz-border-radius:5px;
+	-webkit-border-radius:5px;
+	border-radius:5px;
+
+}
+
+
 .photos {
 	height: auto;
 	overflow: auto;
@@ -1962,8 +1961,23 @@ a.mail-list-link {
 .photo-album-image-wrapper {
 	float: left;
 	margin-top: 15px;
-	height: 350px;
-	width: 350px;
+	margin-right: 15px;
+	width: 200px; height: 200px; 
+	overflow: hidden; 
+	position: relative;
+}
+.photo-album-image-wrapper .caption {
+	display: none; 
+ 	width: 100%;
+ 	position: absolute; 
+ 	bottom: 0px; 
+ 	padding: 0.5em 0.5em 0px 0.5em;
+ 	background-color: rgba(245, 245, 255, 0.8);
+ 	border-bottom: 2px solid #CCC;
+ 	margin: 0px;
+}
+.photo-album-image-wrapper a:hover .caption {
+	display:block;
 }
 
 #photo-album-end {
@@ -1971,12 +1985,22 @@ a.mail-list-link {
 }
 
 .photo-top-image-wrapper {
+	position: relative;
 	float: left;
 	margin-top: 15px;
-	height: 350px;
-	width: 350px;
+	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;
 }
@@ -1990,6 +2014,10 @@ a.mail-list-link {
 	float: left;
 	width: 175px;
 }
+
+#photos-upload-noshare {
+	margin-bottom: 10px;
+}
 #photos-upload-existing-album-text {
 	float: left;
 	width: 175px;
@@ -2000,6 +2028,7 @@ a.mail-list-link {
 #photos-upload-album-select {
 	float: left;
 }
+
 #photos-upload-spacer {
 	margin-top: 25px;
 }
@@ -2022,13 +2051,15 @@ a.mail-list-link {
 }
 
 #profile-jot-desc {
-	float: left;
+	/*float: left;*/
 	width: 480px;
+	color: #FF0000;
 	margin-top: 10px;
 	margin-bottom: 10px;
 }
+
 #character-counter {
-	float: left;
+	float: right;
 	font-size: 120%;
 }
 
@@ -2044,7 +2075,7 @@ a.mail-list-link {
 }
 
 #profile-jot-banner-end {
-	clear: both;
+	/* clear: both; */ 
 }
 
 #photos-upload-select-files-text {
@@ -2052,7 +2083,7 @@ a.mail-list-link {
 	margin-bottom: 15px;
 }
 
-#photos-upload-perms-menu, #photos-upload-perms-menu:visited {
+#photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link {
 	color: #8888FF;
 	text-decoration: none;
 	cursor: pointer;
@@ -2134,7 +2165,6 @@ a.mail-list-link {
 #install-dbuser-label,
 #install-dbpass-label,
 #install-dbdata-label,
-#install-admin-label,
 #install-tz-desc {
        float: left;
        width: 250px;
@@ -2146,8 +2176,7 @@ a.mail-list-link {
 #install-dbhost,
 #install-dbuser,
 #install-dbpass,
-#install-dbdata,
-#install-admin {
+#install-dbdata {
        float: left;
        width: 200px;
        margin-left: 20px;
@@ -2157,7 +2186,6 @@ a.mail-list-link {
 #install-dbuser-end,
 #install-dbpass-end,
 #install-dbdata-end,
-#install-admin-end,
 #install-tz-end {
        clear: both;
 }
@@ -2262,10 +2290,31 @@ a.mail-list-link {
 }
 
 
-#plugin-settings-link, #account-settings-link, #uexport-link {
+#plugin-settings-link, #account-settings-link {
 	margin-bottom: 10px;
 }
 
+#uexport-link {
+	margin-bottom: 20px;
+}
+
+/* end from default */
+	
+
+.fn {
+	padding: 0px 0px 5px 12px;
+	font-size: 120%;
+	font-weight: bold;
+}
+
+.vcard .title {
+	margin-bottom: 5px;
+	margin-left: 12px;
+}
+
+.vcard dl {
+	clear: both;
+}
 
 #birthday-title {
 	float: left;
@@ -2290,41 +2339,97 @@ a.mail-list-link {
 	margin-bottom: 20px;
 }
 
-
 #network-new-link {
 	margin-top: 15px;
 	margin-bottom: 15px;
 }
 
+
 .tool-wrapper {
   float: left;
   margin-left: 15px;
 }
+
 .tool-link {
   cursor: pointer;
 }
 
+.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;
@@ -2338,7 +2443,6 @@ a.mail-list-link {
 	margin-top: 20px;
 }
 
-
 #photo-prev-link, #photo-next-link {
 	padding: 10px;
 	float: left;
@@ -2352,7 +2456,6 @@ a.mail-list-link {
 	clear: both;
 }
 
-
 .profile-match-photo {
 	float: left;
 	text-align: center;
@@ -2371,29 +2474,31 @@ a.mail-list-link {
 	clear: both;
 }
 
+.profile-match-connect {
+	text-align: center;
+	font-weight: bold;
+}
+
 .profile-match-wrapper {
 	float: left;
 	padding: 10px;
-    width: 120px;
-    height: 120px;
-    scroll: auto;
-
+	width: 120px;
+	height: 120px;
+	scroll: auto;
 }
 #profile-match-wrapper-end {
 	clear: both;
 }
-
 .side-link {
 	margin-bottom: 15px;
 }
 
 #language-selector {
 	position: absolute;
-	top: 0;
+	top: 0px;
 	left: 16px;
 }
 
-
 #group-members {
 	margin-top: 20px;
 	padding: 10px;
@@ -2424,7 +2529,7 @@ a.mail-list-link {
 }
 
 #group-edit-desc {
-    margin-top: 15px;
+	margin-top: 15px;
 }
 
 
@@ -2461,32 +2566,36 @@ a.mail-list-link {
 	margin-top: 15px;
 }
 
+#crepair-name-label,
 #crepair-nick-label,
 #crepair-attag-label,
 #crepair-url-label,
 #crepair-request-label,
 #crepair-confirm-label,
 #crepair-notify-label,
+#crepair-photo-label,
 #crepair-poll-label {
 	float: left;
 	width: 200px;
 	margin-bottom: 15px;
 }
 
+#crepair-name,
 #crepair-nick,
 #crepair-attag,
 #crepair-url,
 #crepair-request,
 #crepair-confirm,
 #crepair-notify,
+#crepair-photo,
 #crepair-poll {
 	float: left;
 	width: 300px;
 }
 
+
 #netsearch-box {
-	margin-top: 20px;
-	width: 150px;	
+	margin-top: 20px;	
 }
 
 #netsearch-box #search-submit {
@@ -2497,76 +2606,6 @@ a.mail-list-link {
 	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;
@@ -2591,6 +2630,15 @@ a.mail-list-link {
 	margin-top: 10px;
 }
 
+.body-tag {
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+}
+
+.body-tag:hover {
+	opacity: 1.0 !important;
+	filter:alpha(opacity=100) !important;
+}
 
 .item-select {
 	opacity: 0.1;
@@ -2625,7 +2673,37 @@ a.mail-list-link {
 	position: absolute;
 	left: 0px;
 	top: 0px;
+	opacity: 0.2;
+	filter:alpha(opacity=20);
+}
+
+#lang-select-icon:hover {
+	opacity: 1;
+	filter:alpha(opacity=100);
+}
+
+.notif-image {
+	height: 80px;
+	width: 80px;
+	margin-right: 15px;
+}
+.notification-listing-end {
+	clear: both;
+	margin-bottom: 15px;
 }
+
+
+
+/**
+ * Plugins settings
+ */
+
+.settings-block > h3,
+.settings-heading {
+	border-bottom: 1px solid #babdb6;
+}
+ 
+
 /**
  * Form fields
  */
@@ -2679,15 +2757,14 @@ a.mail-list-link {
 	border-color:#204A87;
 	padding-right: 40px;
 	background-position: right center;
-	background-color: #3465A4;
-	color: #FFFFFF;
+	background-color: #D7E3F1;
+	color: #204A87;
 	text-align: left;
 }
 .hidden { display: none!important; }
 
 .field.radio .field_help { margin-left: 0px; }
 
-
 /**
  * ADMIN
  */
@@ -2697,8 +2774,8 @@ a.mail-list-link {
 	font-weight: bold;
 	background-color: #FF0000;
 	padding: 0em 0.3em;
+	
 }
-
 #adminpage dl {
 	clear: left;
 	margin-bottom: 2px;
@@ -2717,9 +2794,12 @@ a.mail-list-link {
 #adminpage h3 {
 	border-bottom: 1px solid #cccccc;
 }
-
+#adminpage .field label {
+	font-weight: bold;
+}
 #adminpage .submit {
 	clear:left;
+	text-align: right;
 }
 
 #adminpage #pluginslist {
@@ -2733,20 +2813,79 @@ a.mail-list-link {
 	margin-bottom: 5px;
 	clear: left;
 }
+#adminpage .plugin .desc { margin-left: 2.5em;}
 #adminpage .toggleplugin {
 	float:left;
 	margin-right: 1em;
 }
 
-#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table {width:100%; border-bottom: 1px 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; }
+
+/*
+ * UPDATE
+ */
+.popup { 	
+	width: 100%; height: 100%;
+	top:0px; left:0px;
+	position: absolute;
+	display: none;
+}
+
+.popup .background {
+	background-color: rgba(0,0,0,128);
+	opacity: 0.5;
+	width: 100%; height: 100%;
+	position: absolute;
+	top:0px; left:0px;
+}
+.popup .panel {
+	top:25%;left:25%;width:50%;height:50%;
+	padding: 1em;
+	position: absolute;
+	border: 4px solid #000000;
+	background-color: #FFFFFF;
+}
+.popup .panel .panel_text { display: block; overflow: auto; height: 80%; } 
+.popup .panel .panel_in { width: 100%; height: 100%;	position: relative; }
+.popup .panel .panel_actions {  width: 100%; bottom: 4px; left: 0px; position: absolute; }
+.panel_text .progress { width: 50%; overflow: hidden; height: auto; border: 1px solid #cccccc; margin-bottom: 5px}
+.panel_text .progress span {float: right; display: block; width: 25%; background-color: #eeeeee; text-align: right;}
+
+/**
+ * OAuth
+ */
+.oauthapp {
+	height: auto; overflow: auto;
+	border-bottom: 2px solid #cccccc;
+	padding-bottom: 1em;
+	margin-bottom: 1em;	
+}
+.oauthapp img {
+	float: left;
+	width: 48px; height: 48px;
+	margin: 10px;
+}
+.oauthapp img.noicon {
+	background-image: url("../../../images/icons/48/plugin.png");
+	background-position: center center;
+	background-repeat: no-repeat;
+}
+.oauthapp a {
+	float: left;
+}
+
 /**
  * ICONS
  */
+.iconspacer {
+	display: block; width: 16px; height: 16px;
+}
+
 .icon {
 	display: block; width: 16px; height: 16px;
 	background-image: url('../../../images/icons.png');
@@ -2789,6 +2928,7 @@ a.mail-list-link {
 .unstarred { background-position: -32px -48px; }
 .tagged { background-position: -48px -48px; }
 
+
 .icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
 
 .attachtype {
@@ -2807,6 +2947,7 @@ a.mail-list-link {
 .type-text  { background-position: -60px 0px; }
 .type-unkn  { background-position: -80px 0px; }
 
+
 /* autocomplete popup */
 .acpopup {
 	max-height:150px;
@@ -2828,4 +2969,98 @@ a.mail-list-link {
 	color: #FFFFFF; background: #3465A4;
 }
 
+/* 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;
+}
+
+.qcomment {
+	border: 1px solid #EEE;
+	padding: 3px;
+}
+
+.qcomment {
+	opacity: 0;
+	filter:alpha(opacity=0);
+}
+.qcomment:hover {
+	opacity: 1.0;
+	filter:alpha(opacity=100);
+}
+
+/* notifications popup menu */
+.nav-notify {
+	display: none;
+	position: absolute;
+	font-size: 10px;
+	padding: 1px 3px;
+	top: 0px;
+	right: -10px;
+	min-width: 15px;
+	text-align: right;
+}
+.nav-notify.show {
+	display: block;
+}
+ul.menu-popup {
+	position: absolute;
+	display: none;
+	width: 10em;
+	margin: 0px;
+	padding: 0px;
+	list-style: none;
+	z-index: 100000;
+	top: 90px;
+	left: 400px;
+}
+#nav-notifications-menu {
+	width: 320px;
+	max-height: 400px;
+	overflow-y: scroll;overflow-style:scrollbar;
+	background-color:#FFFFFF;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius:5px;
+	border: 1px solid #888;
+}
+#nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; }
+#nav-notifications-menu img { float: left; margin-right: 5px; }
+#nav-notifications-menu .notif-when { font-size: 0.8em; display: block; }
+#nav-notifications-menu li {
+	padding: 7px 0px 7px 10px;
+	word-wrap:normal;
+	border-bottom: 1px solid #000;
+}
+
+#nav-notifications-menu li:hover {
 
+}
+
+#nav-notifications-menu a:hover {
+	text-decoration: underline;
+}
+
+.notif-item a {
+	color: #000000;
+}
+
+.notif-item a:hover {
+	text-decoration: underline;
+}
+
+.notif-image {
+	width: 32px;
+	height: 32px;
+	padding: 7px 7px 0px 0px;
+}
+
+.notify-seen {
+	background: #DDDDDD;
+}
diff --git a/view/theme/facepark/theme.php b/view/theme/facepark/theme.php
new file mode 100644
index 000000000..701fb1349
--- /dev/null
+++ b/view/theme/facepark/theme.php
@@ -0,0 +1,49 @@
+<?php
+$a->theme_info = array();
+
+$a->page['htmlhead'] .= <<< EOT
+<script>
+$(document).ready(function() {
+
+$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+
+$('.group-edit-icon').hover(
+	function() {
+		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
+	function() {
+		$(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+$('.sidebar-group-element').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+	);
+
+
+$('.savedsearchdrop').hover(
+	function() {
+		$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+	function() {
+		$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+$('.savedsearchterm').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
+	);
+
+});
+
+
+</script>
+EOT;
diff --git a/view/theme/clean/unsupported b/view/theme/facepark/unsupported
index e69de29bb..e69de29bb 100644
--- a/view/theme/clean/unsupported
+++ b/view/theme/facepark/unsupported
diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/facepark/wall_item.tpl
index 51e36b6f4..2c88fc598 100755..100644
--- a/view/theme/duepuntozero/wall_item.tpl
+++ b/view/theme/facepark/wall_item.tpl
@@ -56,6 +56,7 @@
 			{{ 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>
+			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.star.filer"></a>
 			{{ endif }}
 			
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/facepark/wallwall_item.tpl
index 5cb2dbc3b..211906c93 100755..100644
--- a/view/theme/duepuntozero/wallwall_item.tpl
+++ b/view/theme/facepark/wallwall_item.tpl
@@ -28,8 +28,8 @@
 		</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-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>
diff --git a/view/theme/ghost/unsupported b/view/theme/ghost/unsupported
deleted file mode 100644
index e69de29bb..000000000
--- a/view/theme/ghost/unsupported
+++ /dev/null
diff --git a/view/theme/goldenrod/style.css b/view/theme/goldenrod/style.css
deleted file mode 100755
index 47985aaa8..000000000
--- a/view/theme/goldenrod/style.css
+++ /dev/null
@@ -1,121 +0,0 @@
-@import url('../loozah/style.css');
-
-footer {
-	background: #CCC;
-}
-
-#banner {
-	color: #444444;
-}
-
-#logo-text a, #logo-text a:visited, #site-location {
-	color: #000000;
-}
-
-body { 
-	background: #FFFFFF;
-	color: #000000;
-}
-.nav-selected {
-	background: #FFFFFF !important;
-	color: #888888 !important;
-}
-
-input:hover {
-	background-color: #FFEEBB;
-	color: #000000;
-	border: 1px solid #000000;
-}
-
-input, select {
-	background-color: #FFEEBB;
-	color: #000000;
-}
-.nav-link:hover, .nav-commlink:hover {
-	background: #FFDDAA;
-	color: #0000EE;
-}
-option {
-	background-color: #FFEEBB;
-}
-#page-footer {
-	border: none;
-}
-
-nav {
-	background: #FFEEBB;
-}
-
-
-
-body { 
-	background: #FFDDAA;
-	color: #444444;
-}
-
-.nav-link {
-	color: #444444;
-	background: #FFCC55;
-}
-
-.nav-commlink {
-	color: #444444;
-	background: #FFCC55;
-}
-
-.nav-selected {
-	background: #FFDDAA !important;
-}
-
-.tab {
-	color: #444444;
-	background: #FFCC55;
-
-}
-
-a, a:visited {
-	color: #8888FF;
-	text-decoration: none;
-}
-
-a:hover {
-	color: #0000FF;
-	text-decoration: underline;
-}
-
-.fakelink, .fakelink:visited {
-	color: #8888FF;
-}
-
-.fakelink:hover {
-	color: #0000FF;
-}
-
-
-
-.wall-item-content-wrapper.comment {
-	background: #FFCC55;
-}
-
-.comment-edit-wrapper {
-	background: #FFCC55;
-}
-
-.comment-wwedit-wrapper {
-	background: #FFCC55;
-}
-
-#photos-upload-perms-menu, #photos-upload-perms-menu:visited {
-	color: #8888FF;
-}
-
-#photos-upload-perms-menu:hover {
-	color: #0000FF;
-}
-#settings-default-perms-menu, #settings-default-perms-menu:visited {
-	color: #8888FF;
-}
-
-#settings-default-perms-menu:hover {
-	color: #0000FF;
-}
diff --git a/view/theme/goldenrod/theme.php b/view/theme/goldenrod/theme.php
deleted file mode 100755
index 47b43cf13..000000000
--- a/view/theme/goldenrod/theme.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$a->theme_info = array(
-  'extends' => 'loozah',
-);
diff --git a/view/theme/goldenrod/unsupported b/view/theme/goldenrod/unsupported
deleted file mode 100644
index e69de29bb..000000000
--- a/view/theme/goldenrod/unsupported
+++ /dev/null
diff --git a/view/theme/greenzero/border.jpg b/view/theme/greenzero/border.jpg
index 034a1cb63..034a1cb63 100755..100644
--- a/view/theme/greenzero/border.jpg
+++ b/view/theme/greenzero/border.jpg
diff --git a/view/theme/greenzero/file.gif b/view/theme/greenzero/file.gif
new file mode 100644
index 000000000..e388a13c0
--- /dev/null
+++ b/view/theme/greenzero/file.gif
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 5d63583f4..ceec4dd97 100755..100644
--- a/view/theme/greenzero/theme.php
+++ b/view/theme/greenzero/theme.php
@@ -7,6 +7,8 @@ $a->page['htmlhead'] .= <<< EOT
 <script>
 $(document).ready(function() {
 
+$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+
 $('.group-edit-icon').hover(
 	function() {
 		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
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/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/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/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 5d63583f4..ceec4dd97 100755..100644
--- a/view/theme/purplezero/theme.php
+++ b/view/theme/purplezero/theme.php
@@ -7,6 +7,8 @@ $a->page['htmlhead'] .= <<< EOT
 <script>
 $(document).ready(function() {
 
+$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+
 $('.group-edit-icon').hover(
 	function() {
 		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
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/loozah/comment_item.tpl b/view/theme/quattro/comment_item.tpl
index 3503c3843..cde4ca3ca 100755..100644
--- a/view/theme/loozah/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/quattro/conversation.tpl b/view/theme/quattro/conversation.tpl
new file mode 100644
index 000000000..ff202bbe4
--- /dev/null
+++ b/view/theme/quattro/conversation.tpl
@@ -0,0 +1,23 @@
+{{ for $threads as $thread }}
+<div id="tread-wrapper-$thread.id" class="tread-wrapper">
+	{{ for $thread.items as $item }}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
+			</div>
+			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
+		{{endif}}
+		{{if $item.comment_lastcollapsed}}</div>{{endif}}
+		
+		{{ inc $item.template }}{{ endinc }}
+		
+		
+	{{ endfor }}
+</div>
+{{ endfor }}
+
+{{ if $dropping }}
+<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/loozah/profile_vcard.tpl b/view/theme/quattro/profile_vcard.tpl
index b3f5cc50d..7cd02f164 100755..100644
--- a/view/theme/loozah/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" 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
new file mode 100644
index 000000000..be47a401c
--- /dev/null
+++ b/view/theme/quattro/theme.php
@@ -0,0 +1,20 @@
+<?php
+
+
+
+
+$quattro_align = get_pconfig(local_user(), 'quattro', 'align' );
+
+if(local_user() && $quattro_align=="center"){
+	
+	$a->page['htmlhead'].="
+	<style>
+		html { width: 100%; margin:0px; padding:0px; }
+		body {
+			margin: 50px auto;
+			width: 900px;
+		}
+	</style>
+	";
+	
+}
diff --git a/view/theme/quattro/theme_settings.tpl b/view/theme/quattro/theme_settings.tpl
new file mode 100644
index 000000000..9771ae162
--- /dev/null
+++ b/view/theme/quattro/theme_settings.tpl
@@ -0,0 +1,8 @@
+{{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
new file mode 100644
index 000000000..82bceeac8
--- /dev/null
+++ b/view/theme/slack-NS/style.css
@@ -0,0 +1,51 @@
+@import url('../duepuntozero/style.css');
+
+.wall-item-content-wrapper {
+	border: none;
+}
+
+.wall-item-content-wrapper.comment {
+	background: #ffffff !important;
+	border-left: 1px solid #EEE;
+}
+
+.wall-item-tools {
+	background: none;
+}
+
+.wall-item-content { 
+	max-height: 20000px; 
+	overflow: none; 
+}
+
+.comment-edit-text-empty, .comment-edit-text-full {
+	border: none;
+	border-left: 1px solid #EEE;
+	background: #EEEEEE;
+}
+
+.comment-edit-wrapper, .comment-wwedit-wrapper {
+	background: #ffffff !important;
+}
+
+section {
+	margin: 0px 32px;
+}
+
+aside {
+	margin-left: 32px;
+}
+nav {
+	margin-left: 32px;
+	margin-right: 32px;
+}
+
+nav #site-location {
+	top: 80px;
+	right: 36px;
+}
+
+.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+}
diff --git a/view/theme/slack-NS/theme.php b/view/theme/slack-NS/theme.php
new file mode 100644
index 000000000..ceec4dd97
--- /dev/null
+++ b/view/theme/slack-NS/theme.php
@@ -0,0 +1,51 @@
+<?php
+$a->theme_info = array(
+  'extends' => 'duepuntozero',
+);
+
+$a->page['htmlhead'] .= <<< EOT
+<script>
+$(document).ready(function() {
+
+$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+
+$('.group-edit-icon').hover(
+	function() {
+		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
+	function() {
+		$(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+$('.sidebar-group-element').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+	);
+
+
+$('.savedsearchdrop').hover(
+	function() {
+		$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+	function() {
+		$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+$('.savedsearchterm').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
+	);
+
+});
+
+
+</script>
+EOT;
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 5d63583f4..ceec4dd97 100755..100644
--- a/view/theme/slackr/theme.php
+++ b/view/theme/slackr/theme.php
@@ -7,6 +7,8 @@ $a->page['htmlhead'] .= <<< EOT
 <script>
 $(document).ready(function() {
 
+$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+
 $('.group-edit-icon').hover(
 	function() {
 		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
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 5bb5b4673..45d206d57 100755..100644
--- a/view/theme/testbubble/jot.tpl
+++ b/view/theme/testbubble/jot.tpl
@@ -16,11 +16,11 @@
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
-
+		<div id="jot-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">
                 <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-upload-wrapper" class="jot-tool" style="display: none;" >
 		<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="$upload"></a></div>
 	</div>
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 d657a11c5..43cc7bca0 100755..100644
--- a/view/theme/testbubble/nav.tpl
+++ b/view/theme/testbubble/nav.tpl
@@ -4,11 +4,13 @@
 	<span id="banner">$banner</span>
 
 	<div id="notifications">	
-		{{ if $nav.network }}<a rel="#nav-notifications-menu" id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
-		{{ if $nav.home }}<a rel="#nav-notifications-menu" id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
-<!--		{{ if $nav.notifications }}<a rel="#nav-notifications-menu" id="intro-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }} -->
-		{{ if $nav.introductions }}<a rel="#nav-notifications-menu" id="intro-update" class="nav-ajax-update" href="$nav.introductions.0" title="$nav.introductions.1"></a>{{ endif }}
-		{{ if $nav.messages }}<a rel="#nav-notifications-menu" id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
+		{{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
+		{{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
+<!--		{{ if $nav.notifications }}<a id="intro-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }} -->
+		{{ if $nav.introductions }}<a id="intro-update" class="nav-ajax-update" href="$nav.introductions.0" title="$nav.introductions.1"></a>{{ endif }}
+		{{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
+		{{ if $nav.notifications }}<a rel="#nav-notifications-menu" id="notify-update" class="nav-ajax-update" href="$nav.notifications.0"  title="$nav.notifications.1"></a>{{ endif }}
+
 		<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>
@@ -56,6 +58,9 @@
 	</div>
 </nav>
 
+
 <ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li><a href="{0}">{2} <span class="notif-when">{3}</span></a></li>
+	<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/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 803257fec..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 c6f66d5ad..1e63c7ef6 100755..100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -55,7 +55,7 @@ p {
 }
 
 label {
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 }
 
 li {
@@ -382,7 +382,8 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
 	padding-left: 11px;
     /*display: none;*/
 }
-#net-update { background-position: 0px -126px; }
+#notify-update { background-position: 0px -168px; }
+#net-update { background-position: 0px -126px }
 #mail-update { background-position: 0px -40px; }
 #intro-update { background-position: 0px -84px; }
 #home-update { background-position: 0px 0px; }
@@ -454,7 +455,7 @@ aside a{
 
 .vcard {
 	font-size: 1em;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 }
 
 .vcard dd {
@@ -487,7 +488,7 @@ aside h4 { font-size: 1.3em; }
 	color: #626262;
 	text-align: center;
 	font-weight: bold;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 	font-size: 1.1em;
 }
 .allcontact-link a {
@@ -1040,7 +1041,7 @@ profile-jot-banner-wrapper {
 	font-size: 0.9em;
 	margin: 4px 0px 0px 140px;
 	padding-left: 10px;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 }
 
 .wall-item-author a {
@@ -1062,7 +1063,7 @@ profile-jot-banner-wrapper {
 	margin-left: 25px;
 	font-size: 0.9em;
 	display: block;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 	color: #898989;
 }
 
@@ -1071,7 +1072,7 @@ profile-jot-banner-wrapper {
 .wall-item-conv a{
 	font-size: 0.9em;
 	color: #898989;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 }
 
 .wallwall .wwto {
@@ -1156,7 +1157,7 @@ profile-jot-banner-wrapper {
 	font-size: 0.9em;
 	color: #898989;
 	margin-left: 60px;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 }
  
 .wall-item-outside-wrapper.comment { margin-left: 70px; }
@@ -1188,7 +1189,7 @@ profile-jot-banner-wrapper {
 .icollapse-wrapper {
 	font-size: 0.9em;
 	color: #898989;
-	font-variant:small-caps;	
+/*	font-variant:small-caps;	*/
 }
 
 .comment-wwedit-wrapper,
@@ -1265,7 +1266,7 @@ profile-jot-banner-wrapper {
 	margin-bottom: 0px;
 	padding-bottom: 5px;
 	font-size: 18px;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 }
  
 div[id$="wrapper"] { height: 100%;} 
@@ -1297,7 +1298,7 @@ div[id$="wrapper"] br { clear: left; }
 
 .profile-listing-name {
 	font-size: 1em;
-	font-variant: small-caps;
+/*	font-variant: small-caps;*/
 }
 .profile-listing-name a {
 	color: #898989;
@@ -1341,7 +1342,7 @@ div[id$="wrapper"] br { clear: left; }
 
 .profile-match-name a{
 	color: #999;
-	font-variant: small-caps;
+/*	font-variant: small-caps; */
 	font-size: 1em;
 }
 
@@ -1461,7 +1462,7 @@ div[id$="wrapper"] br { clear: left; }
 	padding: 0px 5px;
 	font-weight: bold;
 	font-stretch:semi-expanded;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 } 
 
 .photo-top-album-name a{
@@ -1475,7 +1476,7 @@ div[id$="wrapper"] br { clear: left; }
 	text-align: center;
 	color: #6e6e6e;
 	font-size: 0.9em;
-	font-variant: small-caps;
+/*	font-variant: small-caps; */
 }
 
 #photo-photo{
@@ -1486,7 +1487,7 @@ div[id$="wrapper"] br { clear: left; }
 #photo-caption {
 	margin-top: 10px;
 	color: #6E6E6E;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 	font-size: 1.1em;
 }
 
@@ -1711,18 +1712,18 @@ input#photo_edit_form {
 }
 
 #prvmail-subject-label {
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 }
 
 #prvmail-to {
 	padding-left: 10px;
 }
 #prvmail-to-label {
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 }
 
 #prvmail-message-label {
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 	font-size: 1em;	
 }
 
@@ -1768,7 +1769,7 @@ margin-left: 0px;
 .mail-list-sender-name {
 	font-size: 1.1em;
 	display: inline;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 }
 
 .mail-list-date {
@@ -1778,7 +1779,7 @@ margin-left: 0px;
 	font-size: 0.9em;
 	padding-left: 10px;
 	font-stretch:ultra-condensed;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 }
 
 .mail-list-subject {
@@ -1807,8 +1808,8 @@ margin-left: 0px;
 	height: 64px;
 }
 
-.mail-conv-sender-name { float: left; font-variant:small-caps; font-style: bold; }
-.mail-conv-date { float: right; font-variant:small-caps; }
+.mail-conv-sender-name { float: left; font-style: bold; }
+.mail-conv-date { float: right; }
 .mail-conv-subject { clear: right; font-weight: bold; font-size: 1.2em }
 .mail-conv-body {
 	clear: both;
@@ -1902,7 +1903,7 @@ margin-left: 0px;
 	font: #999;
 	font-size: 12px;
 	text-align:center;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 	font-weight: bold;
 	margin-top:5px;
 }
@@ -1919,7 +1920,7 @@ margin-left: 0px;
 	background-color: #ffffff;
 }
 
-#contact-edit-banner-name { font-size: 1.5em; margin-left: 30px; font-variant: small-caps; }
+#contact-edit-banner-name { font-size: 1.5em; margin-left: 30px; }
 
 
 #contact-edit-update-now {
@@ -2002,7 +2003,7 @@ margin-left: 0px;
 }
 
 .view-contact-name {
-	font-variant: small-caps;
+/*	font-variant: small-caps; */
 }
 
 #div.side-link {
@@ -2539,7 +2540,7 @@ margin-left: 0px;
 	margin-bottom: 2px;
 	margin-top: 2px;
 	font-size: 0.9em;
-	font-variant: small-caps;
+/*	font-variant: small-caps; */
 	text-align: left;
 }
 
@@ -2605,7 +2606,7 @@ margin-left: 0px;
 .event-list-date {
 	color: #626262;
 	margin-bottom: 10px;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 	font-stretch:condensed;
 }
 
@@ -2641,7 +2642,7 @@ margin-left: 0px;
 	color: #ffffff;
 	font-weight: bold;
 	text-align:center;
-	font-variant:small-caps;
+/*	font-variant:small-caps; */
 	-moz-box-shadow: 5px 2px 8px #959494;
 	-webkit-box-shadow: 5px 2px 8px #959494;
 	box-shadow: 5px 2px 8px #959494;
@@ -2719,13 +2720,13 @@ tr {
 
 .directory-details {
 	font-size: 0.9em;
-	font-variant: small-caps;
+/*	font-variant: small-caps; */
 	width: 160px;
 }
 
 .directory-name {
 	font-size: 1em;
-	font-variant: small-caps;
+/*	font-variant: small-caps; */
 	width: 150px;	
 }
 
@@ -2887,6 +2888,10 @@ tr {
 	repeat: no-repeat;
 }
 
+.notify {
+  background-image: url("notify.png");}
+  repeat: no-repeat;
+}
 
 .border {
 	border: 1px solid #c1c1c1;
@@ -3272,3 +3277,6 @@ ul.menu-popup {
 	opacity: 1.0;
 	filter:alpha(opacity=100);
 }
+.notify-seen {
+	background: #000;
+}
diff --git a/view/theme/testbubble/theme.php b/view/theme/testbubble/theme.php
new file mode 100644
index 000000000..591d9e066
--- /dev/null
+++ b/view/theme/testbubble/theme.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * Name: Test Bubble
+ * Version: 1.1
+ * Author: Anne Walk
+ * Author: Devlon Duthied
+ * Maintainer: Mike Macgirvin <mike@macgirvin.com>
+ */
+
+$a->page['htmlhead'] .= <<< EOT
+<script>
+$(document).ready(function() {
+
+$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+});
+</script>
+EOT;
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 190e06a8a..44491d967 100755..100644
--- a/view/theme/testbubble/wall_item.tpl
+++ b/view/theme/testbubble/wall_item.tpl
@@ -61,7 +61,7 @@
 		</div>
 		
 		<div class="wall-item-author">
-				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$name</span></a>
+				<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>	
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/theme/vier/style.css b/view/theme/vier/style.css
index 39f4ffea4..d8130e59f 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -108,6 +108,7 @@
 
 .tools 		{ background-position: -50px  -40px;}
 .lock 		{ background-position: -70px  -40px;}
+.unlock 	{ background-position: -90px  -40px;}
 
 .video          { background-position: -110px -40px;}
 .youtube        { background-position: -130px -40px;}
@@ -139,8 +140,8 @@
 
 .icon {
   display: block;
-  width: 20px;
-  height: 20px;
+  width: 18px;
+  height: 18px;
   background-image: url('icons.png');
 }
 
@@ -415,17 +416,21 @@ code {
 	background: #EEE;
 }
 .tool .label {
-  float: left;
+/*  float: left; */
 }
 .tool .action {
   float: right;
 }
 .tool a {
-  color: #000;
+/*  color: #000; */
 }
 .tool a:hover {
-  text-decoration: none;
+  text-decoration: underline;
+}
+.sidebar-group-element {
+/*  color: #000; */
 }
+
 /* popup notifications */
 div.jGrowl div.notice {
   background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
@@ -604,6 +609,10 @@ nav #nav-apps-link.selected {
 	padding: 5px 10px; */
 }
 
+.notify-seen {
+        background: none repeat scroll 0 0 #DDDDDD;
+        }
+
 ul.menu-popup {
   position: absolute;
   display: none;
@@ -970,6 +979,7 @@ section {
   margin-bottom: 1px;
 }
 .wall-item-container .wall-item-actions-social a {
+  float: left;
   margin-right: 1em;
 }
 .wall-item-container .wall-item-actions-tools {
@@ -1244,7 +1254,8 @@ section {
 #jot #jot-tools li.loading img {
   margin-top: 10px;
 }
-#jot #jot-title {
+/* #jot */
+#jot-title {
   border: 0px;
   margin: 0px;
   height: 20px;
@@ -1272,6 +1283,56 @@ section {
   line-height: 20px;
   padding-right: 20px;
 }
+
+#profile-jot-submit {
+  float: right;
+  margin-left: 15px;
+}
+#profile-upload-wrapper {
+  float: left;
+  margin-left: 15px;
+}
+#profile-attach-wrapper {
+  float: left;
+  margin-left: 15px;
+}
+#profile-link-wrapper {
+  float: left;
+  margin-left: 15px;
+}
+#profile-video-wrapper {
+  float: left;
+  margin-left: 15px;
+}
+#profile-audio-wrapper {
+  float: left;
+  margin-left: 15px;
+}
+#profile-location-wrapper {
+  float: left;
+  margin-left: 15px;
+}
+#profile-nolocation-wrapper {
+  float: left;
+  margin-left: 15px;
+}
+#jot-perms-icon {
+  float: right;
+  margin-left: 15px;
+}
+#jot-preview-link {
+  float: right;
+}
+#profile-jot-end {
+  clear: both;
+}
+#profile-jot-text_tbl {
+  width: 800px;
+}
+#profile-jot-wrapper {
+  margin-bottom: 20px;
+}
+
 /** buttons **/
 /*input[type="submit"] {
 	border: 0px;
@@ -1585,6 +1646,12 @@ blockquote {
     border-left: 1px solid #D2D2D2;
     padding-left: 9px;
     margin: 0 0 0 .8ex;
+    color: #777;
+}
+
+.oembed {
+    font-size: large;
+    font-weight: bold;
 }
 
 /* ================== */
diff --git a/view/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