From: Zach Prezkuta <fermion@gmx.com>
Date: Sat, 26 Jan 2013 19:52:21 +0000 (-0700)
Subject: Decaf mobile: an (almost) Javascript-free theme
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=488a38cd85bc349d5bc5f5d9541613ccec1f1806;p=friendica.git

Decaf mobile: an (almost) Javascript-free theme
---

diff --git a/boot.php b/boot.php
index 5107d91af6..62641655e5 100644
--- a/boot.php
+++ b/boot.php
@@ -1935,6 +1935,36 @@ function build_querystring($params, $name=null) {
     return $ret;    
 }
 
+function explode_querystring($query) {
+	$arg_st = strpos($query, '?');
+	if($arg_st !== false) {
+		$base = substr($query, 0, $arg_st);
+		$arg_st += 1;
+	}
+	else {
+		$base = '';
+		$arg_st = 0;
+	}
+
+	$args = explode('&', substr($query, $arg_st));
+	foreach($args as $k=>$arg) {
+		if($arg === '')
+			unset($args[$k]);
+	}
+	$args = array_values($args);
+
+	if(!$base) {
+		$base = $args[0];
+		unset($args[0]);
+		$args = array_values($args);
+	}
+
+	return array(
+		'base' => $base,
+		'args' => $args,
+	);
+}
+
 /**
 * Returns the complete URL of the current page, e.g.: http(s)://something.com/network
 *
diff --git a/include/Contact.php b/include/Contact.php
index d39d7a28b6..c83177ddaa 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -222,13 +222,13 @@ function contact_photo_menu($contact) {
 	$posts_link = $a->get_baseurl() . '/network/?cid=' . $contact['id'];
 
 	$menu = Array(
-		t("Poke") => $poke_link,
-		t("View Status") => $status_link,
-		t("View Profile") => $profile_link,
-		t("View Photos") => $photos_link,		
-		t("Network Posts") => $posts_link, 
-		t("Edit Contact") => $contact_url,
-		t("Send PM") => $pm_url,
+		'poke' => array(t("Poke"), $poke_link),
+		'status' => array(t("View Status"), $status_link),
+		'profile' => array(t("View Profile"), $profile_link),
+		'photos' => array(t("View Photos"), $photos_link),		
+		'network' => array(t("Network Posts"), $posts_link), 
+		'edit' => array(t("Edit Contact"), $contact_url),
+		'pm' => array(t("Send PM"), $pm_url),
 	);
 	
 	
@@ -236,7 +236,7 @@ function contact_photo_menu($contact) {
 	
 	call_hooks('contact_photo_menu', $args);
 	
-	$o = "";
+/*	$o = "";
 	foreach($menu as $k=>$v){
 		if ($v!="") {
 			if(($k !== t("Network Posts")) && ($k !== t("Send PM")) && ($k !== t('Edit Contact')))
@@ -245,7 +245,16 @@ function contact_photo_menu($contact) {
 				$o .= "<li><a href=\"$v\">$k</a></li>\n";
 		}
 	}
-	return $o;
+	return $o;*/
+	foreach($menu as $k=>$v){
+		if ($v[1]!="") {
+			if(($v[0] !== t("Network Posts")) && ($v[0] !== t("Send PM")) && ($v[0] !== t('Edit Contact')))
+				$menu[$k][2] = 1;
+			else
+				$menu[$k][2] = 0;
+		}
+	}
+	return $menu;
 }}
 
 
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 675339559b..1b9843fd17 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once("include/contact_selectors.php");
+
 /**
  * 
  */
@@ -243,9 +246,7 @@ function prune_deadguys($arr) {
 }
 
 
-
-function populate_acl($user = null,$celeb = false) {
-
+function get_acl_permissions($user = null) {
 	$allow_cid = $allow_gid = $deny_cid = $deny_gid = false;
 
 	if(is_array($user)) {
@@ -265,6 +266,19 @@ function populate_acl($user = null,$celeb = false) {
 
 	$allow_cid = prune_deadguys($allow_cid);
 
+	return array(
+		'allow_cid' => $allow_cid,
+		'allow_gid' => $allow_gid,
+		'deny_cid' => $deny_cid,
+		'deny_gid' => $deny_gid,
+	);
+}
+
+
+function populate_acl($user = null,$celeb = false) {
+
+	$perms = get_acl_permissions($user);
+
 	// We shouldn't need to prune deadguys from the block list. Either way they can't get the message.
 	// Also no point enumerating groups and checking them, that will take place on delivery.
 
@@ -311,10 +325,10 @@ function populate_acl($user = null,$celeb = false) {
 		'$showall'=> t("Visible to everybody"),
 		'$show'		 => t("show"),
 		'$hide'		 => t("don't show"),
-		'$allowcid' => json_encode($allow_cid),
-		'$allowgid' => json_encode($allow_gid),
-		'$denycid' => json_encode($deny_cid),
-		'$denygid' => json_encode($deny_gid),
+		'$allowcid' => json_encode($perms['allow_cid']),
+		'$allowgid' => json_encode($perms['allow_gid']),
+		'$denycid' => json_encode($perms['deny_cid']),
+		'$denygid' => json_encode($perms['deny_gid']),
 	));
 	
 	
@@ -322,3 +336,238 @@ function populate_acl($user = null,$celeb = false) {
 
 }
 
+function construct_acl_data(&$a, $user) {
+
+	// Get group and contact information for html ACL selector
+	$acl_data = acl_lookup(&$a, 'html');
+
+	$user_defaults = get_acl_permissions($user);
+
+	if($acl_data['groups']) {
+		foreach($acl_data['groups'] as $key=>$group) {
+			// Add a "selected" flag to groups that are posted to by default
+			if($user_defaults['allow_gid'] &&
+			   in_array($group['id'], $user_defaults['allow_gid']) && !in_array($group['id'], $user_defaults['deny_gid']) )
+				$acl_data['groups'][$key]['selected'] = 1;
+			else
+				$acl_data['groups'][$key]['selected'] = 0;
+		}
+	}
+	if($acl_data['contacts']) {
+		foreach($acl_data['contacts'] as $key=>$contact) {
+			// Add a "selected" flag to groups that are posted to by default
+			if($user_defaults['allow_cid'] &&
+			   in_array($contact['id'], $user_defaults['allow_cid']) && !in_array($contact['id'], $user_defaults['deny_cid']) )
+				$acl_data['contacts'][$key]['selected'] = 1;
+			else
+				$acl_data['contacts'][$key]['selected'] = 0;
+		}
+	}
+
+	return $acl_data;
+
+}
+
+function acl_lookup(&$a, $out_type = 'json') {
+
+	if(!local_user())
+		return "";
+
+
+	$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']:"");
+	
+
+	// For use with jquery.autocomplete for private mail completion
+
+	if(x($_REQUEST,'query') && strlen($_REQUEST['query'])) {
+		if(! $type)
+			$type = 'm';
+		$search = $_REQUEST['query'];
+	}
+
+
+	if ($search!=""){
+		$sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'";
+		$sql_extra2 = "AND (`attag` LIKE '%%".dbesc($search)."%%' OR `name` LIKE '%%".dbesc($search)."%%' OR `nick` LIKE '%%".dbesc($search)."%%')";
+	} else {
+		$sql_extra = $sql_extra2 = "";
+	}
+	
+	// count groups and contacts
+	if ($type=='' || $type=='g'){
+		$r = q("SELECT COUNT(`id`) AS g FROM `group` WHERE `deleted` = 0 AND `uid` = %d $sql_extra",
+			intval(local_user())
+		);
+		$group_count = (int)$r[0]['g'];
+	} else {
+		$group_count = 0;
+	}
+	
+	if ($type=='' || $type=='c'){
+		$r = q("SELECT COUNT(`id`) AS c FROM `contact` 
+				WHERE `uid` = %d AND `self` = 0 
+				AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0
+				AND `notify` != '' $sql_extra2" ,
+			intval(local_user())
+		);
+		$contact_count = (int)$r[0]['c'];
+	} 
+	elseif ($type == 'm') {
+
+		// autocomplete for Private Messages
+
+		$r = q("SELECT COUNT(`id`) AS c FROM `contact` 
+				WHERE `uid` = %d AND `self` = 0 
+				AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 
+				AND `network` IN ('%s','%s','%s') $sql_extra2" ,
+			intval(local_user()),
+			dbesc(NETWORK_DFRN),
+			dbesc(NETWORK_ZOT),
+			dbesc(NETWORK_DIASPORA)
+		);
+		$contact_count = (int)$r[0]['c'];
+
+	}
+	elseif ($type == 'a') {
+
+		// autocomplete for Contacts
+
+		$r = q("SELECT COUNT(`id`) AS c FROM `contact` 
+				WHERE `uid` = %d AND `self` = 0 
+				AND `pending` = 0 $sql_extra2" ,
+			intval(local_user())
+		);
+		$contact_count = (int)$r[0]['c'];
+
+	} else {
+		$contact_count = 0;
+	}
+	
+	$tot = $group_count+$contact_count;
+	
+	$groups = array();
+	$contacts = array();
+	
+	if ($type=='' || $type=='g'){
+		
+		$r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') as uids
+				FROM `group`,`group_member` 
+				WHERE `group`.`deleted` = 0 AND `group`.`uid` = %d 
+					AND `group_member`.`gid`=`group`.`id`
+					$sql_extra
+				GROUP BY `group`.`id`
+				ORDER BY `group`.`name` 
+				LIMIT %d,%d",
+			intval(local_user()),
+			intval($start),
+			intval($count)
+		);
+
+		foreach($r as $g){
+//		logger('acl: group: ' . $g['name'] . ' members: ' . $g['uids']);		
+			$groups[] = array(
+				"type"  => "g",
+				"photo" => "images/twopeople.png",
+				"name"  => $g['name'],
+				"id"	=> intval($g['id']),
+				"uids"  => array_map("intval", explode(",",$g['uids'])),
+				"link"  => ''
+			);
+		}
+	}
+	
+	if ($type=='' || $type=='c'){
+	
+		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact` 
+			WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != ''
+			$sql_extra2
+			ORDER BY `name` ASC ",
+			intval(local_user())
+		);
+	}
+	elseif($type == 'm') {
+		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact` 
+			WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0
+			AND `network` IN ('%s','%s','%s')
+			$sql_extra2
+			ORDER BY `name` ASC ",
+			intval(local_user()),
+			dbesc(NETWORK_DFRN),
+			dbesc(NETWORK_ZOT),
+			dbesc(NETWORK_DIASPORA)
+		);
+	}
+	elseif($type == 'a') {
+		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact` 
+			WHERE `uid` = %d AND `pending` = 0
+			$sql_extra2
+			ORDER BY `name` ASC ",
+			intval(local_user())
+		);
+	}
+	else
+		$r = array();
+
+
+	if($type == 'm' || $type == 'a') {
+		$x = array();
+		$x['query'] = $search;
+		$x['photos'] = array();
+		$x['links'] = array();
+		$x['suggestions'] = array();
+		$x['data'] = array();
+		if(count($r)) {
+			foreach($r as $g) {
+				$x['photos'][] = $g['micro'];
+				$x['links'][] = $g['url'];
+				$x['suggestions'][] = $g['name'];
+				$x['data'][] = intval($g['id']);
+			}
+		}
+		echo json_encode($x);
+		killme();
+	}
+
+	if(count($r)) {
+		foreach($r as $g){
+			$contacts[] = array(
+				"type"  => "c",
+				"photo" => $g['micro'],
+				"name"  => $g['name'],
+				"id"	=> intval($g['id']),
+				"network" => $g['network'],
+				"link" => $g['url'],
+				"nick" => ($g['attag']) ? $g['attag'] : $g['nick'],
+			);
+		}			
+	}
+		
+	$items = array_merge($groups, $contacts);
+
+
+	if($out_type === 'html') {
+		$o = array(
+			'tot'		=> $tot,
+			'start'	=> $start,
+			'count'	=> $count,
+			'groups'	=> $groups,
+			'contacts'	=> $contacts,
+		);
+		return $o;
+	}
+	
+	$o = array(
+		'tot'	=> $tot,
+		'start' => $start,
+		'count'	=> $count,
+		'items'	=> $items,
+	);
+	
+	echo json_encode($o);
+
+	killme();
+}
+
diff --git a/include/conversation.php b/include/conversation.php
index c278ec2f18..d5f87567b9 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once("include/bbcode.php");
+require_once("include/acl_selectors.php");
 
 
 // Note: the code in 'item_extract_images' and 'item_redir_and_replace_images'
@@ -704,6 +705,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 
 	$o = replace_macros($page_template, array(
 		'$baseurl' => $a->get_baseurl($ssl_state),
+		'$return_path' => $a->query_string,
 		'$live_update' => $live_update_div,
 		'$remove' => t('remove'),
 		'$mode' => $mode,
@@ -908,7 +910,7 @@ function format_like($cnt,$arr,$type,$id) {
 			$str .= sprintf( t(', and %d other people'), $total - MAX_LIKERS );
 		}
 		$str = (($type === 'like') ? sprintf( t('%s like this.'), $str) : sprintf( t('%s don\'t like this.'), $str));
-		$o .= "\t" . '<div id="' . $type . 'list-' . $id . '" style="display: none;" >' . $str . '</div>';
+		$o .= "\t" . '<div class="wall-item-' . $type . '-expanded" id="' . $type . 'list-' . $id . '" style="display: none;" >' . $str . '</div>';
 	}
 	return $o;
 }}
@@ -962,8 +964,6 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 	));
 
 
-	$tpl = get_markup_template("jot.tpl");
-
 	$jotplugins = '';
 	$jotnets = '';
 
@@ -994,10 +994,31 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 	if($notes_cid)
 		$jotnets .= '<input type="hidden" name="contact_allow[]" value="' . $notes_cid .'" />';
 
+
+	// Private/public post links for the non-JS ACL form
+	$private_post = 1;
+	if($_REQUEST['public'])
+		$private_post = 0;
+
+	$query_str = $a->query_string;
+	if(strpos($query_str, 'public=1') !== false)
+		$query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str);
+
+	// I think $a->query_string may never have ? in it, but I could be wrong
+	// It looks like it's from the index.php?q=[etc] rewrite that the web
+	// server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
+	if(strpos($query_str, '?') === false)
+		$public_post_link = '?public=1';
+	else
+		$public_post_link = '&public=1';
+
+
+
 //	$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
+	$tpl = get_markup_template("jot.tpl");
 
 	$o .= replace_macros($tpl,array(
-		'$return_path' => $a->query_string,
+		'$return_path' => $query_str,
 		'$action' =>  $a->get_baseurl(true) . '/item',
 		'$share' => (x($x,'button') ? $x['button'] : t('Share')),
 		'$upload' => t('Upload photo'),
@@ -1033,14 +1054,22 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 		'$jotnets' => $jotnets,
 		'$emtitle' => t('Example: bob@example.com, mary@example.com'),
 		'$lockstate' => $x['lockstate'],
-		'$acl' => $x['acl'],
 		'$bang' => $x['bang'],
 		'$profile_uid' => $x['profile_uid'],
 		'$preview' => ((feature_enabled($x['profile_uid'],'preview')) ? t('Preview') : ''),
 		'$jotplugins' => $jotplugins,
 		'$sourceapp' => t($a->sourcename),
 		'$cancel' => t('Cancel'),
-		'$rand_num' => random_digits(12)
+		'$rand_num' => random_digits(12),
+
+		// ACL permissions box
+		'$acl' => $x['acl'],
+		'$acl_data' => $x['acl_data'],
+		'$group_perms' => t('Post to Groups'),
+		'$contact_perms' => t('Post to Contacts'),
+		'$private' => t('Private post'),
+		'$is_private' => $private_post,
+		'$public_link' => $public_post_link,
 	));
 
 
diff --git a/include/items.php b/include/items.php
index 08127c6eb6..b0ceb0ed93 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3874,6 +3874,34 @@ function drop_item($id,$interactive = true) {
 
 	if((local_user() == $item['uid']) || ($cid) || (! $interactive)) {
 
+		// Check if we should do HTML-based delete confirmation
+		if($_REQUEST['confirm']) {
+			// <form> can't take arguments in its "action" parameter
+			// so add any arguments as hidden inputs
+			$query = explode_querystring($a->query_string);
+			$inputs = array();
+			foreach($query['args'] as $arg) {
+				if(strpos($arg, 'confirm=') === false) {
+					$arg_parts = explode('=', $arg);
+					$inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]);
+				}
+			}
+
+			return replace_macros(get_markup_template('confirm.tpl'), array(
+				'$method' => 'get',
+				'$message' => t('Do you really want to delete this item?'),
+				'$extra_inputs' => $inputs,
+				'$confirm' => t('Yes'),
+				'$confirm_url' => $query['base'],
+				'$confirm_name' => 'confirmed',
+				'$cancel' => t('Cancel'),
+			));
+		}
+		// Now check how the user responded to the confirmation query
+		if($_REQUEST['canceled']) {
+			goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
+		}
+
 		logger('delete item: ' . $item['id'], LOGGER_DEBUG);
 		// delete the item
 
diff --git a/include/nav.php b/include/nav.php
index d94bf03be1..d1d184650b 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -8,8 +8,6 @@ function nav(&$a) {
 	 *
 	 */
 
-	$ssl_state = ((local_user()) ? true : false);
-
 	if(!(x($a->page,'nav')))
 		$a->page['nav'] = '';
 
@@ -19,6 +17,35 @@ function nav(&$a) {
 
 	$a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ;
 
+	$nav_info = nav_info($a);
+
+	/**
+	 * Build the page
+	 */
+
+	$tpl = get_markup_template('nav.tpl');
+
+	$a->page['nav'] .= replace_macros($tpl, array(
+        '$baseurl' => $a->get_baseurl(),
+		'$langselector' => lang_selector(),
+		'$sitelocation' => $nav_info['sitelocation'],
+		'$nav' => $nav_info['nav'],
+		'$banner' =>  $nav_info['banner'],
+		'$emptynotifications' => t('Nothing new here'),
+		'$userinfo' => $nav_info['userinfo'],
+		'$sel' => 	$a->nav_sel,
+		'$apps' => $a->apps,
+		'$clear_notifs' => t('Clear notifications')
+	));
+
+	call_hooks('page_header', $a->page['nav']);
+}
+
+
+function nav_info(&$a) {
+
+	$ssl_state = ((local_user()) ? true : false);
+
 	/**
 	 *
 	 * Our network is distributed, and as you visit friends some of the 
@@ -152,6 +179,9 @@ function nav(&$a) {
 	 }
 
 
+	 $nav['navigation'] = array('navigation/', t('Navigation'), "", t('Site map'));
+
+
 	/**
 	 *
 	 * Provide a banner/logo/whatever
@@ -164,23 +194,15 @@ function nav(&$a) {
 		$banner .= '<a href="http://friendica.com"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendica.com">Friendica</a></span>';
 
 
-	$tpl = get_markup_template('nav.tpl');
-
-	$a->page['nav'] .= replace_macros($tpl, array(
-        '$baseurl' => $a->get_baseurl(),
-		'$langselector' => lang_selector(),
-		'$sitelocation' => $sitelocation,
-		'$nav' => $nav,
-		'$banner' =>  $banner,
-		'$emptynotifications' => t('Nothing new here'),
-		'$userinfo' => $userinfo,
-		'$sel' => 	$a->nav_sel,
-		'$apps' => $a->apps,
-	));
-
-	call_hooks('page_header', $a->page['nav']);
+	return array(
+		'sitelocation' => $sitelocation,
+		'nav' => $nav,
+		'banner' => $banner,
+		'userinfo' => $userinfo,
+	);
 }
 
+
 /*
  * Set a menu item in navbar as selected
  * 
diff --git a/include/template_processor.php b/include/template_processor.php
index 6c5908d92e..ebc03b8d84 100644
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -259,15 +259,15 @@ class Template {
 	public function replace($s, $r) {
 		$this->r = $r;
 
+		// remove comments block
+		$s = preg_replace('/{#(.*?\s*?)*?#}/', "", $s);
+
 		$s = $this->_build_nodes($s);
 
 		$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
 		if ($s == Null)
 			$this->_preg_error();
 
-		// remove comments block
-		$s = preg_replace('/{#[^#]*#}/', "", $s);
-
 		// replace strings recursively (limit to 10 loops)
 		$os = "";
 		$count = 0;
diff --git a/mod/acl.php b/mod/acl.php
index f3e46efa56..f5e04b96a7 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -4,193 +4,7 @@
 require_once("include/acl_selectors.php");
 
 function acl_init(&$a){
-	if(!local_user())
-		return "";
-
-
-	$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']:"");
-	
-
-	// For use with jquery.autocomplete for private mail completion
-
-	if(x($_REQUEST,'query') && strlen($_REQUEST['query'])) {
-		if(! $type)
-			$type = 'm';
-		$search = $_REQUEST['query'];
-	}
-
-
-	if ($search!=""){
-		$sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'";
-		$sql_extra2 = "AND (`attag` LIKE '%%".dbesc($search)."%%' OR `name` LIKE '%%".dbesc($search)."%%' OR `nick` LIKE '%%".dbesc($search)."%%')";
-	} else {
-		$sql_extra = $sql_extra2 = "";
-	}
-	
-	// count groups and contacts
-	if ($type=='' || $type=='g'){
-		$r = q("SELECT COUNT(`id`) AS g FROM `group` WHERE `deleted` = 0 AND `uid` = %d $sql_extra",
-			intval(local_user())
-		);
-		$group_count = (int)$r[0]['g'];
-	} else {
-		$group_count = 0;
-	}
-	
-	if ($type=='' || $type=='c'){
-		$r = q("SELECT COUNT(`id`) AS c FROM `contact` 
-				WHERE `uid` = %d AND `self` = 0 
-				AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0
-				AND `notify` != '' $sql_extra2" ,
-			intval(local_user())
-		);
-		$contact_count = (int)$r[0]['c'];
-	} 
-	elseif ($type == 'm') {
-
-		// autocomplete for Private Messages
-
-		$r = q("SELECT COUNT(`id`) AS c FROM `contact` 
-				WHERE `uid` = %d AND `self` = 0 
-				AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 
-				AND `network` IN ('%s','%s','%s') $sql_extra2" ,
-			intval(local_user()),
-			dbesc(NETWORK_DFRN),
-			dbesc(NETWORK_ZOT),
-			dbesc(NETWORK_DIASPORA)
-		);
-		$contact_count = (int)$r[0]['c'];
-
-	}
-	elseif ($type == 'a') {
-
-		// autocomplete for Contacts
-
-		$r = q("SELECT COUNT(`id`) AS c FROM `contact` 
-				WHERE `uid` = %d AND `self` = 0 
-				AND `pending` = 0 $sql_extra2" ,
-			intval(local_user())
-		);
-		$contact_count = (int)$r[0]['c'];
-
-	} else {
-		$contact_count = 0;
-	}
-	
-	$tot = $group_count+$contact_count;
-	
-	$groups = array();
-	$contacts = array();
-	
-	if ($type=='' || $type=='g'){
-		
-		$r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') as uids
-				FROM `group`,`group_member` 
-				WHERE `group`.`deleted` = 0 AND `group`.`uid` = %d 
-					AND `group_member`.`gid`=`group`.`id`
-					$sql_extra
-				GROUP BY `group`.`id`
-				ORDER BY `group`.`name` 
-				LIMIT %d,%d",
-			intval(local_user()),
-			intval($start),
-			intval($count)
-		);
-
-		foreach($r as $g){
-//		logger('acl: group: ' . $g['name'] . ' members: ' . $g['uids']);		
-			$groups[] = array(
-				"type"  => "g",
-				"photo" => "images/twopeople.png",
-				"name"  => $g['name'],
-				"id"	=> intval($g['id']),
-				"uids"  => array_map("intval", explode(",",$g['uids'])),
-				"link"  => ''
-			);
-		}
-	}
-	
-	if ($type=='' || $type=='c'){
-	
-		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact` 
-			WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != ''
-			$sql_extra2
-			ORDER BY `name` ASC ",
-			intval(local_user())
-		);
-	}
-	elseif($type == 'm') {
-		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact` 
-			WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0
-			AND `network` IN ('%s','%s','%s')
-			$sql_extra2
-			ORDER BY `name` ASC ",
-			intval(local_user()),
-			dbesc(NETWORK_DFRN),
-			dbesc(NETWORK_ZOT),
-			dbesc(NETWORK_DIASPORA)
-		);
-	}
-	elseif($type == 'a') {
-		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact` 
-			WHERE `uid` = %d AND `pending` = 0
-			$sql_extra2
-			ORDER BY `name` ASC ",
-			intval(local_user())
-		);
-	}
-	else
-		$r = array();
-
-
-	if($type == 'm' || $type == 'a') {
-		$x = array();
-		$x['query'] = $search;
-		$x['photos'] = array();
-		$x['links'] = array();
-		$x['suggestions'] = array();
-		$x['data'] = array();
-		if(count($r)) {
-			foreach($r as $g) {
-				$x['photos'][] = $g['micro'];
-				$x['links'][] = $g['url'];
-				$x['suggestions'][] = $g['name'];
-				$x['data'][] = intval($g['id']);
-			}
-		}
-		echo json_encode($x);
-		killme();
-	}
-
-	if(count($r)) {
-		foreach($r as $g){
-			$contacts[] = array(
-				"type"  => "c",
-				"photo" => $g['micro'],
-				"name"  => $g['name'],
-				"id"	=> intval($g['id']),
-				"network" => $g['network'],
-				"link" => $g['url'],
-				"nick" => ($g['attag']) ? $g['attag'] : $g['nick'],
-			);
-		}			
-	}
-		
-	$items = array_merge($groups, $contacts);
-	
-	$o = array(
-		'tot'	=> $tot,
-		'start' => $start,
-		'count'	=> $count,
-		'items'	=> $items,
-	);
-	
-	echo json_encode($o);
-
-	killme();
+	acl_lookup($a);
 }
 
 
diff --git a/mod/contacts.php b/mod/contacts.php
index 6e62ec8ef5..ee68863e30 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -225,6 +225,36 @@ function contacts_content(&$a) {
 
 		if($cmd === 'drop') {
 
+			// Check if we should do HTML-based delete confirmation
+			if($_REQUEST['confirm']) {
+				// <form> can't take arguments in its "action" parameter
+				// so add any arguments as hidden inputs
+				$query = explode_querystring($a->query_string);
+				$inputs = array();
+				foreach($query['args'] as $arg) {
+					if(strpos($arg, 'confirm=') === false) {
+						$arg_parts = explode('=', $arg);
+						$inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]);
+					}
+				}
+
+				$a->page['aside'] = '';
+				return replace_macros(get_markup_template('confirm.tpl'), array(
+					'$method' => 'get',
+					'$message' => t('Do you really want to delete this contact?'),
+					'$extra_inputs' => $inputs,
+					'$confirm' => t('Yes'),
+					'$confirm_url' => $query['base'],
+					'$confirm_name' => 'confirmed',
+					'$cancel' => t('Cancel'),
+				));
+			}
+			// Now check how the user responded to the confirmation query
+			if($_REQUEST['canceled']) {
+				goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+
+			}
+
 			require_once('include/Contact.php');
 
 			terminate_friendship($a->user,$a->contact,$orig_record[0]);
@@ -239,6 +269,10 @@ function contacts_content(&$a) {
 		}
 	}
 
+
+
+	$_SESSION['return_url'] = $a->query_string;
+
 	if((x($a->data,'contact')) && (is_array($a->data['contact']))) {
 
 		$contact_id = $a->data['contact']['id'];
@@ -405,8 +439,6 @@ function contacts_content(&$a) {
 	$ignored = false;
 	$all = false;
 
-	$_SESSION['return_url'] = $a->query_string;
-
 	if(($a->argc == 2) && ($a->argv[1] === 'all')) {
 		$sql_extra = '';
 		$all = true;
diff --git a/mod/display.php b/mod/display.php
index 2ac1c369eb..2c9243a217 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -112,8 +112,9 @@ function display_content(&$a, $update = 0) {
 			'acl' => populate_acl($a->user, $celeb),
 			'bang' => '',
 			'visitor' => 'block',
-			'profile_uid' => local_user()
-		);	
+			'profile_uid' => local_user(),
+			'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
+		);
 		$o .= status_editor($a,$x,0,true);
 	}
 
diff --git a/mod/editpost.php b/mod/editpost.php
index c62252bc84..258e2e0b15 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -85,16 +85,19 @@ function editpost_content(&$a) {
 		}
 	}
 
-	if($mail_enabled) {
+	// I don't think there's any need for the $jotnets when editing the post,
+	// and including them makes it difficult for the JS-free theme, so let's
+	// disable them
+/*	if($mail_enabled) {
        $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
 		$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> '
           	. t("Post to Email") . '</div>';
-	}
+	}*/
 					
 
 
 	call_hooks('jot_tool', $jotplugins);
-	call_hooks('jot_networks', $jotnets);
+	//call_hooks('jot_networks', $jotnets);
 
 	
 	//$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));	
diff --git a/mod/item.php b/mod/item.php
index 2ed1b812a4..addffebe06 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -923,10 +923,12 @@ function item_content(&$a) {
 
 	require_once('include/security.php');
 
+	$o = '';
 	if(($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
 		require_once('include/items.php');
-		drop_item($a->argv[2]);
+		$o = drop_item($a->argv[2]);
 	}
+	return $o;
 }
 
 /**
diff --git a/mod/like.php b/mod/like.php
index aaa85928c7..77fc0aec20 100755
--- a/mod/like.php
+++ b/mod/like.php
@@ -105,6 +105,10 @@ function like_content(&$a) {
 	}
 
 
+	// See if we've been passed a return path to redirect to
+	$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
+
+
 	$r = q("SELECT * FROM `item` WHERE `verb` = '%s' AND `deleted` = 0 
 		AND `contact-id` = %d AND ( `parent` = '%s' OR `parent-uri` = '%s' OR `thr-parent` = '%s') LIMIT 1",
 		dbesc($activity),
@@ -137,7 +141,9 @@ function like_content(&$a) {
 //		proc_run('php',"include/notifier.php","like","$post_id"); // $post_id isn't defined here!
 		$like_item_id = $like_item['id'];
 		proc_run('php',"include/notifier.php","like","$like_item_id");
-		return;
+
+		like_content_return($a->get_baseurl(), $return_path);
+		return; // NOTREACHED
 	}
 
 	$uri = item_new_uri($a->get_hostname(),$owner_uid);
@@ -221,11 +227,29 @@ EOT;
 
 	proc_run('php',"include/notifier.php","like","$post_id");
 
-	killme();
+	like_content_return($a->get_baseurl(), $return_path);
+	killme(); // NOTREACHED
 //	return; // NOTREACHED
 }
 
 
+// Decide how to return. If we were called with a 'return' argument,
+// then redirect back to the calling page. If not, just quietly end
+
+function like_content_return($baseurl, $return_path) {
+
+	if($return_path) {
+		$rand = '_=' . time();
+		if(strpos($return_path, '?')) $rand = "&$rand";
+		else $rand = "?$rand";
+
+		goaway($baseurl . "/" . $return_path . $rand);
+	}
+
+	killme();
+}
+
+
 function store_diaspora_like_retract_sig($activity, $item, $like_item, $contact) {
 	// Note that we can only create a signature for a user of the local server. We don't have
 	// a key for remote users. That is ok, because if a remote user is "unlike"ing a post, it 
diff --git a/mod/manage.php b/mod/manage.php
index 1b8e2f1e2c..5513ebe08d 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once("include/text.php");
+
 
 function manage_post(&$a) {
 
@@ -68,6 +70,10 @@ function manage_post(&$a) {
 	unset($_SESSION['return_url']);
 	if(x($_SESSION,'submanage'))
 		unset($_SESSION['submanage']);
+	if(x($_SESSION,'sysmsg'))
+		unset($_SESSION['sysmsg']);
+	if(x($_SESSION,'sysmsg_info'))
+		unset($_SESSION['sysmsg_info']);
 
 	require_once('include/security.php');
 	authenticate_success($r[0],true,true);
@@ -91,27 +97,18 @@ function manage_content(&$a) {
 		return;
 	}
 
-	$o = '<h3>' . t('Manage Identities and/or Pages') . '</h3>';
-
-	
-	$o .= '<div id="identity-manage-desc">' . t('Toggle between different identities or community/group pages which share your account details or which you have been granted "manage" permissions') . '</div>';
-
-	$o .= '<div id="identity-manage-choose">' . t('Select an identity to manage: ') . '</div>';
-
-	$o .= '<div id="identity-selector-wrapper">' . "\r\n";
-	$o .= '<form action="manage" method="post" >' . "\r\n";
-	$o .= '<select name="identity" size="4" onchange="this.form.submit();" >' . "\r\n";
-
-	foreach($a->identities as $rr) {
-		$selected = (($rr['nickname'] === $a->user['nickname']) ? ' selected="selected" ' : '');
-		$o .= '<option ' . $selected . 'value="' . $rr['uid'] . '">' . $rr['username'] . ' (' . $rr['nickname'] . ')</option>' . "\r\n";
+	$identities = $a->identities;
+	foreach($identities as $key=>$id) {
+		$identities[$key]['selected'] = (($id['nickname'] === $a->user['nickname']) ? ' selected="selected" ' : '');
 	}
 
-	$o .= '</select>' . "\r\n";
-	$o .= '<div id="identity-select-break"></div>' . "\r\n";
-
-//	$o .= '<input id="identity-submit" type="submit" name="submit" value="' . t('Submit') . '" />';
-	$o .= '</div></form>' . "\r\n";
+	$o = replace_macros(get_markup_template('manage.tpl'), array(
+		'$title' => t('Manage Identities and/or Pages'),
+		'$desc' => t('Toggle between different identities or community/group pages which share your account details or which you have been granted "manage" permissions'),
+		'$choose' => t('Select an identity to manage: '),
+		'$identities' => $identities,
+		'$submit' => t('Submit'),
+	));
 
 	return $o;
 
diff --git a/mod/message.php b/mod/message.php
index 885cdcd629..0a54f9428d 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -82,6 +82,8 @@ function message_post(&$a) {
 		$a->argc = 2;
 		$a->argv[1] = 'new';
 	}
+	else
+		goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
 
 }
 
@@ -185,6 +187,36 @@ function message_content(&$a) {
 	if(($a->argc == 3) && ($a->argv[1] === 'drop' || $a->argv[1] === 'dropconv')) {
 		if(! intval($a->argv[2]))
 			return;
+
+		// Check if we should do HTML-based delete confirmation
+		if($_REQUEST['confirm']) {
+			// <form> can't take arguments in its "action" parameter
+			// so add any arguments as hidden inputs
+			$query = explode_querystring($a->query_string);
+			$inputs = array();
+			foreach($query['args'] as $arg) {
+				if(strpos($arg, 'confirm=') === false) {
+					$arg_parts = explode('=', $arg);
+					$inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]);
+				}
+			}
+
+			//$a->page['aside'] = '';
+			return replace_macros(get_markup_template('confirm.tpl'), array(
+				'$method' => 'get',
+				'$message' => t('Do you really want to delete this message?'),
+				'$extra_inputs' => $inputs,
+				'$confirm' => t('Yes'),
+				'$confirm_url' => $query['base'],
+				'$confirm_name' => 'confirmed',
+				'$cancel' => t('Cancel'),
+			));
+		}
+		// Now check how the user responded to the confirmation query
+		if($_REQUEST['canceled']) {
+			goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+		}
+
 		$cmd = $a->argv[1];
 		if($cmd === 'drop') {
 			$r = q("DELETE FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -194,7 +226,8 @@ function message_content(&$a) {
 			if($r) {
 				info( t('Message deleted.') . EOL );
 			}
-			goaway($a->get_baseurl(true) . '/message' );
+			//goaway($a->get_baseurl(true) . '/message' );
+			goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
 		}
 		else {
 			$r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -224,7 +257,8 @@ function message_content(&$a) {
 				if($r)
 					info( t('Conversation removed.') . EOL );
 			} 
-			goaway($a->get_baseurl(true) . '/message' );
+			//goaway($a->get_baseurl(true) . '/message' );
+			goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
 		}	
 	
 	}
@@ -304,6 +338,9 @@ function message_content(&$a) {
 		return $o;
 	}
 
+
+	$_SESSION['return_url'] = $a->query_string;
+
 	if($a->argc == 1) {
 
 		// list messages
diff --git a/mod/navigation.php b/mod/navigation.php
new file mode 100644
index 0000000000..c14902c5f4
--- /dev/null
+++ b/mod/navigation.php
@@ -0,0 +1,27 @@
+<?php
+
+require_once("include/nav.php");
+
+function navigation_content(&$a) {
+
+	$nav_info = nav_info($a);
+
+	/**
+	 * Build the page
+	 */
+
+	$tpl = get_markup_template('navigation.tpl');
+	return replace_macros($tpl, array(
+        '$baseurl' => $a->get_baseurl(),
+		'$langselector' => lang_selector(),
+		'$sitelocation' => $nav_info['sitelocation'],
+		'$nav' => $nav_info['nav'],
+		'$banner' =>  $nav_info['banner'],
+		'$emptynotifications' => t('Nothing new here'),
+		'$userinfo' => $nav_info['userinfo'],
+		'$sel' => 	$a->nav_sel,
+		'$apps' => $a->apps,
+		'$clear_notifs' => t('Clear notifications')
+	));
+
+}
diff --git a/mod/network.php b/mod/network.php
index 2524ae0634..b5046b6327 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -560,10 +560,12 @@ function network_content(&$a, $update = 0) {
 			'default_location' => $a->user['default-location'],
 			'nickname' => $a->user['nickname'],
 			'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'),
+			'default_perms' => get_acl_permissions($a->user),
 			'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), $celeb),
 			'bang' => (($group || $cid || $nets) ? '!' : ''),
 			'visitor' => 'block',
-			'profile_uid' => local_user()
+			'profile_uid' => local_user(),
+			'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
 		);
 
 		$o .= status_editor($a,$x);
diff --git a/mod/notes.php b/mod/notes.php
index 62796ed13f..09dac72b0c 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -60,8 +60,8 @@ function notes_content(&$a,$update = false) {
     	    'bang' => '',
         	'visitor' => 'block',
 	   	    'profile_uid' => local_user(),
-			'button' => t('Save')
-
+			'button' => t('Save'),
+			'acl_data' => '',
     	);
 
     	$o .= status_editor($a,$x,$a->contact['id']);
diff --git a/mod/photos.php b/mod/photos.php
index 7035c66904..c6892818af 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -166,6 +166,11 @@ function photos_post(&$a) {
 			return; // NOTREACHED
 		}
 
+		// Check if the user has responded to a delete confirmation query
+		if($_REQUEST['canceled']) {
+			goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+		}
+
 		$newalbum = notags(trim($_POST['albumname']));
 		if($newalbum != $album) {
 			q("UPDATE `photo` SET `album` = '%s' WHERE `album` = '%s' AND `uid` = %d",
@@ -181,6 +186,25 @@ function photos_post(&$a) {
 
 		if($_POST['dropalbum'] == t('Delete Album')) {
 
+			// Check if we should do HTML-based delete confirmation
+			if($_REQUEST['confirm']) {
+				$drop_url = $a->query_string;
+				$extra_inputs = array(
+					array('name' => 'albumname', 'value' => $_POST['albumname']),
+				);
+				$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array(
+					'$method' => 'post',
+					'$message' => t('Do you really want to delete this photo album and all its photos?'),
+					'$extra_inputs' => $extra_inputs,
+					'$confirm' => t('Delete Album'),
+					'$confirm_url' => $drop_url,
+					'$confirm_name' => 'dropalbum', // Needed so that confirmation will bring us back into this if statement
+					'$cancel' => t('Cancel'),
+				));
+				$a->error = 1; // Set $a->error so the other module functions don't execute
+				return;
+			}
+
 			$res = array();
 
 			// get the list of photos we are about to delete
@@ -242,10 +266,32 @@ function photos_post(&$a) {
 		return; // NOTREACHED
 	}
 
+
+	// Check if the user has responded to a delete confirmation query for a single photo
+	if(($a->argc > 2) && $_REQUEST['canceled']) {
+		goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+	}
+
 	if(($a->argc > 2) && (x($_POST,'delete')) && ($_POST['delete'] == t('Delete Photo'))) {
 
 		// same as above but remove single photo
 
+		// Check if we should do HTML-based delete confirmation
+		if($_REQUEST['confirm']) {
+			$drop_url = $a->query_string;
+			$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array(
+				'$method' => 'post',
+				'$message' => t('Do you really want to delete this photo?'),
+				'$extra_inputs' => array(),
+				'$confirm' => t('Delete Photo'),
+				'$confirm_url' => $drop_url,
+				'$confirm_name' => 'delete', // Needed so that confirmation will bring us back into this if statement
+				'$cancel' => t('Cancel'),
+			));
+			$a->error = 1; // Set $a->error so the other module functions don't execute
+			return;
+		}
+
 		if($visitor) {
 			$r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `resource-id` = '%s' LIMIT 1",
 				intval($visitor),
@@ -284,7 +330,7 @@ function photos_post(&$a) {
 			}
 		}
 
-		goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+		goaway($a->get_baseurl() . '/photos/' . $a->data['user']['nickname']);
 		return; // NOTREACHED
 	}
 
@@ -1024,8 +1070,10 @@ function photos_content(&$a) {
 
 		call_hooks('photo_upload_form',$ret);
 
-		$default_upload = '<input id="photos-upload-choose" type="file" name="userfile" /> 	<div class="photos-upload-submit-wrapper" >
-		<input type="submit" name="submit" value="' . t('Submit') . '" id="photos-upload-submit" /> </div>';
+		$default_upload_box = replace_macros(get_markup_template('photos_default_uploader_box.tpl'), array());
+		$default_upload_submit = replace_macros(get_markup_template('photos_default_uploader_submit.tpl'), array(
+			'$submit' => t('Submit'),
+		));
 
 		$usage_message = '';
 		$limit = service_class_fetch($a->data['user']['uid'],'photo_upload_limit');
@@ -1038,6 +1086,25 @@ function photos_content(&$a) {
 		}
 
 
+		// Private/public post links for the non-JS ACL form
+		$private_post = 1;
+		if($_REQUEST['public'])
+			$private_post = 0;
+
+		$query_str = $a->query_string;
+		if(strpos($query_str, 'public=1') !== false)
+			$query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str);
+
+		// I think $a->query_string may never have ? in it, but I could be wrong
+		// It looks like it's from the index.php?q=[etc] rewrite that the web
+		// server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
+		if(strpos($query_str, '?') === false)
+			$public_post_link = '?public=1';
+		else
+			$public_post_link = '&public=1';
+
+
+
 		$tpl = get_markup_template('photos_upload.tpl');
 
 		if($a->theme['template_engine'] === 'internal') {
@@ -1060,9 +1127,20 @@ function photos_content(&$a) {
 			'$albumselect' => $albumselect_e,
 			'$permissions' => t('Permissions'),
 			'$aclselect' => $aclselect_e,
-			'$uploader' => $ret['addon_text'],
-			'$default' => (($ret['default_upload']) ? $default_upload : ''),
-			'$uploadurl' => $ret['post_url']
+			'$alt_uploader' => $ret['addon_text'],
+			'$default_upload_box' => (($ret['default_upload']) ? $default_upload_box : ''),
+			'$default_upload_submit' => (($ret['default_upload']) ? $default_upload_submit : ''),
+			'$uploadurl' => $ret['post_url'],
+
+			// ACL permissions box
+			'$acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
+			'$group_perms' => t('Show to Groups'),
+			'$contact_perms' => t('Show to Contacts'),
+			'$private' => t('Private Photo'),
+			'$public' => t('Public Photo'),
+			'$is_private' => $private_post,
+			'$return_path' => $query_str,
+			'$public_link' => $public_post_link,
 
 		));
 
@@ -1372,6 +1450,24 @@ function photos_content(&$a) {
 		if(($cmd === 'edit') && ($can_post)) {
 			$edit_tpl = get_markup_template('photo_edit.tpl');
 
+			// Private/public post links for the non-JS ACL form
+			$private_post = 1;
+			if($_REQUEST['public'])
+				$private_post = 0;
+
+			$query_str = $a->query_string;
+			if(strpos($query_str, 'public=1') !== false)
+				$query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str);
+
+			// I think $a->query_string may never have ? in it, but I could be wrong
+			// It looks like it's from the index.php?q=[etc] rewrite that the web
+			// server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
+			if(strpos($query_str, '?') === false)
+				$public_post_link = '?public=1';
+			else
+				$public_post_link = '&public=1';
+
+
 			if($a->theme['template_engine'] === 'internal') {
 				$album_e = template_escape($ph[0]['album']);
 				$caption_e = template_escape($ph[0]['desc']);
@@ -1400,7 +1496,17 @@ function photos_content(&$a) {
 				'$help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'),
 				'$item_id' => ((count($linked_items)) ? $link_item['id'] : 0),
 				'$submit' => t('Submit'),
-				'$delete' => t('Delete Photo')
+				'$delete' => t('Delete Photo'),
+
+				// ACL permissions box
+				'$acl_data' => construct_acl_data($a, $ph[0]), // For non-Javascript ACL selector
+				'$group_perms' => t('Show to Groups'),
+				'$contact_perms' => t('Show to Contacts'),
+				'$private' => t('Private photo'),
+				'$public' => t('Public photo'),
+				'$is_private' => $private_post,
+				'$return_path' => $query_str,
+				'$public_link' => $public_post_link,
 			));
 		}
 
@@ -1418,9 +1524,10 @@ function photos_content(&$a) {
 				$likebuttons = replace_macros($like_tpl,array(
 					'$id' => $link_item['id'],
 					'$likethis' => t("I like this \x28toggle\x29"),
-					'$nolike' => t("I don't like this \x28toggle\x29"),
+					'$nolike' => (feature_enabled(local_user(), 'dislike') ? t("I don't like this \x28toggle\x29") : ''),
 					'$share' => t('Share'),
-					'$wait' => t('Please wait')
+					'$wait' => t('Please wait'),
+					'$return_path' => $a->query_string,
 				));
 			}
 
diff --git a/mod/profile.php b/mod/profile.php
index 25871c2405..eea5dc7e4b 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -198,7 +198,8 @@ function profile_content(&$a, $update = 0) {
             	'acl' => (($is_owner) ? populate_acl($a->user, $celeb) : ''),
 	            'bang' => '',
     	        'visitor' => (($is_owner || $commvisitor) ? 'block' : 'none'),
-        	    'profile_uid' => $a->profile['profile_uid']
+        	    'profile_uid' => $a->profile['profile_uid'],
+				'acl_data' => ( $is_owner ? construct_acl_data($a, $a->user) : '' ), // For non-Javascript ACL selector
         	);
 
         	$o .= status_editor($a,$x);
diff --git a/mod/settings.php b/mod/settings.php
index dbdd40bc36..8b3cebfa35 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1012,6 +1012,25 @@ function settings_content(&$a) {
 	require_once('include/group.php');
 	$group_select = mini_group_select(local_user(),$a->user['def_gid']);
 
+
+	// Private/public post links for the non-JS ACL form
+	$private_post = 1;
+	if($_REQUEST['public'])
+		$private_post = 0;
+
+	$query_str = $a->query_string;
+	if(strpos($query_str, 'public=1') !== false)
+		$query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str);
+
+	// I think $a->query_string may never have ? in it, but I could be wrong
+	// It looks like it's from the index.php?q=[etc] rewrite that the web
+	// server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
+	if(strpos($query_str, '?') === false)
+		$public_post_link = '?public=1';
+	else
+		$public_post_link = '&public=1';
+
+
 	$o .= replace_macros($stpl, array(
 		'$ptitle' 	=> t('Account Settings'),
 
@@ -1046,6 +1065,17 @@ function settings_content(&$a) {
 		'$blockwall'=> $blockwall, // array('blockwall', t('Allow friends to post to your profile page:'), !$blockwall, ''),
 		'$blocktags'=> $blocktags, // array('blocktags', t('Allow friends to tag your posts:'), !$blocktags, ''),
 
+		// ACL permissions box
+		'$acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
+		'$group_perms' => t('Show to Groups'),
+		'$contact_perms' => t('Show to Contacts'),
+		'$private' => t('Default Private Post'),
+		'$public' => t('Default Public Post'),
+		'$is_private' => $private_post,
+		'$return_path' => $query_str,
+		'$public_link' => $public_post_link,
+		'$settings_perms' => t('Default Permissions for New Posts'),
+
 		'$group_select' => $group_select,
 
 
diff --git a/mod/starred.php b/mod/starred.php
index 035b81e764..4fbfd1a953 100644
--- a/mod/starred.php
+++ b/mod/starred.php
@@ -28,6 +28,16 @@ function starred_init(&$a) {
 		intval($message_id)
 	);
  
+	// See if we've been passed a return path to redirect to
+	$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
+	if($return_path) {
+		$rand = '_=' . time();
+		if(strpos($return_path, '?')) $rand = "&$rand";
+		else $rand = "?$rand";
+
+		goaway($a->get_baseurl() . "/" . $return_path . $rand);
+	}
+
 	// the json doesn't really matter, it will either be 0 or 1
 
 	echo json_encode($starred);
diff --git a/mod/suggest.php b/mod/suggest.php
index 7a86d53a1d..a86b412b32 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -9,10 +9,38 @@ function suggest_init(&$a) {
 		return;
 
 	if(x($_GET,'ignore') && intval($_GET['ignore'])) {
-		q("insert into gcign ( uid, gcid ) values ( %d, %d ) ",
-			intval(local_user()),
-			intval($_GET['ignore'])
-		);
+		// Check if we should do HTML-based delete confirmation
+		if($_REQUEST['confirm']) {
+			// <form> can't take arguments in its "action" parameter
+			// so add any arguments as hidden inputs
+			$query = explode_querystring($a->query_string);
+			$inputs = array();
+			foreach($query['args'] as $arg) {
+				if(strpos($arg, 'confirm=') === false) {
+					$arg_parts = explode('=', $arg);
+					$inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]);
+				}
+			}
+
+			$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array(
+				'$method' => 'get',
+				'$message' => t('Do you really want to delete this suggestion?'),
+				'$extra_inputs' => $inputs,
+				'$confirm' => t('Yes'),
+				'$confirm_url' => $query['base'],
+				'$confirm_name' => 'confirmed',
+				'$cancel' => t('Cancel'),
+			));
+			$a->error = 1; // Set $a->error so the other module functions don't execute
+			return;
+		}
+		// Now check how the user responded to the confirmation query
+		if(!$_REQUEST['canceled']) {
+			q("insert into gcign ( uid, gcid ) values ( %d, %d ) ",
+				intval(local_user()),
+				intval($_GET['ignore'])
+			);
+		}
 	}
 
 }
@@ -56,6 +84,7 @@ function suggest_content(&$a) {
 			'$name' => $rr['name'],
 			'$photo' => $rr['photo'],
 			'$ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'],
+			'$ignid' => $rr['id'],
 			'$conntxt' => t('Connect'),
 			'$connlnk' => $connlnk,
 			'$ignore' => t('Ignore/Hide')
diff --git a/object/Item.php b/object/Item.php
index 9c06fc8cf7..cd42c4008c 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -588,7 +588,7 @@ class Item extends BaseObject {
 				$qcomment = (($qc) ? explode("\n",$qc) : null);
 			}
 			$comment_box = replace_macros($template,array(
-				'$return_path' => '',
+				'$return_path' => $a->query_string,
 				'$threaded' => $this->is_threaded(),
 //				'$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''),
 				'$jsreload' => '',
diff --git a/view/comment_item.tpl b/view/comment_item.tpl
index 5783a409c5..1764f99d89 100644
--- a/view/comment_item.tpl
+++ b/view/comment_item.tpl
@@ -7,7 +7,7 @@
 				<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="return" value="$return_path" />-->#}
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
 				<input type="hidden" name="post_id_random" value="$rand_num" />
diff --git a/view/confirm.tpl b/view/confirm.tpl
new file mode 100644
index 0000000000..5e7e641c45
--- /dev/null
+++ b/view/confirm.tpl
@@ -0,0 +1,14 @@
+<center>
+<form action="$confirm_url" id="confirm-form" method="$method">
+
+	<span id="confirm-message">$message</span>
+	{{ for $extra_inputs as $input }}
+	<input type="hidden" name="$input.name" value="$input.value" />
+	{{ endfor }}
+
+	<input class="confirm-button" id="confirm-submit-button" type="submit" name="$confirm_name" value="$confirm" />
+	<input class="confirm-button" id="confirm-cancel-button" type="submit" name="canceled" value="$cancel" />
+
+</form>
+</center>
+
diff --git a/view/contact_template.tpl b/view/contact_template.tpl
index 48930b48ab..f7ed107509 100644
--- a/view/contact_template.tpl
+++ b/view/contact_template.tpl
@@ -11,7 +11,13 @@
 			<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
+						{{ for $contact.photo_menu as $c }}
+						{{ if $c.2 }}
+						<li><a target="redir" href="$c.1">$c.0</a></li>
+						{{ else }}
+						<li><a href="$c.1">$c.0</a></li>
+						{{ endif }}
+						{{ endfor }}
                     </ul>
                 </div>
 			{{ endif }}
diff --git a/view/like_noshare.tpl b/view/like_noshare.tpl
index 2651ea1f89..777b2e3594 100644
--- a/view/like_noshare.tpl
+++ b/view/like_noshare.tpl
@@ -1,5 +1,7 @@
 <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>
+	{{ if $nolike }}
 	<a href="#" class="icon dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a>
+	{{ endif }}
 	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 </div>
diff --git a/view/manage.tpl b/view/manage.tpl
new file mode 100644
index 0000000000..24497b42c6
--- /dev/null
+++ b/view/manage.tpl
@@ -0,0 +1,17 @@
+<h3>$title</h3>
+<div id="identity-manage-desc">$desc</div>
+<div id="identity-manage-choose">$choose</div>
+<div id="identity-selector-wrapper">
+	<form action="manage" method="post" >
+	<select name="identity" size="4" onchange="this.form.submit();" >
+
+	{{ for $identities as $id }}
+		<option $id.selected value="$id.uid">$id.username ($id.nickname)</option>
+	{{ endfor }}
+
+	</select>
+	<div id="identity-select-break"></div>
+
+	{#<!--<input id="identity-submit" type="submit" name="submit" value="$submit" />-->#}
+</div></form>
+
diff --git a/view/navigation.tpl b/view/navigation.tpl
new file mode 100644
index 0000000000..3e03efa30a
--- /dev/null
+++ b/view/navigation.tpl
@@ -0,0 +1,103 @@
+{#
+ # LOGIN/REGISTER
+ #}
+<center>
+{# Use nested if's since the Friendica template engine doesn't support AND or OR in if statements #}
+{{ if $nav.login }}
+<div id="navigation-login-wrapper" >
+{{ else }}
+{{ if $nav.register }}
+<div id="navigation-login-wrapper" >
+{{ endif }}
+{{ endif }}
+{{ if $nav.login }}<a id="navigation-login-link" class="navigation-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><br/> {{ endif }}
+{{ if $nav.register }}<a id="navigation-register-link" class="navigation-link $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a><br/>{{ endif }}
+{{ if $nav.login }}
+</div>
+{{ else }}
+{{ if $nav.register }}
+</div>
+{{ endif }}
+{{ endif }}
+
+{#
+ # NETWORK/HOME
+ #}
+{{ if $nav.network }}
+<div id="navigation-network-wrapper" >
+{{ else }}
+{{ if $nav.home }}
+<div id="navigation-network-wrapper" >
+{{ else }}
+{{ if $nav.community }}
+<div id="navigation-network-wrapper" >
+{{ endif }}
+{{ endif }}
+{{ endif }}
+{{ if $nav.network }}
+<a id="navigation-network-link" class="navigation-link navigation-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a><br/>
+<a class="navigation-link navigation-commlink" href="$nav.net_reset.0" title="$nav.net_reset.3">$nav.net_reset.1</a><br/>
+{{ endif }}
+{{ if $nav.home }}
+<a id="navigation-home-link" class="navigation-link navigation-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a><br/>
+{{ endif }}
+{{ if $nav.community }}
+<a id="navigation-community-link" class="navigation-link navigation-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a><br/>
+{{ endif }}
+{{ if $nav.network }}
+</div>
+{{ else }}
+{{ if $nav.home }}
+</div>
+{{ else }}
+{{ if $nav.community }}
+</div>
+{{ endif }}
+{{ endif }}
+{{ endif }}
+
+{#
+ # PRIVATE MESSAGES
+ #}
+{{ if $nav.messages }}
+<div id="navigation-messages-wrapper">
+<a id="navigation-messages-link" class="navigation-link navigation-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a><br/>
+</div>
+{{ endif }}
+
+	
+{#
+ # CONTACTS
+ #}
+<div id="navigation-contacts-wrapper">
+{{ if $nav.contacts }}<a id="navigation-contacts-link" class="navigation-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a><br/>{{ endif }}
+<a id="navigation-directory-link" class="navigation-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a><br/>
+{{ if $nav.introductions }}
+<a id="navigation-notify-link" class="navigation-link navigation-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a><br/>
+{{ endif }}
+</div>
+
+{#
+ # NOTIFICATIONS
+ #}
+{{ if $nav.notifications }}
+<div id="navigation-notifications-wrapper">
+<a id="navigation-notifications-link" class="navigation-link navigation-commlink" href="$nav.notifications.0" rel="#navigation-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a><br/>
+</div>
+{{ endif }}		
+
+{#
+ # MISCELLANEOUS
+ #}
+<div id="navigation-misc-wrapper">
+{{ if $nav.settings }}<a id="navigation-settings-link" class="navigation-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a><br/>{{ endif }}
+{{ if $nav.manage }}<a id="navigation-manage-link" class="navigation-link navigation-commlink $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a><br/>{{ endif }}
+{{ if $nav.profiles }}<a id="navigation-profiles-link" class="navigation-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a><br/>{{ endif }}
+{{ if $nav.admin }}<a id="navigation-admin-link" class="navigation-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a><br/>{{ endif }}
+<a id="navigation-search-link" class="navigation-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a><br/>
+{{ if $nav.apps }}<a id="navigation-apps-link" class="navigation-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a><br/>{{ endif }}
+{{ if $nav.help }} <a id="navigation-help-link" class="navigation-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a><br/>{{ endif }}
+</div>
+
+{{ if $nav.logout }}<a id="navigation-logout-link" class="navigation-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a><br/>{{ endif }}
+</center>
diff --git a/view/photos_default_uploader_box.tpl b/view/photos_default_uploader_box.tpl
new file mode 100644
index 0000000000..2f1f69a50d
--- /dev/null
+++ b/view/photos_default_uploader_box.tpl
@@ -0,0 +1 @@
+<input id="photos-upload-choose" type="file" name="userfile" />
diff --git a/view/photos_default_uploader_submit.tpl b/view/photos_default_uploader_submit.tpl
new file mode 100644
index 0000000000..cacb416569
--- /dev/null
+++ b/view/photos_default_uploader_submit.tpl
@@ -0,0 +1,3 @@
+<div class="photos-upload-submit-wrapper" >
+	<input type="submit" name="submit" value="$submit" id="photos-upload-submit" />
+</div>
diff --git a/view/photos_upload.tpl b/view/photos_upload.tpl
index 2a820d9c7d..7de8d8ab74 100644
--- a/view/photos_upload.tpl
+++ b/view/photos_upload.tpl
@@ -39,9 +39,10 @@
 
 	<div id="photos-upload-spacer"></div>
 
-	$uploader
+	$alt_uploader
 
-	$default
+	$default_upload_box
+	$default_upload_submit
 
 	<div class="photos-upload-end" ></div>
 </form>
diff --git a/view/theme/comix-plain/comment_item.tpl b/view/theme/comix-plain/comment_item.tpl
index e3c686f052..045a350f6d 100644
--- a/view/theme/comix-plain/comment_item.tpl
+++ b/view/theme/comix-plain/comment_item.tpl
@@ -3,7 +3,7 @@
 				<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="return" value="$return_path" />-->#}
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
 				<input type="hidden" name="post_id_random" value="$rand_num" />
diff --git a/view/theme/comix/comment_item.tpl b/view/theme/comix/comment_item.tpl
index e3c686f052..045a350f6d 100644
--- a/view/theme/comix/comment_item.tpl
+++ b/view/theme/comix/comment_item.tpl
@@ -3,7 +3,7 @@
 				<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="return" value="$return_path" />-->#}
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
 				<input type="hidden" name="post_id_random" value="$rand_num" />
diff --git a/view/theme/decaf-mobile/TODO b/view/theme/decaf-mobile/TODO
new file mode 100644
index 0000000000..735f6bdc36
--- /dev/null
+++ b/view/theme/decaf-mobile/TODO
@@ -0,0 +1,31 @@
+Photo album display?
+
+- The "lock" icon for private items
+	- change it to black?
+	- when clicked, the popup window displays poorly
+
+- Edit photo page: bottom buttons are off-center in Dolphin Mini
+
+- BB code buttons for status updates
+
+- Get "add contact" back on contacts page
+
+- Allow creating a new private message
+
+- Admin: access to more pages than summary?
+
+- Find a way to show embedded videos at the normal size for tablets that can handle it
+
+- Need to find a way to deal with freakin annoying elements that don't respect screen width limits.
+  Specifically, need to find a way to keep them from forcing a horizontal scroll bar to show up and
+  making the rest of the body text overflow the item's borders that is screen-width sensitive (it's
+  annoying to have a 300px truncated code block on a 1024px wide screen). At least the following cause problems:
+	- code blocks
+	- blockquote blocks
+	- #reallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallylongtags
+
+- Needs to be faster!
+	- Reduce DOM elements (~2400 for 10 items, ~8400 for 40 items)
+
+
+- Sometimes, when "Permission denied", wrong login page is shown
diff --git a/view/theme/decaf-mobile/acl_html_selector.tpl b/view/theme/decaf-mobile/acl_html_selector.tpl
new file mode 100644
index 0000000000..e84b0eefca
--- /dev/null
+++ b/view/theme/decaf-mobile/acl_html_selector.tpl
@@ -0,0 +1,29 @@
+<a name="acl-wrapper-target"></a>
+<div id="acl-wrapper">
+	<div id="acl-public-switch">
+		<a href="$return_path#acl-wrapper-target" {{ if $is_private == 1 }}class="acl-public-switch-selected"{{ endif }} >$private</a>
+		<a href="$return_path$public_link#acl-wrapper-target" {{ if $is_private == 0 }}class="acl-public-switch-selected"{{ endif }} >$public</a>
+	</div>
+	<div id="acl-list">
+		<div id="acl-list-content">
+			<div id="acl-html-groups" class="acl-html-select-wrapper">
+			$group_perms<br />
+			<select name="group_allow[]" multiple {{ if $is_private == 0 }}disabled{{ endif }} id="acl-html-group-select" class="acl-html-select" size=7>
+				{{ for $acl_data.groups as $group }}
+				<option value="$group.id" {{ if $is_private == 1 }}{{ if $group.selected }}selected{{ endif }}{{ endif }}>$group.name</option>
+				{{ endfor }}
+			</select>
+			</div>
+			<div id="acl-html-contacts" class="acl-html-select-wrapper">
+			$contact_perms<br />
+			<select name="contact_allow[]" multiple {{ if $is_private == 0 }}disabled{{ endif }} id="acl-html-contact-select" class="acl-html-select" size=7>
+				{{ for $acl_data.contacts as $contact }}
+				<option value="$contact.id" {{ if $is_private == 1 }}{{ if $contact.selected }}selected{{ endif }}{{ endif }}>$contact.name ($contact.networkName)</option>
+				{{ endfor }}
+			</select>
+			</div>
+		</div>
+	</div>
+	<span id="acl-fields"></span>
+</div>
+
diff --git a/view/theme/decaf-mobile/acl_selector.tpl b/view/theme/decaf-mobile/acl_selector.tpl
new file mode 100644
index 0000000000..8e9916c950
--- /dev/null
+++ b/view/theme/decaf-mobile/acl_selector.tpl
@@ -0,0 +1,23 @@
+<div id="acl-wrapper">
+	<input id="acl-search">
+	<a href="#" id="acl-showall">$showall</a>
+	<div id="acl-list">
+		<div id="acl-list-content">
+		</div>
+	</div>
+	<span id="acl-fields"></span>
+</div>
+
+<div class="acl-list-item" rel="acl-template" style="display:none">
+	<img data-src="{0}"><p>{1}</p>
+	<a href="#" class='acl-button-show'>$show</a>
+	<a href="#" class='acl-button-hide'>$hide</a>
+</div>
+
+{#<!--<script>
+	window.allowCID = $allowcid;
+	window.allowGID = $allowgid;
+	window.denyCID = $denycid;
+	window.denyGID = $denygid;
+	window.aclInit = "true";
+</script>-->#}
diff --git a/view/theme/decaf-mobile/admin_aside.tpl b/view/theme/decaf-mobile/admin_aside.tpl
new file mode 100644
index 0000000000..da3ed23a88
--- /dev/null
+++ b/view/theme/decaf-mobile/admin_aside.tpl
@@ -0,0 +1,31 @@
+
+<h4><a href="$admurl">$admtxt</a></h4>
+<ul class='admin linklist'>
+	<li class='admin button $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
+	<li class='admin button $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
+	<li class='admin button $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
+	<li class='admin button $admin.themes.2'><a href='$admin.themes.0'>$admin.themes.1</a></li>
+	<li class='admin button $admin.dbsync.2'><a href='$admin.dbsync.0'>$admin.dbsync.1</a></li>
+</ul>
+
+{{ if $admin.update }}
+<ul class='admin linklist'>
+	<li class='admin button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
+	<li class='admin button $admin.update.2'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
+</ul>
+{{ endif }}
+
+
+{{ if $admin.plugins_admin }}<h4>$plugadmtxt</h4>{{ endif }}
+<ul class='admin linklist'>
+	{{ for $admin.plugins_admin as $l }}
+	<li class='admin button $l.2'><a href='$l.0'>$l.1</a></li>
+	{{ endfor }}
+</ul>
+	
+	
+<h4>$logtxt</h4>
+<ul class='admin linklist'>
+	<li class='admin button $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
+</ul>
+
diff --git a/view/theme/decaf-mobile/admin_site.tpl b/view/theme/decaf-mobile/admin_site.tpl
new file mode 100644
index 0000000000..087de4f7db
--- /dev/null
+++ b/view/theme/decaf-mobile/admin_site.tpl
@@ -0,0 +1,61 @@
+
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/site" method="post">
+    <input type='hidden' name='form_security_token' value='$form_security_token'>
+
+	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
+	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+	
+	<h3>$registration</h3>
+	{{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
+	
+	{{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+
+	<h3>$upload</h3>
+	{{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}
+	
+	<h3>$corporate</h3>
+	{{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+	
+	<h3>$advanced</h3>
+	{{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+	
+	</form>
+</div>
diff --git a/view/theme/decaf-mobile/admin_users.tpl b/view/theme/decaf-mobile/admin_users.tpl
new file mode 100644
index 0000000000..3364679249
--- /dev/null
+++ b/view/theme/decaf-mobile/admin_users.tpl
@@ -0,0 +1,98 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "$confirm_delete".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("$confirm_delete_multi");
+	}
+	{#/*function selectall(cls){
+		$j("."+cls).attr('checked','checked');
+		return false;
+	}*/#}
+</script>
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='$form_security_token'>
+		
+		<h3>$h_pending</h3>
+		{{ if $pending }}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{ for $pending as $u }}
+				<tr>
+					<td class="created">$u.created</td>
+					<td class="name">$u.name</td>
+					<td class="email">$u.email</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
+					<td class="tools">
+						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='tool like'></span></a>
+						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='tool dislike'></span></a>
+					</td>
+				</tr>
+			{{ endfor }}
+				</tbody>
+			</table>
+			{#<!--<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>-->#}
+			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
+		{{ else }}
+			<p>$no_pending</p>
+		{{ endif }}
+	
+	
+		
+	
+		<h3>$h_users</h3>
+		{{ if $users }}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{ for $users as $u }}
+					<tr>
+						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
+						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
+						<td class='email'>$u.email</td>
+						<td class='register_date'>$u.register_date</td>
+						<td class='login_date'>$u.login_date</td>
+						<td class='lastitem_date'>$u.lastitem_date</td>
+						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }}</td>
+						<td class="checkbox"> 
+                                    {{ if $u.is_admin }}
+                                        &nbsp;
+                                    {{ else }}
+                                        <input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
+                                    {{ endif }}
+						<td class="tools">
+                                    {{ if $u.is_admin }}
+                                        &nbsp;
+                                    {{ else }}
+                                        <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+                                        <a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
+                                    {{ endif }}
+						</td>
+					</tr>
+				{{ endfor }}
+				</tbody>
+			</table>
+			{#<!--<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>-->#}
+			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
+		{{ else }}
+			NO USERS?!?
+		{{ endif }}
+	</form>
+</div>
diff --git a/view/theme/decaf-mobile/album_edit.tpl b/view/theme/decaf-mobile/album_edit.tpl
new file mode 100644
index 0000000000..3fe2d9fe92
--- /dev/null
+++ b/view/theme/decaf-mobile/album_edit.tpl
@@ -0,0 +1,15 @@
+<div id="photo-album-edit-wrapper">
+<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/$nickname/album/$hexalbum" method="post" >
+	<input id="photo-album-edit-form-confirm" type="hidden" name="confirm" value="1" />
+
+	<label id="photo-album-edit-name-label" for="photo-album-edit-name" >$nametext</label>
+	<input type="text" size="64" name="albumname" value="$album" >
+
+	<div id="photo-album-edit-name-end"></div>
+
+	<input id="photo-album-edit-submit" type="submit" name="submit" value="$submit" />
+	<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="$dropsubmit" onclick="return confirmDelete(function(){remove('photo-album-edit-form-confirm');});" />
+
+</form>
+</div>
+<div id="photo-album-edit-end" ></div>
diff --git a/view/theme/decaf-mobile/border.jpg b/view/theme/decaf-mobile/border.jpg
new file mode 100644
index 0000000000..034a1cb63b
Binary files /dev/null and b/view/theme/decaf-mobile/border.jpg differ
diff --git a/view/theme/decaf-mobile/categories_widget.tpl b/view/theme/decaf-mobile/categories_widget.tpl
new file mode 100644
index 0000000000..ebc62404b8
--- /dev/null
+++ b/view/theme/decaf-mobile/categories_widget.tpl
@@ -0,0 +1,12 @@
+{#<!--<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/theme/decaf-mobile/comment_item.tpl b/view/theme/decaf-mobile/comment_item.tpl
new file mode 100755
index 0000000000..ee0e8c7916
--- /dev/null
+++ b/view/theme/decaf-mobile/comment_item.tpl
@@ -0,0 +1,79 @@
+{#<!--		<script>
+		$(document).ready( function () {
+			$(document).mouseup(function(e) {
+				var container = $("#comment-edit-wrapper-$id");
+				if( container.has(e.target).length === 0) {
+					commentClose(document.getElementById('comment-edit-text-$id'),$id);
+					cmtBbClose($id);
+				}
+			});
+		});
+		</script>-->#}
+
+		<div class="comment-wwedit-wrapper $indent" id="comment-edit-wrapper-$id" style="display: block;" >
+			<a name="comment-wwedit-wrapper-pos"></a>
+			<form class="comment-edit-form $indent" id="comment-edit-form-$id" action="item" method="post" >
+{#<!--			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
+			<form class="comment-edit-form" style="display: none;" 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="source" value="$sourceapp" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path#comment-wwedit-wrapper-pos" />
+				<input type="hidden" name="jsreload" value="$jsreload" />
+				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+				<input type="hidden" name="post_id_random" value="$rand_num" />
+
+				{#<!--<div class="comment-edit-photo" id="comment-edit-photo-$id" >-->#}
+					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+				{#<!--</div>-->#}
+				{#<!--<div class="comment-edit-photo-end"></div>-->#}
+				{#<!--<ul class="comment-edit-bb-$id">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="$edbold"
+						onclick="insertFormatting('$comment','b', $id);"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="$editalic"
+						onclick="insertFormatting('$comment','i', $id);"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="$eduline"
+						onclick="insertFormatting('$comment','u', $id);"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="$edquote"
+						onclick="insertFormatting('$comment','quote', $id);"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="$edcode"
+						onclick="insertFormatting('$comment','code', $id);"></a></li>-->#}
+{#<!--					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="$edimg"
+						onclick="insertFormatting('$comment','img', $id);"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="$edurl"
+						onclick="insertFormatting('$comment','url', $id);"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="$edvideo"
+						onclick="insertFormatting('$comment','video', $id);"></a></li>-->#}
+				{#<!--</ul>	-->#}
+				{#<!--<div class="comment-edit-bb-end"></div>-->#}
+{#<!--				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);cmtBbClose($id);" >$comment</textarea>-->#}
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-full" name="body" ></textarea>
+				{#<!--{{ if $qcomment }}
+					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+					<option value=""></option>
+				{{ for $qcomment as $qc }}
+					<option value="$qc">$qc</option>				
+				{{ endfor }}
+					</select>
+				{{ endif }}-->#}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" >
+					<input type="submit" 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="preview-link 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/decaf-mobile/common_tabs.tpl b/view/theme/decaf-mobile/common_tabs.tpl
new file mode 100644
index 0000000000..940e5aeb2f
--- /dev/null
+++ b/view/theme/decaf-mobile/common_tabs.tpl
@@ -0,0 +1,6 @@
+<ul class="tabs">
+	{{ for $tabs as $tab }}
+		<li id="$tab.id"><a href="$tab.url" class="tab button $tab.sel"{{ if $tab.title }} title="$tab.title"{{ endif }}>$tab.label</a></li>
+	{{ endfor }}
+	<div id="tabs-end"></div>
+</ul>
diff --git a/view/theme/decaf-mobile/contact_block.tpl b/view/theme/decaf-mobile/contact_block.tpl
new file mode 100644
index 0000000000..a8e34fce16
--- /dev/null
+++ b/view/theme/decaf-mobile/contact_block.tpl
@@ -0,0 +1,12 @@
+{#<!--<div id="contact-block">
+<h4 class="contact-block-h4">$contacts</h4>
+{{ if $micropro }}
+		<a class="allcontact-link" href="viewcontacts/$nickname">$viewcontacts</a>
+		<div class='contact-block-content'>
+		{{ for $micropro as $m }}
+			$m
+		{{ endfor }}
+		</div>
+{{ endif }}
+</div>
+<div class="clear"></div>-->#}
diff --git a/view/theme/decaf-mobile/contact_edit.tpl b/view/theme/decaf-mobile/contact_edit.tpl
new file mode 100644
index 0000000000..908212b48c
--- /dev/null
+++ b/view/theme/decaf-mobile/contact_edit.tpl
@@ -0,0 +1,93 @@
+
+<h2>$header</h2>
+
+<div id="contact-edit-wrapper" >
+
+	$tab_str
+
+	<div id="contact-edit-drop-link-wrapper" >
+		<a href="contacts/$contact_id/drop?confirm=1" class="icon drophide" id="contact-edit-drop-link" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'contacts/$contact_id/drop')});"  title="$delete" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#}></a>
+	</div>
+
+	<div id="contact-edit-drop-link-end"></div>
+
+	<div class="vcard">
+		<div class="fn">$name</div>
+		<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="$photo" alt="$name" /></div>
+	</div>
+
+
+	<div id="contact-edit-nav-wrapper" >
+		<div id="contact-edit-links">
+			<ul>
+				<li><div id="contact-edit-rel">$relation_text</div></li>
+				<li><div id="contact-edit-nettype">$nettype</div></li>
+				{{ if $lost_contact }}
+					<li><div id="lost-contact-message">$lost_contact</div></li>
+				{{ endif }}
+				{{ if $insecure }}
+					<li><div id="insecure-message">$insecure</div></li>
+				{{ endif }}
+				{{ if $blocked }}
+					<li><div id="block-message">$blocked</div></li>
+				{{ endif }}
+				{{ if $ignored }}
+					<li><div id="ignore-message">$ignored</div></li>
+				{{ endif }}
+				{{ if $archived }}
+					<li><div id="archive-message">$archived</div></li>
+				{{ endif }}
+
+				<li>&nbsp;</li>
+
+				{{ if $common_text }}
+					<li><div id="contact-edit-common"><a href="$common_link">$common_text</a></div></li>
+				{{ endif }}
+				{{ if $all_friends }}
+					<li><div id="contact-edit-allfriends"><a href="allfriends/$contact_id">$all_friends</a></div></li>
+				{{ endif }}
+
+
+				<li><a href="network/?cid=$contact_id" id="contact-edit-view-recent">$lblrecent</a></li>
+				{{ if $lblsuggest }}
+					<li><a href="fsuggest/$contact_id" id="contact-edit-suggest">$lblsuggest</a></li>
+				{{ endif }}
+
+			</ul>
+		</div>
+	</div>
+	<div id="contact-edit-nav-end"></div>
+
+
+<form action="contacts/$contact_id" method="post" >
+<input type="hidden" name="contact_id" value="$contact_id">
+
+	{{ if $poll_enabled }}
+		<div id="contact-edit-poll-wrapper">
+			<div id="contact-edit-last-update-text">$lastupdtext <span id="contact-edit-last-updated">$last_update</span></div>
+			<span id="contact-edit-poll-text">$updpub $poll_interval</span> <span id="contact-edit-update-now" class="button"><a id="update_now_link" href="contacts/$contact_id/update" >$udnow</a></span>
+		</div>
+	{{ endif }}
+	<div id="contact-edit-end" ></div>
+
+	{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
+
+<div id="contact-edit-info-wrapper">
+<h4>$lbl_info1</h4>
+	<textarea id="contact-edit-info" rows="8"{# cols="35"#} name="info">$info</textarea>
+	<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
+</div>
+<div id="contact-edit-info-end"></div>
+
+
+<div id="contact-edit-profile-select-text">
+<h4>$lbl_vis1</h4>
+<p>$lbl_vis2</p> 
+</div>
+$profile_select
+<div id="contact-edit-profile-select-end"></div>
+
+<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
+
+</form>
+</div>
diff --git a/view/theme/decaf-mobile/contact_head.tpl b/view/theme/decaf-mobile/contact_head.tpl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/view/theme/decaf-mobile/contact_template.tpl b/view/theme/decaf-mobile/contact_template.tpl
new file mode 100644
index 0000000000..4ef0405b7b
--- /dev/null
+++ b/view/theme/decaf-mobile/contact_template.tpl
@@ -0,0 +1,38 @@
+
+<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);" 
+		onmouseout="t$contact.id=setTimeout('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>-->#}
+			{#<!--<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">-->#}
+			<a href="$contact.photo_menu.edit.1" title="$contact.photo_menu.edit.0">
+			<img src="$contact.thumb" $contact.sparkle alt="$contact.name" />
+			</a>
+			{#<!--</span>-->#}
+
+{#<!--			{{ 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>
+						{{ for $contact.photo_menu as $c }}
+						{{ if $c.2 }}
+						<li><a target="redir" href="$c.1">$c.0</a></li>
+						{{ else }}
+						<li><a href="$c.1">$c.0</a></li>
+						{{ endif }}
+						{{ endfor }}
+                    </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><br />
+{{ if $contact.alt_text }}<div class="contact-entry-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
+	<div class="contact-entry-network" id="contact-entry-network-$contact.id" >$contact.network</div>
+
+	<div class="contact-entry-end" ></div>
+</div>
diff --git a/view/theme/decaf-mobile/contacts-end.tpl b/view/theme/decaf-mobile/contacts-end.tpl
new file mode 100644
index 0000000000..fea596360b
--- /dev/null
+++ b/view/theme/decaf-mobile/contacts-end.tpl
@@ -0,0 +1,4 @@
+{#<!--
+<script src="$baseurl/library/jquery_ac/friendica.complete.min.js" ></script>
+
+-->#}
diff --git a/view/theme/decaf-mobile/contacts-head.tpl b/view/theme/decaf-mobile/contacts-head.tpl
new file mode 100644
index 0000000000..6c7355f4c7
--- /dev/null
+++ b/view/theme/decaf-mobile/contacts-head.tpl
@@ -0,0 +1,5 @@
+{#<!--
+<script>
+	window.autocompleteType = 'contacts-head';
+</script>
+-->#}
diff --git a/view/theme/decaf-mobile/contacts-template.tpl b/view/theme/decaf-mobile/contacts-template.tpl
new file mode 100644
index 0000000000..76254c1ca8
--- /dev/null
+++ b/view/theme/decaf-mobile/contacts-template.tpl
@@ -0,0 +1,28 @@
+<h1>$header{{ if $total }} ($total){{ endif }}</h1>
+
+{{ if $finding }}<h4>$finding</h4>{{ endif }}
+
+<div id="contacts-search-wrapper">
+<form id="contacts-search-form" action="$cmd" method="get" >
+<span class="contacts-search-desc">$desc</span>
+<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="$search" />
+<input type="submit" name="submit" id="contacts-search-submit" value="$submit" />
+</form>
+</div>
+<div id="contacts-search-end"></div>
+
+$tabs
+
+
+<div id="contacts-display-wrapper">
+{{ for $contacts as $contact }}
+	{{ inc contact_template.tpl }}{{ endinc }}
+{{ endfor }}
+</div>
+<div id="contact-edit-end"></div>
+
+$paginate
+
+
+
+
diff --git a/view/theme/decaf-mobile/contacts-widget-sidebar.tpl b/view/theme/decaf-mobile/contacts-widget-sidebar.tpl
new file mode 100644
index 0000000000..1c63f9eab2
--- /dev/null
+++ b/view/theme/decaf-mobile/contacts-widget-sidebar.tpl
@@ -0,0 +1,2 @@
+$follow_widget
+
diff --git a/view/theme/decaf-mobile/conversation.tpl b/view/theme/decaf-mobile/conversation.tpl
new file mode 100644
index 0000000000..d39976f39f
--- /dev/null
+++ b/view/theme/decaf-mobile/conversation.tpl
@@ -0,0 +1,29 @@
+$live_update
+
+{{ 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 }}
+
+<div id="conversation-end"></div>
+
+{#<!--{{ 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/decaf-mobile/cropbody.tpl b/view/theme/decaf-mobile/cropbody.tpl
new file mode 100644
index 0000000000..3283084cad
--- /dev/null
+++ b/view/theme/decaf-mobile/cropbody.tpl
@@ -0,0 +1,27 @@
+<h1>$title</h1>
+<p id="cropimage-desc">
+$desc
+</p>
+<div id="cropimage-wrapper">
+<img src="$image_url" id="croppa" class="imgCrop" alt="$title" />
+</div>
+<div id="cropimage-preview-wrapper" >
+<div id="previewWrap" ></div>
+</div>
+
+<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" />
+<input type="hidden" name="ystart" id="y1" />
+<input type="hidden" name="xfinal" id="x2" />
+<input type="hidden" name="yfinal" id="y2" />
+<input type="hidden" name="height" id="height" />
+<input type="hidden" name="width"  id="width" />
+
+<div id="crop-image-submit-wrapper" >
+<input type="submit" name="submit" value="$done" />
+</div>
+
+</form>
diff --git a/view/theme/decaf-mobile/cropend.tpl b/view/theme/decaf-mobile/cropend.tpl
new file mode 100644
index 0000000000..a27de0e2f8
--- /dev/null
+++ b/view/theme/decaf-mobile/cropend.tpl
@@ -0,0 +1,4 @@
+{#<!--      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
+      <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
+      <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
+      <script type="text/javascript" language="javascript">initCrop();</script>-->#}
diff --git a/view/theme/decaf-mobile/crophead.tpl b/view/theme/decaf-mobile/crophead.tpl
new file mode 100644
index 0000000000..56e941e3ab
--- /dev/null
+++ b/view/theme/decaf-mobile/crophead.tpl
@@ -0,0 +1 @@
+      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/theme/decaf-mobile/default.php b/view/theme/decaf-mobile/default.php
new file mode 100644
index 0000000000..ad464760f7
--- /dev/null
+++ b/view/theme/decaf-mobile/default.php
@@ -0,0 +1,44 @@
+<!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($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>
+	<?php if(x($page,'nav')) echo $page['nav']; ?>
+
+	<?php if( $a->module === 'home' ) { ?>
+	<center>
+	<div class="login-button">
+	<a href="login" class="login-button-link"><img class="login-button-image" src="images/friendica-1600.png" title="Click to log in"></a>
+	</div>
+	</center>
+
+	<?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
+	?>
+	<div class='section-wrapper'>
+	<section><?php if(x($page,'content')) echo $page['content']; ?>
+	</section>
+	</div>
+	<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+
+	<?php } else { ?>
+	<div class='main-container'>
+<!--		<div class='main-content-container'>-->
+		<div class='section-wrapper'>
+		<?php if( ($a->module === 'settings' || $a->module === 'message' || $a->module === 'profile') && x($page,'aside')) echo $page['aside']; ?>
+		<section><?php if(x($page,'content')) echo $page['content']; ?>
+			<div id="page-footer"></div>
+		</section>
+		</div>
+		<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
+		<?php if( ($a->module === 'contacts') && x($page,'aside')) echo $page['aside']; ?>
+		<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+<!--		</div>-->
+	</div>
+	<?php } ?>
+	<?php if(x($page,'end')) echo $page['end']; ?>
+</body>
+</html>
+
diff --git a/view/theme/decaf-mobile/display-head.tpl b/view/theme/decaf-mobile/display-head.tpl
new file mode 100644
index 0000000000..1c990657f0
--- /dev/null
+++ b/view/theme/decaf-mobile/display-head.tpl
@@ -0,0 +1,4 @@
+{#<!--<script>
+	window.autoCompleteType = 'display-head';
+</script>
+-->#}
diff --git a/view/theme/decaf-mobile/editicons.png b/view/theme/decaf-mobile/editicons.png
new file mode 100644
index 0000000000..171a408765
Binary files /dev/null and b/view/theme/decaf-mobile/editicons.png differ
diff --git a/view/theme/decaf-mobile/end.tpl b/view/theme/decaf-mobile/end.tpl
new file mode 100644
index 0000000000..cb3824d9d1
--- /dev/null
+++ b/view/theme/decaf-mobile/end.tpl
@@ -0,0 +1,24 @@
+<!--[if IE]>
+<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+{#<!--<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
+<script type="text/javascript">
+  tinyMCE.init({ mode : "none"});
+</script>-->#}
+{#<!--<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
+<script type="text/javascript">var $j = jQuery.noConflict();</script>
+<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/jquery.divgrow-1.3.1.f1.js" ></script>
+<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
+<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/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/view/theme/decaf-mobile/js/acl.js" ></script>
+<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script>
+<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/main.js" ></script>-->#}
+<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/theme.js"></script>
+
+<!--<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/jquery.package.js" ></script>
+<script type="text/javascript">var $j = jQuery.noConflict();</script>
+<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/decaf-mobile.package.js" ></script>-->
+
diff --git a/view/theme/decaf-mobile/event_end.tpl b/view/theme/decaf-mobile/event_end.tpl
new file mode 100644
index 0000000000..3e4be6ec61
--- /dev/null
+++ b/view/theme/decaf-mobile/event_end.tpl
@@ -0,0 +1,4 @@
+{#<!--<script language="javascript" type="text/javascript"
+          src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
+
+-->#}
diff --git a/view/theme/decaf-mobile/event_head.tpl b/view/theme/decaf-mobile/event_head.tpl
new file mode 100644
index 0000000000..63a1135af6
--- /dev/null
+++ b/view/theme/decaf-mobile/event_head.tpl
@@ -0,0 +1,6 @@
+<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' />
+{#<!--
+<script language="javascript" type="text/javascript">
+window.aclType = 'event_head';
+</script>
+-->#}
diff --git a/view/theme/decaf-mobile/field_checkbox.tpl b/view/theme/decaf-mobile/field_checkbox.tpl
new file mode 100644
index 0000000000..9fbf84eac9
--- /dev/null
+++ b/view/theme/decaf-mobile/field_checkbox.tpl
@@ -0,0 +1,6 @@
+	
+	<div class='field checkbox' id='div_id_$field.0'>
+		<label id='label_id_$field.0' for='id_$field.0'>$field.1</label>
+		<input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="checked"{{ endif }}><br />
+		<span class='field_help' id='help_id_$field.0'>$field.3</span>
+	</div>
diff --git a/view/theme/decaf-mobile/field_input.tpl b/view/theme/decaf-mobile/field_input.tpl
new file mode 100644
index 0000000000..58e17406c0
--- /dev/null
+++ b/view/theme/decaf-mobile/field_input.tpl
@@ -0,0 +1,6 @@
+	
+	<div class='field input' id='wrapper_$field.0'>
+		<label for='id_$field.0'>$field.1</label><br />
+		<input name='$field.0' id='id_$field.0' value="$field.2">
+		<span class='field_help'>$field.3</span>
+	</div>
diff --git a/view/theme/decaf-mobile/field_openid.tpl b/view/theme/decaf-mobile/field_openid.tpl
new file mode 100644
index 0000000000..8d330a30a0
--- /dev/null
+++ b/view/theme/decaf-mobile/field_openid.tpl
@@ -0,0 +1,6 @@
+	
+	<div class='field input openid' id='wrapper_$field.0'>
+		<label for='id_$field.0'>$field.1</label><br />
+		<input name='$field.0' id='id_$field.0' value="$field.2">
+		<span class='field_help'>$field.3</span>
+	</div>
diff --git a/view/theme/decaf-mobile/field_password.tpl b/view/theme/decaf-mobile/field_password.tpl
new file mode 100644
index 0000000000..7a0d3fe9f4
--- /dev/null
+++ b/view/theme/decaf-mobile/field_password.tpl
@@ -0,0 +1,6 @@
+	
+	<div class='field password' id='wrapper_$field.0'>
+		<label for='id_$field.0'>$field.1</label><br />
+		<input type='password' name='$field.0' id='id_$field.0' value="$field.2">
+		<span class='field_help'>$field.3</span>
+	</div>
diff --git a/view/theme/decaf-mobile/field_themeselect.tpl b/view/theme/decaf-mobile/field_themeselect.tpl
new file mode 100644
index 0000000000..5ac310f804
--- /dev/null
+++ b/view/theme/decaf-mobile/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' {#{{ if $field.5 }}onchange="previewTheme(this);"{{ endif }}#} >
+			{{ 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/theme/decaf-mobile/field_yesno.tpl b/view/theme/decaf-mobile/field_yesno.tpl
new file mode 100644
index 0000000000..c399579b29
--- /dev/null
+++ b/view/theme/decaf-mobile/field_yesno.tpl
@@ -0,0 +1,14 @@
+{#<!--	<div class='field yesno'>
+		<label for='id_$field.0'>$field.1</label>
+		<div class='onoff' id="id_$field.0_onoff">
+			<input  type="hidden" name='$field.0' id='id_$field.0' value="$field.2">
+			<a href="#" class='off'>
+				{{ if $field.4 }}$field.4.0{{ else }}OFF{{ endif }}
+			</a>
+			<a href="#" class='on'>
+				{{ if $field.4 }}$field.4.1{{ else }}ON{{ endif }}
+			</a>
+		</div>
+		<span class='field_help'>$field.3</span>
+	</div>-->#}
+{{ inc field_checkbox.tpl }}{{ endinc }}
diff --git a/view/theme/decaf-mobile/file.gif b/view/theme/decaf-mobile/file.gif
new file mode 100644
index 0000000000..7885b998d5
Binary files /dev/null and b/view/theme/decaf-mobile/file.gif differ
diff --git a/view/theme/decaf-mobile/friendica-16.png b/view/theme/decaf-mobile/friendica-16.png
new file mode 100644
index 0000000000..1a742ecdc1
Binary files /dev/null and b/view/theme/decaf-mobile/friendica-16.png differ
diff --git a/view/theme/decaf-mobile/generic_links_widget.tpl b/view/theme/decaf-mobile/generic_links_widget.tpl
new file mode 100644
index 0000000000..a976d4573c
--- /dev/null
+++ b/view/theme/decaf-mobile/generic_links_widget.tpl
@@ -0,0 +1,12 @@
+<div class="widget{{ if $class }} $class{{ endif }}">
+{#<!--	{{if $title}}<h3>$title</h3>{{endif}}-->#}
+	{{if $desc}}<div class="desc">$desc</div>{{endif}}
+	
+	<ul class="tabs links-widget">
+		{{ for $items as $item }}
+			<li class="tool"><a href="$item.url" class="tab {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
+		{{ endfor }}
+		<div id="tabs-end"></div>
+	</ul>
+	
+</div>
diff --git a/view/theme/decaf-mobile/group_drop.tpl b/view/theme/decaf-mobile/group_drop.tpl
new file mode 100644
index 0000000000..959b77bb21
--- /dev/null
+++ b/view/theme/decaf-mobile/group_drop.tpl
@@ -0,0 +1,9 @@
+<div class="group-delete-wrapper button" id="group-delete-wrapper-$id" >
+	<a href="group/drop/$id?t=$form_security_token" 
+		onclick="return confirmDelete();" 
+		id="group-delete-icon-$id" 
+		class="icon drophide group-delete-icon" 
+		{#onmouseover="imgbright(this);" 
+		onmouseout="imgdull(this);"#} ></a>
+</div>
+<div class="group-delete-end"></div>
diff --git a/view/theme/decaf-mobile/group_side.tpl b/view/theme/decaf-mobile/group_side.tpl
new file mode 100644
index 0000000000..0b4564077a
--- /dev/null
+++ b/view/theme/decaf-mobile/group_side.tpl
@@ -0,0 +1,33 @@
+<div class="widget" id="group-sidebar">
+<h3>$title</h3>
+
+<div id="sidebar-group-list">
+	<ul id="sidebar-group-ul">
+		{{ for $groups as $group }}
+			<li class="sidebar-group-li">
+				{{ if $group.cid }}
+					<input type="checkbox" 
+						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
+						{#onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"#}
+						{{ if $group.ismember }}checked="checked"{{ endif }}
+					/>
+				{{ endif }}			
+				{{ if $group.edit }}
+					<a class="groupsideedit" href="$group.edit.href" title="$edittext"><span id="edit-sidebar-group-element-$group.id" class="group-edit-icon iconspacer small-pencil"></span></a>
+				{{ endif }}
+				<a id="sidebar-group-element-$group.id" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
+			</li>
+		{{ endfor }}
+	</ul>
+	</div>
+  <div id="sidebar-new-group">
+  <a href="group/new">$createtext</a>
+  </div>
+  {{ if $ungrouped }}
+  <div id="sidebar-ungrouped">
+  <a href="nogroup">$ungrouped</a>
+  </div>
+  {{ endif }}
+</div>
+
+
diff --git a/view/theme/decaf-mobile/head.jpg b/view/theme/decaf-mobile/head.jpg
new file mode 100644
index 0000000000..6210b76bef
Binary files /dev/null and b/view/theme/decaf-mobile/head.jpg differ
diff --git a/view/theme/decaf-mobile/head.tpl b/view/theme/decaf-mobile/head.tpl
new file mode 100644
index 0000000000..5ad82b4c5d
--- /dev/null
+++ b/view/theme/decaf-mobile/head.tpl
@@ -0,0 +1,29 @@
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+{#<!--<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
+<meta content='True' name='HandheldFriendly'>
+<meta content='320' name='MobileOptimized'>-->#}
+<meta name="viewport" content="width=device-width; initial-scale = 1.0; maximum-scale=1.0; user-scalable=no" />
+{#<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->#}
+
+<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" />
+
+<script>
+	window.delItem = "$delitem";
+{#/*	window.commentEmptyText = "$comment";
+	window.showMore = "$showmore";
+	window.showFewer = "$showfewer";
+	var updateInterval = $update_interval;
+	var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};*/#}
+</script>
diff --git a/view/theme/decaf-mobile/images/approve-blue.png b/view/theme/decaf-mobile/images/approve-blue.png
new file mode 100644
index 0000000000..a13668a503
Binary files /dev/null and b/view/theme/decaf-mobile/images/approve-blue.png differ
diff --git a/view/theme/decaf-mobile/images/approve.png b/view/theme/decaf-mobile/images/approve.png
new file mode 100644
index 0000000000..473c646e57
Binary files /dev/null and b/view/theme/decaf-mobile/images/approve.png differ
diff --git a/view/theme/decaf-mobile/images/arrow-left.png b/view/theme/decaf-mobile/images/arrow-left.png
new file mode 100644
index 0000000000..a312cfa71e
Binary files /dev/null and b/view/theme/decaf-mobile/images/arrow-left.png differ
diff --git a/view/theme/decaf-mobile/images/arrow-right.png b/view/theme/decaf-mobile/images/arrow-right.png
new file mode 100644
index 0000000000..2be9bd746e
Binary files /dev/null and b/view/theme/decaf-mobile/images/arrow-right.png differ
diff --git a/view/theme/decaf-mobile/images/boldB-serif.png b/view/theme/decaf-mobile/images/boldB-serif.png
new file mode 100644
index 0000000000..78ce59a547
Binary files /dev/null and b/view/theme/decaf-mobile/images/boldB-serif.png differ
diff --git a/view/theme/decaf-mobile/images/camera.png b/view/theme/decaf-mobile/images/camera.png
new file mode 100644
index 0000000000..aa5935b7c0
Binary files /dev/null and b/view/theme/decaf-mobile/images/camera.png differ
diff --git a/view/theme/decaf-mobile/images/code.png b/view/theme/decaf-mobile/images/code.png
new file mode 100644
index 0000000000..d490cea9da
Binary files /dev/null and b/view/theme/decaf-mobile/images/code.png differ
diff --git a/view/theme/decaf-mobile/images/contacts.png b/view/theme/decaf-mobile/images/contacts.png
new file mode 100644
index 0000000000..e870470d09
Binary files /dev/null and b/view/theme/decaf-mobile/images/contacts.png differ
diff --git a/view/theme/decaf-mobile/images/disapprove-blue.png b/view/theme/decaf-mobile/images/disapprove-blue.png
new file mode 100644
index 0000000000..ebbc7e4e69
Binary files /dev/null and b/view/theme/decaf-mobile/images/disapprove-blue.png differ
diff --git a/view/theme/decaf-mobile/images/disapprove.png b/view/theme/decaf-mobile/images/disapprove.png
new file mode 100644
index 0000000000..fa58d020eb
Binary files /dev/null and b/view/theme/decaf-mobile/images/disapprove.png differ
diff --git a/view/theme/decaf-mobile/images/drop-blue.png b/view/theme/decaf-mobile/images/drop-blue.png
new file mode 100644
index 0000000000..a8b6c53c91
Binary files /dev/null and b/view/theme/decaf-mobile/images/drop-blue.png differ
diff --git a/view/theme/decaf-mobile/images/drop-darkred.png b/view/theme/decaf-mobile/images/drop-darkred.png
new file mode 100644
index 0000000000..9657d11387
Binary files /dev/null and b/view/theme/decaf-mobile/images/drop-darkred.png differ
diff --git a/view/theme/decaf-mobile/images/drop-red.png b/view/theme/decaf-mobile/images/drop-red.png
new file mode 100644
index 0000000000..91b0260ce1
Binary files /dev/null and b/view/theme/decaf-mobile/images/drop-red.png differ
diff --git a/view/theme/decaf-mobile/images/drop.png b/view/theme/decaf-mobile/images/drop.png
new file mode 100644
index 0000000000..af38adf5e1
Binary files /dev/null and b/view/theme/decaf-mobile/images/drop.png differ
diff --git a/view/theme/decaf-mobile/images/folder-blue.png b/view/theme/decaf-mobile/images/folder-blue.png
new file mode 100644
index 0000000000..6af9bbec0d
Binary files /dev/null and b/view/theme/decaf-mobile/images/folder-blue.png differ
diff --git a/view/theme/decaf-mobile/images/folder.png b/view/theme/decaf-mobile/images/folder.png
new file mode 100644
index 0000000000..86dd21029a
Binary files /dev/null and b/view/theme/decaf-mobile/images/folder.png differ
diff --git a/view/theme/decaf-mobile/images/globe.png b/view/theme/decaf-mobile/images/globe.png
new file mode 100644
index 0000000000..f84632bff6
Binary files /dev/null and b/view/theme/decaf-mobile/images/globe.png differ
diff --git a/view/theme/decaf-mobile/images/italicI-serif.png b/view/theme/decaf-mobile/images/italicI-serif.png
new file mode 100644
index 0000000000..86fa40f9c5
Binary files /dev/null and b/view/theme/decaf-mobile/images/italicI-serif.png differ
diff --git a/view/theme/decaf-mobile/images/lock.png b/view/theme/decaf-mobile/images/lock.png
new file mode 100644
index 0000000000..b8b8cd20e0
Binary files /dev/null and b/view/theme/decaf-mobile/images/lock.png differ
diff --git a/view/theme/decaf-mobile/images/menu.png b/view/theme/decaf-mobile/images/menu.png
new file mode 100644
index 0000000000..44d5285fe0
Binary files /dev/null and b/view/theme/decaf-mobile/images/menu.png differ
diff --git a/view/theme/decaf-mobile/images/message.png b/view/theme/decaf-mobile/images/message.png
new file mode 100644
index 0000000000..8f735aed09
Binary files /dev/null and b/view/theme/decaf-mobile/images/message.png differ
diff --git a/view/theme/decaf-mobile/images/network.png b/view/theme/decaf-mobile/images/network.png
new file mode 100644
index 0000000000..943e3252ff
Binary files /dev/null and b/view/theme/decaf-mobile/images/network.png differ
diff --git a/view/theme/decaf-mobile/images/noglobe.png b/view/theme/decaf-mobile/images/noglobe.png
new file mode 100644
index 0000000000..b5aceb6d5f
Binary files /dev/null and b/view/theme/decaf-mobile/images/noglobe.png differ
diff --git a/view/theme/decaf-mobile/images/notifications.png b/view/theme/decaf-mobile/images/notifications.png
new file mode 100644
index 0000000000..27bacc6727
Binary files /dev/null and b/view/theme/decaf-mobile/images/notifications.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/LICENSE b/view/theme/decaf-mobile/images/oxygen/LICENSE
new file mode 100644
index 0000000000..65c5ca88a6
--- /dev/null
+++ b/view/theme/decaf-mobile/images/oxygen/LICENSE
@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/view/theme/decaf-mobile/images/oxygen/application-msword.png b/view/theme/decaf-mobile/images/oxygen/application-msword.png
new file mode 100644
index 0000000000..aa5aaf31a1
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-msword.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-pdf.png b/view/theme/decaf-mobile/images/oxygen/application-pdf.png
new file mode 100644
index 0000000000..bc954ff646
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-pdf.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-vnd.ms-excel.png b/view/theme/decaf-mobile/images/oxygen/application-vnd.ms-excel.png
new file mode 100644
index 0000000000..aa0d99597e
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-vnd.ms-excel.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-vnd.ms-powerpoint.png b/view/theme/decaf-mobile/images/oxygen/application-vnd.ms-powerpoint.png
new file mode 100644
index 0000000000..022b5152ed
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-vnd.ms-powerpoint.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-vnd.oasis.opendocument.presentation.png b/view/theme/decaf-mobile/images/oxygen/application-vnd.oasis.opendocument.presentation.png
new file mode 100644
index 0000000000..cb573b5c7c
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-vnd.oasis.opendocument.presentation.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-vnd.oasis.opendocument.spreadsheet.png b/view/theme/decaf-mobile/images/oxygen/application-vnd.oasis.opendocument.spreadsheet.png
new file mode 100644
index 0000000000..6b8030edd7
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-vnd.oasis.opendocument.spreadsheet.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-vnd.oasis.opendocument.text.png b/view/theme/decaf-mobile/images/oxygen/application-vnd.oasis.opendocument.text.png
new file mode 100644
index 0000000000..1adb56e251
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-vnd.oasis.opendocument.text.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-bzip-compressed-tar.png b/view/theme/decaf-mobile/images/oxygen/application-x-bzip-compressed-tar.png
new file mode 100644
index 0000000000..d7dd1d1fb6
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-bzip-compressed-tar.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-compressed-tar.png b/view/theme/decaf-mobile/images/oxygen/application-x-compressed-tar.png
new file mode 100644
index 0000000000..adda685059
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-compressed-tar.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-deb.png b/view/theme/decaf-mobile/images/oxygen/application-x-deb.png
new file mode 100644
index 0000000000..1832d3b73a
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-deb.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-font-otf.png b/view/theme/decaf-mobile/images/oxygen/application-x-font-otf.png
new file mode 100644
index 0000000000..68fb5dd017
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-font-otf.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-font-ttf.png b/view/theme/decaf-mobile/images/oxygen/application-x-font-ttf.png
new file mode 100644
index 0000000000..93b92fb26f
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-font-ttf.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-java-archive.png b/view/theme/decaf-mobile/images/oxygen/application-x-java-archive.png
new file mode 100644
index 0000000000..4883b2d7ab
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-java-archive.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-lzma-compressed-tar.png b/view/theme/decaf-mobile/images/oxygen/application-x-lzma-compressed-tar.png
new file mode 100644
index 0000000000..6092aedd3e
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-lzma-compressed-tar.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-php.png b/view/theme/decaf-mobile/images/oxygen/application-x-php.png
new file mode 100644
index 0000000000..f133c87a2e
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-php.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-rar.png b/view/theme/decaf-mobile/images/oxygen/application-x-rar.png
new file mode 100644
index 0000000000..a9b1b12a64
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-rar.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-rpm.png b/view/theme/decaf-mobile/images/oxygen/application-x-rpm.png
new file mode 100644
index 0000000000..43149f17e4
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-rpm.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-ruby.png b/view/theme/decaf-mobile/images/oxygen/application-x-ruby.png
new file mode 100644
index 0000000000..e640ead732
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-ruby.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-shellscript.png b/view/theme/decaf-mobile/images/oxygen/application-x-shellscript.png
new file mode 100644
index 0000000000..11e27543f6
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-shellscript.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-shockwave-flash.png b/view/theme/decaf-mobile/images/oxygen/application-x-shockwave-flash.png
new file mode 100644
index 0000000000..ea9ca59ee9
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-shockwave-flash.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-x-tar.png b/view/theme/decaf-mobile/images/oxygen/application-x-tar.png
new file mode 100644
index 0000000000..4b7d023f79
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-x-tar.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-xml.png b/view/theme/decaf-mobile/images/oxygen/application-xml.png
new file mode 100644
index 0000000000..58d32e4384
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-xml.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/application-zip.png b/view/theme/decaf-mobile/images/oxygen/application-zip.png
new file mode 100644
index 0000000000..9d349a89a6
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/application-zip.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/audio-aac.png b/view/theme/decaf-mobile/images/oxygen/audio-aac.png
new file mode 100644
index 0000000000..a2d5177d9a
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/audio-aac.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/audio-mp4.png b/view/theme/decaf-mobile/images/oxygen/audio-mp4.png
new file mode 100644
index 0000000000..ae5fd740f6
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/audio-mp4.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/audio-mpeg.png b/view/theme/decaf-mobile/images/oxygen/audio-mpeg.png
new file mode 100644
index 0000000000..5fe3a23594
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/audio-mpeg.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/audio-x-flac.png b/view/theme/decaf-mobile/images/oxygen/audio-x-flac.png
new file mode 100644
index 0000000000..f2f11e8636
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/audio-x-flac.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/audio-x-generic.png b/view/theme/decaf-mobile/images/oxygen/audio-x-generic.png
new file mode 100644
index 0000000000..fe7b052772
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/audio-x-generic.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/audio-x-mp2.png b/view/theme/decaf-mobile/images/oxygen/audio-x-mp2.png
new file mode 100644
index 0000000000..5ac7909920
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/audio-x-mp2.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/audio-x-ms-wma.png b/view/theme/decaf-mobile/images/oxygen/audio-x-ms-wma.png
new file mode 100644
index 0000000000..86cb3e51c8
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/audio-x-ms-wma.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/audio-x-vorbis+ogg.png b/view/theme/decaf-mobile/images/oxygen/audio-x-vorbis+ogg.png
new file mode 100644
index 0000000000..5ac7909920
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/audio-x-vorbis+ogg.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/audio-x-wav.png b/view/theme/decaf-mobile/images/oxygen/audio-x-wav.png
new file mode 100644
index 0000000000..101f8fe5b1
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/audio-x-wav.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/image-x-generic.png b/view/theme/decaf-mobile/images/oxygen/image-x-generic.png
new file mode 100644
index 0000000000..d1d4e256c8
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/image-x-generic.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/text-css.png b/view/theme/decaf-mobile/images/oxygen/text-css.png
new file mode 100644
index 0000000000..119aec52cc
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/text-css.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/text-html.png b/view/theme/decaf-mobile/images/oxygen/text-html.png
new file mode 100644
index 0000000000..34768bfbe5
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/text-html.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/text-x-generic-2.png b/view/theme/decaf-mobile/images/oxygen/text-x-generic-2.png
new file mode 100644
index 0000000000..70be9bfc3a
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/text-x-generic-2.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/text-x-tex.png b/view/theme/decaf-mobile/images/oxygen/text-x-tex.png
new file mode 100644
index 0000000000..23d8bf7cae
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/text-x-tex.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/unknown.png b/view/theme/decaf-mobile/images/oxygen/unknown.png
new file mode 100644
index 0000000000..eb1758ae15
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/unknown.png differ
diff --git a/view/theme/decaf-mobile/images/oxygen/video-x-generic.png b/view/theme/decaf-mobile/images/oxygen/video-x-generic.png
new file mode 100644
index 0000000000..81fe23e7e8
Binary files /dev/null and b/view/theme/decaf-mobile/images/oxygen/video-x-generic.png differ
diff --git a/view/theme/decaf-mobile/images/paperclip.png b/view/theme/decaf-mobile/images/paperclip.png
new file mode 100644
index 0000000000..3a2ee26966
Binary files /dev/null and b/view/theme/decaf-mobile/images/paperclip.png differ
diff --git a/view/theme/decaf-mobile/images/pencil-blue.png b/view/theme/decaf-mobile/images/pencil-blue.png
new file mode 100644
index 0000000000..f51ddd4fe2
Binary files /dev/null and b/view/theme/decaf-mobile/images/pencil-blue.png differ
diff --git a/view/theme/decaf-mobile/images/pencil.png b/view/theme/decaf-mobile/images/pencil.png
new file mode 100644
index 0000000000..8078d30832
Binary files /dev/null and b/view/theme/decaf-mobile/images/pencil.png differ
diff --git a/view/theme/decaf-mobile/images/quote.png b/view/theme/decaf-mobile/images/quote.png
new file mode 100644
index 0000000000..93127c5e71
Binary files /dev/null and b/view/theme/decaf-mobile/images/quote.png differ
diff --git a/view/theme/decaf-mobile/images/recycle-blue.png b/view/theme/decaf-mobile/images/recycle-blue.png
new file mode 100644
index 0000000000..4129f05cd9
Binary files /dev/null and b/view/theme/decaf-mobile/images/recycle-blue.png differ
diff --git a/view/theme/decaf-mobile/images/recycle.png b/view/theme/decaf-mobile/images/recycle.png
new file mode 100644
index 0000000000..e5d8e1181b
Binary files /dev/null and b/view/theme/decaf-mobile/images/recycle.png differ
diff --git a/view/theme/decaf-mobile/images/remote-link-blue.png b/view/theme/decaf-mobile/images/remote-link-blue.png
new file mode 100644
index 0000000000..de8d21db64
Binary files /dev/null and b/view/theme/decaf-mobile/images/remote-link-blue.png differ
diff --git a/view/theme/decaf-mobile/images/remote-link.png b/view/theme/decaf-mobile/images/remote-link.png
new file mode 100644
index 0000000000..1f657411ae
Binary files /dev/null and b/view/theme/decaf-mobile/images/remote-link.png differ
diff --git a/view/theme/decaf-mobile/images/star-blue.png b/view/theme/decaf-mobile/images/star-blue.png
new file mode 100644
index 0000000000..f8783fcdac
Binary files /dev/null and b/view/theme/decaf-mobile/images/star-blue.png differ
diff --git a/view/theme/decaf-mobile/images/star-yellow.png b/view/theme/decaf-mobile/images/star-yellow.png
new file mode 100644
index 0000000000..cc2b884b2f
Binary files /dev/null and b/view/theme/decaf-mobile/images/star-yellow.png differ
diff --git a/view/theme/decaf-mobile/images/star.png b/view/theme/decaf-mobile/images/star.png
new file mode 100644
index 0000000000..f8a61a497c
Binary files /dev/null and b/view/theme/decaf-mobile/images/star.png differ
diff --git a/view/theme/decaf-mobile/images/tag-blue.png b/view/theme/decaf-mobile/images/tag-blue.png
new file mode 100644
index 0000000000..6e5cec80ed
Binary files /dev/null and b/view/theme/decaf-mobile/images/tag-blue.png differ
diff --git a/view/theme/decaf-mobile/images/tag.png b/view/theme/decaf-mobile/images/tag.png
new file mode 100644
index 0000000000..9c644b8232
Binary files /dev/null and b/view/theme/decaf-mobile/images/tag.png differ
diff --git a/view/theme/decaf-mobile/images/underlineU-serif.png b/view/theme/decaf-mobile/images/underlineU-serif.png
new file mode 100644
index 0000000000..745ca2cd6b
Binary files /dev/null and b/view/theme/decaf-mobile/images/underlineU-serif.png differ
diff --git a/view/theme/decaf-mobile/images/unlock.png b/view/theme/decaf-mobile/images/unlock.png
new file mode 100644
index 0000000000..81d9740e81
Binary files /dev/null and b/view/theme/decaf-mobile/images/unlock.png differ
diff --git a/view/theme/decaf-mobile/jot-end.tpl b/view/theme/decaf-mobile/jot-end.tpl
new file mode 100644
index 0000000000..59585d01d5
--- /dev/null
+++ b/view/theme/decaf-mobile/jot-end.tpl
@@ -0,0 +1,5 @@
+
+<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
+{#<!--
+<script>if(typeof window.jotInit != 'undefined') initEditor();</script>
+-->#}
diff --git a/view/theme/decaf-mobile/jot-header.tpl b/view/theme/decaf-mobile/jot-header.tpl
new file mode 100644
index 0000000000..c239aeecd8
--- /dev/null
+++ b/view/theme/decaf-mobile/jot-header.tpl
@@ -0,0 +1,17 @@
+
+<script>
+{#/*	var none = "none"; // ugly hack: $editselect shouldn't be a string if TinyMCE is enabled, but should if it isn't
+	window.editSelect = $editselect;
+	window.isPublic = "$ispublic";
+	window.nickname = "$nickname";
+	window.linkURL = "$linkurl";
+	window.vidURL = "$vidurl";
+	window.audURL = "$audurl";
+	window.whereAreU = "$whereareu";
+	window.term = "$term";
+	window.baseURL = "$baseurl";
+	window.geoTag = function () { $geotag }*/#}
+	window.jotId = "#profile-jot-text";
+	window.imageUploadButton = 'wall-image-upload';
+</script>
+
diff --git a/view/theme/decaf-mobile/jot.tpl b/view/theme/decaf-mobile/jot.tpl
new file mode 100644
index 0000000000..697a7c8094
--- /dev/null
+++ b/view/theme/decaf-mobile/jot.tpl
@@ -0,0 +1,99 @@
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey"></div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="$action" method="post" >
+		<input type="hidden" name="type" value="$ptyp" />
+		<input type="hidden" name="profile_uid" value="$profile_uid" />
+		<input type="hidden" name="return" value="$return_path" />
+		<input type="hidden" name="location" id="jot-location" value="$defloc" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="$post_id" />
+		<input type="hidden" name="source" value="$sourceapp" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="$rand_num" />
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" ></div>
+		{{ if $placeholdercategory }}
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" /></div>
+		{{ endif }}
+		<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" placeholder=$share >{{ if $content }}$content{{ 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-rotator-wrapper" style="display: $visitor;" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+	</div> 
+	
+	<div id="profile-upload-wrapper" style="display: $visitor;" >
+		<div id="wall-image-upload-div" style="display: none;" ><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" style="display: none;" ><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 id="profile-link-wrapper" style="display: $visitor;" >
+		<a id="profile-link" class="icon link" title="$weblink" 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="jot-preview-content" style="display:none;"></div>
+
+	{#<!--<div style="display: none;">-->#}
+		<div id="profile-jot-acl-wrapper">
+			{#<!--$acl
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+			$jotnets
+			<div id="profile-jot-networks-end"></div>-->#}
+			{{ if $acl_data }}
+			{{ inc acl_html_selector.tpl }}{{ endinc }}
+			{{ endif }}
+			$jotnets
+		</div>
+	{#<!--</div>-->#}
+
+
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+		{#<!--{{ if $content }}<script>window.jotInit = true;</script>{{ endif }}-->#}
+<script>
+document.getElementById('wall-image-upload-div').style.display = "inherit";
+document.getElementById('wall-file-upload-div').style.display = "inherit";
+</script>
diff --git a/view/theme/decaf-mobile/jot_geotag.tpl b/view/theme/decaf-mobile/jot_geotag.tpl
new file mode 100644
index 0000000000..3f8bee91a7
--- /dev/null
+++ b/view/theme/decaf-mobile/jot_geotag.tpl
@@ -0,0 +1,11 @@
+
+	if(navigator.geolocation) {
+		navigator.geolocation.getCurrentPosition(function(position) {
+			var lat = position.coords.latitude.toFixed(4);
+			var lon = position.coords.longitude.toFixed(4);
+
+			$j('#jot-coord').val(lat + ', ' + lon);
+			$j('#profile-nolocation-wrapper').show();
+		});
+	}
+
diff --git a/view/theme/decaf-mobile/js/theme.js b/view/theme/decaf-mobile/js/theme.js
new file mode 100644
index 0000000000..cd9a17f0dd
--- /dev/null
+++ b/view/theme/decaf-mobile/js/theme.js
@@ -0,0 +1,77 @@
+// For Firefox < 3.6, which doesn't support document.readyState
+// verify that document.readyState is undefined
+// verify that document.addEventListener is there
+// these two conditions are basically telling us
+// we are using Firefox < 3.6
+/*if(document.readyState == null && document.addEventListener){
+    // on DOMContentLoaded event, supported since ages
+    document.addEventListener("DOMContentLoaded", function DOMContentLoaded(){
+        // remove the listener itself
+        document.removeEventListener("DOMContentLoaded", DOMContentLoaded, false);
+        // assign readyState as complete
+        document.readyState = "complete";
+    }, false);
+    // set readyState = loading or interactive
+    // it does not really matter for this purpose
+    document.readyState = "loading";
+}*/
+
+document.addEventListener('DOMContentLoaded', function(){
+
+	if(typeof window.AjaxUpload != "undefined") {
+		var uploader = new window.AjaxUpload(
+			window.imageUploadButton,
+			{ action: 'wall_upload/'+window.nickname,
+				name: 'userfile',
+				onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					var currentText = $j(window.jotId).val();
+					$j(window.jotId).val(currentText + response);
+					$j('#profile-rotator').hide();
+				}				 
+			}
+		);
+
+		if(document.getElementById('wall-file-upload') != null) {
+			var file_uploader = new window.AjaxUpload(
+				'wall-file-upload',
+				{ action: 'wall_attach/'+window.nickname,
+					name: 'userfile',
+					onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
+					onComplete: function(file,response) {
+						var currentText = $j(window.jotId).val();
+						$j(window.jotId).val(currentText + response);
+						$j('#profile-rotator').hide();
+					}				 
+				}
+			);
+		}
+	}
+
+});
+
+function confirmDelete(f) {
+	response = confirm(window.delItem);
+	if(response && typeof f == 'function') {
+		f();
+	}
+	return response;
+}
+
+function changeHref(elemId, url) {
+	elem = document.getElementById(elemId);
+	elem.href = url;
+}
+
+function remove(elemId) {
+	elem = document.getElementById(elemId);
+	elem.parentNode.removeChild(elem);
+}
+
+function openClose(el) {}
+
+// It's better to separate Javascript from the HTML, but the wall_thread
+// items require more work to find since they contain the item ID in the id field
+//document.getElementById('photo-album-edit-drop').onclick = function(){return confirmDelete(function(){remove('photo-album-edit-form-confirm');});}
+//document.getElementById('photo-edit-delete-button').onclick = function(){return confirmDelete(function(){remove('photo-edit-form-confirm');});}
+
diff --git a/view/theme/decaf-mobile/lang_selector.tpl b/view/theme/decaf-mobile/lang_selector.tpl
new file mode 100644
index 0000000000..e777a0a861
--- /dev/null
+++ b/view/theme/decaf-mobile/lang_selector.tpl
@@ -0,0 +1,10 @@
+<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" ></div>
+<div id="language-selector" style="display: none;" >
+	<form action="#" method="post" >
+		<select name="system_language" onchange="this.form.submit();" >
+			{{ for $langs.0 as $v=>$l }}
+				<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
+			{{ endfor }}
+		</select>
+	</form>
+</div>
diff --git a/view/theme/decaf-mobile/like_noshare.tpl b/view/theme/decaf-mobile/like_noshare.tpl
new file mode 100644
index 0000000000..5e74850a7a
--- /dev/null
+++ b/view/theme/decaf-mobile/like_noshare.tpl
@@ -0,0 +1,7 @@
+<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+	<a href="like/$id?verb=like&return=$return_path#$item.id" class="icon like" title="$likethis" ></a>
+	{{ if $nolike }}
+	<a href="like/$id?verb=dislike&return=$return_path#$item.id" class="icon dislike" title="$nolike" ></a>
+	{{ endif }}
+	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+</div>
diff --git a/view/theme/decaf-mobile/lock.cur b/view/theme/decaf-mobile/lock.cur
new file mode 100644
index 0000000000..892c5e851e
Binary files /dev/null and b/view/theme/decaf-mobile/lock.cur differ
diff --git a/view/theme/decaf-mobile/login-bg.gif b/view/theme/decaf-mobile/login-bg.gif
new file mode 100644
index 0000000000..cde836c893
Binary files /dev/null and b/view/theme/decaf-mobile/login-bg.gif differ
diff --git a/view/theme/decaf-mobile/login-style.css b/view/theme/decaf-mobile/login-style.css
new file mode 100644
index 0000000000..bbb60ebabb
--- /dev/null
+++ b/view/theme/decaf-mobile/login-style.css
@@ -0,0 +1,180 @@
+html {
+	width: 100%;
+}
+
+body {
+	font-family: helvetica,arial,freesans,clean,sans-serif;
+	font-size: 16px;
+	background-color: #ffffff;
+	color: #505050;/* ZP Change*/
+	margin: 0px;
+}
+
+a, a:visited, a:link { color: #3465a4; text-decoration: none; }
+a:hover {text-decoration: underline; }
+
+img { border :0px; }
+
+nav {
+	display: none;
+}
+
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+  margin: 0px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+  margin: 0px;
+}
+#jGrowl.top-right {
+	top: 15px;
+	right: 10px;
+}
+div.jGrowl-notification {
+  border-radius: 7px;
+}
+
+.login-button {
+	margin-top: 90px;
+	margin-left: auto;
+	margin-right: auto;
+	
+}
+
+img.login-button-image {
+	max-width: 300px;
+}
+
+div.section-wrapper {
+	position: relative;
+	width: 300px;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+.login-form {
+	margin-top: 40px;
+}
+
+.field {
+	position: relative;
+	margin-bottom: 15px;
+}
+
+.field label {
+	margin-left: 25px;
+	font-weight: 700;
+	float: none;
+	width: auto;
+}
+
+.field input {
+	font-size: 18px;
+	width: 200px;
+	margin-left: 50px;
+}
+
+.field.checkbox label {
+	margin-left: auto;
+	float: auto;
+	/*margin-left: 100px;*/
+}
+.field.checkbox input {
+	width: auto;
+	margin-left: 30px;
+}
+
+#div_id_remember {
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+
+#login_openid {
+	margin-top: 50px;
+}
+
+#login_openid input {
+	background: url(login-bg.gif) no-repeat;
+	background-position: 0 50%;
+	width: 182px;
+	padding-left: 18px;
+	margin-left: 50px;
+}
+
+#login-footer {
+	margin-top: 10px;
+	text-align: center;
+}
+
+.login-extra-links, .agreement {
+	font-size: 14px;
+}
+
+#login-submit-button, #register-submit-button, #lostpass-submit-button {
+	font-size: 20px;
+	padding: 0.5em 1em;
+}
+
+#register-link {
+	margin-right: 100px;
+}
+
+.register-form {
+	margin-top: 15px;
+}
+
+.register-form h2, .lostpass-form h2 {
+	text-align: center;
+}
+
+.error-message {
+	width: 270px;
+	color: #FF0000;
+	font-size: 1.1em;
+	text-align: justify;
+	border: 1px solid #FF8888;
+	background-color: #FFEEEE;
+	padding: 10px;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+.register-explain-wrapper {
+	width: 290px;
+	text-align: justify;
+	font-size: 14px;
+	margin-left: 5px;
+}
+
+#register-footer {
+	margin-top: 60px;
+	text-align: center;
+}
+
+.lostpass-form {
+	margin-top: 100px;
+}
+
+#lostpass-desc {
+	width: 290px;
+	margin-left: 5px;
+	margin-bottom: 30px;
+	text-align: justify;
+	font-size: 14px;
+}
+
+#login-submit-wrapper {
+	text-align: center;
+}
+
+footer {
+	text-align: center;
+	padding-top: 3em;
+	padding-bottom: 1em;
+}
diff --git a/view/theme/decaf-mobile/login.tpl b/view/theme/decaf-mobile/login.tpl
new file mode 100644
index 0000000000..926ab769d2
--- /dev/null
+++ b/view/theme/decaf-mobile/login.tpl
@@ -0,0 +1,45 @@
+
+<div class="login-form">
+<form action="$dest_url" method="post" >
+	<input type="hidden" name="auth-params" value="login" />
+
+	<div id="login_standard">
+	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
+	</div>
+	
+	{{ if $openid }}
+			<div id="login_openid">
+			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
+			</div>
+	{{ endif }}
+
+	<br />
+	<div id='login-footer'>
+	{#<!--<div class="login-extra-links">
+	By signing in you agree to the latest <a href="tos.html" title="$tostitle" id="terms-of-service-link" >$toslink</a> and <a href="privacy.html" title="$privacytitle" id="privacy-link" >$privacylink</a>
+	</div>-->#}
+
+	<br />
+	{{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
+
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="$login" />
+	</div>
+
+	<br /><br />
+	<div class="login-extra-links">
+		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
+        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
+	</div>
+	</div>
+	
+	{{ for $hiddens as $k=>$v }}
+		<input type="hidden" name="$k" value="$v" />
+	{{ endfor }}
+	
+	
+</form>
+</div>
+
+{#<!--<script type="text/javascript">window.loginName = "$lname.0";</script>-->#}
diff --git a/view/theme/decaf-mobile/login_head.tpl b/view/theme/decaf-mobile/login_head.tpl
new file mode 100644
index 0000000000..14734821ce
--- /dev/null
+++ b/view/theme/decaf-mobile/login_head.tpl
@@ -0,0 +1,2 @@
+{#<!--<link rel="stylesheet" href="$baseurl/view/theme/frost-mobile/login-style.css" type="text/css" media="all" />-->#}
+
diff --git a/view/theme/decaf-mobile/lostpass.tpl b/view/theme/decaf-mobile/lostpass.tpl
new file mode 100644
index 0000000000..583e3dbaff
--- /dev/null
+++ b/view/theme/decaf-mobile/lostpass.tpl
@@ -0,0 +1,21 @@
+<div class="lostpass-form">
+<h2>$title</h2>
+<br /><br /><br />
+
+<form action="lostpass" method="post" >
+<div id="login-name-wrapper" class="field input">
+        <label for="login-name" id="label-login-name">$name</label><br />
+        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
+</div>
+<div id="login-extra-end"></div>
+<p id="lostpass-desc">
+$desc
+</p>
+<br />
+
+<div id="login-submit-wrapper" >
+        <input type="submit" name="submit" id="lostpass-submit-button" value="$submit" />
+</div>
+<div id="login-submit-end"></div>
+</form>
+</div>
diff --git a/view/theme/decaf-mobile/mail_conv.tpl b/view/theme/decaf-mobile/mail_conv.tpl
new file mode 100644
index 0000000000..7aac8370b2
--- /dev/null
+++ b/view/theme/decaf-mobile/mail_conv.tpl
@@ -0,0 +1,18 @@
+<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>
+	<div class="mail-conv-body">$mail.body</div>
+</div>
+<div class="mail-conv-outside-wrapper-end"></div>
+
+
+<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id?confirm=1" class="icon drophide delete-icon mail-list-delete-icon" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'message/drop/$mail.id')});" 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>
+
+<hr class="mail-conv-break" />
diff --git a/view/theme/decaf-mobile/mail_list.tpl b/view/theme/decaf-mobile/mail_list.tpl
new file mode 100644
index 0000000000..74274a246a
--- /dev/null
+++ b/view/theme/decaf-mobile/mail_list.tpl
@@ -0,0 +1,16 @@
+<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>
+	</div>
+	<div class="mail-list-detail">
+		<div class="mail-list-sender-name" >$from_name</div>
+		<div class="mail-list-date">$date</div>
+		<div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
+	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
+		<a href="message/dropconv/$id?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'message/dropconv/$id')});"  title="$delete" class="icon drophide mail-list-delete	delete-icon" id="mail-list-delete-$id" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>
+	</div>
+</div>
+</div>
+<div class="mail-list-delete-end"></div>
+
+<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/theme/decaf-mobile/manage.tpl b/view/theme/decaf-mobile/manage.tpl
new file mode 100644
index 0000000000..fec30db9b0
--- /dev/null
+++ b/view/theme/decaf-mobile/manage.tpl
@@ -0,0 +1,18 @@
+<h3>$title</h3>
+<div id="identity-manage-desc">$desc</div>
+<div id="identity-manage-choose">$choose</div>
+<div id="identity-selector-wrapper">
+	<form action="manage" method="post" >
+	<select name="identity" size="4" onchange="this.form.submit();" >
+
+	{{ for $identities as $id }}
+		<option $id.selected value="$id.uid">$id.username ($id.nickname)</option>
+	{{ endfor }}
+
+	</select>
+	<div id="identity-select-break"></div>
+
+	{# name="submit" interferes with this.form.submit() #}
+	<input id="identity-submit" type="submit" {#name="submit"#} value="$submit" />
+</div></form>
+
diff --git a/view/theme/decaf-mobile/message-end.tpl b/view/theme/decaf-mobile/message-end.tpl
new file mode 100644
index 0000000000..fea596360b
--- /dev/null
+++ b/view/theme/decaf-mobile/message-end.tpl
@@ -0,0 +1,4 @@
+{#<!--
+<script src="$baseurl/library/jquery_ac/friendica.complete.min.js" ></script>
+
+-->#}
diff --git a/view/theme/decaf-mobile/message-head.tpl b/view/theme/decaf-mobile/message-head.tpl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/view/theme/decaf-mobile/mobile b/view/theme/decaf-mobile/mobile
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/view/theme/decaf-mobile/msg-end.tpl b/view/theme/decaf-mobile/msg-end.tpl
new file mode 100644
index 0000000000..6074133798
--- /dev/null
+++ b/view/theme/decaf-mobile/msg-end.tpl
@@ -0,0 +1,2 @@
+<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
+
diff --git a/view/theme/decaf-mobile/msg-header.tpl b/view/theme/decaf-mobile/msg-header.tpl
new file mode 100644
index 0000000000..9ccf5d6fa2
--- /dev/null
+++ b/view/theme/decaf-mobile/msg-header.tpl
@@ -0,0 +1,10 @@
+
+<script language="javascript" type="text/javascript">
+{#/*	window.nickname = "$nickname";
+	window.linkURL = "$linkurl";
+	var plaintext = "none";
+	window.autocompleteType = 'msg-header';*/#}
+	window.jotId = "#prvmail-text";
+	window.imageUploadButton = 'prvmail-upload';
+</script>
+
diff --git a/view/theme/decaf-mobile/nav.tpl b/view/theme/decaf-mobile/nav.tpl
new file mode 100644
index 0000000000..45b7beeefc
--- /dev/null
+++ b/view/theme/decaf-mobile/nav.tpl
@@ -0,0 +1,155 @@
+<nav>
+{#<!--	$langselector -->#}
+
+{#<!--	<div id="site-location">$sitelocation</div> -->#}
+
+	<span id="nav-link-wrapper" >
+
+{#<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->#}
+	<div class="nav-button-container">
+{#<!--	<a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->#}
+	<a href="$nav.navigation.0" title="$nav.navigation.3" >
+	<img rel="#system-menu-list" class="nav-link" src="view/theme/decaf-mobile/images/menu.png">
+	</a>
+{#<!--	</a>-->#}
+	{#<!--<ul id="system-menu-list" class="nav-menu-list">
+		{{ if $nav.login }}
+		<a id="nav-login-link" class="nav-load-page-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
+		{{ endif }}
+
+		{{ if $nav.register }}
+		<a id="nav-register-link" class="nav-load-page-link $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>
+		{{ endif }}
+
+		{{ if $nav.settings }}
+		<li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
+		{{ endif }}
+
+		{{ if $nav.manage }}
+		<li>
+		<a id="nav-manage-link" class="nav-load-page-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
+		</li>
+		{{ endif }}
+
+		{{ if $nav.profiles }}
+		<li><a id="nav-profiles-link" class="$nav.profiles.2 nav-load-page-link" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a></li>
+		{{ endif }}
+
+		{{ if $nav.admin }}
+		<li><a id="nav-admin-link" class="$nav.admin.2 nav-load-page-link" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>
+		{{ endif }}
+
+		<li><a id="nav-search-link" class="$nav.search.2 nav-load-page-link" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
+
+		{{ if $nav.apps }}
+		<li><a id="nav-apps-link" class="$nav.apps.2 nav-load-page-link" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a></li>
+		{{ endif }}
+
+		{{ if $nav.help }}
+		<li><a id="nav-help-link" class="$nav.help.2 nav-load-page-link" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>
+		{{ endif }}
+		
+		{{ if $nav.logout }}
+		<li><a id="nav-logout-link" class="$nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
+		{{ endif }}
+	</ul>-->#}
+	</div>
+
+	{{ if $nav.notifications }}
+{#<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>-->#}
+	<div class="nav-button-container">
+{#<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">-->#}
+	<a href="$nav.notifications.all.0">
+	<img rel="#nav-notifications-menu" class="nav-link" src="view/theme/decaf-mobile/images/notifications.png">
+	</a>
+{#<!--	</a>-->#}
+	{#<!--<span id="notify-update" class="nav-ajax-left"></span>
+	<ul id="nav-notifications-menu" class="notifications-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>-->#}
+	</div>
+	{{ endif }}		
+
+{#<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->#}
+	{{ if $nav.contacts }}
+	<div class="nav-button-container">
+{#<!--	<a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->#}
+	<a id="nav-contacts-link" class="$nav.contacts.2 nav-load-page-link" href="$nav.contacts.0" title="$nav.contacts.3" >
+	<img rel="#contacts-menu-list"  class="nav-link" src="view/theme/decaf-mobile/images/contacts.png">
+	</a>
+	{#<!--</a>-->#}
+	{{ if $nav.introductions }}
+	<span id="intro-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{#<!--<ul id="contacts-menu-list" class="nav-menu-list">
+		{{ if $nav.contacts }}
+		<li><a id="nav-contacts-link" class="$nav.contacts.2 nav-load-page-link" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a><li>
+		{{ endif }}
+
+		<li><a id="nav-directory-link" class="$nav.directory.2 nav-load-page-link" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a><li>
+
+		{{ if $nav.introductions }}
+		<li>
+		<a id="nav-notify-link" class="$nav.introductions.2 $sel.introductions nav-load-page-link" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
+		</li>
+		{{ endif }}
+	</ul>-->#}
+	</div>
+	{{ endif }}
+
+	{{ if $nav.messages }}
+{#<!--	<a id="nav-messages-link" class="nav-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>-->#}
+	<div class="nav-button-container">
+	<a id="nav-messages-link" class="$nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >
+	<img src="view/theme/decaf-mobile/images/message.png" class="nav-link">
+	</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	</div>
+	{{ endif }}
+
+{#<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->#}
+	{{ if $nav.network }}
+	<div class="nav-button-container">
+{#<!--	<a class="network-menu-link nav-link" href="#network-menu" title="Network">-->#}
+	<a id="nav-network-link" class="$nav.network.2 $sel.network nav-load-page-link" href="/" >
+	<img rel="#network-menu-list" class="nav-link" src="view/theme/decaf-mobile/images/network.png">
+	</a>
+{#<!--	</a>-->#}
+	<span id="net-update" class="nav-ajax-left"></span>
+	</div>
+	{{ endif }}
+<!--	<ul id="network-menu-list" class="nav-menu-list">
+		{{ if $nav.network }}
+		<li>
+		<a id="nav-network-link" class="$nav.network.2 $sel.network nav-load-page-link" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+		</li>
+		{{ endif }}
+
+		{{ if $nav.network }}
+		<li>
+		<a class="nav-menu-icon network-reset-link nav-link" href="$nav.net_reset.0" title="$nav.net_reset.3">$nav.net_reset.1</a>
+		</li>
+		{{ endif }}
+
+		{{ if $nav.home }}
+		<li><a id="nav-home-link" class="$nav.home.2 $sel.home nav-load-page-link" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a></li>
+		{{ endif }}
+
+		{{ if $nav.community }}
+		<li>
+		<a id="nav-community-link" class="$nav.community.2 $sel.community nav-load-page-link" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+		</li>
+		{{ endif }}
+	</ul>
+	</div>-->
+
+	</span>
+	{#<!--<span id="nav-end"></span>-->#}
+	<span id="banner">$banner</span>
+</nav>
+
+{#<!--<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>-->#}
diff --git a/view/theme/decaf-mobile/photo_drop.tpl b/view/theme/decaf-mobile/photo_drop.tpl
new file mode 100644
index 0000000000..296b829091
--- /dev/null
+++ b/view/theme/decaf-mobile/photo_drop.tpl
@@ -0,0 +1,4 @@
+<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+	<a href="item/drop/$id?confirm=1" onclick="return confirmDelete(function(){this.href='item/drop/$id'});" class="icon drophide" title="$delete" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>
+</div>
+<div class="wall-item-delete-end"></div>
diff --git a/view/theme/decaf-mobile/photo_edit.tpl b/view/theme/decaf-mobile/photo_edit.tpl
new file mode 100644
index 0000000000..5bfa37c366
--- /dev/null
+++ b/view/theme/decaf-mobile/photo_edit.tpl
@@ -0,0 +1,60 @@
+
+<form action="photos/$nickname/$resource_id" method="post" id="photo_edit_form" >
+
+	<input type="hidden" name="item_id" value="$item_id" />
+	<input id="photo-edit-form-confirm" type="hidden" name="confirm" value="1" />
+
+	<div class="photo-edit-input-text">
+	<label id="photo-edit-albumname-label" for="photo-edit-albumname">$newalbum</label>
+	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="$album" />
+	</div>
+
+	<div id="photo-edit-albumname-end"></div>
+
+	<div class="photo-edit-input-text">
+	<label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label>
+	<input id="photo-edit-caption" type="text" size="32" name="desc" value="$caption" />
+	</div>
+
+	<div id="photo-edit-caption-end"></div>
+
+	<div class="photo-edit-input-text">
+	<label id="photo-edit-tags-label" for="photo-edit-newtag" >$tag_label</label>
+	<input name="newtag" id="photo-edit-newtag" size="32" title="$help_tags" type="text" />
+	</div>
+
+	<div id="photo-edit-tags-end"></div>
+
+	<div class="photo-edit-rotate-choice">
+	<label id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw">$rotatecw</label>
+	<input id="photo-edit-rotate-cw" class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
+	</div>
+
+	<div class="photo-edit-rotate-choice">
+	<label id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw">$rotateccw</label>
+	<input id="photo-edit-rotate-ccw" class="photo-edit-rotate" type="radio" name="rotate" value="2" />
+	</div>
+	<div id="photo-edit-rotate-end"></div>
+
+	<div id="photo-edit-perms" class="photo-edit-perms" >
+		{#<!--<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="popupbox button" title="$permissions"/>
+			<span id="jot-perms-icon" class="icon $lockstate photo-perms-icon" ></span><div class="photo-jot-perms-text">$permissions</div>
+		</a>
+		<div id="photo-edit-perms-menu-end"></div>
+		
+		<div style="display: none;">-->#}
+			<div id="photo-edit-perms-select" >
+				{#<!--$aclselect-->#}
+				{{ inc acl_html_selector.tpl }}{{ endinc }}
+			</div>
+		{#<!--</div>-->#}
+	</div>
+	<div id="photo-edit-perms-end"></div>
+
+	<input id="photo-edit-submit-button" type="submit" name="submit" value="$submit" />
+	<input id="photo-edit-delete-button" type="submit" name="delete" value="$delete" onclick="return confirmDelete(function(){remove('photo-edit-form-confirm');});" />
+
+	<div id="photo-edit-end"></div>
+</form>
+
+
diff --git a/view/theme/decaf-mobile/photo_edit_head.tpl b/view/theme/decaf-mobile/photo_edit_head.tpl
new file mode 100644
index 0000000000..c819e24ce3
--- /dev/null
+++ b/view/theme/decaf-mobile/photo_edit_head.tpl
@@ -0,0 +1,7 @@
+{#<!--
+<script>
+	window.prevLink = "$prevlink";
+	window.nextLink = "$nextlink";
+	window.photoEdit = true;
+
+</script>-->#}
diff --git a/view/theme/decaf-mobile/photo_view.tpl b/view/theme/decaf-mobile/photo_view.tpl
new file mode 100644
index 0000000000..329e0a4e05
--- /dev/null
+++ b/view/theme/decaf-mobile/photo_view.tpl
@@ -0,0 +1,42 @@
+<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-nav">
+	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0"><img src="view/theme/decaf-mobile/images/arrow-left.png"></a></div>{{ endif }}
+	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0"><img src="view/theme/decaf-mobile/images/arrow-right.png"></a></div>{{ endif }}
+</div>
+<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></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
+{{ else }}
+
+{{ if $likebuttons }}
+<div id="photo-like-div">
+	$likebuttons
+	$like
+	$dislike	
+</div>
+{{ endif }}
+
+$comments
+
+$paginate
+{{ endif }}
+
diff --git a/view/theme/decaf-mobile/photos_head.tpl b/view/theme/decaf-mobile/photos_head.tpl
new file mode 100644
index 0000000000..5c13a0ae6c
--- /dev/null
+++ b/view/theme/decaf-mobile/photos_head.tpl
@@ -0,0 +1,5 @@
+{#<!--
+<script>
+	window.isPublic = "$ispublic";
+</script>
+-->#}
diff --git a/view/theme/decaf-mobile/photos_upload.tpl b/view/theme/decaf-mobile/photos_upload.tpl
new file mode 100644
index 0000000000..31ad468015
--- /dev/null
+++ b/view/theme/decaf-mobile/photos_upload.tpl
@@ -0,0 +1,51 @@
+<h3>$pagename</h3>
+
+<div id="photos-usage-message">$usage</div>
+
+<form action="photos/$nickname" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
+	<div id="photos-upload-new-wrapper" >
+		<div id="photos-upload-newalbum-div">
+			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >$newalbum</label>
+		</div>
+		<input id="photos-upload-newalbum" type="text" name="newalbum" />
+	</div>
+	<div id="photos-upload-new-end"></div>
+	<div id="photos-upload-exist-wrapper">
+		<div id="photos-upload-existing-album-text">$existalbumtext</div>
+		<select id="photos-upload-album-select" name="album">
+		$albumselect
+		</select>
+	</div>
+	<div id="photos-upload-exist-end"></div>
+
+	$default_upload_box
+
+	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
+		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
+		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >$nosharetext</label>
+	</div>
+
+
+	{#<!--<div id="photos-upload-perms" class="photos-upload-perms" >
+		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
+		<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
+		</a>
+	</div>
+	<div id="photos-upload-perms-end"></div>
+
+	<div style="display: none;">-->#}
+		<div id="photos-upload-permissions-wrapper">
+			{#<!--$aclselect-->#}
+			{{ inc acl_html_selector.tpl }}{{ endinc }}
+		</div>
+	{#<!--</div>-->#}
+
+	<div id="photos-upload-spacer"></div>
+
+	$alt_uploader
+
+	$default_upload_submit
+
+	<div class="photos-upload-end" ></div>
+</form>
+
diff --git a/view/theme/decaf-mobile/profed_end.tpl b/view/theme/decaf-mobile/profed_end.tpl
new file mode 100644
index 0000000000..ff56fda467
--- /dev/null
+++ b/view/theme/decaf-mobile/profed_end.tpl
@@ -0,0 +1,8 @@
+{#<!--
+<script type="text/javascript" src="js/country.min.js" ></script>
+
+<script language="javascript" type="text/javascript">
+	Fill_Country('$country_name');
+	Fill_States('$region');
+</script>
+-->#}
diff --git a/view/theme/decaf-mobile/profed_head.tpl b/view/theme/decaf-mobile/profed_head.tpl
new file mode 100644
index 0000000000..02fd46aa49
--- /dev/null
+++ b/view/theme/decaf-mobile/profed_head.tpl
@@ -0,0 +1,5 @@
+{#<!--
+<script language="javascript" type="text/javascript">
+	window.editSelect = "none";
+</script>
+-->#}
diff --git a/view/theme/decaf-mobile/profile_edit.tpl b/view/theme/decaf-mobile/profile_edit.tpl
new file mode 100644
index 0000000000..bed1de35ae
--- /dev/null
+++ b/view/theme/decaf-mobile/profile_edit.tpl
@@ -0,0 +1,324 @@
+$default
+
+<h1>$banner</h1>
+
+<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="$profile_clone_link" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li>
+<li></li>
+<li><a href="$profile_drop_link" id="profile-edit-drop-link" title="$del_prof" $disabled >$del_prof</a></li>
+
+</ul>
+</div>
+
+<div id="profile-edit-links-end"></div>
+
+
+<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>
+<input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
+</div>
+<div id="profile-edit-profile-name-end"></div>
+
+<div id="profile-edit-name-wrapper" >
+<label id="profile-edit-name-label" for="profile-edit-name" >$lbl_fullname </label>
+<input type="text" size="28" name="name" id="profile-edit-name" value="$name" />
+</div>
+<div id="profile-edit-name-end"></div>
+
+<div id="profile-edit-pdesc-wrapper" >
+<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >$lbl_title </label>
+<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
+</div>
+<div id="profile-edit-pdesc-end"></div>
+
+
+<div id="profile-edit-gender-wrapper" >
+<label id="profile-edit-gender-label" for="gender-select" >$lbl_gender </label>
+$gender
+</div>
+<div id="profile-edit-gender-end"></div>
+
+<div id="profile-edit-dob-wrapper" >
+<label id="profile-edit-dob-label" for="dob-select" >$lbl_bd </label>
+<div id="profile-edit-dob" >
+$dob $age
+</div>
+</div>
+<div id="profile-edit-dob-end"></div>
+
+$hide_friends
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="profile-edit-address-wrapper" >
+<label id="profile-edit-address-label" for="profile-edit-address" >$lbl_address </label>
+<input type="text" size="28" name="address" id="profile-edit-address" value="$address" />
+</div>
+<div id="profile-edit-address-end"></div>
+
+<div id="profile-edit-locality-wrapper" >
+<label id="profile-edit-locality-label" for="profile-edit-locality" >$lbl_city </label>
+<input type="text" size="28" name="locality" id="profile-edit-locality" value="$locality" />
+</div>
+<div id="profile-edit-locality-end"></div>
+
+
+<div id="profile-edit-postal-code-wrapper" >
+<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >$lbl_zip </label>
+<input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
+</div>
+<div id="profile-edit-postal-code-end"></div>
+
+<div id="profile-edit-country-name-wrapper" >
+<label id="profile-edit-country-name-label" for="profile-edit-country-name" >$lbl_country </label>
+<input type="text" size="28" name="country_name" id="profile-edit-country-name" value="$country_name" />
+{#<!--<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
+<option selected="selected" >$country_name</option>
+<option>temp</option>
+</select>-->#}
+</div>
+<div id="profile-edit-country-name-end"></div>
+
+<div id="profile-edit-region-wrapper" >
+<label id="profile-edit-region-label" for="profile-edit-region" >$lbl_region </label>
+<input type="text" size="28" name="region" id="profile-edit-region" value="$region" />
+{#<!--<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
+<option selected="selected" >$region</option>
+<option>temp</option>
+</select>-->#}
+</div>
+<div id="profile-edit-region-end"></div>
+
+<div id="profile-edit-hometown-wrapper" >
+<label id="profile-edit-hometown-label" for="profile-edit-hometown" >$lbl_hometown </label>
+<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="$hometown" />
+</div>
+<div id="profile-edit-hometown-end"></div>
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="profile-edit-marital-wrapper" >
+<label id="profile-edit-marital-label" for="profile-edit-marital" >$lbl_marital </label>
+$marital
+</div>
+<label id="profile-edit-with-label" for="profile-edit-with" > $lbl_with </label>
+<input type="text" size="28" name="with" id="profile-edit-with" title="$lbl_ex1" value="$with" />
+<label id="profile-edit-howlong-label" for="profile-edit-howlong" > $lbl_howlong </label>
+<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="$lbl_howlong" value="$howlong" />
+
+<div id="profile-edit-marital-end"></div>
+
+<div id="profile-edit-sexual-wrapper" >
+<label id="profile-edit-sexual-label" for="sexual-select" >$lbl_sexual </label>
+$sexual
+</div>
+<div id="profile-edit-sexual-end"></div>
+
+
+
+<div id="profile-edit-homepage-wrapper" >
+<label id="profile-edit-homepage-label" for="profile-edit-homepage" >$lbl_homepage </label>
+<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="$homepage" />
+</div>
+<div id="profile-edit-homepage-end"></div>
+
+<div id="profile-edit-politic-wrapper" >
+<label id="profile-edit-politic-label" for="profile-edit-politic" >$lbl_politic </label>
+<input type="text" size="28" name="politic" id="profile-edit-politic" value="$politic" />
+</div>
+<div id="profile-edit-politic-end"></div>
+
+<div id="profile-edit-religion-wrapper" >
+<label id="profile-edit-religion-label" for="profile-edit-religion" >$lbl_religion </label>
+<input type="text" size="28" name="religion" id="profile-edit-religion" value="$religion" />
+</div>
+<div id="profile-edit-religion-end"></div>
+
+<div id="profile-edit-pubkeywords-wrapper" >
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >$lbl_pubkey </label>
+<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="$lbl_ex2" value="$pub_keywords" />
+</div><div id="profile-edit-pubkeywords-desc">$lbl_pubdsc</div>
+<div id="profile-edit-pubkeywords-end"></div>
+
+<div id="profile-edit-prvkeywords-wrapper" >
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >$lbl_prvkey </label>
+<input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="$lbl_ex2" value="$prv_keywords" />
+</div><div id="profile-edit-prvkeywords-desc">$lbl_prvdsc</div>
+<div id="profile-edit-prvkeywords-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="about-jot-wrapper" class="profile-jot-box">
+<p id="about-jot-desc" >
+$lbl_about
+</p>
+
+<textarea rows="10" cols="30" id="profile-about-text" class="profile-edit-textarea" name="about" >$about</textarea>
+
+</div>
+<div id="about-jot-end"></div>
+
+
+<div id="interest-jot-wrapper" class="profile-jot-box" >
+<p id="interest-jot-desc" >
+$lbl_hobbies
+</p>
+
+<textarea rows="10" cols="30" id="interest-jot-text" class="profile-edit-textarea" name="interest" >$interest</textarea>
+
+</div>
+<div id="interest-jot-end"></div>
+
+
+<div id="likes-jot-wrapper" class="profile-jot-box" >
+<p id="likes-jot-desc" >
+$lbl_likes
+</p>
+
+<textarea rows="10" cols="30" id="likes-jot-text" class="profile-edit-textarea" name="likes" >$likes</textarea>
+
+</div>
+<div id="likes-jot-end"></div>
+
+
+<div id="dislikes-jot-wrapper" class="profile-jot-box" >
+<p id="dislikes-jot-desc" >
+$lbl_dislikes
+</p>
+
+<textarea rows="10" cols="30" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >$dislikes</textarea>
+
+</div>
+<div id="dislikes-jot-end"></div>
+
+
+<div id="contact-jot-wrapper" class="profile-jot-box" >
+<p id="contact-jot-desc" >
+$lbl_social
+</p>
+
+<textarea rows="10" cols="30" id="contact-jot-text" class="profile-edit-textarea" name="contact" >$contact</textarea>
+
+</div>
+<div id="contact-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="music-jot-wrapper" class="profile-jot-box" >
+<p id="music-jot-desc" >
+$lbl_music
+</p>
+
+<textarea rows="10" cols="30" id="music-jot-text" class="profile-edit-textarea" name="music" >$music</textarea>
+
+</div>
+<div id="music-jot-end"></div>
+
+<div id="book-jot-wrapper" class="profile-jot-box" >
+<p id="book-jot-desc" >
+$lbl_book
+</p>
+
+<textarea rows="10" cols="30" id="book-jot-text" class="profile-edit-textarea" name="book" >$book</textarea>
+
+</div>
+<div id="book-jot-end"></div>
+
+
+
+<div id="tv-jot-wrapper" class="profile-jot-box" >
+<p id="tv-jot-desc" >
+$lbl_tv 
+</p>
+
+<textarea rows="10" cols="30" id="tv-jot-text" class="profile-edit-textarea" name="tv" >$tv</textarea>
+
+</div>
+<div id="tv-jot-end"></div>
+
+
+
+<div id="film-jot-wrapper" class="profile-jot-box" >
+<p id="film-jot-desc" >
+$lbl_film
+</p>
+
+<textarea rows="10" cols="30" id="film-jot-text" class="profile-edit-textarea" name="film" >$film</textarea>
+
+</div>
+<div id="film-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="romance-jot-wrapper" class="profile-jot-box" >
+<p id="romance-jot-desc" >
+$lbl_love
+</p>
+
+<textarea rows="10" cols="30" id="romance-jot-text" class="profile-edit-textarea" name="romance" >$romance</textarea>
+
+</div>
+<div id="romance-jot-end"></div>
+
+
+
+<div id="work-jot-wrapper" class="profile-jot-box" >
+<p id="work-jot-desc" >
+$lbl_work
+</p>
+
+<textarea rows="10" cols="30" id="work-jot-text" class="profile-edit-textarea" name="work" >$work</textarea>
+
+</div>
+<div id="work-jot-end"></div>
+
+
+
+<div id="education-jot-wrapper" class="profile-jot-box" >
+<p id="education-jot-desc" >
+$lbl_school 
+</p>
+
+<textarea rows="10" cols="30" id="education-jot-text" class="profile-edit-textarea" name="education" >$education</textarea>
+
+</div>
+<div id="education-jot-end"></div>
+
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+</form>
+</div>
+
diff --git a/view/theme/decaf-mobile/profile_photo.tpl b/view/theme/decaf-mobile/profile_photo.tpl
new file mode 100644
index 0000000000..42fc139f8f
--- /dev/null
+++ b/view/theme/decaf-mobile/profile_photo.tpl
@@ -0,0 +1,19 @@
+<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>
+<input name="userfile" type="file" id="profile-photo-upload" size="25" />
+</div>
+
+<div id="profile-photo-submit-wrapper">
+<input type="submit" name="submit" id="profile-photo-submit" value="$submit">
+</div>
+
+</form>
+
+<div id="profile-photo-link-select-wrapper">
+$select
+</div>
diff --git a/view/theme/decaf-mobile/profile_vcard.tpl b/view/theme/decaf-mobile/profile_vcard.tpl
new file mode 100644
index 0000000000..e91e6125ff
--- /dev/null
+++ b/view/theme/decaf-mobile/profile_vcard.tpl
@@ -0,0 +1,51 @@
+<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?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 }}
+			<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-vcard-break"></div>	
+	<div id="profile-extra-links">
+		<ul>
+			{{ 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>
+
+$contact_block
+
+
diff --git a/view/theme/decaf-mobile/prv_message.tpl b/view/theme/decaf-mobile/prv_message.tpl
new file mode 100644
index 0000000000..5d9925297d
--- /dev/null
+++ b/view/theme/decaf-mobile/prv_message.tpl
@@ -0,0 +1,43 @@
+
+<h3>$header</h3>
+
+<div id="prvmail-wrapper" >
+<form id="prvmail-form" action="message" method="post" >
+
+$parent
+
+<div id="prvmail-to-label">$to</div>
+
+{{ if $showinputs }}
+<input type="text" id="recip" name="messageto" value="$prefill" maxlength="255" size="64" tabindex="10" />
+<input type="hidden" id="recip-complete" name="messageto" value="$preid">
+{{ else }}
+$select
+{{ endif }}
+
+<div id="prvmail-subject-label">$subject</div>
+<input type="text" size="28" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
+
+<div id="prvmail-message-label">$yourmessage</div>
+<textarea rows="8" cols="32" 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-upload-wrapper"  style="display: none;">
+		<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
+	</div> 
+	{#<!--<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>
+
+<script>
+document.getElementById('prvmail-upload-wrapper').style.display = "inherit";
+</script>
diff --git a/view/theme/decaf-mobile/register.tpl b/view/theme/decaf-mobile/register.tpl
new file mode 100644
index 0000000000..b1f39048e9
--- /dev/null
+++ b/view/theme/decaf-mobile/register.tpl
@@ -0,0 +1,80 @@
+<div class='register-form'>
+<h2>$regtitle</h2>
+<br />
+
+<form action="register" method="post" id="register-form">
+
+	<input type="hidden" name="photo" value="$photo" />
+
+	$registertext
+
+	<p id="register-realpeople">$realpeople</p>
+
+	<br />
+{{ if $oidlabel }}
+	<div id="register-openid-wrapper" >
+    	<label for="register-openid" id="label-register-openid" >$oidlabel</label><input 	type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >
+	</div>
+	<div id="register-openid-end" ></div>
+{{ endif }}
+
+	<div class="register-explain-wrapper">
+	<p id="register-fill-desc">$fillwith $fillext</p>
+	</div>
+
+	<br /><br />
+
+{{ if $invitations }}
+
+	<p id="register-invite-desc">$invite_desc</p>
+	<div id="register-invite-wrapper" >
+		<label for="register-invite" id="label-register-invite" >$invite_label</label>
+		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="$invite_id" >
+	</div>
+	<div id="register-name-end" ></div>
+
+{{ endif }}
+
+
+	<div id="register-name-wrapper" class="field input" >
+		<label for="register-name" id="label-register-name" >$namelabel</label><br />
+		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="$username" >
+	</div>
+	<div id="register-name-end" ></div>
+
+
+	<div id="register-email-wrapper"  class="field input" >
+		<label for="register-email" id="label-register-email" >$addrlabel</label><br />
+		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="$email" >
+	</div>
+	<div id="register-email-end" ></div>
+
+	<div id="register-nickname-wrapper" class="field input" >
+		<label for="register-nickname" id="label-register-nickname" >$nicklabel</label><br />
+		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="$nickname" >
+	</div>
+	<div id="register-nickname-end" ></div>
+
+	<div class="register-explain-wrapper">
+	<p id="register-nickname-desc" >$nickdesc</p>
+	</div>
+
+	$publish
+
+	<div id="register-footer">
+	{#<!--<div class="agreement">
+	By clicking '$regbutt' you are agreeing to the latest <a href="tos.html" title="$tostitle" id="terms-of-service-link" >$toslink</a> and <a href="privacy.html" title="$privacytitle" id="privacy-link" >$privacylink</a>
+	</div>-->#}
+	<br />
+
+	<div id="register-submit-wrapper">
+		<input type="submit" name="submit" id="register-submit-button" value="$regbutt" />
+	</div>
+	<div id="register-submit-end" ></div>
+	</div>
+</form>
+<br /><br /><br />
+
+$license
+
+</div>
diff --git a/view/theme/decaf-mobile/screenshot.jpg b/view/theme/decaf-mobile/screenshot.jpg
new file mode 100644
index 0000000000..1b18c3a410
Binary files /dev/null and b/view/theme/decaf-mobile/screenshot.jpg differ
diff --git a/view/theme/decaf-mobile/search_item.tpl b/view/theme/decaf-mobile/search_item.tpl
new file mode 100644
index 0000000000..3e14b644b0
--- /dev/null
+++ b/view/theme/decaf-mobile/search_item.tpl
@@ -0,0 +1,64 @@
+<a name="$item.id" ></a>
+{#<!--<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="wall-item-lock 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" title="$item.localtime">$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>
+			{{ if $item.has_cats }}
+			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+			</div>
+			{{ endif }}
+
+			{{ if $item.has_folders }}
+			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+			</div>
+			{{ endif }}
+		</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?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/$item.id')});" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>{{ endif }}
+			{#<!--</div>-->#}
+				{#<!--{{ if $item.drop.pagedrop }}<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/decaf-mobile/settings-head.tpl b/view/theme/decaf-mobile/settings-head.tpl
new file mode 100644
index 0000000000..5c13a0ae6c
--- /dev/null
+++ b/view/theme/decaf-mobile/settings-head.tpl
@@ -0,0 +1,5 @@
+{#<!--
+<script>
+	window.isPublic = "$ispublic";
+</script>
+-->#}
diff --git a/view/theme/decaf-mobile/settings.tpl b/view/theme/decaf-mobile/settings.tpl
new file mode 100644
index 0000000000..3ab464b257
--- /dev/null
+++ b/view/theme/decaf-mobile/settings.tpl
@@ -0,0 +1,148 @@
+<h1>$ptitle</h1>
+
+$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>
+
+{{inc field_password.tpl with $field=$password1 }}{{endinc}}
+{{inc field_password.tpl with $field=$password2 }}{{endinc}}
+
+{{ if $oid_enable }}
+{{inc field_input.tpl with $field=$openid }}{{endinc}}
+{{ endif }}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_basic</h3>
+
+{{inc field_input.tpl with $field=$username }}{{endinc}}
+{{inc field_input.tpl with $field=$email }}{{endinc}}
+{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
+{{inc field_input.tpl with $field=$defloc }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_prv</h3>
+
+
+<input type="hidden" name="visibility" value="$visibility" />
+
+{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
+
+$profile_in_dir
+
+$profile_in_net_dir
+
+$hide_friends
+
+$hide_wall
+
+$blockwall
+
+$blocktags
+
+$suggestme
+
+$unkmail
+
+
+{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
+
+{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
+
+
+<div class="field input">
+	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
+	<div style="display: none;">
+		<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}}
+			{{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
+		</div>
+	</div>
+
+</div>
+
+
+<div id="settings-perms-wrapper" class="field">
+<label for="settings-default-perms">$settings_perms</label><br/>
+<div id="settings-default-perms" class="settings-default-perms" >
+{#<!--	<a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>$permissions $permdesc</a>
+	<div id="settings-default-perms-menu-end"></div>
+
+	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
+	
+	<div style="display: none;">-->#}
+		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
+			{#<!--$aclselect-->#}
+			{{ inc acl_html_selector.tpl }}{{ endinc }}
+		</div>
+{#<!--	</div>
+
+	</div>-->#}
+</div>
+</div>
+<br/>
+<div id="settings-default-perms-end"></div>
+
+$group_select
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+
+<h3 class="settings-heading">$h_not</h3>
+<div id="settings-notifications">
+
+<div id="settings-activity-desc">$activity_options</div>
+
+{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
+
+
+<div id="settings-notify-desc">$lbl_not</div>
+
+<div class="group">
+{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
+</div>
+
+</div>
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_advn</h3>
+<div id="settings-pagetype-desc">$h_descadvn</div>
+
+$pagetype
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
diff --git a/view/theme/decaf-mobile/settings_display_end.tpl b/view/theme/decaf-mobile/settings_display_end.tpl
new file mode 100644
index 0000000000..739c43b35a
--- /dev/null
+++ b/view/theme/decaf-mobile/settings_display_end.tpl
@@ -0,0 +1,2 @@
+	<script>$j(function(){ previewTheme($j("#id_$theme.0")[0]); });</script>
+
diff --git a/view/theme/decaf-mobile/smarty3/acl_html_selector.tpl b/view/theme/decaf-mobile/smarty3/acl_html_selector.tpl
new file mode 100644
index 0000000000..05e82f2d05
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/acl_html_selector.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<a name="acl-wrapper-target"></a>
+<div id="acl-wrapper">
+	<div id="acl-public-switch">
+		<a href="{{$return_path}}#acl-wrapper-target" {{if $is_private == 1}}class="acl-public-switch-selected"{{/if}} >{{$private}}</a>
+		<a href="{{$return_path}}{{$public_link}}#acl-wrapper-target" {{if $is_private == 0}}class="acl-public-switch-selected"{{/if}} >{{$public}}</a>
+	</div>
+	<div id="acl-list">
+		<div id="acl-list-content">
+			<div id="acl-html-groups" class="acl-html-select-wrapper">
+			{{$group_perms}}<br />
+			<select name="group_allow[]" multiple {{if $is_private == 0}}disabled{{/if}} id="acl-html-group-select" class="acl-html-select" size=7>
+				{{foreach $acl_data.groups as $group}}
+				<option value="{{$group.id}}" {{if $is_private == 1}}{{if $group.selected}}selected{{/if}}{{/if}}>{{$group.name}}</option>
+				{{/foreach}}
+			</select>
+			</div>
+			<div id="acl-html-contacts" class="acl-html-select-wrapper">
+			{{$contact_perms}}<br />
+			<select name="contact_allow[]" multiple {{if $is_private == 0}}disabled{{/if}} id="acl-html-contact-select" class="acl-html-select" size=7>
+				{{foreach $acl_data.contacts as $contact}}
+				<option value="{{$contact.id}}" {{if $is_private == 1}}{{if $contact.selected}}selected{{/if}}{{/if}}>{{$contact.name}} ({{$contact.networkName}})</option>
+				{{/foreach}}
+			</select>
+			</div>
+		</div>
+	</div>
+	<span id="acl-fields"></span>
+</div>
+
diff --git a/view/theme/decaf-mobile/smarty3/acl_selector.tpl b/view/theme/decaf-mobile/smarty3/acl_selector.tpl
new file mode 100644
index 0000000000..49f22ef981
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/acl_selector.tpl
@@ -0,0 +1,28 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="acl-wrapper">
+	<input id="acl-search">
+	<a href="#" id="acl-showall">{{$showall}}</a>
+	<div id="acl-list">
+		<div id="acl-list-content">
+		</div>
+	</div>
+	<span id="acl-fields"></span>
+</div>
+
+<div class="acl-list-item" rel="acl-template" style="display:none">
+	<img data-src="{0}"><p>{1}{7}</p>
+	<a href="#" class='acl-button-show'>{{$show}}</a>
+	<a href="#" class='acl-button-hide'>{{$hide}}</a>
+</div>
+
+{{*<!--<script>
+	window.allowCID = {{$allowcid}};
+	window.allowGID = {{$allowgid}};
+	window.denyCID = {{$denycid}};
+	window.denyGID = {{$denygid}};
+	window.aclInit = "true";
+</script>-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/admin_aside.tpl b/view/theme/decaf-mobile/smarty3/admin_aside.tpl
new file mode 100644
index 0000000000..024d6195b5
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/admin_aside.tpl
@@ -0,0 +1,36 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h4><a href="{{$admurl}}">{{$admtxt}}</a></h4>
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.site.2}}'><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li>
+	<li class='admin button {{$admin.users.2}}'><a href='{{$admin.users.0}}'>{{$admin.users.1}}</a><span id='pending-update' title='{{$h_pending}}'></span></li>
+	<li class='admin button {{$admin.plugins.2}}'><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
+	<li class='admin button {{$admin.themes.2}}'><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
+	<li class='admin button {{$admin.dbsync.2}}'><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
+</ul>
+
+{{if $admin.update}}
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.update.2}}'><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
+	<li class='admin button {{$admin.update.2}}'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
+</ul>
+{{/if}}
+
+
+{{if $admin.plugins_admin}}<h4>{{$plugadmtxt}}</h4>{{/if}}
+<ul class='admin linklist'>
+	{{foreach $admin.plugins_admin as $l}}
+	<li class='admin button {{$l.2}}'><a href='{{$l.0}}'>{{$l.1}}</a></li>
+	{{/foreach}}
+</ul>
+	
+	
+<h4>{{$logtxt}}</h4>
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.logs.2}}'><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li>
+</ul>
+
diff --git a/view/theme/decaf-mobile/smarty3/admin_site.tpl b/view/theme/decaf-mobile/smarty3/admin_site.tpl
new file mode 100644
index 0000000000..27773da2c4
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/admin_site.tpl
@@ -0,0 +1,66 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/site" method="post">
+    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+	{{include file="field_input.tpl" field=$sitename}}
+	{{include file="field_textarea.tpl" field=$banner}}
+	{{include file="field_select.tpl" field=$language}}
+	{{include file="field_select.tpl" field=$theme}}
+	{{include file="field_select.tpl" field=$theme_mobile}}
+	{{include file="field_select.tpl" field=$ssl_policy}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$registration}}</h3>
+	{{include file="field_input.tpl" field=$register_text}}
+	{{include file="field_select.tpl" field=$register_policy}}
+	
+	{{include file="field_checkbox.tpl" field=$no_multi_reg}}
+	{{include file="field_checkbox.tpl" field=$no_openid}}
+	{{include file="field_checkbox.tpl" field=$no_regfullname}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+
+	<h3>{{$upload}}</h3>
+	{{include file="field_input.tpl" field=$maximagesize}}
+	{{include file="field_input.tpl" field=$maximagelength}}
+	{{include file="field_input.tpl" field=$jpegimagequality}}
+	
+	<h3>{{$corporate}}</h3>
+	{{include file="field_input.tpl" field=$allowed_sites}}
+	{{include file="field_input.tpl" field=$allowed_email}}
+	{{include file="field_checkbox.tpl" field=$block_public}}
+	{{include file="field_checkbox.tpl" field=$force_publish}}
+	{{include file="field_checkbox.tpl" field=$no_community_page}}
+	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
+	{{include file="field_checkbox.tpl" field=$dfrn_only}}
+	{{include file="field_input.tpl" field=$global_directory}}
+	{{include file="field_checkbox.tpl" field=$thread_allow}}
+	{{include file="field_checkbox.tpl" field=$newuser_private}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$advanced}}</h3>
+	{{include file="field_checkbox.tpl" field=$no_utf}}
+	{{include file="field_checkbox.tpl" field=$verifyssl}}
+	{{include file="field_input.tpl" field=$proxy}}
+	{{include file="field_input.tpl" field=$proxyuser}}
+	{{include file="field_input.tpl" field=$timeout}}
+	{{include file="field_input.tpl" field=$delivery_interval}}
+	{{include file="field_input.tpl" field=$poll_interval}}
+	{{include file="field_input.tpl" field=$maxloadavg}}
+	{{include file="field_input.tpl" field=$abandon_days}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	</form>
+</div>
diff --git a/view/theme/decaf-mobile/smarty3/admin_users.tpl b/view/theme/decaf-mobile/smarty3/admin_users.tpl
new file mode 100644
index 0000000000..886b67dcdf
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/admin_users.tpl
@@ -0,0 +1,103 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script>
+	function confirm_delete(uname){
+		return confirm( "{{$confirm_delete}}".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("{{$confirm_delete_multi}}");
+	}
+	{{*/*function selectall(cls){
+		$j("."+cls).attr('checked','checked');
+		return false;
+	}*/*}}
+</script>
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		
+		<h3>{{$h_pending}}</h3>
+		{{if $pending}}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{foreach $pending as $u}}
+				<tr>
+					<td class="created">{{$u.created}}</td>
+					<td class="name">{{$u.name}}</td>
+					<td class="email">{{$u.email}}</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
+					<td class="tools">
+						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='tool like'></span></a>
+						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='tool dislike'></span></a>
+					</td>
+				</tr>
+			{{/foreach}}
+				</tbody>
+			</table>
+			{{*<!--<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>-->*}}
+			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>			
+		{{else}}
+			<p>{{$no_pending}}</p>
+		{{/if}}
+	
+	
+		
+	
+		<h3>{{$h_users}}</h3>
+		{{if $users}}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{foreach $users as $u}}
+					<tr>
+						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
+						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
+						<td class='email'>{{$u.email}}</td>
+						<td class='register_date'>{{$u.register_date}}</td>
+						<td class='login_date'>{{$u.login_date}}</td>
+						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}}</td>
+						<td class="checkbox"> 
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
+                                    {{/if}}
+						<td class="tools">
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
+                                        <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
+                                    {{/if}}
+						</td>
+					</tr>
+				{{/foreach}}
+				</tbody>
+			</table>
+			{{*<!--<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>-->*}}
+			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
+		{{else}}
+			NO USERS?!?
+		{{/if}}
+	</form>
+</div>
diff --git a/view/theme/decaf-mobile/smarty3/album_edit.tpl b/view/theme/decaf-mobile/smarty3/album_edit.tpl
new file mode 100644
index 0000000000..094da70a93
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/album_edit.tpl
@@ -0,0 +1,20 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="photo-album-edit-wrapper">
+<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
+	<input id="photo-album-edit-form-confirm" type="hidden" name="confirm" value="1" />
+
+	<label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
+	<input type="text" size="64" name="albumname" value="{{$album}}" >
+
+	<div id="photo-album-edit-name-end"></div>
+
+	<input id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+	<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" onclick="return confirmDelete(function(){remove('photo-album-edit-form-confirm');});" />
+
+</form>
+</div>
+<div id="photo-album-edit-end" ></div>
diff --git a/view/theme/decaf-mobile/smarty3/categories_widget.tpl b/view/theme/decaf-mobile/smarty3/categories_widget.tpl
new file mode 100644
index 0000000000..1749fced3f
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/categories_widget.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--<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{{/if}}">{{$all}}</a></li>
+		{{foreach $terms as $term}}
+			<li class="tool"><a href="{{$base}}?f=&category={{$term.name}}" class="categories-link{{if $term.selected}} categories-selected{{/if}}">{{$term.name}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/comment_item.tpl b/view/theme/decaf-mobile/smarty3/comment_item.tpl
new file mode 100644
index 0000000000..63c70aa5be
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/comment_item.tpl
@@ -0,0 +1,84 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--		<script>
+		$(document).ready( function () {
+			$(document).mouseup(function(e) {
+				var container = $("#comment-edit-wrapper-{{$id}}");
+				if( container.has(e.target).length === 0) {
+					commentClose(document.getElementById('comment-edit-text-{{$id}}'),{{$id}});
+					cmtBbClose({{$id}});
+				}
+			});
+		});
+		</script>-->*}}
+
+		<div class="comment-wwedit-wrapper {{$indent}}" id="comment-edit-wrapper-{{$id}}" style="display: block;" >
+			<a name="comment-wwedit-wrapper-pos"></a>
+			<form class="comment-edit-form {{$indent}}" id="comment-edit-form-{{$id}}" action="item" method="post" >
+{{*<!--			<span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
+			<form class="comment-edit-form" style="display: none;" 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="source" value="{{$sourceapp}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				<input type="hidden" name="return" value="{{$return_path}}#comment-wwedit-wrapper-pos" />
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				{{*<!--<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->*}}
+					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-{{$id}}" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				{{*<!--</div>-->*}}
+				{{*<!--<div class="comment-edit-photo-end"></div>-->*}}
+				{{*<!--<ul class="comment-edit-bb-{{$id}}">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="{{$edbold}}"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="{{$editalic}}"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="{{$eduline}}"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="{{$edquote}}"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="{{$edcode}}"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>-->*}}
+{{*<!--					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="{{$edimg}}"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="{{$edurl}}"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="{{$edvideo}}"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>-->*}}
+				{{*<!--</ul>	-->*}}
+				{{*<!--<div class="comment-edit-bb-end"></div>-->*}}
+{{*<!--				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->*}}
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-full" name="body" ></textarea>
+				{{*<!--{{if $qcomment}}
+					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+					<option value=""></option>
+				{{foreach $qcomment as $qc}}
+					<option value="{{$qc}}">{{$qc}}</option>				
+				{{/foreach}}
+					</select>
+				{{/if}}-->*}}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" >
+					<input type="submit" 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="preview-link 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/decaf-mobile/smarty3/common_tabs.tpl b/view/theme/decaf-mobile/smarty3/common_tabs.tpl
new file mode 100644
index 0000000000..9fa4ed41d9
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/common_tabs.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<ul class="tabs">
+	{{foreach $tabs as $tab}}
+		<li id="{{$tab.id}}"><a href="{{$tab.url}}" class="tab button {{$tab.sel}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
+	{{/foreach}}
+	<div id="tabs-end"></div>
+</ul>
diff --git a/view/theme/decaf-mobile/smarty3/contact_block.tpl b/view/theme/decaf-mobile/smarty3/contact_block.tpl
new file mode 100644
index 0000000000..5a0a26b87e
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/contact_block.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--<div id="contact-block">
+<h4 class="contact-block-h4">{{$contacts}}</h4>
+{{if $micropro}}
+		<a class="allcontact-link" href="viewcontacts/{{$nickname}}">{{$viewcontacts}}</a>
+		<div class='contact-block-content'>
+		{{foreach $micropro as $m}}
+			{{$m}}
+		{{/foreach}}
+		</div>
+{{/if}}
+</div>
+<div class="clear"></div>-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/contact_edit.tpl b/view/theme/decaf-mobile/smarty3/contact_edit.tpl
new file mode 100644
index 0000000000..bced55ac3c
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/contact_edit.tpl
@@ -0,0 +1,98 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h2>{{$header}}</h2>
+
+<div id="contact-edit-wrapper" >
+
+	{{$tab_str}}
+
+	<div id="contact-edit-drop-link-wrapper" >
+		<a href="contacts/{{$contact_id}}/drop?confirm=1" class="icon drophide" id="contact-edit-drop-link" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'contacts/{{$contact_id}}/drop')});"  title="{{$delete}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}}></a>
+	</div>
+
+	<div id="contact-edit-drop-link-end"></div>
+
+	<div class="vcard">
+		<div class="fn">{{$name}}</div>
+		<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></div>
+	</div>
+
+
+	<div id="contact-edit-nav-wrapper" >
+		<div id="contact-edit-links">
+			<ul>
+				<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
+				<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
+				{{if $lost_contact}}
+					<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
+				{{/if}}
+				{{if $insecure}}
+					<li><div id="insecure-message">{{$insecure}}</div></li>
+				{{/if}}
+				{{if $blocked}}
+					<li><div id="block-message">{{$blocked}}</div></li>
+				{{/if}}
+				{{if $ignored}}
+					<li><div id="ignore-message">{{$ignored}}</div></li>
+				{{/if}}
+				{{if $archived}}
+					<li><div id="archive-message">{{$archived}}</div></li>
+				{{/if}}
+
+				<li>&nbsp;</li>
+
+				{{if $common_text}}
+					<li><div id="contact-edit-common"><a href="{{$common_link}}">{{$common_text}}</a></div></li>
+				{{/if}}
+				{{if $all_friends}}
+					<li><div id="contact-edit-allfriends"><a href="allfriends/{{$contact_id}}">{{$all_friends}}</a></div></li>
+				{{/if}}
+
+
+				<li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
+				{{if $lblsuggest}}
+					<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
+				{{/if}}
+
+			</ul>
+		</div>
+	</div>
+	<div id="contact-edit-nav-end"></div>
+
+
+<form action="contacts/{{$contact_id}}" method="post" >
+<input type="hidden" name="contact_id" value="{{$contact_id}}">
+
+	{{if $poll_enabled}}
+		<div id="contact-edit-poll-wrapper">
+			<div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
+			<span id="contact-edit-poll-text">{{$updpub}} {{$poll_interval}}</span> <span id="contact-edit-update-now" class="button"><a id="update_now_link" href="contacts/{{$contact_id}}/update" >{{$udnow}}</a></span>
+		</div>
+	{{/if}}
+	<div id="contact-edit-end" ></div>
+
+	{{include file="field_checkbox.tpl" field=$hidden}}
+
+<div id="contact-edit-info-wrapper">
+<h4>{{$lbl_info1}}</h4>
+	<textarea id="contact-edit-info" rows="8"{{* cols="35"*}} name="info">{{$info}}</textarea>
+	<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+</div>
+<div id="contact-edit-info-end"></div>
+
+
+<div id="contact-edit-profile-select-text">
+<h4>{{$lbl_vis1}}</h4>
+<p>{{$lbl_vis2}}</p> 
+</div>
+{{$profile_select}}
+<div id="contact-edit-profile-select-end"></div>
+
+<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+
+</form>
+</div>
diff --git a/view/theme/decaf-mobile/smarty3/contact_head.tpl b/view/theme/decaf-mobile/smarty3/contact_head.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/contact_head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/decaf-mobile/smarty3/contact_template.tpl b/view/theme/decaf-mobile/smarty3/contact_template.tpl
new file mode 100644
index 0000000000..f017744f7e
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/contact_template.tpl
@@ -0,0 +1,43 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<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}});" 
+		onmouseout="t{{$contact.id}}=setTimeout('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>-->*}}
+			{{*<!--<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">-->*}}
+			<a href="{{$contact.photo_menu.edit.1}}" title="{{$contact.photo_menu.edit.0}}">
+			<img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
+			</a>
+			{{*<!--</span>-->*}}
+
+{{*<!--			{{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>
+						{{foreach $contact.photo_menu as $c}}
+						{{if $c.2}}
+						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+						{{else}}
+						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+						{{/if}}
+						{{/foreach}}
+                    </ul>
+                </div>
+			{{/if}}-->*}}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div><br />
+{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
+	<div class="contact-entry-network" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
+
+	<div class="contact-entry-end" ></div>
+</div>
diff --git a/view/theme/decaf-mobile/smarty3/contacts-end.tpl b/view/theme/decaf-mobile/smarty3/contacts-end.tpl
new file mode 100644
index 0000000000..adeea280c7
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/contacts-end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script src="{{$baseurl}}/library/jquery_ac/friendica.complete.min.js" ></script>
+
+-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/contacts-head.tpl b/view/theme/decaf-mobile/smarty3/contacts-head.tpl
new file mode 100644
index 0000000000..7fa1411649
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/contacts-head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script>
+	window.autocompleteType = 'contacts-head';
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/contacts-template.tpl b/view/theme/decaf-mobile/smarty3/contacts-template.tpl
new file mode 100644
index 0000000000..b9162c2e9e
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/contacts-template.tpl
@@ -0,0 +1,33 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1>
+
+{{if $finding}}<h4>{{$finding}}</h4>{{/if}}
+
+<div id="contacts-search-wrapper">
+<form id="contacts-search-form" action="{{$cmd}}" method="get" >
+<span class="contacts-search-desc">{{$desc}}</span>
+<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
+<input type="submit" name="submit" id="contacts-search-submit" value="{{$submit}}" />
+</form>
+</div>
+<div id="contacts-search-end"></div>
+
+{{$tabs}}
+
+
+<div id="contacts-display-wrapper">
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
+{{/foreach}}
+</div>
+<div id="contact-edit-end"></div>
+
+{{$paginate}}
+
+
+
+
diff --git a/view/theme/decaf-mobile/smarty3/contacts-widget-sidebar.tpl b/view/theme/decaf-mobile/smarty3/contacts-widget-sidebar.tpl
new file mode 100644
index 0000000000..bda321896e
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/contacts-widget-sidebar.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$follow_widget}}
+
diff --git a/view/theme/decaf-mobile/smarty3/conversation.tpl b/view/theme/decaf-mobile/smarty3/conversation.tpl
new file mode 100644
index 0000000000..f6810bb100
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/conversation.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">
+	{{foreach $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;">
+		{{/if}}
+		{{if $item.comment_lastcollapsed}}</div>{{/if}}
+		
+		{{include file="{{$item.template}}"}}
+		
+		
+	{{/foreach}}
+</div>
+{{/foreach}}
+
+<div id="conversation-end"></div>
+
+{{*<!--{{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>
+{{/if}}-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/cropbody.tpl b/view/theme/decaf-mobile/smarty3/cropbody.tpl
new file mode 100644
index 0000000000..5ace9a1aaf
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/cropbody.tpl
@@ -0,0 +1,32 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
+<p id="cropimage-desc">
+{{$desc}}
+</p>
+<div id="cropimage-wrapper">
+<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
+</div>
+<div id="cropimage-preview-wrapper" >
+<div id="previewWrap" ></div>
+</div>
+
+<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" />
+<input type="hidden" name="ystart" id="y1" />
+<input type="hidden" name="xfinal" id="x2" />
+<input type="hidden" name="yfinal" id="y2" />
+<input type="hidden" name="height" id="height" />
+<input type="hidden" name="width"  id="width" />
+
+<div id="crop-image-submit-wrapper" >
+<input type="submit" name="submit" value="{{$done}}" />
+</div>
+
+</form>
diff --git a/view/theme/decaf-mobile/smarty3/cropend.tpl b/view/theme/decaf-mobile/smarty3/cropend.tpl
new file mode 100644
index 0000000000..e75083f512
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/cropend.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
+      <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
+      <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
+      <script type="text/javascript" language="javascript">initCrop();</script>-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/crophead.tpl b/view/theme/decaf-mobile/smarty3/crophead.tpl
new file mode 100644
index 0000000000..6438cfb354
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/crophead.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/theme/decaf-mobile/smarty3/display-head.tpl b/view/theme/decaf-mobile/smarty3/display-head.tpl
new file mode 100644
index 0000000000..2943201923
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/display-head.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--<script>
+	window.autoCompleteType = 'display-head';
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/end.tpl b/view/theme/decaf-mobile/smarty3/end.tpl
new file mode 100644
index 0000000000..e75845bac3
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/end.tpl
@@ -0,0 +1,29 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<!--[if IE]>
+<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
+<script type="text/javascript">
+  tinyMCE.init({ mode : "none"});
+</script>-->*}}
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
+<script type="text/javascript">var $j = jQuery.noConflict();</script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/jquery.divgrow-1.3.1.f1.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/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}}/view/theme/decaf-mobile/js/acl.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/main.js" ></script>-->*}}
+<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/theme.js"></script>
+
+<!--<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/jquery.package.js" ></script>
+<script type="text/javascript">var $j = jQuery.noConflict();</script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/decaf-mobile.package.js" ></script>-->
+
diff --git a/view/theme/decaf-mobile/smarty3/event_end.tpl b/view/theme/decaf-mobile/smarty3/event_end.tpl
new file mode 100644
index 0000000000..63dbec4426
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/event_end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--<script language="javascript" type="text/javascript"
+          src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
+
+-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/event_head.tpl b/view/theme/decaf-mobile/smarty3/event_head.tpl
new file mode 100644
index 0000000000..bd72758e6f
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/event_head.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
+{{*<!--
+<script language="javascript" type="text/javascript">
+window.aclType = 'event_head';
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/field_checkbox.tpl b/view/theme/decaf-mobile/smarty3/field_checkbox.tpl
new file mode 100644
index 0000000000..f7f857f592
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/field_checkbox.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field checkbox' id='div_id_{{$field.0}}'>
+		<label id='label_id_{{$field.0}}' for='id_{{$field.0}}'>{{$field.1}}</label>
+		<input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}><br />
+		<span class='field_help' id='help_id_{{$field.0}}'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/decaf-mobile/smarty3/field_input.tpl b/view/theme/decaf-mobile/smarty3/field_input.tpl
new file mode 100644
index 0000000000..240bed249f
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/field_input.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field input' id='wrapper_{{$field.0}}'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label><br />
+		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/decaf-mobile/smarty3/field_openid.tpl b/view/theme/decaf-mobile/smarty3/field_openid.tpl
new file mode 100644
index 0000000000..d5ebd9a3b6
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/field_openid.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field input openid' id='wrapper_{{$field.0}}'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label><br />
+		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/decaf-mobile/smarty3/field_password.tpl b/view/theme/decaf-mobile/smarty3/field_password.tpl
new file mode 100644
index 0000000000..f1352f27b2
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/field_password.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field password' id='wrapper_{{$field.0}}'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label><br />
+		<input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/decaf-mobile/smarty3/field_themeselect.tpl b/view/theme/decaf-mobile/smarty3/field_themeselect.tpl
new file mode 100644
index 0000000000..95cfd6bcdb
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/field_themeselect.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+	<div class='field select'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<select name='{{$field.0}}' id='id_{{$field.0}}' {{*{{if $field.5}}onchange="previewTheme(this);"{{/if}}*}} >
+			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+		</select>
+		<span class='field_help'>{{$field.3}}</span>
+		<div id="theme-preview"></div>
+	</div>
diff --git a/view/theme/decaf-mobile/smarty3/field_yesno.tpl b/view/theme/decaf-mobile/smarty3/field_yesno.tpl
new file mode 100644
index 0000000000..9cdb95e01c
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/field_yesno.tpl
@@ -0,0 +1,19 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--	<div class='field yesno'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<div class='onoff' id="id_{{$field.0}}_onoff">
+			<input  type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+			<a href="#" class='off'>
+				{{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
+			</a>
+			<a href="#" class='on'>
+				{{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
+			</a>
+		</div>
+		<span class='field_help'>{{$field.3}}</span>
+	</div>-->*}}
+{{include file="field_checkbox.tpl"}}
diff --git a/view/theme/decaf-mobile/smarty3/generic_links_widget.tpl b/view/theme/decaf-mobile/smarty3/generic_links_widget.tpl
new file mode 100644
index 0000000000..705ddb57cb
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/generic_links_widget.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="widget{{if $class}} {{$class}}{{/if}}">
+{{*<!--	{{if $title}}<h3>{{$title}}</h3>{{/if}}-->*}}
+	{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
+	
+	<ul class="tabs links-widget">
+		{{foreach $items as $item}}
+			<li class="tool"><a href="{{$item.url}}" class="tab {{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li>
+		{{/foreach}}
+		<div id="tabs-end"></div>
+	</ul>
+	
+</div>
diff --git a/view/theme/decaf-mobile/smarty3/group_drop.tpl b/view/theme/decaf-mobile/smarty3/group_drop.tpl
new file mode 100644
index 0000000000..2693228154
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/group_drop.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="group-delete-wrapper button" id="group-delete-wrapper-{{$id}}" >
+	<a href="group/drop/{{$id}}?t={{$form_security_token}}" 
+		onclick="return confirmDelete();" 
+		id="group-delete-icon-{{$id}}" 
+		class="icon drophide group-delete-icon" 
+		{{*onmouseover="imgbright(this);" 
+		onmouseout="imgdull(this);"*}} ></a>
+</div>
+<div class="group-delete-end"></div>
diff --git a/view/theme/decaf-mobile/smarty3/group_side.tpl b/view/theme/decaf-mobile/smarty3/group_side.tpl
new file mode 100644
index 0000000000..7d9d23ebe1
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/group_side.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="widget" id="group-sidebar">
+<h3>{{$title}}</h3>
+
+<div id="sidebar-group-list">
+	<ul id="sidebar-group-ul">
+		{{foreach $groups as $group}}
+			<li class="sidebar-group-li">
+				{{if $group.cid}}
+					<input type="checkbox" 
+						class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
+						{{*onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"*}}
+						{{if $group.ismember}}checked="checked"{{/if}}
+					/>
+				{{/if}}			
+				{{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>
+				{{/if}}
+				<a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
+			</li>
+		{{/foreach}}
+	</ul>
+	</div>
+  <div id="sidebar-new-group">
+  <a href="group/new">{{$createtext}}</a>
+  </div>
+  {{if $ungrouped}}
+  <div id="sidebar-ungrouped">
+  <a href="nogroup">{{$ungrouped}}</a>
+  </div>
+  {{/if}}
+</div>
+
+
diff --git a/view/theme/decaf-mobile/smarty3/head.tpl b/view/theme/decaf-mobile/smarty3/head.tpl
new file mode 100644
index 0000000000..ad9e1ad281
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/head.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+{{*<!--<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
+<meta content='True' name='HandheldFriendly'>
+<meta content='320' name='MobileOptimized'>-->*}}
+<meta name="viewport" content="width=device-width; initial-scale = 1.0; maximum-scale=1.0; user-scalable=no" />
+{{*<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->*}}
+
+<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" />
+
+<script>
+	window.delItem = "{{$delitem}}";
+{{*/*	window.commentEmptyText = "{{$comment}}";
+	window.showMore = "{{$showmore}}";
+	window.showFewer = "{{$showfewer}}";
+	var updateInterval = {{$update_interval}};
+	var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};*/*}}
+</script>
diff --git a/view/theme/decaf-mobile/smarty3/jot-end.tpl b/view/theme/decaf-mobile/smarty3/jot-end.tpl
new file mode 100644
index 0000000000..88c8e59c62
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/jot-end.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
+{{*<!--
+<script>if(typeof window.jotInit != 'undefined') initEditor();</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/jot-header.tpl b/view/theme/decaf-mobile/smarty3/jot-header.tpl
new file mode 100644
index 0000000000..b0bf78916b
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/jot-header.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+{{*/*	var none = "none"; // ugly hack: {{$editselect}} shouldn't be a string if TinyMCE is enabled, but should if it isn't
+	window.editSelect = {{$editselect}};
+	window.isPublic = "{{$ispublic}}";
+	window.nickname = "{{$nickname}}";
+	window.linkURL = "{{$linkurl}}";
+	window.vidURL = "{{$vidurl}}";
+	window.audURL = "{{$audurl}}";
+	window.whereAreU = "{{$whereareu}}";
+	window.term = "{{$term}}";
+	window.baseURL = "{{$baseurl}}";
+	window.geoTag = function () { {{$geotag}} }*/*}}
+	window.jotId = "#profile-jot-text";
+	window.imageUploadButton = 'wall-image-upload';
+</script>
+
diff --git a/view/theme/decaf-mobile/smarty3/jot.tpl b/view/theme/decaf-mobile/smarty3/jot.tpl
new file mode 100644
index 0000000000..61a72154c0
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/jot.tpl
@@ -0,0 +1,104 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey"></div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="{{$action}}" method="post" >
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="source" value="{{$sourceapp}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" ></div>
+		{{if $placeholdercategory}}
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" /></div>
+		{{/if}}
+		<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" placeholder={{$share}} >{{if $content}}{{$content}}{{/if}}</textarea>
+		</div>
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
+
+	<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-upload-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-image-upload-div" style="display: none;" ><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" style="display: none;" ><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 id="profile-link-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-link" class="icon link" title="{{$weblink}}" 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="jot-preview-content" style="display:none;"></div>
+
+	{{*<!--<div style="display: none;">-->*}}
+		<div id="profile-jot-acl-wrapper">
+			{{*<!--{{$acl}}
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+			{{$jotnets}}
+			<div id="profile-jot-networks-end"></div>-->*}}
+			{{if $acl_data}}
+			{{include file="acl_html_selector.tpl"}}
+			{{/if}}
+			{{$jotnets}}
+		</div>
+	{{*<!--</div>-->*}}
+
+
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+		{{*<!--{{if $content}}<script>window.jotInit = true;</script>{{/if}}-->*}}
+<script>
+document.getElementById('wall-image-upload-div').style.display = "inherit";
+document.getElementById('wall-file-upload-div').style.display = "inherit";
+</script>
diff --git a/view/theme/decaf-mobile/smarty3/jot_geotag.tpl b/view/theme/decaf-mobile/smarty3/jot_geotag.tpl
new file mode 100644
index 0000000000..d828980e58
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/jot_geotag.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+	if(navigator.geolocation) {
+		navigator.geolocation.getCurrentPosition(function(position) {
+			var lat = position.coords.latitude.toFixed(4);
+			var lon = position.coords.longitude.toFixed(4);
+
+			$j('#jot-coord').val(lat + ', ' + lon);
+			$j('#profile-nolocation-wrapper').show();
+		});
+	}
+
diff --git a/view/theme/decaf-mobile/smarty3/lang_selector.tpl b/view/theme/decaf-mobile/smarty3/lang_selector.tpl
new file mode 100644
index 0000000000..a1aee8277f
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/lang_selector.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
+<div id="language-selector" style="display: none;" >
+	<form action="#" method="post" >
+		<select name="system_language" onchange="this.form.submit();" >
+			{{foreach $langs.0 as $v=>$l}}
+				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
+			{{/foreach}}
+		</select>
+	</form>
+</div>
diff --git a/view/theme/decaf-mobile/smarty3/like_noshare.tpl b/view/theme/decaf-mobile/smarty3/like_noshare.tpl
new file mode 100644
index 0000000000..9d6a58ea20
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/like_noshare.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}">
+	<a href="like/{{$id}}?verb=like&return={{$return_path}}#{{$item.id}}" class="icon like" title="{{$likethis}}" ></a>
+	{{if $nolike}}
+	<a href="like/{{$id}}?verb=dislike&return={{$return_path}}#{{$item.id}}" class="icon dislike" title="{{$nolike}}" ></a>
+	{{/if}}
+	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+</div>
diff --git a/view/theme/decaf-mobile/smarty3/login.tpl b/view/theme/decaf-mobile/smarty3/login.tpl
new file mode 100644
index 0000000000..d220321ec9
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/login.tpl
@@ -0,0 +1,50 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div class="login-form">
+<form action="{{$dest_url}}" method="post" >
+	<input type="hidden" name="auth-params" value="login" />
+
+	<div id="login_standard">
+	{{include file="field_input.tpl" field=$lname}}
+	{{include file="field_password.tpl" field=$lpassword}}
+	</div>
+	
+	{{if $openid}}
+			<div id="login_openid">
+			{{include file="field_openid.tpl" field=$lopenid}}
+			</div>
+	{{/if}}
+
+	<br />
+	<div id='login-footer'>
+	<div class="login-extra-links">
+	By signing in you agree to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
+	</div>
+
+	<br />
+	{{include file="field_checkbox.tpl" field=$lremember}}
+
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
+	</div>
+
+	<br /><br />
+	<div class="login-extra-links">
+		{{if $register}}<a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}
+        <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
+	</div>
+	</div>
+	
+	{{foreach $hiddens as $k=>$v}}
+		<input type="hidden" name="{{$k}}" value="{{$v}}" />
+	{{/foreach}}
+	
+	
+</form>
+</div>
+
+{{*<!--<script type="text/javascript">window.loginName = "{{$lname.0}}";</script>-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/login_head.tpl b/view/theme/decaf-mobile/smarty3/login_head.tpl
new file mode 100644
index 0000000000..c2d9504ad3
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/login_head.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--<link rel="stylesheet" href="{{$baseurl}}/view/theme/frost-mobile/login-style.css" type="text/css" media="all" />-->*}}
+
diff --git a/view/theme/decaf-mobile/smarty3/lostpass.tpl b/view/theme/decaf-mobile/smarty3/lostpass.tpl
new file mode 100644
index 0000000000..5a22c245bf
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/lostpass.tpl
@@ -0,0 +1,26 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="lostpass-form">
+<h2>{{$title}}</h2>
+<br /><br /><br />
+
+<form action="lostpass" method="post" >
+<div id="login-name-wrapper" class="field input">
+        <label for="login-name" id="label-login-name">{{$name}}</label><br />
+        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
+</div>
+<div id="login-extra-end"></div>
+<p id="lostpass-desc">
+{{$desc}}
+</p>
+<br />
+
+<div id="login-submit-wrapper" >
+        <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
+</div>
+<div id="login-submit-end"></div>
+</form>
+</div>
diff --git a/view/theme/decaf-mobile/smarty3/mail_conv.tpl b/view/theme/decaf-mobile/smarty3/mail_conv.tpl
new file mode 100644
index 0000000000..c2b43c538d
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/mail_conv.tpl
@@ -0,0 +1,23 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<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>
+	<div class="mail-conv-body">{{$mail.body}}</div>
+</div>
+<div class="mail-conv-outside-wrapper-end"></div>
+
+
+<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}?confirm=1" class="icon drophide delete-icon mail-list-delete-icon" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'message/drop/{{$mail.id}}')});" 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>
+
+<hr class="mail-conv-break" />
diff --git a/view/theme/decaf-mobile/smarty3/mail_list.tpl b/view/theme/decaf-mobile/smarty3/mail_list.tpl
new file mode 100644
index 0000000000..538f6affbd
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/mail_list.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<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>
+	</div>
+	<div class="mail-list-detail">
+		<div class="mail-list-sender-name" >{{$from_name}}</div>
+		<div class="mail-list-date">{{$date}}</div>
+		<div class="mail-list-subject"><a href="message/{{$id}}" class="mail-list-link">{{$subject}}</a></div>
+	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-{{$id}}" >
+		<a href="message/dropconv/{{$id}}?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'message/dropconv/{{$id}}')});"  title="{{$delete}}" class="icon drophide mail-list-delete	delete-icon" id="mail-list-delete-{{$id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>
+	</div>
+</div>
+</div>
+<div class="mail-list-delete-end"></div>
+
+<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/theme/decaf-mobile/smarty3/manage.tpl b/view/theme/decaf-mobile/smarty3/manage.tpl
new file mode 100644
index 0000000000..f7d72f653b
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/manage.tpl
@@ -0,0 +1,23 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
+<div id="identity-manage-desc">{{$desc}}</div>
+<div id="identity-manage-choose">{{$choose}}</div>
+<div id="identity-selector-wrapper">
+	<form action="manage" method="post" >
+	<select name="identity" size="4" onchange="this.form.submit();" >
+
+	{{foreach $identities as $id}}
+		<option {{$id.selected}} value="{{$id.uid}}">{{$id.username}} ({{$id.nickname}})</option>
+	{{/foreach}}
+
+	</select>
+	<div id="identity-select-break"></div>
+
+	{{* name="submit" interferes with this.form.submit() *}}
+	<input id="identity-submit" type="submit" {{*name="submit"*}} value="{{$submit}}" />
+</div></form>
+
diff --git a/view/theme/decaf-mobile/smarty3/message-end.tpl b/view/theme/decaf-mobile/smarty3/message-end.tpl
new file mode 100644
index 0000000000..adeea280c7
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/message-end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script src="{{$baseurl}}/library/jquery_ac/friendica.complete.min.js" ></script>
+
+-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/message-head.tpl b/view/theme/decaf-mobile/smarty3/message-head.tpl
new file mode 100644
index 0000000000..a7fb961089
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/message-head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/decaf-mobile/smarty3/moderated_comment.tpl b/view/theme/decaf-mobile/smarty3/moderated_comment.tpl
new file mode 100644
index 0000000000..b2401ca483
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/moderated_comment.tpl
@@ -0,0 +1,66 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+		<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>
+				<div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
+					<div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
+					<input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
+					<div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
+					<input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
+					<div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
+					<input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
+				</div>
+				<ul class="comment-edit-bb-{{$id}}">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="{{$edbold}}"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="{{$editalic}}"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="{{$eduline}}"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="{{$edquote}}"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="{{$edcode}}"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="{{$edimg}}"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="{{$edurl}}"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="{{$edvideo}}"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+				</ul>	
+				<div class="comment-edit-bb-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$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;" >
+					<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/decaf-mobile/smarty3/msg-end.tpl b/view/theme/decaf-mobile/smarty3/msg-end.tpl
new file mode 100644
index 0000000000..594f3f79b9
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/msg-end.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
+
diff --git a/view/theme/decaf-mobile/smarty3/msg-header.tpl b/view/theme/decaf-mobile/smarty3/msg-header.tpl
new file mode 100644
index 0000000000..8447bb3006
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/msg-header.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script language="javascript" type="text/javascript">
+{{*/*	window.nickname = "{{$nickname}}";
+	window.linkURL = "{{$linkurl}}";
+	var plaintext = "none";
+	window.autocompleteType = 'msg-header';*/*}}
+	window.jotId = "#prvmail-text";
+	window.imageUploadButton = 'prvmail-upload';
+</script>
+
diff --git a/view/theme/decaf-mobile/smarty3/nav.tpl b/view/theme/decaf-mobile/smarty3/nav.tpl
new file mode 100644
index 0000000000..87d0bdec7e
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/nav.tpl
@@ -0,0 +1,160 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav>
+{{*<!--	{{$langselector}} -->*}}
+
+{{*<!--	<div id="site-location">{{$sitelocation}}</div> -->*}}
+
+	<span id="nav-link-wrapper" >
+
+{{*<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->*}}
+	<div class="nav-button-container">
+{{*<!--	<a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->*}}
+	<a href="{{$nav.navigation.0}}" title="{{$nav.navigation.3}}" >
+	<img rel="#system-menu-list" class="nav-link" src="view/theme/decaf-mobile/images/menu.png">
+	</a>
+{{*<!--	</a>-->*}}
+	{{*<!--<ul id="system-menu-list" class="nav-menu-list">
+		{{if $nav.login}}
+		<a id="nav-login-link" class="nav-load-page-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
+		{{/if}}
+
+		{{if $nav.register}}
+		<a id="nav-register-link" class="nav-load-page-link {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>
+		{{/if}}
+
+		{{if $nav.settings}}
+		<li><a id="nav-settings-link" class="{{$nav.settings.2}} nav-load-page-link" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.manage}}
+		<li>
+		<a id="nav-manage-link" class="nav-load-page-link {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>
+		</li>
+		{{/if}}
+
+		{{if $nav.profiles}}
+		<li><a id="nav-profiles-link" class="{{$nav.profiles.2}} nav-load-page-link" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.admin}}
+		<li><a id="nav-admin-link" class="{{$nav.admin.2}} nav-load-page-link" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>
+		{{/if}}
+
+		<li><a id="nav-search-link" class="{{$nav.search.2}} nav-load-page-link" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a></li>
+
+		{{if $nav.apps}}
+		<li><a id="nav-apps-link" class="{{$nav.apps.2}} nav-load-page-link" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.help}}
+		<li><a id="nav-help-link" class="{{$nav.help.2}} nav-load-page-link" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>
+		{{/if}}
+		
+		{{if $nav.logout}}
+		<li><a id="nav-logout-link" class="{{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>
+		{{/if}}
+	</ul>-->*}}
+	</div>
+
+	{{if $nav.notifications}}
+{{*<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>-->*}}
+	<div class="nav-button-container">
+{{*<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">-->*}}
+	<a href="{{$nav.notifications.all.0}}">
+	<img rel="#nav-notifications-menu" class="nav-link" src="view/theme/decaf-mobile/images/notifications.png">
+	</a>
+{{*<!--	</a>-->*}}
+	{{*<!--<span id="notify-update" class="nav-ajax-left"></span>
+	<ul id="nav-notifications-menu" class="notifications-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>-->*}}
+	</div>
+	{{/if}}		
+
+{{*<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->*}}
+	{{if $nav.contacts}}
+	<div class="nav-button-container">
+{{*<!--	<a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->*}}
+	<a id="nav-contacts-link" class="{{$nav.contacts.2}} nav-load-page-link" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >
+	<img rel="#contacts-menu-list"  class="nav-link" src="view/theme/decaf-mobile/images/contacts.png">
+	</a>
+	{{*<!--</a>-->*}}
+	{{if $nav.introductions}}
+	<span id="intro-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{*<!--<ul id="contacts-menu-list" class="nav-menu-list">
+		{{if $nav.contacts}}
+		<li><a id="nav-contacts-link" class="{{$nav.contacts.2}} nav-load-page-link" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a><li>
+		{{/if}}
+
+		<li><a id="nav-directory-link" class="{{$nav.directory.2}} nav-load-page-link" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a><li>
+
+		{{if $nav.introductions}}
+		<li>
+		<a id="nav-notify-link" class="{{$nav.introductions.2}} {{$sel.introductions}} nav-load-page-link" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
+		</li>
+		{{/if}}
+	</ul>-->*}}
+	</div>
+	{{/if}}
+
+	{{if $nav.messages}}
+{{*<!--	<a id="nav-messages-link" class="nav-link {{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>-->*}}
+	<div class="nav-button-container">
+	<a id="nav-messages-link" class="{{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >
+	<img src="view/theme/decaf-mobile/images/message.png" class="nav-link">
+	</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	</div>
+	{{/if}}
+
+{{*<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->*}}
+	{{if $nav.network}}
+	<div class="nav-button-container">
+{{*<!--	<a class="network-menu-link nav-link" href="#network-menu" title="Network">-->*}}
+	<a id="nav-network-link" class="{{$nav.network.2}} {{$sel.network}} nav-load-page-link" href="/" >
+	<img rel="#network-menu-list" class="nav-link" src="view/theme/decaf-mobile/images/network.png">
+	</a>
+{{*<!--	</a>-->*}}
+	<span id="net-update" class="nav-ajax-left"></span>
+	</div>
+	{{/if}}
+<!--	<ul id="network-menu-list" class="nav-menu-list">
+		{{if $nav.network}}
+		<li>
+		<a id="nav-network-link" class="{{$nav.network.2}} {{$sel.network}} nav-load-page-link" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+		</li>
+		{{/if}}
+
+		{{if $nav.network}}
+		<li>
+		<a class="nav-menu-icon network-reset-link nav-link" href="{{$nav.net_reset.0}}" title="{{$nav.net_reset.3}}">{{$nav.net_reset.1}}</a>
+		</li>
+		{{/if}}
+
+		{{if $nav.home}}
+		<li><a id="nav-home-link" class="{{$nav.home.2}} {{$sel.home}} nav-load-page-link" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.community}}
+		<li>
+		<a id="nav-community-link" class="{{$nav.community.2}} {{$sel.community}} nav-load-page-link" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+		</li>
+		{{/if}}
+	</ul>
+	</div>-->
+
+	</span>
+	{{*<!--<span id="nav-end"></span>-->*}}
+	<span id="banner">{{$banner}}</span>
+</nav>
+
+{{*<!--<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/photo_drop.tpl b/view/theme/decaf-mobile/smarty3/photo_drop.tpl
new file mode 100644
index 0000000000..57f26cf52b
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/photo_drop.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" >
+	<a href="item/drop/{{$id}}?confirm=1" onclick="return confirmDelete(function(){this.href='item/drop/{{$id}}'});" class="icon drophide" title="{{$delete}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>
+</div>
+<div class="wall-item-delete-end"></div>
diff --git a/view/theme/decaf-mobile/smarty3/photo_edit.tpl b/view/theme/decaf-mobile/smarty3/photo_edit.tpl
new file mode 100644
index 0000000000..1cff8f0448
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/photo_edit.tpl
@@ -0,0 +1,65 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
+
+	<input type="hidden" name="item_id" value="{{$item_id}}" />
+	<input id="photo-edit-form-confirm" type="hidden" name="confirm" value="1" />
+
+	<div class="photo-edit-input-text">
+	<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$newalbum}}</label>
+	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$album}}" />
+	</div>
+
+	<div id="photo-edit-albumname-end"></div>
+
+	<div class="photo-edit-input-text">
+	<label id="photo-edit-caption-label" for="photo-edit-caption">{{$capt_label}}</label>
+	<input id="photo-edit-caption" type="text" size="32" name="desc" value="{{$caption}}" />
+	</div>
+
+	<div id="photo-edit-caption-end"></div>
+
+	<div class="photo-edit-input-text">
+	<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$tag_label}}</label>
+	<input name="newtag" id="photo-edit-newtag" size="32" title="{{$help_tags}}" type="text" />
+	</div>
+
+	<div id="photo-edit-tags-end"></div>
+
+	<div class="photo-edit-rotate-choice">
+	<label id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw">{{$rotatecw}}</label>
+	<input id="photo-edit-rotate-cw" class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
+	</div>
+
+	<div class="photo-edit-rotate-choice">
+	<label id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw">{{$rotateccw}}</label>
+	<input id="photo-edit-rotate-ccw" class="photo-edit-rotate" type="radio" name="rotate" value="2" />
+	</div>
+	<div id="photo-edit-rotate-end"></div>
+
+	<div id="photo-edit-perms" class="photo-edit-perms" >
+		{{*<!--<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="popupbox button" title="{{$permissions}}"/>
+			<span id="jot-perms-icon" class="icon {{$lockstate}} photo-perms-icon" ></span><div class="photo-jot-perms-text">{{$permissions}}</div>
+		</a>
+		<div id="photo-edit-perms-menu-end"></div>
+		
+		<div style="display: none;">-->*}}
+			<div id="photo-edit-perms-select" >
+				{{*<!--{{$aclselect}}-->*}}
+				{{include file="acl_html_selector.tpl"}}
+			</div>
+		{{*<!--</div>-->*}}
+	</div>
+	<div id="photo-edit-perms-end"></div>
+
+	<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
+	<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete(function(){remove('photo-edit-form-confirm');});" />
+
+	<div id="photo-edit-end"></div>
+</form>
+
+
diff --git a/view/theme/decaf-mobile/smarty3/photo_edit_head.tpl b/view/theme/decaf-mobile/smarty3/photo_edit_head.tpl
new file mode 100644
index 0000000000..740c3b425a
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/photo_edit_head.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script>
+	window.prevLink = "{{$prevlink}}";
+	window.nextLink = "{{$nextlink}}";
+	window.photoEdit = true;
+
+</script>-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/photo_view.tpl b/view/theme/decaf-mobile/smarty3/photo_view.tpl
new file mode 100644
index 0000000000..5ccb5fb163
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/photo_view.tpl
@@ -0,0 +1,47 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<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>
+{{/if}}
+{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" {{*onclick="lockview(event,'photo/{{$id}}');"*}} /> {{/if}}
+</div>
+
+<div id="photo-nav">
+	{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><img src="view/theme/decaf-mobile/images/arrow-left.png"></a></div>{{/if}}
+	{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><img src="view/theme/decaf-mobile/images/arrow-right.png"></a></div>{{/if}}
+</div>
+<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></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>
+{{/if}}
+{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
+
+{{if $edit}}
+{{$edit}}
+{{else}}
+
+{{if $likebuttons}}
+<div id="photo-like-div">
+	{{$likebuttons}}
+	{{$like}}
+	{{$dislike}}	
+</div>
+{{/if}}
+
+{{$comments}}
+
+{{$paginate}}
+{{/if}}
+
diff --git a/view/theme/decaf-mobile/smarty3/photos_head.tpl b/view/theme/decaf-mobile/smarty3/photos_head.tpl
new file mode 100644
index 0000000000..c8bfa62c1d
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/photos_head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script>
+	window.isPublic = "{{$ispublic}}";
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/photos_upload.tpl b/view/theme/decaf-mobile/smarty3/photos_upload.tpl
new file mode 100644
index 0000000000..9c22448dda
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/photos_upload.tpl
@@ -0,0 +1,56 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$pagename}}</h3>
+
+<div id="photos-usage-message">{{$usage}}</div>
+
+<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
+	<div id="photos-upload-new-wrapper" >
+		<div id="photos-upload-newalbum-div">
+			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
+		</div>
+		<input id="photos-upload-newalbum" type="text" name="newalbum" />
+	</div>
+	<div id="photos-upload-new-end"></div>
+	<div id="photos-upload-exist-wrapper">
+		<div id="photos-upload-existing-album-text">{{$existalbumtext}}</div>
+		<select id="photos-upload-album-select" name="album">
+		{{$albumselect}}
+		</select>
+	</div>
+	<div id="photos-upload-exist-end"></div>
+
+	{{$default_upload_box}}
+
+	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
+		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
+		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
+	</div>
+
+
+	{{*<!--<div id="photos-upload-perms" class="photos-upload-perms" >
+		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
+		<span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
+		</a>
+	</div>
+	<div id="photos-upload-perms-end"></div>
+
+	<div style="display: none;">-->*}}
+		<div id="photos-upload-permissions-wrapper">
+			{{*<!--{{$aclselect}}-->*}}
+			{{include file="acl_html_selector.tpl"}}
+		</div>
+	{{*<!--</div>-->*}}
+
+	<div id="photos-upload-spacer"></div>
+
+	{{$alt_uploader}}
+
+	{{$default_upload_submit}}
+
+	<div class="photos-upload-end" ></div>
+</form>
+
diff --git a/view/theme/decaf-mobile/smarty3/profed_end.tpl b/view/theme/decaf-mobile/smarty3/profed_end.tpl
new file mode 100644
index 0000000000..e9c03543b1
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/profed_end.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script type="text/javascript" src="js/country.min.js" ></script>
+
+<script language="javascript" type="text/javascript">
+	Fill_Country('{{$country_name}}');
+	Fill_States('{{$region}}');
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/profed_head.tpl b/view/theme/decaf-mobile/smarty3/profed_head.tpl
new file mode 100644
index 0000000000..c8ce27bb83
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/profed_head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script language="javascript" type="text/javascript">
+	window.editSelect = "none";
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/profile_edit.tpl b/view/theme/decaf-mobile/smarty3/profile_edit.tpl
new file mode 100644
index 0000000000..7583784fbf
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/profile_edit.tpl
@@ -0,0 +1,329 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$default}}
+
+<h1>{{$banner}}</h1>
+
+<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="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>
+<li></li>
+<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>
+
+</ul>
+</div>
+
+<div id="profile-edit-links-end"></div>
+
+
+<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>
+<input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /><div class="required">*</div>
+</div>
+<div id="profile-edit-profile-name-end"></div>
+
+<div id="profile-edit-name-wrapper" >
+<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label>
+<input type="text" size="28" name="name" id="profile-edit-name" value="{{$name}}" />
+</div>
+<div id="profile-edit-name-end"></div>
+
+<div id="profile-edit-pdesc-wrapper" >
+<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label>
+<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" />
+</div>
+<div id="profile-edit-pdesc-end"></div>
+
+
+<div id="profile-edit-gender-wrapper" >
+<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
+{{$gender}}
+</div>
+<div id="profile-edit-gender-end"></div>
+
+<div id="profile-edit-dob-wrapper" >
+<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label>
+<div id="profile-edit-dob" >
+{{$dob}} {{$age}}
+</div>
+</div>
+<div id="profile-edit-dob-end"></div>
+
+{{$hide_friends}}
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="profile-edit-address-wrapper" >
+<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label>
+<input type="text" size="28" name="address" id="profile-edit-address" value="{{$address}}" />
+</div>
+<div id="profile-edit-address-end"></div>
+
+<div id="profile-edit-locality-wrapper" >
+<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label>
+<input type="text" size="28" name="locality" id="profile-edit-locality" value="{{$locality}}" />
+</div>
+<div id="profile-edit-locality-end"></div>
+
+
+<div id="profile-edit-postal-code-wrapper" >
+<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label>
+<input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" />
+</div>
+<div id="profile-edit-postal-code-end"></div>
+
+<div id="profile-edit-country-name-wrapper" >
+<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label>
+<input type="text" size="28" name="country_name" id="profile-edit-country-name" value="{{$country_name}}" />
+{{*<!--<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');">
+<option selected="selected" >{{$country_name}}</option>
+<option>temp</option>
+</select>-->*}}
+</div>
+<div id="profile-edit-country-name-end"></div>
+
+<div id="profile-edit-region-wrapper" >
+<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label>
+<input type="text" size="28" name="region" id="profile-edit-region" value="{{$region}}" />
+{{*<!--<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
+<option selected="selected" >{{$region}}</option>
+<option>temp</option>
+</select>-->*}}
+</div>
+<div id="profile-edit-region-end"></div>
+
+<div id="profile-edit-hometown-wrapper" >
+<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label>
+<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" />
+</div>
+<div id="profile-edit-hometown-end"></div>
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="profile-edit-marital-wrapper" >
+<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
+{{$marital}}
+</div>
+<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
+<input type="text" size="28" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
+<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
+<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
+
+<div id="profile-edit-marital-end"></div>
+
+<div id="profile-edit-sexual-wrapper" >
+<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
+{{$sexual}}
+</div>
+<div id="profile-edit-sexual-end"></div>
+
+
+
+<div id="profile-edit-homepage-wrapper" >
+<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label>
+<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" />
+</div>
+<div id="profile-edit-homepage-end"></div>
+
+<div id="profile-edit-politic-wrapper" >
+<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label>
+<input type="text" size="28" name="politic" id="profile-edit-politic" value="{{$politic}}" />
+</div>
+<div id="profile-edit-politic-end"></div>
+
+<div id="profile-edit-religion-wrapper" >
+<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label>
+<input type="text" size="28" name="religion" id="profile-edit-religion" value="{{$religion}}" />
+</div>
+<div id="profile-edit-religion-end"></div>
+
+<div id="profile-edit-pubkeywords-wrapper" >
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label>
+<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords}}" />
+</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
+<div id="profile-edit-pubkeywords-end"></div>
+
+<div id="profile-edit-prvkeywords-wrapper" >
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$lbl_prvkey}} </label>
+<input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords}}" />
+</div><div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div>
+<div id="profile-edit-prvkeywords-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="about-jot-wrapper" class="profile-jot-box">
+<p id="about-jot-desc" >
+{{$lbl_about}}
+</p>
+
+<textarea rows="10" cols="30" id="profile-about-text" class="profile-edit-textarea" name="about" >{{$about}}</textarea>
+
+</div>
+<div id="about-jot-end"></div>
+
+
+<div id="interest-jot-wrapper" class="profile-jot-box" >
+<p id="interest-jot-desc" >
+{{$lbl_hobbies}}
+</p>
+
+<textarea rows="10" cols="30" id="interest-jot-text" class="profile-edit-textarea" name="interest" >{{$interest}}</textarea>
+
+</div>
+<div id="interest-jot-end"></div>
+
+
+<div id="likes-jot-wrapper" class="profile-jot-box" >
+<p id="likes-jot-desc" >
+{{$lbl_likes}}
+</p>
+
+<textarea rows="10" cols="30" id="likes-jot-text" class="profile-edit-textarea" name="likes" >{{$likes}}</textarea>
+
+</div>
+<div id="likes-jot-end"></div>
+
+
+<div id="dislikes-jot-wrapper" class="profile-jot-box" >
+<p id="dislikes-jot-desc" >
+{{$lbl_dislikes}}
+</p>
+
+<textarea rows="10" cols="30" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >{{$dislikes}}</textarea>
+
+</div>
+<div id="dislikes-jot-end"></div>
+
+
+<div id="contact-jot-wrapper" class="profile-jot-box" >
+<p id="contact-jot-desc" >
+{{$lbl_social}}
+</p>
+
+<textarea rows="10" cols="30" id="contact-jot-text" class="profile-edit-textarea" name="contact" >{{$contact}}</textarea>
+
+</div>
+<div id="contact-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="music-jot-wrapper" class="profile-jot-box" >
+<p id="music-jot-desc" >
+{{$lbl_music}}
+</p>
+
+<textarea rows="10" cols="30" id="music-jot-text" class="profile-edit-textarea" name="music" >{{$music}}</textarea>
+
+</div>
+<div id="music-jot-end"></div>
+
+<div id="book-jot-wrapper" class="profile-jot-box" >
+<p id="book-jot-desc" >
+{{$lbl_book}}
+</p>
+
+<textarea rows="10" cols="30" id="book-jot-text" class="profile-edit-textarea" name="book" >{{$book}}</textarea>
+
+</div>
+<div id="book-jot-end"></div>
+
+
+
+<div id="tv-jot-wrapper" class="profile-jot-box" >
+<p id="tv-jot-desc" >
+{{$lbl_tv}} 
+</p>
+
+<textarea rows="10" cols="30" id="tv-jot-text" class="profile-edit-textarea" name="tv" >{{$tv}}</textarea>
+
+</div>
+<div id="tv-jot-end"></div>
+
+
+
+<div id="film-jot-wrapper" class="profile-jot-box" >
+<p id="film-jot-desc" >
+{{$lbl_film}}
+</p>
+
+<textarea rows="10" cols="30" id="film-jot-text" class="profile-edit-textarea" name="film" >{{$film}}</textarea>
+
+</div>
+<div id="film-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="romance-jot-wrapper" class="profile-jot-box" >
+<p id="romance-jot-desc" >
+{{$lbl_love}}
+</p>
+
+<textarea rows="10" cols="30" id="romance-jot-text" class="profile-edit-textarea" name="romance" >{{$romance}}</textarea>
+
+</div>
+<div id="romance-jot-end"></div>
+
+
+
+<div id="work-jot-wrapper" class="profile-jot-box" >
+<p id="work-jot-desc" >
+{{$lbl_work}}
+</p>
+
+<textarea rows="10" cols="30" id="work-jot-text" class="profile-edit-textarea" name="work" >{{$work}}</textarea>
+
+</div>
+<div id="work-jot-end"></div>
+
+
+
+<div id="education-jot-wrapper" class="profile-jot-box" >
+<p id="education-jot-desc" >
+{{$lbl_school}} 
+</p>
+
+<textarea rows="10" cols="30" id="education-jot-text" class="profile-edit-textarea" name="education" >{{$education}}</textarea>
+
+</div>
+<div id="education-jot-end"></div>
+
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+</form>
+</div>
+
diff --git a/view/theme/decaf-mobile/smarty3/profile_photo.tpl b/view/theme/decaf-mobile/smarty3/profile_photo.tpl
new file mode 100644
index 0000000000..6bcb3cf850
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/profile_photo.tpl
@@ -0,0 +1,24 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<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>
+<input name="userfile" type="file" id="profile-photo-upload" size="25" />
+</div>
+
+<div id="profile-photo-submit-wrapper">
+<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
+</div>
+
+</form>
+
+<div id="profile-photo-link-select-wrapper">
+{{$select}}
+</div>
diff --git a/view/theme/decaf-mobile/smarty3/profile_vcard.tpl b/view/theme/decaf-mobile/smarty3/profile_vcard.tpl
new file mode 100644
index 0000000000..85c6345d6d
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/profile_vcard.tpl
@@ -0,0 +1,56 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	<div class="fn label">{{$profile.name}}</div>
+	
+				
+	
+	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+	<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>{{/if}}
+			<span class="city-state-zip">
+				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<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>{{/if}}
+		</dd>
+		</dl>
+	{{/if}}
+
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	
+	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+	{{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>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+
+	<div id="profile-vcard-break"></div>	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+			{{if $wallmessage}}
+				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/theme/decaf-mobile/smarty3/prv_message.tpl b/view/theme/decaf-mobile/smarty3/prv_message.tpl
new file mode 100644
index 0000000000..6372d306ae
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/prv_message.tpl
@@ -0,0 +1,48 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h3>{{$header}}</h3>
+
+<div id="prvmail-wrapper" >
+<form id="prvmail-form" action="message" method="post" >
+
+{{$parent}}
+
+<div id="prvmail-to-label">{{$to}}</div>
+
+{{if $showinputs}}
+<input type="text" id="recip" name="messageto" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
+<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
+{{else}}
+{{$select}}
+{{/if}}
+
+<div id="prvmail-subject-label">{{$subject}}</div>
+<input type="text" size="28" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
+
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="8" cols="32" 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-upload-wrapper"  style="display: none;">
+		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
+	</div> 
+	{{*<!--<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>
+
+<script>
+document.getElementById('prvmail-upload-wrapper').style.display = "inherit";
+</script>
diff --git a/view/theme/decaf-mobile/smarty3/register.tpl b/view/theme/decaf-mobile/smarty3/register.tpl
new file mode 100644
index 0000000000..7dd8c77ca4
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/register.tpl
@@ -0,0 +1,85 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class='register-form'>
+<h2>{{$regtitle}}</h2>
+<br />
+
+<form action="register" method="post" id="register-form">
+
+	<input type="hidden" name="photo" value="{{$photo}}" />
+
+	{{$registertext}}
+
+	<p id="register-realpeople">{{$realpeople}}</p>
+
+	<br />
+{{if $oidlabel}}
+	<div id="register-openid-wrapper" >
+    	<label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input 	type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid}}" >
+	</div>
+	<div id="register-openid-end" ></div>
+{{/if}}
+
+	<div class="register-explain-wrapper">
+	<p id="register-fill-desc">{{$fillwith}} {{$fillext}}</p>
+	</div>
+
+	<br /><br />
+
+{{if $invitations}}
+
+	<p id="register-invite-desc">{{$invite_desc}}</p>
+	<div id="register-invite-wrapper" >
+		<label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
+		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}" >
+	</div>
+	<div id="register-name-end" ></div>
+
+{{/if}}
+
+
+	<div id="register-name-wrapper" class="field input" >
+		<label for="register-name" id="label-register-name" >{{$namelabel}}</label><br />
+		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username}}" >
+	</div>
+	<div id="register-name-end" ></div>
+
+
+	<div id="register-email-wrapper"  class="field input" >
+		<label for="register-email" id="label-register-email" >{{$addrlabel}}</label><br />
+		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="{{$email}}" >
+	</div>
+	<div id="register-email-end" ></div>
+
+	<div id="register-nickname-wrapper" class="field input" >
+		<label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label><br />
+		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="{{$nickname}}" >
+	</div>
+	<div id="register-nickname-end" ></div>
+
+	<div class="register-explain-wrapper">
+	<p id="register-nickname-desc" >{{$nickdesc}}</p>
+	</div>
+
+	{{$publish}}
+
+	<div id="register-footer">
+	<div class="agreement">
+	By clicking '{{$regbutt}}' you are agreeing to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
+	</div>
+	<br />
+
+	<div id="register-submit-wrapper">
+		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
+	</div>
+	<div id="register-submit-end" ></div>
+	</div>
+</form>
+<br /><br /><br />
+
+{{$license}}
+
+</div>
diff --git a/view/theme/decaf-mobile/smarty3/search_item.tpl b/view/theme/decaf-mobile/smarty3/search_item.tpl
new file mode 100644
index 0000000000..a6da44d3d6
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/search_item.tpl
@@ -0,0 +1,69 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<a name="{{$item.id}}" ></a>
+{{*<!--<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="wall-item-lock lockview" alt="{{$item.lock}}" {{*onclick="lockview(event,{{$item.id}});" *}}/>{{*<!--</div>-->*}}
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<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}}" title="{{$item.localtime}}">{{$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>
+			{{if $item.has_cats}}
+			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+
+			{{if $item.has_folders}}
+			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+		</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}}?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/{{$item.id}}')});" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>{{/if}}
+			{{*<!--</div>-->*}}
+				{{*<!--{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}-->*}}
+			{{*<!--<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>
+	{{/if}}
+	</div>
+
+{{*<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->*}}
+
+{{*<!--</div>-->*}}
+
+
diff --git a/view/theme/decaf-mobile/smarty3/settings-head.tpl b/view/theme/decaf-mobile/smarty3/settings-head.tpl
new file mode 100644
index 0000000000..c8bfa62c1d
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/settings-head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script>
+	window.isPublic = "{{$ispublic}}";
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/smarty3/settings.tpl b/view/theme/decaf-mobile/smarty3/settings.tpl
new file mode 100644
index 0000000000..d702cd7d1b
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/settings.tpl
@@ -0,0 +1,153 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$ptitle}}</h1>
+
+{{$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>
+
+{{include file="field_password.tpl" field=$password1}}
+{{include file="field_password.tpl" field=$password2}}
+
+{{if $oid_enable}}
+{{include file="field_input.tpl" field=$openid}}
+{{/if}}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+<h3 class="settings-heading">{{$h_basic}}</h3>
+
+{{include file="field_input.tpl" field=$username}}
+{{include file="field_input.tpl" field=$email}}
+{{include file="field_custom.tpl" field=$timezone}}
+{{include file="field_input.tpl" field=$defloc}}
+{{include file="field_checkbox.tpl" field=$allowloc}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+<h3 class="settings-heading">{{$h_prv}}</h3>
+
+
+<input type="hidden" name="visibility" value="{{$visibility}}" />
+
+{{include file="field_input.tpl" field=$maxreq}}
+
+{{$profile_in_dir}}
+
+{{$profile_in_net_dir}}
+
+{{$hide_friends}}
+
+{{$hide_wall}}
+
+{{$blockwall}}
+
+{{$blocktags}}
+
+{{$suggestme}}
+
+{{$unkmail}}
+
+
+{{include file="field_input.tpl" field=$cntunkmail}}
+
+{{include file="field_input.tpl" field=$expire.days}}
+
+
+<div class="field input">
+	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="{{$expire.advanced}}">{{$expire.label}}</a></span>
+	<div style="display: none;">
+		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
+			<h3>{{$expire.advanced}}</h3>
+			{{include file="field_yesno.tpl" field=$expire.items}}
+			{{include file="field_yesno.tpl" field=$expire.notes}}
+			{{include file="field_yesno.tpl" field=$expire.starred}}
+			{{include file="field_yesno.tpl" field=$expire.network_only}}
+		</div>
+	</div>
+
+</div>
+
+
+<div id="settings-perms-wrapper" class="field">
+<label for="settings-default-perms">{{$settings_perms}}</label><br/>
+<div id="settings-default-perms" class="settings-default-perms" >
+{{*<!--	<a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>{{$permissions}} {{$permdesc}}</a>
+	<div id="settings-default-perms-menu-end"></div>
+
+	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
+	
+	<div style="display: none;">-->*}}
+		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
+			{{*<!--{{$aclselect}}-->*}}
+			{{include file="acl_html_selector.tpl"}}
+		</div>
+{{*<!--	</div>
+
+	</div>-->*}}
+</div>
+</div>
+<br/>
+<div id="settings-default-perms-end"></div>
+
+{{$group_select}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+
+<h3 class="settings-heading">{{$h_not}}</h3>
+<div id="settings-notifications">
+
+<div id="settings-activity-desc">{{$activity_options}}</div>
+
+{{include file="field_checkbox.tpl" field=$post_newfriend}}
+{{include file="field_checkbox.tpl" field=$post_joingroup}}
+{{include file="field_checkbox.tpl" field=$post_profilechange}}
+
+
+<div id="settings-notify-desc">{{$lbl_not}}</div>
+
+<div class="group">
+{{include file="field_intcheckbox.tpl" field=$notify1}}
+{{include file="field_intcheckbox.tpl" field=$notify2}}
+{{include file="field_intcheckbox.tpl" field=$notify3}}
+{{include file="field_intcheckbox.tpl" field=$notify4}}
+{{include file="field_intcheckbox.tpl" field=$notify5}}
+{{include file="field_intcheckbox.tpl" field=$notify6}}
+{{include file="field_intcheckbox.tpl" field=$notify7}}
+</div>
+
+</div>
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+<h3 class="settings-heading">{{$h_advn}}</h3>
+<div id="settings-pagetype-desc">{{$h_descadvn}}</div>
+
+{{$pagetype}}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
diff --git a/view/theme/decaf-mobile/smarty3/settings_display_end.tpl b/view/theme/decaf-mobile/smarty3/settings_display_end.tpl
new file mode 100644
index 0000000000..4b3db00f5a
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/settings_display_end.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	<script>$j(function(){ previewTheme($j("#id_{{$theme.0}}")[0]); });</script>
+
diff --git a/view/theme/decaf-mobile/smarty3/suggest_friends.tpl b/view/theme/decaf-mobile/smarty3/suggest_friends.tpl
new file mode 100644
index 0000000000..7221dc6898
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/suggest_friends.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="profile-match-wrapper">
+	<div class="profile-match-photo">
+		<a href="{{$url}}">
+			<img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" onError="this.src='../../../images/person-48.jpg';" />
+		</a>
+	</div>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="{{$url}}" title="{{$name}}">{{$name}}</a>
+	</div>
+	<div class="profile-match-end"></div>
+	{{if $connlnk}}
+	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
+	{{/if}}
+	<a href="{{$ignlnk}}&confirm=1" title="{{$ignore}}" class="icon drophide profile-match-ignore" id="profile-match-drop-{{$ignid}}" {{*onmouseout="imgdull(this);" onmouseover="imgbright(this);"*}} onclick="id=this.id;return confirmDelete(function(){changeHref(id, '{{$ignlnk}}')});" ></a>
+</div>
diff --git a/view/theme/decaf-mobile/smarty3/threaded_conversation.tpl b/view/theme/decaf-mobile/smarty3/threaded_conversation.tpl
new file mode 100644
index 0000000000..e90caf5a70
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/threaded_conversation.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+{{if $mode == display}}
+{{include file="{{$thread.template}}" item=$thread}}
+{{else}}
+{{include file="wall_thread_toponly.tpl" item=$thread}}
+{{/if}}
+{{/foreach}}
+
+<div id="conversation-end"></div>
+
diff --git a/view/theme/decaf-mobile/smarty3/voting_fakelink.tpl b/view/theme/decaf-mobile/smarty3/voting_fakelink.tpl
new file mode 100644
index 0000000000..1e073916e1
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/voting_fakelink.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<span class="fakelink-wrapper"  id="{{$type}}list-{{$id}}-wrapper">{{$phrase}}</span>
diff --git a/view/theme/decaf-mobile/smarty3/wall_thread.tpl b/view/theme/decaf-mobile/smarty3/wall_thread.tpl
new file mode 100644
index 0000000000..97769f3017
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/wall_thread.tpl
@@ -0,0 +1,125 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<a name="{{$item.id}}" ></a>
+{{*<!--<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{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
+			{{if $item.owner_url}}
+			<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}}" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/if}}
+			{{*<!--<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)">-->*}}
+			{{*<!--<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$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}}" onError="this.src='../../../images/person-48.jpg';" />
+				</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 class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+                        {{$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="wall-item-lock lockview" alt="{{$item.lock}}" {{*onclick="lockview(event,{{$item.id}});"*}} />{{*<!--</div>-->*}}
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<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>{{if $item.owner_url}} {{$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}}{{/if}}<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">-->*}}
+						{{foreach $item.tags as $tag}}
+							<span class='body-tag tag'>{{$tag}}</span>
+						{{/foreach}}
+					{{*<!--</div>-->*}}
+			{{if $item.has_cats}}
+			<div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+
+			{{if $item.has_folders}}
+			<div class="filesavetags">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+			</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="like/{{$item.id}}?verb=like&return={{$return_path}}#{{$item.id}}" class="icon like" title="{{$item.vote.like.0}}" ></a>
+				{{if $item.vote.dislike}}
+				<a href="like/{{$item.id}}?verb=dislike&return={{$return_path}}#{{$item.id}}" class="icon dislike" title="{{$item.vote.dislike.0}}" ></a>
+				{{/if}}
+				{{*<!--{{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>{{/if}}-->*}}
+				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+			</div>
+			{{/if}}
+			{{if $item.plink}}
+				{{*<!--<div class="wall-item-links-wrapper">-->*}}<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}}"></a>{{*<!--</div>-->*}}
+			{{/if}}
+			{{if $item.edpost}}
+				<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+			{{/if}}
+			 
+			{{if $item.star}}
+			<a href="starred/{{$item.id}}?return={{$return_path}}#{{$item.id}}" id="starred-{{$item.id}}" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
+			{{/if}}
+			{{*<!--{{if $item.tagger}}
+			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
+			{{/if}}-->*}}
+			{{*<!--{{if $item.filer}}
+			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
+			{{/if}}			-->*}}
+			
+			{{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/{{$item.id}}')});" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>{{/if}}
+			{{*<!--</div>-->*}}
+				{{*<!--{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}-->*}}
+			{{*<!--<div class="wall-item-delete-end"></div>-->*}}
+		</div>
+	</div>	
+	{{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
+	<div class="wall-item-like wall-item-like-full {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+	<div class="wall-item-dislike wall-item-dislike-full {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+	<div class="wall-item-boring wall-item-boring-full {{$item.indent}}" id="wall-item-boring-{{$item.id}}">{{$item.boring}}</div>
+
+	{{if $item.threaded}}
+	{{if $item.comment}}
+	{{*<!--<div class="wall-item-comment-wrapper {{$item.indent}}" >-->*}}
+		{{$item.comment}}
+	{{*<!--</div>-->*}}
+	{{/if}}
+	{{/if}}
+
+{{*<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->*}}
+{{*<!--</div>-->*}}
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+
+{{if $item.flatten}}
+{{*<!--<div class="wall-item-comment-wrapper" >-->*}}
+	{{$item.comment}}
+{{*<!--</div>-->*}}
+{{/if}}
+</div>
+
diff --git a/view/theme/decaf-mobile/smarty3/wall_thread_toponly.tpl b/view/theme/decaf-mobile/smarty3/wall_thread_toponly.tpl
new file mode 100644
index 0000000000..6a4da1acc4
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/wall_thread_toponly.tpl
@@ -0,0 +1,107 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<!--{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}-->
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<a name="{{$item.id}}" ></a>
+	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
+			{{if $item.owner_url}}
+			<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}}" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/if}}
+				<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}}" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" {{*onclick="lockview(event,{{$item.id}});"*}} />
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
+			</div>
+		</div>
+				<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>{{if $item.owner_url}} {{$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}}{{/if}}<br />
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</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-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+						{{foreach $item.tags as $tag}}
+							<span class='body-tag tag'>{{$tag}}</span>
+						{{/foreach}}
+			{{if $item.has_cats}}
+			<div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+
+			{{if $item.has_folders}}
+			<div class="filesavetags">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+			</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="like/{{$item.id}}?verb=like&return={{$return_path}}#{{$item.id}}" class="icon like" title="{{$item.vote.like.0}}" ></a>
+				{{if $item.vote.dislike}}
+				<a href="like/{{$item.id}}?verb=dislike&return={{$return_path}}#{{$item.id}}" class="icon dislike" title="{{$item.vote.dislike.0}}" ></a>
+				{{/if}}
+				{{*<!--{{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>{{/if}}-->*}}
+				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+			</div>
+			{{/if}}
+			{{if $item.plink}}
+				<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}}"></a>
+			{{/if}}
+			{{if $item.edpost}}
+				<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+			{{/if}}
+			 
+			{{if $item.star}}
+			<a href="starred/{{$item.id}}?return={{$return_path}}#{{$item.id}}" id="starred-{{$item.id}}" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
+			{{/if}}
+			{{*<!--{{if $item.tagger}}
+			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
+			{{/if}}
+			{{if $item.filer}}
+			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
+			{{/if}}			-->*}}
+			
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/{{$item.id}}')});" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>{{/if}}
+				{{*<!--{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}-->*}}
+		</div>
+	</div>	
+	<div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+	<div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+	<div class="wall-item-boring {{$item.indent}}" id="wall-item-boring-{{$item.id}}">{{$item.boring}}</div>
+
+	<div class="hide-comments-outer">
+	<a href="display/{{$user.nickname}}/{{$item.id}}"><span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.total_comments_num}} {{$item.total_comments_text}}</span></a>
+	</div>
+<!--	{{if $item.threaded}}
+	{{if $item.comment}}
+		{{$item.comment}}
+	{{/if}}
+	{{/if}}
+
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+
+{{if $item.flatten}}
+	{{$item.comment}}
+{{/if}}-->
+</div>
+<!--{{if $item.comment_lastcollapsed}}</div>{{/if}}-->
+
diff --git a/view/theme/decaf-mobile/smarty3/wallmessage.tpl b/view/theme/decaf-mobile/smarty3/wallmessage.tpl
new file mode 100644
index 0000000000..4cba900917
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/wallmessage.tpl
@@ -0,0 +1,37 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<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/theme/decaf-mobile/smarty3/wallmsg-end.tpl b/view/theme/decaf-mobile/smarty3/wallmsg-end.tpl
new file mode 100644
index 0000000000..594f3f79b9
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/wallmsg-end.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
+
diff --git a/view/theme/decaf-mobile/smarty3/wallmsg-header.tpl b/view/theme/decaf-mobile/smarty3/wallmsg-header.tpl
new file mode 100644
index 0000000000..e6f1c6737e
--- /dev/null
+++ b/view/theme/decaf-mobile/smarty3/wallmsg-header.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script language="javascript" type="text/javascript">
+{{*//window.editSelect = "none";*}}
+window.jotId = "#prvmail-text";
+window.imageUploadButton = 'prvmail-upload';
+</script>
+
diff --git a/view/theme/decaf-mobile/style.css b/view/theme/decaf-mobile/style.css
new file mode 100644
index 0000000000..4cfdd805fb
--- /dev/null
+++ b/view/theme/decaf-mobile/style.css
@@ -0,0 +1,4317 @@
+/**
+ * duepuntozero Frindika style
+ * Fabio Comuni <fabrix.xm@gmail.com>
+ *
+ * Heavily modified for Frost Mobile
+ * Zach P
+ */
+
+
+/* generals */
+html {
+/*	width: 320px;*/
+	margin-left: auto;
+	margin-right: auto;
+/*	overflow-x:hidden;*/
+}
+
+body {
+	font-family: helvetica,arial,freesans,clean,sans-serif;
+	font-size: 16px;
+/*	line-height: 24px;*/
+	background-color: #ffffff;
+	background-image: url(head.jpg);
+	background-repeat: repeat-x;
+	color: #505050;
+	margin: 0px;
+	overflow-x:hidden;
+}
+
+div.container {
+	display: block;
+/*	width: 100%;*/
+	margin-top: 0px;
+	margin-bottom: 0px;
+	margin-left: auto;
+	margin-right: auto;
+	overflow-x:hidden;
+}
+
+a, a:visited, a:link { color: #3465a4; text-decoration: none; }
+a:hover {text-decoration: underline; }
+
+input {
+	border: 1px solid #666666;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;	
+	padding: 3px;
+}
+
+img { border :0px; }
+
+#id_openid_url, .openid input {
+   background: url(login-bg.gif) no-repeat;
+   background-position: 0 50%;
+   padding-left: 18px;
+   width: 212px;
+   margin-left: 20px;
+}
+.openid:hover {
+
+}
+
+/*#id_openid_url {
+	width: 384px;
+}*/
+
+/*code {
+	font-family: Courier, monospace;
+	white-space: pre;
+	display: block;
+	overflow: auto;
+	border: 1px solid #444;
+	background: #EEE;
+	color: #444;
+	padding: 10px;
+	margin-top: 20px; 
+}
+
+blockquote {
+	background-color: #f4f8f9;
+	border-left: 4px solid #dae4ee;
+	padding: 0.4em;
+	margin-left: 20px;
+	margin-right: 0px;
+	width: 260px;
+	overflow: hidden;
+}*/
+
+code {
+	font-family: Courier, monospace;
+	white-space: pre;
+	display: block;
+	overflow: auto;
+	border: 1px solid #444;
+	background: #EEE;
+	color: #444;
+	padding: 10px;
+	margin-top: 20px; 
+}
+
+blockquote {
+	background-color: #f4f8f9;
+	border-left: 4px solid #dae4ee;
+	padding: 0.4em;
+}
+
+.icollapse-wrapper, .ccollapse-wrapper {
+	border: 1px solid #CCC;
+	padding: 5px;
+}
+
+.hide-comments-outer {
+	margin-left: 0px;
+	font-weight: 700;
+	opacity: 0.6;
+}
+.hide-comments {
+	margin-left: 5px;
+}
+
+#panel {
+	background-color: ivory;
+	position: absolute;
+/*	z-index: 2;*/
+	width: 30%;
+	padding: 25px;
+	border: 1px solid #444;
+}
+
+.heart {
+	color: #FF0000;
+	font-size: 100%;
+	margin-right: 5px;
+}
+
+
+
+/* nav */
+nav {
+	height: 94px;
+/*	width: 100%;*/
+	width: 320px;
+	display: block;
+	margin-top: 0px;
+	margin-bottom: 0px;
+	margin-left: auto;
+	margin-right: auto;
+}
+nav #site-location {
+	color: #888a85;
+	font-size: 0.8em;
+	position: absolute;
+}
+
+.error-message {
+	color: #FF0000;
+	font-size: 1.1em;
+	border: 1px solid #FF8888;
+	background-color: #FFEEEE;
+	padding: 10px;
+}
+
+.info-message {
+	color: #204a87;
+	font-size: 1.1em;
+	border: 1px solid #3465a4;
+	background-color: #d7e3f1;
+	padding: 10px;
+}
+
+
+nav #banner {
+/*	display: block;*/
+	display: none;
+	margin-top: 14px;
+	position: absolute;
+}
+nav #banner #logo-text a {
+	display: none;
+	font-size: 40px;
+	font-weight: bold;
+	margin-left: 3px;
+	color: #000000;
+
+}
+nav #banner #logo-text a:hover { text-decoration: none; }
+
+
+/* ZP REMOVE? nav-commlink */
+.nav-commlink, .nav-login-link {
+	display: block;
+	height: 15px;
+	margin-top: 67px;
+	margin-right: 2px;
+	/*padding: 6px 10px;*/
+	padding: 6px 3px;
+	float: left;
+	bottom: 140px;
+	border: 1px solid #babdb6;
+	border-bottom: 0px;
+	background-color: #aec0d3;
+	color: #565854;		
+	-moz-border-radius: 3px 3px 0px 0px;
+	-webkit-border-radius: 3px 3px 0px 0px;
+	border-radius: 3px 3px 0px 0px;	
+}
+
+.nav-commlink.selected {
+	background-color: #ffffff;
+	border-bottom: 1px solid #ffffff;
+	color: #000000 !important;
+	margin-top: 64px;
+	padding-top: 6px;
+	padding-bottom: 8px;
+}
+
+.nav-ajax-left.show {
+	position: absolute;
+	font-size: 0.8em;
+	top: 22px;
+	right: 2px;
+	padding: 1px 2px;
+	border-radius: 4px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	background-color: gold !important;
+}
+
+
+
+nav #nav-link-wrapper .nav-link {
+	/*border-right: 1px solid #babdb6;*/
+}
+
+nav .nav-link {
+	margin-top: 24px;
+	margin-bottom: 0.2em;
+	margin-right: 1em;
+	margin-left: 1em;
+	background-color: transparent !important;
+}
+
+.nav-button-container {
+	float: right;
+	position: relative;
+}
+
+.nav-button-container .nav-ajax-left {
+}
+
+.nav-button-container a {
+	padding-top: 1.4em;
+}
+
+.nav-menu-list {
+	text-align: center;
+	text-size: 18px;
+	line-height: 24px;
+
+	border-left: 1px solid #aaa;/*#444444;*/
+	border-right: 1px solid #aaa;
+	border-top: 1px solid #aaa;
+	border-bottom: 1px solid #aaa;
+
+	background: #FFFFFF;
+
+	display: none;
+	list-style: none;
+
+	width: 8em;
+	position: absolute;
+	margin: 0px;
+/*	right: -33px;*/
+	padding: 1em 0px;
+
+	-moz-box-shadow: 3px 3px 5px #555;
+	-webkit-box-shadow: 3px 3px 5px #555;
+	box-shadow: 3px 3px 5px #555;
+
+	z-index: 100;
+}
+
+#network-menu-list {
+	width: 9em;
+	left: 3px;
+}
+
+#contacts-menu-list {
+	right: -30px;
+}
+
+#system-menu-list {
+	right: 3px;
+}
+
+
+div.main-container {
+/*	width: 100%;*/
+	margin: 0px auto;
+	display: block;
+	position: relative;
+}
+
+/*div.main-content-loading {
+	position: absolute;
+	top: 200px;
+	left: 50%;
+	display: none;
+}*/
+
+
+/* aside */
+/*aside {
+	display: block;
+	min-height: 112px;
+
+	width: 250px;
+
+	padding: 1em;
+	margin: 1em 0px 0px 0px;
+
+	position: absolute;
+}*/
+
+#dfrn-request-link {
+	display: block;
+	color: #FFFFFF;
+	-webkit-border-radius: 5px ;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	padding: 5px;
+	font-weight: bold;
+	background: #3465a4 url('friendica-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 */
+div.section-wrapper {
+/*	width: 100%;*/
+/*	width: 320px;
+
+	margin-left: auto;
+	margin-right: auto;*/
+	margin-left: 0px;
+
+	/*padding-right:2em;*/
+
+	display: block;
+
+	background-color: #ffffff;
+	background-image: url(border.jpg);
+	background-position: top right;
+	background-repeat: no-repeat;
+}
+
+section {
+	margin: 0px 0px 0px 0px;
+
+	padding-left: 5px;
+	padding-right: 5px;
+	padding-top: 1em;
+	padding-bottom: 3em;
+
+	background-image: url(border.jpg);
+	background-position: top left;
+	background-repeat: no-repeat;
+
+	min-height: 112px;
+	border-top: 1px solid #babdb6;	
+	overflow-x:hidden;
+}
+
+/* footer */
+footer {
+	text-align: center;
+	padding-bottom: 1em;
+}
+
+.tabs {
+	/*background-image: url(head.jpg);
+	background-repeat: repeat-x;	
+	background-position: 0px -20px;*/
+	border-bottom: 1px solid #babdb6;
+	padding:0px;
+}
+.tabs.links-widget {
+	border: none;
+}
+.tabs li { margin: 0px 0px 20px 0px; padding-left: 1em; list-style: none; }
+.tabs a {
+	padding: 0.4em 2em;
+	border: 1px solid #aaa;
+	border-radius: 8px;
+	-moz-border-radius: 8px;
+	-webkit-border-radius: 8px;
+}
+.tab {
+	/*display:block;*/
+	float:left;
+	padding-left: 1em;
+	padding-right: 0.4em;
+	padding-top: 0.4em;
+	padding-bottom: 0.4em;
+	margin-right: 0.5em;
+	margin-bottom: 0.4em;
+}
+.tab.active {
+	font-weight: bold;
+	
+}
+#events-tab {
+	display: none;
+}
+#tabs-end {
+	padding-top: 0.3em;
+	clear: both;
+}
+
+
+/* Navigation page */
+.navigation-link {
+/*	display: block;
+	clear: both;
+	text-align: center;*/
+	font-size: 24px;
+}
+#navigation-login-wrapper,
+#navigation-network-wrapper,
+navigation-messages-wrapper,
+#navigation-contacts-wrapper,
+#navigation-notifications-wrapper,
+#navigation-misc-wrapper {
+	margin-bottom: 1em;
+}
+
+
+.birthday-today, .event-today {
+	font-weight: bold;
+}
+
+.preview {
+	background: #FFFFC8;
+}
+
+#theme-preview {
+	margin: 15px 0 15px 15px;
+}
+#theme-version {
+	display: block;
+	font-weight: bold;
+}
+#theme-credits {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+/* 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;
+}
+
+#jot-perms-icon {
+	float: left;
+}
+
+#jot-title, #jot-category {
+	border: 0px;
+	margin: 0px;
+	height: 20px;
+	width: 270px;
+	margin-bottom: 5px;
+	font-weight: bold;
+	border: 1px solid #ffffff;
+}
+
+/*#jot-title::-webkit-input-placeholder{font-weight: normal;}
+#jot-title:-moz-placeholder{font-weight: normal;}
+#jot-category::-webkit-input-placeholder{font-weight: normal;}
+#jot-category:-moz-placeholder{font-weight: normal;}*/
+#profile-jot-text::-webkit-input-placeholder{font-weight: bold;}
+#profile-jot-text:-moz-placeholder{font-weight: bold; font-size:18px; color: graytext}
+	
+#jot-title:hover,
+#jot-title:focus,
+#jot-category:hover,
+#jot-category:focus {
+	border: 1px solid #cccccc; 
+}
+
+/*.jothidden { display:none; }*/
+
+
+/*.fakelink, .fakelink:visited, .fakelink:link {
+	color: #3465a4;
+	text-decoration: none;
+	cursor: pointer;
+	margin-top: 15px;
+	margin-bottom: 15px;
+}*/
+.lockview {
+	cursor: pointer;
+}
+
+#group-sidebar {
+	margin-bottom: 10px;
+}
+
+.group-selected, .nets-selected, .fileas-selected, .categories-selected {
+	padding: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;	
+	border: 1px solid #CCCCCC;
+	background: #F8F8F8;
+	font-weight: bold;
+}
+
+.settings-widget .selected {
+/*	padding: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;	
+	border: 1px solid #CCCCCC;*/
+	background: #F8F8F8;
+	font-weight: bold;
+}
+
+/*.fakelink:hover {
+	color: #3465a4;
+	text-decoration: underline;
+	cursor: pointer;
+}*/
+.smalltext {
+	font-size: 0.7em;
+}
+#sysmsg {
+	/*width: 600px;*/
+	margin-bottom: 10px;
+}
+
+#register-fill-ext {
+	margin-bottom: 25px;
+}
+
+#label-register-name, #label-register-email, #label-register-nickname, #label-register-openid {
+	float: left;
+	width: 350px;
+	margin-top: 10px;
+}
+
+#register-name, #register-email, #register-nickname {
+	float: left;
+	margin-top: 10px;
+	width: 150px;
+}
+
+#register-openid {
+	float: left;
+	margin-top: 10px;
+	width: 130px;
+}
+
+#register-name-end, #register-email-end, #register-nickname-end, #register-submit-end, #register-openid-end {
+	clear: both;
+}
+
+#register-nickname-desc {
+	margin-top: 30px;
+	width: 650px;
+}
+#register-sitename {
+	float: left;
+	margin-top: 10px;
+}
+
+#register-submit-button {
+	margin-top: 10px;
+}
+
+/*
+#login_standard {
+	width: 210px;
+	float: left;
+}
+#login_openid {
+	width: 210px;
+	margin-left: 250px;
+}
+
+#login_standard input,
+#login_openid input {
+	width: 180px;
+}
+
+#login-extra-links {
+	clear: both;
+}
+
+#register-link, #lost-password-link {
+	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;
+}*/
+
+
+input#dfrn-url {
+	float: left;
+	background: url(friendica-16.png) no-repeat;
+	background-position: 2px center;
+	font-size: 17px;
+	padding-left: 21px;
+	height: 21px;
+	background-color: #FFFFFF;
+	color: #000000;
+	margin-bottom: 20px;
+	max-width: 90%;
+}
+
+#dfrn-url-label {
+	float: left;
+	width: 250px;
+}
+
+#dfrn-request-url-end {
+	clear: both;
+}
+
+#knowyouyes, #knowyouno {
+	float: left;
+}
+
+#dfrn-request-knowyou-yes-wrapper, #dfrn-request-knowyou-no-wrapper {
+
+	float: none;
+}
+#dfrn-request-knowyou-yes-label, #dfrn-request-knowyou-no-label {
+	float: left;
+	width: 75px;
+	margin-left: 50px;
+	margin-bottom: 7px;
+}
+#dfrn-request-knowyou-break, #dfrn-request-knowyou-end {
+	clear: both;
+}
+
+#dfrn-request-message-wrapper {
+	margin-bottom: 50px;
+}
+#dfrn-request-message-wrapper textarea {
+	max-width: 90%;
+}
+#dfrn-request-submit-wrapper {
+	clear: both;
+	/*margin-left: 50px;*/
+}
+#dfrn-request-submit-wrapper input {
+	font-size: 18px;
+	padding: 5px 10px;
+}
+
+#dfrn-request-info-wrapper {
+	margin-left: 50px;
+}
+
+
+
+#cropimage-wrapper, #cropimage-preview-wrapper {
+	float: left;
+	padding: 10px;
+}
+.imgCrop {
+	max-width: 280px;
+}
+#crop-image-form {
+	margin-top: 30px;
+	clear: both;
+}
+
+.intro-wrapper {
+	margin-top: 20px;
+}
+
+.intro-fullname {
+	font-size: 1.1em;
+	font-weight: bold;
+
+}
+.intro-desc {
+	margin-bottom: 20px;
+	font-weight: bold;
+}
+
+.intro-note {
+	padding: 10px;
+}
+
+.intro-end {
+	padding: 30px;
+}
+
+.intro-form {
+	float: left;
+}
+.intro-approve-form {
+	clear: both;
+}
+.intro-approve-as-friend-end {
+	clear: both;
+}
+.intro-submit-approve, .intro-submit-ignore {
+	margin-right: 20px;
+}
+.intro-submit-approve {
+	margin-top: 15px;
+}
+
+.intro-approve-as-friend-label, .intro-approve-as-fan-label {
+	float: left;
+	width: 100px;
+	margin-left: 20px;
+}
+.intro-approve-as-friend, .intro-approve-as-fan {
+	float: left;
+}
+.intro-form-end {
+	clear: both;
+}
+.intro-approve-as-friend-desc {
+	margin-top: 15px;
+}
+.intro-approve-as-end {
+	clear: both;
+	margin-bottom: 10px;
+}
+
+.intro-end {
+	clear: both;
+	margin-bottom: 30px;
+}
+.aprofile dt {
+	font-weight: bold;
+}
+#page-profile .title {
+	font-weight: bold;
+}
+#profile-vcard-break {
+	clear: both;
+}
+#profile-extra-links {
+	clear: both;
+	margin-top: 10px;
+}
+
+#profile-extra-links ul {
+	list-style-type: none;
+	padding: 0px;
+}
+
+
+#profile-extra-links li {
+	margin-top: 5px;
+	max-width: 300px;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+#profile-edit-links ul {
+	list-style-type: none;
+}
+
+#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;
+	float: left;
+	margin-left: 20px;
+	width: 180px;
+}
+
+.contact-wrapper {
+	float: left;
+	width: 150px;
+	height: 150px;
+	overflow: auto;
+}
+
+#view-contact-end {
+	clear: both;
+}
+
+
+#viewcontacts {
+	margin-top: 15px;
+}
+#profile-edit-default-desc {
+	color: #FF0000;
+	border: 1px solid #FF8888;
+	background-color: #FFEEEE;
+	padding: 7px;
+}
+
+#profile-edit-clone-link-wrapper {
+	float: left;
+	margin-left: 50px;
+	margin-bottom: 20px;
+	width: 300px;
+}
+
+
+#profile-edit-links-end {
+	clear: both;
+	margin-bottom: 15px;
+}
+
+.profile-listing-photo {
+	border: none;
+}
+
+.profile-edit-submit-wrapper {
+	margin-top: 20px;
+	margin-bottom: 20px;
+}
+
+#profile-photo-link-select-wrapper {
+	margin-top: 2em;
+}
+
+#profile-photo-submit-wrapper {
+	margin-top: 10px;
+}
+
+#profile-photo-wrapper {
+	text-align: center;
+}
+#profile-photo-wrapper img {
+	width:175px;
+	height:175px;
+	padding: 12px;
+}
+
+#profile-edit-profile-name-label,
+#profile-edit-name-label,
+#profile-edit-pdesc-label,
+#profile-edit-gender-label,
+#profile-edit-dob-label,
+#profile-edit-address-label,
+#profile-edit-locality-label,
+#profile-edit-region-label,
+#profile-edit-postal-code-label,
+#profile-edit-country-name-label,
+#profile-edit-marital-label,
+#profile-edit-sexual-label,
+#profile-edit-politic-label,
+#profile-edit-religion-label,
+#profile-edit-pubkeywords-label,
+#profile-edit-prvkeywords-label,
+#profile-edit-homepage-label,
+#profile-edit-hometown-label {
+	font-weight: 700;
+	float: left;
+	width: 175px;
+}
+
+#profile-edit-profile-name,
+#profile-edit-name,
+#profile-edit-pdesc,
+#gender-select,
+#profile-edit-dob,
+#profile-edit-address,
+#profile-edit-locality,
+#profile-edit-region,
+#profile-edit-postal-code,
+#profile-edit-country-name,
+#marital-select,
+#sexual-select,
+#profile-edit-politic,
+#profile-edit-religion,
+#profile-edit-pubkeywords,
+#profile-edit-prvkeywords,
+#profile-in-dir-yes,
+#profile-in-dir-no,
+#profile-in-netdir-yes,
+#profile-in-netdir-no,
+#hide-wall-yes,
+#hide-wall-no,
+#hide-friends-yes,
+#hide-friends-no {
+	float: left;
+	margin-bottom: 20px;
+	margin-left: 20px;
+}
+#profile-edit-country-name {
+	max-width: 260px;
+}
+#profile-edit-pubkeywords,
+#profile-edit-prvkeywords {
+	margin-bottom: 5px;
+}
+#settings-normal,
+#settings-soapbox,
+#settings-freelove,
+#settings-community {
+	float: left;
+}
+#settings-notifications label {
+	margin-left: 20px;
+}
+#settings-notify-desc, #settings-activity-desc {
+	font-weight: bold;
+	margin-bottom: 15px;
+}
+#settings-pagetype-desc {
+	color: #666666;
+	margin-bottom: 15px;
+}
+
+#profile-in-dir-yes-label,
+#profile-in-dir-no-label,
+#profile-in-netdir-yes-label,
+#profile-in-netdir-no-label,
+#hide-wall-yes-label,
+#hide-wall-no-label,
+#hide-friends-yes-label,
+#hide-friends-no-label {
+	margin-left: 125px;
+	float: left;
+	width: 50px;
+}
+
+
+#profile-edit-howlong-label,
+#profile-edit-with-label {
+	display: block;
+	font-style: italic;
+	width: 175px;
+	margin-left: 0px;
+}
+#profile-edit-howlong,
+#profile-edit-with {
+	margin-left: 20px;
+	margin-bottom: 20px;
+}
+
+#profile-publish-yes-reg,
+#profile-publish-no-reg {
+	float: left;
+	margin-bottom: 10px;
+}
+
+#profile-publish-yes-label-reg,
+#profile-publish-no-label-reg {
+	margin-left: 350px;
+	float: left;
+	width: 50px;
+}
+
+#profile-publish-break-reg,
+#profile-publish-end-reg {
+	clear: both;
+}
+
+
+#profile-edit-pdesc-desc,
+#profile-edit-pubkeywords-desc,
+#profile-edit-prvkeywords-desc  {
+	float: left;
+	color: #777;
+	margin-left: 20px;
+	margin-bottom: 20px;
+}
+#profile-edit-prvkeywords-desc {
+	margin-bottom: 0px;
+}
+
+#profile-edit-homepage, #profile-edit-hometown {
+	float: left;
+	margin-bottom: 25px;
+	margin-left: 20px;
+}
+#profile-edit-hometown {
+	margin-bottom: 5px;
+}
+#settings-normal-label,
+#settings-soapbox-label,
+#settings-community-label,
+#settings-freelove-label {
+	float: left;
+	width: 200px;
+}
+#settings-normal-desc,
+#settings-soapbox-desc,
+#settings-community-desc,
+#settings-freelove-desc {
+	/*float: left;
+	margin-left: 75px;*/
+    clear: left;
+    color: #666666;
+    display: block;
+    margin-bottom: 20px	
+}
+
+#profile-edit-profile-name-end,
+#profile-edit-name-end,
+#profile-edit-pdesc-end,
+#profile-edit-gender-end,
+#profile-edit-dob-end,
+#profile-edit-address-end,
+#profile-edit-locality-end,
+#profile-edit-region-end,
+#profile-edit-postal-code-end,
+#profile-edit-country-name-end,
+#profile-edit-marital-end,
+#profile-edit-sexual-end,
+#profile-edit-politic-end,
+#profile-edit-religion-end,
+#profile-edit-pubkeywords-end,
+#profile-edit-prvkeywords-end,
+#profile-edit-homepage-end,
+#profile-edit-hometown-end,
+#profile-in-dir-break,
+#profile-in-dir-end,
+#profile-in-netdir-break,
+#profile-in-netdir-end,
+#hide-wall-break,
+#hide-wall-end,
+#hide-friends-break,
+#hide-friends-end,
+#settings-normal-break,
+#settings-soapbox-break,
+#settings-community-break,
+#settings-freelove-break {
+	clear: both;
+}
+#profile-edit-marital-wrapper, #profile-edit-address-wrapper {
+	margin-top: 50px;
+}
+#profile-edit-marital-end {
+	margin-bottom: 20px;
+}
+
+#id_theme,
+#id_mobile_theme {
+	width: 280px;
+}
+/*.settings-widget ul {
+	list-style-type: none;
+	padding: 0px;
+}
+
+.settings-widget li {
+	margin-left: 24px;
+	margin-bottom: 8px;
+}*/
+
+
+#gender-select, #marital-select, #sexual-select {
+	width: 220px;
+}
+
+#profile-edit-profile-name-wrapper .required {
+	color: #FF0000;
+	float: left;
+}
+
+#contacts-search-submit {
+	font-size: 18px;
+	padding: 5px 10px;
+}
+
+#contacts-display-wrapper {
+	padding-left: 35px;
+}
+
+#contacts-main {
+	margin-top: 20px;
+	margin-bottom: 20px;
+}
+
+.contact-entry-wrapper {
+	float: left;
+/*	width: 120px;
+	height: 120px;*/
+	padding-left: 15px;
+	padding-right: 15px; 
+	width: 95px;
+	height: 200px;
+}
+#contacts-search-end {
+	margin-bottom: 10px;
+}
+
+.contact-entry-direction-icon {
+	margin-top: 24px;
+	margin-right: 2px;
+}
+
+.contact-entry-photo img {
+	border: none;
+}
+.contact-entry-photo-end {
+	clear: both;
+}
+.contact-entry-name {
+	float: left;
+	margin-left: 0px;
+	margin-right: 10px;
+	padding-bottom: 5px;
+	width: 120px;
+	font-weight: 600;
+	overflow: hidden;
+}
+.contact-entry-details {
+	font-style: italic;
+	font-size: 10px;
+	font-weight: 500;
+}
+.contact-entry-network {
+	font-size: 10px;
+	font-weight: 500;
+}
+.contact-entry-edit-links {
+	margin-top: 6px;
+	margin-left: 10px;
+	width: 16px;
+}
+.contact-entry-nav-wrapper {
+	float: left;
+	margin-left: 10px;
+}
+
+.contact-entry-edit-links img {
+	border: none;
+	margin-right: 15px;
+}
+.contact-entry-photo {
+	float: left;
+	position: relative;
+}
+.contact-entry-end {
+	clear: both;
+}
+
+#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;
+}
+
+.toplevel_item {
+	margin-bottom: 60px;
+}
+
+.wall-item-content-wrapper {
+	padding-top: 1em;
+/*	padding-left: 0.25em;
+	padding-right: 0.25em;*/
+
+	border-top: 2px solid #AAAAAA;
+	position: relative;
+}
+
+.wall-item-content-wrapper.comment {
+	margin-top: 15px;
+	margin-left: 5px;
+	margin-right: 5px;
+
+	padding-top: 0px;
+/*	padding-left: 0.5em
+	padding-right: 0.5em;*/
+
+	border: 2px solid #AAAAAA;
+	border-radius: 10px;
+	-webkit-border-radius: 10px;
+	-moz-border-radius: 10px;
+/*	background: #EEEEEE;*/
+}
+
+.wall-item-like, .wall-item-dislike {
+	font-style: italic;
+	margin-left: 0px;
+	opacity: 0.6;
+}
+
+.wall-item-like.comment, .wall-item-dislike.comment {
+	margin-left: 5px;
+}
+
+.wall-item-like-full .fakelink-wrapper,
+.wall-item-dislike-full .fakelink-wrapper {
+	display: none;
+}
+.wall-item-like-full .wall-item-like-expanded,
+.wall-item-dislike-full .wall-item-dislike-expanded {
+	display: inherit !important;
+}
+
+.wall-item-info {
+	display: block;
+	float: left;
+	width:110px;
+	margin-right:10px;
+	margin-bottom:10px;
+}
+.comment .wall-item-info {
+	width: 70px;
+}
+
+.wall-item-photo-menu-button {
+	display: block;
+	position: absolute;
+	background-image: url("photo-menu.jpg");
+	background-position: top left; 
+	background-repeat: no-repeat;
+	margin: 0px; padding: 0px;
+	width: 16px;
+	height: 16px;
+	top: 94px; left:0px;
+	overflow: hidden;
+	text-indent: 40px;
+	display: none;
+	
+}
+.wall-item-photo-menu {
+	width: auto;
+	border: 2px solid #444444;
+	background: #FFFFFF;
+	position: absolute;
+	left: 0px; top:110px;
+	display: none;
+/*	z-index: 10000;*/
+}
+.wall-item-photo-menu { margin:0px; padding: 0px; list-style: none }
+.wall-item-photo-menu li a { display: block; padding: 2px; }
+.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
+
+
+.comment .wall-item-photo-menu-button {	top: 64px;}
+.comment .wall-item-photo-menu { top: 80px; }
+
+.wallwall .wwto {
+    left: 50px;
+    margin: 0;
+    position: absolute;
+    top: 67px;
+    width: 30px
+}
+.wallwall .wwto img {
+	width: 30px !important;
+	height: 30px !important;
+}
+
+.wallwall /*.wall-item-photo-end*/ {
+	clear: both;
+}
+
+.wall-item-arrowphoto-wrapper {
+    position: absolute;
+    left: 75px;
+    top: 67px;
+/*    z-index: 100;*/
+}
+.wall-item-lock {
+	margin-top: 1em;
+	left: 105px;
+	position: absolute;
+	top: 1px;	
+}
+.comment .wall-item-lock {
+	margin-top: 0px;
+	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: 3px;
+}
+
+.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: 10px;
+	margin-right: 10px;
+}
+
+.editpost {
+	margin-left: 10px;
+	float: left;
+}
+.star-item {
+	margin-left: 10px;
+	float: left;	
+}
+.tag-item {
+	margin-left: 10px;
+	float: left;	
+}
+
+.filer-item {
+	margin-left: 10px;
+	float: left;
+}
+
+.wall-item-links-wrapper {
+	float: left;
+}
+
+.wall-item-delete-wrapper {
+	float: right;
+}
+
+/*.wall-item-delete-end {
+	clear: both;
+}*/
+
+.wall-item-delete-icon {
+	border: none;
+}
+
+
+/*.wall-item-wrapper-end {
+	clear: both;
+}*/
+.wall-item-name-link {
+	font-weight: bold;
+	text-decoration: none;
+	color: #3172BD;
+}
+.wall-item-photo {
+	border: none;
+	border-radius: 7px;
+}
+.comment .wall-item-photo {
+	width: 50px !important; 
+	height: 50px !important;
+}
+.wall-item-content {
+/*	float: left;
+	max-width: 100%*/
+/*	padding-right: 1em;
+	max-height: 500px;
+	overflow: auto;*/
+	padding-left:0.25em;
+	padding-right:0.25em;
+	clear: left; /* I hate this, but it's the only way to keep the text from bunching to the right on the Android browser */
+}
+.comment .wall-item-content {
+	padding-left:0.5em;
+	padding-right:0.5em;
+}
+
+.wall-item-title {
+	/*float: left;*/
+	font-weight: bold;
+	font-size: 1.6em; 
+	/*width: 450px;*/
+}
+
+/*.wall-item-title-end {
+	clear: both;
+}*/
+
+.wall-item-body {
+	text-align: justify;
+	float: left;
+	max-width: 100%;
+	overflow: hidden;
+	margin-top: 10px;
+	line-height: 23px;
+}
+
+.wall-item-body img {
+	display: block;
+	margin-top: 2px;
+	margin-right: auto;
+	margin-left: auto;
+	/*max-width: 290px;*/
+	max-width: 100%;
+	border-radius: 7px;
+	-moz-border-radius: 7px;
+	-webkit-border-radius: 7px;
+}
+
+/*.comment .wall-item-body img {
+	max-width: 100%;
+}*/
+
+.wall-item-body img.smiley {
+	display: inline;
+	margin: auto;
+	border-radius: 0;
+	-webkit-border-radius: 0;
+}
+
+.wall-item-body blockquote {
+	margin-left: 0px;
+	margin-right: 0px;
+}
+
+.comment .wall-item-body ul {
+	padding-left: 1.5em;
+}
+
+.wall-item-body iframe {
+	display: block;
+	clear: both;
+	margin-top: 1.5em;
+	margin-bottom: 1.5em;
+}
+
+.wall-item-body code {
+	overflow: hidden;
+}
+
+.divgrow-showmore {
+	display: block;
+	clear: both;
+	text-align: center;
+	outline: 0;
+	border-top: 1px dotted #888;
+}
+
+.wall-item-tools {
+	clear: both;
+/*	background-image: url("head.jpg");
+	background-position: 0 -20px;
+	background-repeat: repeat-x;*/
+   	padding: 5px 5px 0px;
+	height: 32px;
+
+}
+.wall-item-author {
+/*	margin-top: 10px;*/
+	margin-top: 0px;
+}
+
+.comment .wall-item-tools {
+/*	background:none;*/
+/*	background-image: url("head.jpg");
+	background-position: 0 -20px;
+	background-repeat: repeat-x;*/
+	border-bottom-left-radius: 10px;
+	border-bottom-right-radius: 10px;
+} 
+
+
+.comment-edit-wrapper {
+	margin-top: 15px;
+	background: #f3f3f3;
+	margin-left: 50px;
+}
+
+.comment-wwedit-wrapper {
+	display: block;
+	margin-top: 15px;
+	background: #f3f3f3;
+	margin-left: 10px;
+	margin-right: 10px;
+
+	max-width: 90%;
+}
+
+.comment-wwedit-wrapper.comment {
+	margin-left: 40px;
+	margin-right: 40px;
+	border-radius: 10px;
+}
+
+.comment-edit-form {
+	padding-left: 1em;
+	padding-right: 1.5em;
+}
+
+.comment-edit-photo {
+	margin-top: 15px;
+	/*margin-left: 10px;*/
+	/*margin-bottom: 10px;*/
+	width: 25px;
+	float: left;
+}
+.comment-edit-photo img {
+	width: 25px;
+}
+.comment-edit-text-empty, .comment-edit-text-full {
+/*	float: left;*/
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;	
+	border: 1px solid #cccccc;
+	padding: 3px 1px 1px 3px;
+}
+
+.comment-edit-text-empty {
+	color: gray;
+	height: 30px;
+	width: 175px;
+/*	overflow: auto;*/
+	margin-top: 40px;
+	margin-bottom: 10px;
+	margin-left: 20px;
+}
+
+.comment-edit-text-full {
+	color: black;
+	height: 150px;
+/*	width: 350px;
+	overflow: auto;*/
+/*	width: 250px;*/
+	width: 100%;
+	margin-top: 1.5em;
+/*	margin-left: 20px;*/
+}
+
+.comment .comment-edit-text-empty {
+	width: 120px;
+}
+.comment .comment-edit-text-full {
+	margin-left: 10px;
+	width: 210px;
+}
+
+
+.comment-edit-text-end {
+	clear: both;
+}
+
+.comment-edit-submit {
+	font-size: 18px;
+	padding: 5px 10px;
+	margin: 10px 0px 10px 0px;
+}
+
+#profile-jot-wrapper {
+	padding-left: 10px;
+	padding-right: 10px;
+}
+
+.shared_header {
+	border-top: 1px solid #aaa;
+	color: #999;
+
+	height: 42px; /* 32 px for the image plus 10 px for the margin around the image */
+	padding-top: 0.5em;
+	margin-top: 1em;
+	margin-bottom: 1em;
+	
+}
+.shared_header img {
+	float: left;
+
+	margin: auto 1em auto auto;
+	padding: 0;
+
+	box-shadow: none;
+	-moz-box-shadow: none;
+	-webkit-box-shadow: none;
+}
+
+#profile-jot-plugin-wrapper,
+#profile-jot-submit-wrapper {
+	margin-top: 15px;
+}
+
+#profile-jot-submit {
+	float: left;
+	font-size: 18px;
+	padding: 5px 8px;
+}
+#profile-upload-wrapper {
+	float: left;
+	margin-left: 30px;
+}
+#profile-attach-wrapper {
+	float: left;
+	margin-left: 15px;
+}
+#profile-rotator {
+	float: left;
+	margin-left: 30px;
+}
+#profile-link-wrapper {
+	float: left;
+	margin-left: 15px;
+}
+#profile-youtube-wrapper {
+	float: left;
+	margin-left: 15px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
+}
+#profile-location-wrapper {
+	float: left;
+	margin-left: 15px;
+}
+#jot-preview-link {
+	display: none;
+	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;
+}
+
+#profile-jot-perms {
+	float: left;
+	margin-left: 40px;
+	font-weight: bold;
+	font-size: 1.2em;
+}
+
+
+#profile-jot-perms-end {
+	/*clear: left;*/
+	height: 30px;
+}
+
+#profile-jot-plugin-end{
+  clear: both;
+}
+input#profile-jot-email {
+	display: block;
+}
+.profile-jot-net {
+	float: left;
+	margin-right: 10px;
+	margin-top: 5px;
+	margin-bottom: 5px;
+}
+
+#profile-jot-networks-end {
+	clear: both;
+}
+
+.profile-jot-box {
+	margin-top: 50px;
+}
+.profile-edit-textarea {
+	margin-left: 20px;
+}
+
+#profile-jot-end {
+	clear: both;
+	margin-bottom: 30px;
+}
+#about-jot-submit-wrapper {
+	margin-top: 15px;
+}
+#about-jot-end {
+	margin-bottom: 30px;
+}
+#contacts-main {
+	margin-bottom: 30px;
+}
+
+#profile-listing-desc {
+	margin-left: 30px;
+}
+
+#profile-listing-new-link-wrapper {
+	margin-left: 30px;
+	margin-bottom: 30px;
+}
+.profile-listing-photo-wrapper {
+	float: left;
+}
+
+.profile-listing-edit-buttons-wrapper {
+	clear: both;
+}
+.profile-listing-photo-edit-link {
+	float: left;
+	width: 125px;
+}
+.profile-listing-end {
+	clear: both;
+}
+.profile-listing-edit-buttons-wrapper img{
+	border: none;
+	margin-right: 20px;
+}
+.profile-listing {
+	float: left;
+	margin-left: 30px;
+	margin-top: 25px;
+}
+.profile-listing-visible {
+	margin-left: 100px;
+}
+.profile-listing-name {
+	float: left;
+	margin-left: 12px;
+	margin-top: 10px;
+	color: #3172BD;
+	font-weight: bold;
+	width: 200px;
+
+}
+.fortune {
+	margin-top: 50px;
+	color: #4444FF;
+	font-weight: bold;
+	margin-bottom: 20px;
+}
+
+
+.directory-end {
+	clear: both;
+}
+.directory-name {
+	text-align: center;
+}
+.directory-photo {
+	margin-left: 15px;
+}
+.directory-details {
+	font-size: 0.7em;
+	text-align: center;
+	margin-left: 5px;
+	margin-right: 5px;
+}
+.directory-item {
+	float: left;
+/*	width: 225px;
+	height: 260px;*/
+	padding-left: 15px;
+	width: 130px;
+	height: 235px;
+	overflow: auto;
+}
+
+#directory-search-wrapper {
+	margin-top: 20px;
+	margin-right: 20px;
+	margin-bottom: 50px;
+}
+
+#directory-search-end {
+}
+
+.directory-photo-img {
+	width: 125px;
+	border: none;
+}
+
+
+.pager {
+  margin-top: 30px;
+  margin-right: auto;
+  margin-left: auto;
+
+  padding-top: 10px;
+  padding-bottom: 10px;
+  padding-left: 10px;
+  text-align: center;
+/*  line-height: 2.75em;*/
+}
+
+.pager a {
+	font-size: 1.5em;
+	padding: 0.2em 1em;
+	border: 1px solid #aaa;
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+
+
+.pager_first,
+.pager_last,
+.pager_prev,
+.pager_next,
+.pager_n {
+/*	float: left;
+	border: 1px solid black;
+	border-radius: 7px;
+	background: #EEE;
+	text-align: center;
+	width: 50px;
+	margin-right: 5px;
+	margin-bottom: 10px;*/
+/*	float: left;*/
+/*	margin-right: 15px;
+	margin-left: 15px;*/
+}
+
+.pager_first,
+.pager_last,
+.pager_n {
+	display: none;
+}
+
+/*.pager_first a,
+.pager_last a,
+.pager_prev a,
+.pager_next a {
+	padding-top: 5px;
+	padding-bottom: 5px;
+	padding-left: 25px;
+	padding-right: 30px;
+
+	border: 2px solid #AAAAAA;
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+    font-size: 1.25em;
+	text-align: center;
+	text-decoration: none;
+}
+.pager_n a {
+	padding-top: 2px;
+	padding-bottom: 2px;
+	padding-left: 9px;
+	padding-right: 18px;
+	text-decoration: none;
+
+
+
+
+
+
+
+}*/
+
+.pager_prev a,
+
+.pager_next a {
+	font-size: 1.5em;
+	padding: 0.2em 1em;
+	border: 1px solid #aaa;
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+
+.pager_current {
+	display: none;
+	float: left;
+	border: 1px solid black;
+	border-radius: 7px;
+	-moz-border-radius: 7px;
+	-webkit-border-radius: 7px;
+	background: #FFCCCC;
+	font-size: 1.25em;
+	text-align: center;
+	width: 50px;
+	margin-right: 5px;
+	margin-bottom: 10px;
+}
+
+
+#advanced-profile-name-wrapper,
+#advanced-profile-gender-wrapper,
+#advanced-profile-dob-wrapper,
+#advanced-profile-age-wrapper,
+#advanced-profile-marital-wrapper,
+#advanced-profile-sexual-wrapper,
+#advanced-profile-homepage-wrapper,
+#advanced-profile-politic-wrapper,
+#advanced-profile-religion-wrapper,
+#advanced-profile-about-wrapper,
+#advanced-profile-interest-wrapper,
+#advanced-profile-contact-wrapper,
+#advanced-profile-music-wrapper,
+#advanced-profile-book-wrapper,
+#advanced-profile-tv-wrapper,
+#advanced-profile-film-wrapper,
+#advanced-profile-romance-wrapper,
+#advanced-profile-work-wrapper,
+#advanced-profile-education-wrapper {
+	margin-top: 20px;
+}
+
+#advanced-profile-name-text,
+#advanced-profile-gender-text,
+#advanced-profile-dob-text,
+#advanced-profile-age-text,
+#advanced-profile-marital-text,
+#advanced-profile-sexual-text,
+#advanced-profile-homepage-text,
+#advanced-profile-politic-text,
+#advanced-profile-religion-text,
+#advanced-profile-about-text,
+#advanced-profile-interest-text,
+#advanced-profile-contact-text,
+#advanced-profile-music-text,
+#advanced-profile-book-text,
+#advanced-profile-tv-text,
+#advanced-profile-film-text,
+#advanced-profile-romance-text,
+#advanced-profile-work-text,
+#advanced-profile-education-text {
+	width: 300px;
+	float: left;
+}
+
+#advanced-profile-name-end,
+#advanced-profile-gender-end,
+#advanced-profile-dob-end,
+#advanced-profile-age-end,
+#advanced-profile-marital-end,
+#advanced-profile-sexual-end,
+#advanced-profile-homepage-end,
+#advanced-profile-politic-end,
+#advanced-profile-religion-end {
+	height: 10px;
+}
+
+#advanced-profile-about-end,
+#advanced-profile-interest-end,
+#advanced-profile-contact-end,
+#advanced-profile-music-end,
+#advanced-profile-book-end,
+#advanced-profile-tv-end,
+#advanced-profile-film-end,
+#advanced-profile-romance-end,
+#advanced-profile-work-end,
+#advanced-profile-education-end {
+
+
+}
+
+#advanced-profile-name,
+#advanced-profile-gender,
+#advanced-profile-dob,
+#advanced-profile-age,
+#advanced-profile-marital,
+#advanced-profile-sexual,
+#advanced-profile-homepage,
+#advanced-profile-politic,
+#advanced-profile-religion {
+	float: left;
+
+}
+
+
+#advanced-profile-about,
+#advanced-profile-interest,
+#advanced-profile-contact,
+#advanced-profile-music,
+#advanced-profile-book,
+#advanced-profile-tv,
+#advanced-profile-film,
+#advanced-profile-romance,
+#advanced-profile-work,
+#advanced-profile-education {
+	margin-top: 10px;
+	margin-left: 50px;
+	margin-right: 20px;
+	padding: 10px;
+	border: 1px solid #CCCCCC;
+}
+
+#advanced-profile-with {
+	float: left;
+	margin-left: 15px;
+}
+
+#contact-edit-wrapper {
+	margin-top: 10px;
+}
+
+#contact-edit-banner-name {
+	font-size: 1.4em;
+	font-weight: bold;
+}
+
+#contact-edit-poll-wrapper {
+	margin-top: 15px;
+}
+
+#contact-edit-last-update-text {
+	float: left;
+	clear: left;
+	margin-top: 30px;
+}
+
+#contact-edit-poll-text {
+	float: left;
+	clear: left;
+	margin-top: 15px;
+	margin-bottom: 0px;
+}
+
+#contact-edit-update-now {
+	margin-top: 15px;
+}
+
+#contact-edit-links{
+	clear: both;
+}
+
+#contact-edit-links ul {
+	list-style: none;
+	list-style-type: none;
+	margin-left: 0px;
+	padding-left: 0px;
+}
+
+#contact-edit-links li {
+	margin-top: 5px;
+}
+
+#contact-edit-drop-link {
+	float: right;
+	margin-right: 10px;
+}
+
+#contact-edit-nav-end {
+	clear: both;
+}
+
+#contact-edit-wrapper {
+	width: 100%;
+}
+
+#update_now_link {
+	float: left;
+	clear: left;
+	margin-bottom: 20px;
+}
+
+#label_id_hidden, #id_hidden {
+	margin-top: 30px;
+}
+#help_id_hidden {
+	margin-top: 30px;
+}
+
+#contact-edit-info-wrapper, #contact-edit-info {
+	width: 90%;
+}
+
+#contact-edit-end {
+	clear: both;
+	margin-top: 15px;
+}
+
+#contact-profile-selector {
+	width: 175px;
+	margin-left: 0px;
+}
+
+.contact-edit-submit {
+	clear: left;
+	display: block;
+
+	margin-top: 10px;
+	margin-bottom: 45px;
+	padding: 0.2em 0.5em;
+	font-size: 18px;
+}
+
+
+.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: 130px;
+	border: 1px solid #AAA;
+	background: #FFFFFF;
+	position: absolute;
+	left: -30px; top: 80px;
+	display: none;
+	z-index: 101;
+	-moz-box-shadow: 3px 3px 5px #555;
+	-webkit-box-shadow: 3px 3px 5px #555;
+	box-shadow: 3px 3px 5px #555;
+}
+.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; }
+
+
+#block-message, #ignore-message, #archive-message, #lost-contact-message {
+	color: #FF0000;
+}
+
+#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-desc {
+	/*float: left;*/
+	width: 100%;
+	color: #FF0000;
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+
+#profile-jot-text {
+	width: 100%;
+	height: 200px;
+	color:#000;
+	border: 1px solid #cccccc;
+	padding: 3px 0px 0px 5px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;	
+}
+
+
+/** acl **/
+#photo-edit-perms-select,
+#photos-upload-permissions-wrapper,
+#profile-jot-acl-wrapper{
+	/*display:block!important;*/
+}
+
+#photos-usage-message {
+	margin-bottom: 15px;
+}
+
+#profile-jot-acl-wrapper{
+	/*width:270px;
+	padding-left:10px;
+	padding-right:10px;*/
+	height:auto;
+	overflow:visible;
+	text-align: center;
+}
+
+#acl-wrapper {
+	/*display: inline-block;*/
+	padding-right: 1em;
+	padding-left: 1em;
+
+	border: 1px solid #444;
+	border-radius: 10px;
+}
+
+#acl-public-switch {
+	margin-top: 40px;
+	text-align: center;
+/*  margin-right: auto;
+  margin-left: auto;
+
+  padding-top: 10px;
+  padding-bottom: 10px;
+  padding-left: 10px;
+  text-align: center;*/
+}
+
+#acl-public-switch a {
+	font-size: 1.5em;
+	padding: 0.2em 1em;
+	border: 1px solid #aaa;
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	display: inline-block;
+	margin-right: 0.4em;
+	margin-bottom: 0.4em;
+}
+
+.acl-public-switch-selected {
+	font-weight: 700;
+}
+
+#acl-search {
+	display: none;
+	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;
+	-webkit-border-radius: 5px ;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	color: #999999;
+}
+#acl-showall.selected {
+	color: #000000;
+	background-color: #ff9900;
+	background-image: url("../../../images/show_all_on.png");
+}
+
+#acl-list {
+/*	height: 210px;*/
+/*	border: 1px solid #cccccc;*/
+	clear: both;
+	margin-top: 0.7em;
+	overflow: visible;
+}
+#acl-list-content {
+	text-align: center;
+}
+.acl-html-select-wrapper {
+	display: inline-block;
+	margin-right: 1em;
+	margin-bottom: 2em;
+	font-weight: 700;
+	max-width: 100%;
+}
+.acl-html-select {
+	margin-top: 0.4em;
+	max-width: 100%;
+}
+.acl-list-item {
+	display: block;
+	width: 120px;
+	height: 30px;
+	border: 1px solid #cccccc;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+	margin-top: 5px;
+
+	margin-bottom: 5px;
+	margin-right: 2px;
+	margin-left: 2px;
+	padding-left: 5px;
+	float: left;
+}
+.acl-list-item img{
+
+	display: none;
+	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 **/
+
+
+#group-new-submit-wrapper {
+	margin-top: 30px;
+}
+
+
+#group-edit-name-label {
+	float: left;
+	width: 175px;
+	margin-top: 20px;
+	margin-bottom: 20px;
+}
+
+#group-edit-name {
+	float: left;
+	width: 225px;
+	margin-top: 20px;
+	margin-bottom: 20px;
+}
+
+#group-edit-name-wrapper {
+
+
+}
+
+
+#group_members_select_label {
+	display: block;
+	float: left;
+	width: 175px;
+}
+
+.group_members_select {
+	float: left;
+	width: 230px;
+	overflow: auto;
+}
+
+#group_members_select_end {
+	clear: both;
+}
+#group-edit-name-end {
+	clear: both;
+}
+
+#message-new {
+	font-size: 24px;
+}
+
+#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: left;
+	font-size: 18px;
+	padding: 0.25em 0.5em;
+	margin-top: 10px;
+	margin-right: 30px;
+}
+#prvmail-upload-wrapper,
+#prvmail-link-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+.mail-list-sender,
+.mail-list-detail {
+	float: left;
+}
+.mail-list-detail {
+	margin-left: 20px;
+}
+
+.mail-list-subject {
+	font-size: 1.1em;
+	margin-top: 10px;
+}
+a.mail-list-link {
+    display: block;
+    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;
+	margin-bottom: 10px;
+	/*width: 270px;*/
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-body {
+	padding-top: 20px;
+	clear: both;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	padding-bottom: 0.5em;
+	margin-right: 5px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+.message-links ul {
+	list-style-type: none;
+	padding: 0px;
+}
+
+.message-links li {
+	margin-top: 10px;
+	float: left;
+}
+.message-links a {
+	padding: 3px 5px;
+}
+
+.message-links-end {
+	clear: both;
+}
+
+#sidebar-group-list ul {
+	list-style-type: none;
+}
+
+#sidebar-group-list .icon, #sidebar-group-list .iconspacer {
+	display: inline-block;
+	height: 12px;
+	width: 12px;
+}
+
+#sidebar-group-list li {
+	margin-top: 10px;
+}
+
+.nets-ul, .fileas-ul, .categories-ul {
+	list-style-type: none;
+}
+
+.nets-ul li, .fileas-ul li, .categories-ul li {
+	margin-top: 10px;
+}
+
+.nets-link {
+	margin-left: 24px;
+}
+.nets-all {
+	margin-left: 42px;
+}
+
+.fileas-link, .categories-link {
+	margin-left: 24px;
+}
+
+.fileas-all, .categories-all {
+	margin-left: 0px;
+}
+
+#search-save {
+	font-size: 18px;
+	padding: 5px 10px;
+	margin-left: 5px;
+}
+.groupsideedit {
+	margin-right: 10px;
+}
+#saved-search-ul {
+	list-style-type: none;
+}
+.savedsearchdrop, .savedsearchterm {
+	float: left;
+	margin-top: 10px;
+}
+.savedsearchterm {
+	margin-left: 10px;
+}
+
+
+#side-follow-wrapper {
+	margin-top: 20px;
+}
+#side-follow-url, #side-peoplefind-url {
+	margin-top: 5px;
+}
+#side-follow-submit, #side-peoplefind-submit {
+	font-size: 18px;
+	padding: 5px 10px;
+	margin: 10px 0px 10px 10px;
+}
+
+#side-match-link {
+	margin-top: 10px;
+}
+
+aside input[type='text'] {
+ width: 174px;
+}
+
+.widget {
+	border: 1px solid #DDDDDD;
+	padding: 18px;
+	margin-top: 5px;
+	-moz-border-radius:5px;
+	-webkit-border-radius:5px;
+	border-radius:5px;
+}
+.widget.settings-widget {
+	padding: 0;
+}
+
+
+/*.photos {
+	height: auto;
+	overflow: auto;
+}*/
+
+.photos-end {
+	clear: both;
+	margin-bottom: 25px;
+}
+
+.photo-album-image-wrapper {
+	float: left;
+	margin-top: 15px;
+	margin-right: 15px;
+	margin-left: 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 {
+	clear: both;
+	margin-bottom: 25px;
+}
+
+.photo-top-image-wrapper {
+/*	position: relative; 
+	float: left;*/
+	display: inline-block;
+	vertical-align: top;
+	margin-top: 15px;
+	margin-right: 15px;
+	margin-left: 15px;
+	margin-bottom: 15px;
+/*	width: 200px; height: 200px; 
+	overflow: hidden; */
+}
+.photo-top-image-wrapper img {
+	max-width: 290px;
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+.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-form {
+	text-align: center;
+}
+
+#photos-upload-newalbum-div, #photos-upload-existing-album-text {
+	/*float: left;*/
+	display: inline-block;
+	width: 175px;
+	text-align: left;
+}
+
+#photos-upload-noshare {
+	margin-bottom: 10px;
+}
+#photos-upload-noshare-div {
+	margin-top: 2em;
+	margin-bottom: 15px;
+}
+
+#photos-upload-noshare-label {
+	margin-left: 25px;
+}
+
+#photos-upload-newalbum {
+	width: 15em;
+}
+#photos-upload-album-select {
+	width: 15.7em;
+}
+
+#photos-upload-spacer {
+	margin-top: 25px;
+}
+#photos-upload-new-end, #photos-upload-exist-end {
+	clear: both;
+}
+#photos-upload-exist-end {
+	margin-bottom: 15px;
+}
+
+#photos_upload_applet_wrapper {
+	margin-bottom: 15px;
+}
+
+#photos-upload-no-java-message {
+	margin-bottom: 15px;
+}
+
+#character-counter {
+	float: right;
+	font-size: 120%;
+}
+
+#character-counter.grey {
+	color: #888888;
+}
+
+#character-counter.orange {
+	color: orange;
+}
+#character-counter.red {
+	color: red;
+}
+
+#profile-jot-banner-end {
+	/* clear: both; */ 
+}
+
+#photos-upload-select-files-text {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+#photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link {
+	color: #8888FF;
+	text-decoration: none;
+	cursor: pointer;
+}
+
+#photos-upload-perms-menu {
+	margin-left: 15px;
+}
+
+#photos-upload-perms-menu:hover {
+	color: #0000FF;
+	text-decoration: underline;
+	cursor: pointer;
+}
+#settings-default-perms-menu {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+.photo-edit-input-text {
+	display: inline-block;
+	text-align: left;
+}
+
+#photo_edit_form {
+	text-align: center;
+}
+
+#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, .photo-edit-rotate-label {
+	/*float: left;*/
+	display: inline-block;
+	width: 150px;
+}
+
+#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label {
+	font-weight: 700;
+}
+
+.photo-perms-icon {
+	float: left;
+}
+
+#photo-edit-perms-menu, #photos-upload-perms-menu, #settings-default-perms-menu {
+	text-decoration: none;
+}
+
+.photo-jot-perms-text {
+	padding-top: 5px;
+	padding-left: 40px;
+}
+
+#photo-edit-perms, #photos-upload-perms, #settings-default-perms {
+	margin-top: 30px;
+}
+#photos-upload-perms {
+	margin-top: 15px;
+	margin-left: 5px;
+}
+
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #settings-jot-acl-wrapper {
+	margin-top: 30px;
+/*	margin-left: 20px;*/
+}
+
+#advanced-expire-popup {
+	padding-left: 1em;
+	margin-top: 15px;
+	border: 1px solid #aaa;
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+
+#photo-edit-perms-end {
+	margin-bottom: 15px;
+}
+
+#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
+	/*float: left;*/
+	margin-bottom: 25px;
+}
+
+.photo-edit-rotate-choice {
+	display: inline-block;
+}
+
+.photo-edit-rotate {
+	float: left;
+	margin-left: 20px;
+}
+#photo-edit-link-wrap {
+	margin-bottom: 15px;
+}
+#photo-like-div {
+	margin-left: 15px;
+	margin-bottom: 65px;
+}
+
+#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end {
+	clear: both;
+}
+
+#photo-edit-rotate-end {
+	margin-bottom: 15px;
+}
+
+#photo-edit-submit-button, #photo-edit-delete-button, #photos-upload-submit {
+	margin-top: 30px;
+	padding: 0.25em 0.5em;
+	font-size: 18px;
+}
+#photo-edit-submit-button {
+	margin-left: 10px;
+}
+#photo-edit-delete-button {
+	margin-left: 45px;
+}
+#photos-upload-choose {
+/*	position: absolute;
+	top: 460px;
+	left: 5px;*/
+	margin-top: 1em;
+}
+#photos-upload-submit {
+	margin-top: 0px;
+}
+.settings-submit, .profile-edit-submit-button, .settings-features-submit {
+	padding: 0.25em 0.5em;
+	margin-bottom: 10px;
+	font-size: 18px;
+}
+#photo-edit-end {
+	margin-bottom: 35px;
+}
+#photo-caption {
+	font-size: 110%;
+	font-weight: bold;
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+#in-this-photo-text {
+	color: #0000FF;
+	margin-left: 30px;
+}
+
+#in-this-photo {
+	margin-left: 60px;
+	margin-top: 10px;
+	margin-bottom: 20px;
+}
+
+#photo-album-edit-form {
+	max-width: 100%;
+	padding-left: 0.5em;
+	padding-right: 0.5em;
+}
+#photo-album-edit-form input {
+	max-width: 100%;
+}
+#photo-album-edit-name-label {
+	display: block;
+}
+
+#photo-album-edit-submit, #photo-album-edit-drop {
+	margin-top: 15px;
+	margin-bottom: 15px;
+
+	padding: 0.25em 0.5em;
+	font-size: 18px;
+}
+
+#photo-album-edit-drop {
+	margin-left: 2em;
+}
+
+.group-delete-wrapper {
+	float: right;
+	margin-right: 50px;
+}
+
+#confirm-message {
+	display: block;
+	font-size: 24px;
+}
+.confirm-button {
+	margin-top: 30px;
+	margin-right: 0.4em;
+	padding: 0.25em 0.5em;
+	font-size: 18px;
+}
+
+#install-dbhost-label,
+#install-dbuser-label,
+#install-dbpass-label,
+#install-dbdata-label,
+#install-tz-desc {
+       float: left;
+       width: 250px;
+       margin-top: 10px;
+       margin-bottom: 10px;
+
+}
+
+#install-dbhost,
+#install-dbuser,
+#install-dbpass,
+#install-dbdata {
+       float: left;
+       width: 200px;
+       margin-left: 20px;
+}
+
+#install-dbhost-end,
+#install-dbuser-end,
+#install-dbpass-end,
+#install-dbdata-end,
+#install-tz-end {
+       clear: both;
+}
+
+#install-form select#timezone_select {
+       float: left;
+       margin-top: 18px;
+       margin-left: 20px;
+}
+
+#dfrn-request-networks {
+	margin-bottom: 30px;
+}
+
+#pause {
+  position: fixed;
+  bottom: 5px;
+  right: 5px;
+}
+
+.sparkle {
+	cursor: url('lock.cur'), pointer;
+/*	cursor: pointer !important; */
+}
+
+.contact-block-div {
+	float: left;
+	width: 52px;
+	height: 52px;
+}
+.contact-block-textdiv {
+	float: left;
+	width: 150px;
+	height: 34px;
+}
+
+#contact-block-end {
+	clear: both;
+}
+.contact-block-link {
+	float: left;
+}
+.contact-block-img {
+	width:48px;
+	height:48px;
+}
+
+#tag-remove {
+	margin-bottom: 15px;
+}
+
+#tagrm li {
+	margin-bottom: 10px;
+}
+
+#tagrm-submit, #tagrm-cancel {
+	margin-top: 25px;
+}
+
+#tagrm-cancel {
+	margin-left: 15px;
+}
+
+.wall-item-conv {
+	margin-top: 5px;
+	margin-bottom: 25px;
+}
+
+#search-submit {
+	font-size: 18px;
+	padding: 5px 10px;
+	margin-left: 15px;
+}
+
+#search-box {
+	margin-bottom: 25px;
+}
+
+.location-label, .gender-label, .marital-label, .homepage-label {
+	float: left;
+	text-align: right;
+	display: block;
+	width: 65px;
+}
+
+.adr, .x-gender, .marital-text, .homepage-url {
+	float: left;
+	display: block;
+	margin-left: 8px;
+}
+
+.profile-clear {
+	clear: both;
+}
+
+
+.clear {
+	clear: both;
+}
+
+.cc-license {
+	margin-top: 50px;
+	font-size: 70%;
+}
+
+
+#plugin-settings-link, #account-settings-link {
+	margin-bottom: 10px;
+}
+
+#uexport-link {
+	margin-bottom: 20px;
+}
+
+/* end from default */
+	
+
+.fn {
+	padding: 1em 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;
+	font-weight: bold;	
+}
+
+#birthday-adjust {
+	float: left;
+	font-size: 75%;
+	margin-left: 10px;
+}
+
+#birthday-title-end {
+	clear: both;
+}
+
+.birthday-list {
+	margin-left: 15px;
+}
+
+#birthday-wrapper {
+	margin-bottom: 20px;
+}
+
+#network-new-link {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+
+.tool-wrapper {
+  float: left;
+  margin-left: 15px;
+}
+
+.tool-link {
+  cursor: pointer;
+}
+
+.eventcal {
+	float: left;
+	font-size: 20px;
+}
+
+#event-summary-text {
+	margin-top: 15px;
+}
+
+#event-share-checkbox {
+	float: left;
+	margin-top: 10px;
+}
+
+#event-share-text {
+	float: left;
+	margin-top: 10px;
+	margin-left: 5px;
+}
+
+#event-share-break {
+	clear: both;
+	margin-bottom: 10px;
+}
+
+#event-summary {
+	width: 280px;
+}
+
+.vevent {
+	border: 1px solid #CCCCCC;
+}
+
+.vevent .event-summary {
+	margin-left: 10px;
+	margin-right: 10px;
+	font-weight: bold;
+}
+
+.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 {
+	font-size: 14px;
+	margin-left: 10px;
+	width: 280px;
+	clear: both;
+	padding-bottom: 1.5em;
+}
+
+.event-start .dtstart, .event-end .dtend {
+	clear: both;
+	float: left;
+}
+
+.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-nav {
+	position: relative;
+	height: 55px;
+}
+
+#photo-prev-link {
+	position: absolute;
+	left: 5px;
+}
+#photo-next-link {
+	position: absolute;
+	right: 5px;
+}
+#photo-prev-link, #photo-next-link {
+	padding: 10px;
+/*	float: left;*/
+}
+
+/*#photo-photo {
+	float: left;
+}*/
+
+#photo-photo {
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
+	text-align: center;
+}
+
+#photo-photo img {
+	max-width: 100%;
+}
+
+#photo-photo-end {
+	clear: both;
+}
+
+.profile-match-photo {
+	float: left;
+	text-align: center;
+	width: 120px;
+}
+
+.profile-match-name {
+	float: left;
+	text-align: center;
+	width: 120px;
+	overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+	clear: both;
+}
+
+.profile-match-connect {
+	text-align: center;
+	font-weight: bold;
+}
+
+.profile-match-wrapper {
+	display: inline-block;
+	padding: 10px;
+	/*width: 120px;
+	height: 120px;*/
+	scroll: auto;
+	margin-bottom: 2em;
+	vertical-align: top;
+}
+.profile-match-wrapper .icon.drophide {
+	margin-left: auto;
+	margin-right: auto;
+	margin-top: 1em;
+}
+#profile-match-wrapper-end {
+	clear: both;
+}
+.side-link {
+	margin-bottom: 15px;
+}
+
+#language-selector {
+	position: absolute;
+	top: 0px;
+	left: 16px;
+}
+
+#group-members {
+	margin-top: 20px;
+	padding: 10px;
+	height: 250px;
+	overflow: auto;
+	border: 1px solid #ddd;
+}
+
+#group-members-end {
+	clear: both;
+}
+
+#group-separator {
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+
+#group-all-contacts {
+	padding: 10px;
+	height: 450px;
+	overflow: auto;
+	border: 1px solid #ddd;
+}
+
+#group-all-contacts-end {
+	clear: both;
+	margin-bottom: 10px;
+}
+
+#group-edit-desc {
+	margin-top: 15px;
+}
+
+
+#prof-members {
+	margin-top: 20px;
+	padding: 10px;
+	height: 250px;
+	overflow: auto;
+	border: 1px solid #ddd;
+}
+
+#prof-members-end {
+	clear: both;
+}
+
+#prof-separator {
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+
+#prof-all-contacts {
+	padding: 10px;
+	height: 450px;
+	overflow: auto;
+	border: 1px solid #ddd;
+}
+
+#prof-all-contacts-end {
+	clear: both;
+	margin-bottom: 10px;
+}
+
+#prof-edit-desc {
+	margin-top: 15px;
+}
+
+#crepair-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;	
+}
+
+#netsearch-box #search-submit {
+	margin: 5px 0px 0px 0px;
+}
+
+.required {
+	color: #FF0000;
+}
+
+#event-start-text, #event-finish-text {
+	margin-top: 10px;
+	margin-bottom: 5px;
+}
+
+#event-nofinish-checkbox, #event-nofinish-text, #event-adjust-checkbox, #event-adjust-text {
+	float: left;
+}
+#event-datetime-break {
+	margin-bottom: 10px;
+}
+
+#event-nofinish-break, #event-adjust-break {
+	clear: both;
+}
+
+#event-desc-text, #event-location-text {
+	margin-top: 10px;
+	margin-bottom: 5px;
+}
+
+#event-submit {
+	margin-top: 10px;
+}
+
+.filesavetags, .categorytags {
+	display: block;
+	clear: left;
+}
+
+.body-tag, .filesavetags, .categorytags {
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+}
+
+.body-tag:hover, .filesavetags:hover, .categorytags:hover {
+	opacity: 1.0 !important;
+	filter:alpha(opacity=100) !important;
+}
+
+.item-select {
+	display: none;
+	opacity: 0.1;
+	filter:alpha(opacity=10);
+	float: right;
+	margin-right: 10px;
+
+}
+.item-select:hover, .checkeditem {
+	opacity: 1;
+	filter:alpha(opacity=100);
+}
+
+
+#item-delete-selected {
+	margin-top: 30px;
+}
+
+#item-delete-selected-end {
+	clear: both;
+}
+#item-delete-selected-icon, #item-delete-selected-desc {
+	float: left;
+	margin-right: 5px;
+}
+#item-delete-selected-desc:hover {
+	text-decoration: underline;
+}
+
+#lang-select-icon {
+	cursor: pointer;
+	position: fixed;
+	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
+ */
+.field {
+	margin-bottom: 10px;
+	padding-bottom: 10px;
+	overflow: auto;
+/*	width: 100%*/
+}
+
+.field label {
+	font-weight: 700;
+	float: left;
+	width: 200px;
+}
+
+.field input,
+.field textarea {
+	width: 230px;
+	margin-left: 20px;
+}
+.field input[type=checkbox],
+.field input[type=radio] {
+	width: auto;
+}
+.field textarea { height: 100px; }
+.field_help {
+	display: block;
+	margin-left: 20px;
+	color: #666666;
+	clear: left;
+}
+
+
+
+.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;
+}
+.hidden { display: none!important; }
+
+.field.radio .field_help { margin-left: 20px; }
+
+/**
+ * ADMIN
+ */
+#pending-update {
+	float:right;
+	color: #ffffff;
+	font-weight: bold;
+	background-color: #FF0000;
+	padding: 0em 0.3em;
+	
+}
+#adminpage dl {
+	clear: left;
+	min-height: 40px;
+	margin-bottom: 2px;
+	padding-bottom: 2px;
+	border-bottom: 1px solid black;
+}
+#adminpage dt {
+	width: 180px;
+	float: left;
+	font-weight: bold;
+}
+#adminpage dd {
+	margin-left: 180px;
+}
+
+#adminpage h3 {
+	border-bottom: 1px solid #cccccc;
+}
+#adminpage .field label {
+	font-weight: bold;
+}
+#adminpage .submit {
+	clear:left;
+	text-align: right;
+}
+
+#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 .plugin .desc { margin-left: 2.5em;}
+#adminpage .toggleplugin {
+	float:left;
+	margin-right: 1em;
+}
+
+#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; }
+
+#cnftheme {
+	display: none;
+}
+
+/*
+ * 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');
+}
+.article { background-position: 0px 0px;}
+.icon.audio { display: none; background-position: -16px 0px;}
+.block { background-position: -32px 0px;}
+/*.drop { background-position: -48px 0px;}
+.drophide { background-position: -64px 0px;}*/
+.icon.drop {
+	display: block; width: 28px; height: 28px;
+	background-size: 100% 100%;
+	background-image: url('images/drop-darkred.png');
+	background-repeat: no-repeat;
+}
+.icon.drophide {
+	display: block; width: 28px; height: 28px;
+	background-size: 100% 100%;
+	background-image: url('images/drop-darkred.png');
+	background-repeat: no-repeat;
+}
+.edit { background-position: -80px 0px;}
+/*.camera { background-position: -96px 0px;}*/
+.icon.camera {
+	display: block; width: 28px; height: 21px;
+	margin-top: 4px;
+	background-size: 100% 100%;
+	background-image: url('images/camera.png');
+	background-repeat: no-repeat;
+}
+/*.dislike { background-position: -112px 0px;}*/
+.icon.dislike {
+	display: block;
+	width: 26px; height: 28px;/*31 33*/
+	background-size: 100% 100%;
+	background-image: url('images/disapprove.png');
+	background-repeat: no-repeat;
+	opacity: 0.5;
+}
+/*.like { background-position: -128px 0px;}*/
+.icon.like {
+	display: block; width: 26px; height: 28px;/*31 33*/
+	margin-right: 7px;
+	background-size: 100% 100%;
+	background-image: url('images/approve.png');
+	background-repeat: no-repeat;
+	opacity: 0.5;
+}
+.icon.link { display: none; background-position: -144px 0px;}
+
+/*.globe { background-position: 0px -16px;}*/
+.icon.globe {
+	display: block; width: 28px; height: 28px;
+	background-size: 100% 100%;
+	background-image: url('images/globe.png');
+	background-repeat: no-repeat;
+}
+/*.noglobe { background-position: -16px -16px;}*/
+.icon.noglobe {
+	display: block; width: 24px; height: 24px;
+	background-size: 100% 100%;
+	background-image: url('images/noglobe.png');
+	background-repeat: no-repeat;
+}
+.no { background-position: -32px -16px;}
+.pause { background-position: -48px -16px;}
+.play { background-position: -64px -16px;}
+/*.pencil { background-position: -80px -16px;}
+.small-pencil { background-position: -96px -16px;}*/
+.icon.pencil {
+	display: block; width: 28px; height: 28px;
+	background-size: 100% 100%;
+	background-image: url('images/pencil.png');
+	background-repeat: no-repeat;
+	opacity: 0.5;
+}
+.icon.small-pencil {
+	display: block; width: 28px; height: 28px;
+	background-size: 100% 100%;
+	background-image: url('images/pencil.png');
+	background-repeat: no-repeat;
+	opacity: 0.5;
+}
+/*.recycle { background-position: -112px -16px;}*/
+.icon.recycle {
+	display: block;
+	width: 28px; height: 27px;/*33 32*/
+	background-size: 100% 100%;
+	background-image: url('images/recycle.png');
+	background-repeat: no-repeat;
+	opacity: 0.5;
+}
+/*.remote-link { background-position: -128px -16px;}*/
+.icon.remote-link {
+/*	display: block;*/
+	display: none;
+	width: 28px; height: 28px;
+	background-size: 100% 100%;
+	background-image: url('images/remote-link.png');
+	background-repeat: no-repeat;
+	opacity: 0.5;
+}
+.share { background-position: -144px -16px;}
+
+.tools { background-position: 0px -32px;}
+/*.lock { background-position: -16px -32px;}*/
+.icon.lock {
+	display: block; width: 17px; height: 25px;
+	margin-top: 1px;
+	background-size: 100% 100%;
+	background-image: url('images/lock.png');
+	background-repeat: no-repeat;
+}
+/*.unlock { background-position: -32px -32px;}*/
+.icon.unlock {
+	display: block; width: 17px; height: 28px;
+	margin-top: -2px;
+	background-size: 100% 100%;
+	background-image: url('images/unlock.png');
+	background-repeat: no-repeat;
+}
+.icon.video { display: none; background-position: -48px -32px;}
+.oembed.video a { display: block; }
+.youtube { background-position: -64px -32px;}
+/*.attach { background-position: -80px -32px; }*/
+.icon.attach {
+	display: block; width: 28px; height: 28px;
+	background-size: 100% 100%;
+	background-image: url('images/paperclip.png');
+	background-repeat: no-repeat;
+}
+.language { background-position: -96px -32px; }
+.prev { background-position: -112px -32px; }
+.next { background-position: -128px -32px; }
+.on { background-position: -144px -32px; }
+
+.off { background-position: 0px -48px; }
+/*.starred { background-position: -16px -48px; }*/
+.icon.starred {
+	display: block; width: 28px; height: 28px;
+	background-size: 100% 100%;
+	background-image: url('images/star-yellow.png');
+	background-repeat: no-repeat;
+}
+/*.unstarred { background-position: -32px -48px; }*/
+.icon.unstarred {
+	display: block; width: 28px; height: 28px;
+	background-size: 100% 100%;
+	background-image: url('images/star.png');
+	background-repeat: no-repeat;
+
+	opacity: 0.5;
+}
+/*.tagged { background-position: -48px -48px; }*/
+.icon.tagged {
+	display: block; width: 28px; height: 28px;
+	background-size: 100% 100%;
+	background-image: url('images/tag.png');
+	background-repeat: no-repeat;
+	opacity: 0.5;
+}
+.yellow { background-position: -64px -48px; }
+
+
+.filer-icon {
+	display: block; width: 24px; height: 24px;
+	background-size: 100% 100%;
+	background-image: url('images/folder.png');
+	background-repeat: no-repeat;
+	opacity: 0.5;
+}
+
+.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
+
+[class^="comment-edit-bb"] {
+	list-style: none;
+	display: none;
+	margin: 0px 0 -5px 20px;
+	width: 75%;
+}
+[class^="comment-edit-bb"] > li {
+	display: inline-block;
+	margin: 20px 10px 0 0;
+	visibility: none;
+}
+/*[class^="comment-edit-bb-end"] {
+	clear: both;
+}*/
+.editicon {
+    display: inline-block;
+	background-size: 100% 100%;
+	background-repeat: no-repeat;
+	background-color: #f3f3f3;
+    text-decoration: none;
+}
+/*.editicon:hover {
+	background-color: #ccc;
+}*/
+.boldbb {
+/*	background-position: 0px 0px;*/
+	width: 26px; height: 28px;
+	background-image: url('images/boldB-serif.png');
+}
+/*.boldbb:hover {
+	background-position: 0px -16px;
+}*/
+.italicbb {
+/*	background-position: -16px 0px;*/
+	width: 16px; height: 28px;
+	background-image: url('images/italicI-serif.png');
+}
+/*.italicbb:hover {
+	background-position: -16px -16px;
+}*/
+.underlinebb {
+/*	background-position: -32px 0px;*/
+	width: 25px; height: 28px;
+	background-image: url('images/underlineU-serif.png');
+}
+/*.underlinebb:hover {
+	background-position: -32px -16px;
+}*/
+.quotebb {
+/*	background-position: -48px 0px;*/
+	width: 28px; height: 28px;
+	background-image: url('images/quote.png');
+}
+/*.quotebb:hover {
+	background-position: -48px -16px;
+}*/
+.codebb {
+/*	background-position: -64px 0px;*/
+	width: 28px; height: 28px;
+	background-image: url('images/code.png');
+}
+/*.codebb:hover {
+	background-position: -64px -16px;
+}*/
+.imagebb {
+	background-position: -80px 0px;
+}
+.imagebb:hover {
+	background-position: -80px -16px;
+}
+.urlbb {
+	background-position: -96px 0px;
+}
+.urlbb:hover {
+	background-position: -96px -16px;
+}
+.videobb {
+	background-position: -112px 0px;
+}
+.videobb:hover {
+	background-position: -112px -16px;
+}
+
+.attachtype {
+	display: block;
+	float: left;
+	background-size: 100% 100%;
+	width: 48px;
+	height: 48px;
+	background-image: url('images/oxygen/unknown.png');
+}
+
+.body-attach {
+	margin-top: 10px;
+}
+
+/*.type-video { background-position: 0px 0px; }
+.type-image { background-position: -20px 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text  { background-position: -60px 0px; }
+.type-unkn  { background-position: -80px 0px; }*/
+.type-video {
+	background-image: url('images/oxygen/video-x-generic.png');
+	background-size: 100% 100%;
+	width: 48px;
+	height: 48px;
+}
+.type-image {
+	background-image: url('images/oxygen/image-x-generic.png');
+	background-size: 100% 100%;
+	width: 48px;
+	height: 48px;
+}
+.type-audio {	background-image: url('images/oxygen/audio-x-generic.png');
+	background-size: 100% 100%;
+	width: 48px;
+	height: 48px;
+}
+
+.type-text  {
+	background-image: url('images/oxygen/text-x-generic-2.png');
+	background-size: 100% 100%;
+	width: 48px;
+	height: 48px;
+}
+.subtype-msword, .subtype-vnd-openxmlformats-officedocument-wordprocessingml-document  {
+	background-image: url('images/oxygen/application-msword.png');
+	background-size: 100% 100%;
+	width: 48px;
+	height: 48px;
+}
+.subtype-pdf  {
+	background-image: url('images/oxygen/application-pdf.png');
+	background-size: 100% 100%;
+	width: 48px;
+	height: 48px;
+}
+/*.type-unkn  {
+	background-image: url('images/oxygen/unknown.png');
+	background-size: 100% 100%;
+
+	width: 48px;
+	height: 48px;
+}*/
+
+
+
+/* autocomplete popup */
+.acpopup {
+	max-height:150px;
+	background-color:#ffffff;
+	overflow:auto;
+	z-index:102;
+	border:1px solid #cccccc;
+}
+.acpopupitem {
+	background-color:#ffffff; padding: 4px;
+	clear:left;
+}
+.acpopupitem img {
+	float: left;
+	margin-right: 4px;
+
+}
+
+.acpopupitem.selected {
+	color: #FFFFFF; background: #3465A4;
+}
+
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+  margin: 0px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+  margin: 0px;
+}
+#jGrowl.top-right {
+	top: 15px;
+	right: 10px;
+}
+div.jGrowl-notification {
+  border-radius: 7px;
+}
+.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.3;
+	filter:alpha(opacity=30);
+}
+.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.notifications-menu-popup {
+	position: absolute;
+	display: none;
+	width: 10em;
+	margin: 0px;
+	padding: 0px 0.3em;
+	list-style: none;
+	right: -60px;
+}
+#nav-notifications-menu {
+	width: 300px;
+/*	max-height: 400px;*/
+	height: auto;
+/*	overflow-y: scroll;overflow-style:scrollbar;*/
+	background-color:#FFFFFF;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius:5px;
+	border: 1px solid #AAA;
+	-moz-box-shadow: 3px 3px 5px #555;
+	-webkit-box-shadow: 3px 3px 5px #555;
+	box-shadow: 3px 3px 5px #555;
+/*	z-index: 103;*/
+}
+#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;
+}
+
+#id_term_label {
+	width:75px;
+}
+#id_term {
+	width:100px;
+}
+
+#recip {
+	
+}
+.autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
+.autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px;  _margin:0; _overflow-x:hidden; }
+.autocomplete .selected { background:#F0F0F0; }
+.autocomplete div { padding:2px 5px; white-space:nowrap; overflow:hidden; }
+
+#datebrowse-sidebar select {
+	margin-left: 40px;
+	width: 130px;
+}
+
+/*@media only screen and (min-device-width: 768px)
+and (max-device-width: 1024px)*/
+/*@media only screen and (min-device-width: 768px)
+{
+html {
+width:700px
+}
+div.section-wrapper {
+width:700px;
+margin-left:0px;
+}
+.wall-item-body {
+width:700px;
+}
+.comment .wall-item-body {
+width:650px;
+}
+}*/
+
+/*@media only screen and (min-device-width: 768px)
+{
+	.wall-item-body code {
+		width: 700px;
+	}
+
+	.comment .wall-item-body blockquote {
+		margin-left: 20px;
+		width: 680px;
+	}
+	blockquote {
+		width: 700px;
+	}
+
+}*/
+
diff --git a/view/theme/decaf-mobile/suggest_friends.tpl b/view/theme/decaf-mobile/suggest_friends.tpl
new file mode 100644
index 0000000000..d5051e33b5
--- /dev/null
+++ b/view/theme/decaf-mobile/suggest_friends.tpl
@@ -0,0 +1,16 @@
+<div class="profile-match-wrapper">
+	<div class="profile-match-photo">
+		<a href="$url">
+			<img src="$photo" alt="$name" width="80" height="80" title="$name [$url]" onError="this.src='../../../images/person-48.jpg';" />
+		</a>
+	</div>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="$url" title="$name">$name</a>
+	</div>
+	<div class="profile-match-end"></div>
+	{{ if $connlnk }}
+	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
+	{{ endif }}
+	<a href="$ignlnk&confirm=1" title="$ignore" class="icon drophide profile-match-ignore" id="profile-match-drop-$ignid" {#onmouseout="imgdull(this);" onmouseover="imgbright(this);"#} onclick="id=this.id;return confirmDelete(function(){changeHref(id, '$ignlnk')});" ></a>
+</div>
diff --git a/view/theme/decaf-mobile/theme.php b/view/theme/decaf-mobile/theme.php
new file mode 100644
index 0000000000..2897176c4e
--- /dev/null
+++ b/view/theme/decaf-mobile/theme.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * Name: Decaf--mobile version
+ * Description: No Javascript theme
+ * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
+ * Version: Version 0.2.17
+ * Author: Zach P <techcity@f.shmuz.in>
+ * Maintainer: Zach P <techcity@f.shmuz.in>
+ */
+
+function decaf_mobile_init(&$a) {
+	$a->theme_info = array();
+	$a->sourcename = 'Friendica mobile web';
+	$a->videowidth = 250;
+	$a->videoheight = 200;
+	$a->theme_thread_allow = false;
+//	$a->force_max_items = 10;
+	set_template_engine($a, 'smarty3');
+}
+
+function decaf_mobile_content_loaded(&$a) {
+
+	// I could do this in style.php, but by having the CSS in a file the browser will cache it,
+	// making pages load faster
+	if( $a->module === 'home' || $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
+//		$a->page['htmlhead'] = str_replace('$stylesheet', $a->get_baseurl() . '/view/theme/decaf-mobile/login-style.css', $a->page['htmlhead']);
+		$a->theme['stylesheet'] = $a->get_baseurl() . '/view/theme/decaf-mobile/login-style.css';
+	}
+	if( $a->module === 'login' )
+		$a->page['end'] .= '<script type="text/javascript"> $j(document).ready(function() { $j("#id_" + window.loginName).focus();} );</script>';
+
+}
diff --git a/view/theme/decaf-mobile/threaded_conversation.tpl b/view/theme/decaf-mobile/threaded_conversation.tpl
new file mode 100644
index 0000000000..5310b323a9
--- /dev/null
+++ b/view/theme/decaf-mobile/threaded_conversation.tpl
@@ -0,0 +1,12 @@
+$live_update
+
+{{ for $threads as $thread }}
+{{ if $mode == display }}
+{{ inc $thread.template with $item=$thread }}{{ endinc }}
+{{ else }}
+{{ inc wall_thread_toponly.tpl with $item=$thread }}{{ endinc }}
+{{ endif }}
+{{ endfor }}
+
+<div id="conversation-end"></div>
+
diff --git a/view/theme/decaf-mobile/voting_fakelink.tpl b/view/theme/decaf-mobile/voting_fakelink.tpl
new file mode 100644
index 0000000000..b66302cc27
--- /dev/null
+++ b/view/theme/decaf-mobile/voting_fakelink.tpl
@@ -0,0 +1 @@
+<span class="fakelink-wrapper"  id="$[type]list-$id-wrapper">$phrase</span>
diff --git a/view/theme/decaf-mobile/wall_thread.tpl b/view/theme/decaf-mobile/wall_thread.tpl
new file mode 100644
index 0000000000..a5bcbda7ea
--- /dev/null
+++ b/view/theme/decaf-mobile/wall_thread.tpl
@@ -0,0 +1,119 @@
+<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
+<a name="$item.id" ></a>
+{#<!--<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{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
+			{{ if $item.owner_url }}
+			<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" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
+			{{ endif }}
+			{#<!--<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)">-->#}
+			{#<!--<div class="wall-item-photo-wrapper{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$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" onError="this.src='../../../images/person-48.jpg';" />
+				</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 class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+                        $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="wall-item-lock 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>{{ if $item.owner_url }} $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{{ endif }}<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='body-tag tag'>$tag</span>
+						{{ endfor }}
+					{#<!--</div>-->#}
+			{{ if $item.has_cats }}
+			<div class="categorytags">$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+			</div>
+			{{ endif }}
+
+			{{ if $item.has_folders }}
+			<div class="filesavetags">$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+			</div>
+			{{ endif }}
+			</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="like/$item.id?verb=like&return=$return_path#$item.id" class="icon like" title="$item.vote.like.0" ></a>
+				{{ if $item.vote.dislike }}
+				<a href="like/$item.id?verb=dislike&return=$return_path#$item.id" class="icon dislike" title="$item.vote.dislike.0" ></a>
+				{{ endif }}
+				{#<!--{{ 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="wall-item-links-wrapper icon remote-link$item.sparkle"></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="starred/$item.id?return=$return_path#$item.id" id="starred-$item.id" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+			{{ endif }}
+			{#<!--{{ if $item.tagger }}
+			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.tagger.add"></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?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/$item.id')});" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>{{ endif }}
+			{#<!--</div>-->#}
+				{#<!--{{ if $item.drop.pagedrop }}<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 wall-item-like-full $item.indent" id="wall-item-like-$item.id">$item.like</div>
+	<div class="wall-item-dislike wall-item-dislike-full $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
+
+	{{ if $item.threaded }}
+	{{ if $item.comment }}
+	{#<!--<div class="wall-item-comment-wrapper $item.indent" >-->#}
+		$item.comment
+	{#<!--</div>-->#}
+	{{ endif }}
+	{{ endif }}
+
+{#<!--<div class="wall-item-outside-wrapper-end $item.indent" ></div>-->#}
+{#<!--</div>-->#}
+{{ for $item.children as $child }}
+	{{ inc $child.template with $item=$child }}{{ endinc }}
+{{ endfor }}
+
+{{ if $item.flatten }}
+{#<!--<div class="wall-item-comment-wrapper" >-->#}
+	$item.comment
+{#<!--</div>-->#}
+{{ endif }}
+</div>
+
diff --git a/view/theme/decaf-mobile/wall_thread_toponly.tpl b/view/theme/decaf-mobile/wall_thread_toponly.tpl
new file mode 100644
index 0000000000..817432da53
--- /dev/null
+++ b/view/theme/decaf-mobile/wall_thread_toponly.tpl
@@ -0,0 +1,101 @@
+<!--{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+	<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
+	</div>
+	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
+{{endif}}-->
+<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
+<a name="$item.id" ></a>
+	<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
+		<div class="wall-item-info{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
+			{{ if $item.owner_url }}
+			<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" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
+			{{ endif }}
+				<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" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+
+			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+				{{ if $item.lock }}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" {#onclick="lockview(event,$item.id);"#} />
+				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
+				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
+			</div>
+		</div>
+				<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>{{ if $item.owner_url }} $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{{ endif }}<br />
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</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-body" id="wall-item-body-$item.id" >$item.body
+						{{ for $item.tags as $tag }}
+							<span class='body-tag tag'>$tag</span>
+						{{ endfor }}
+			{{ if $item.has_cats }}
+			<div class="categorytags">$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+			</div>
+			{{ endif }}
+
+			{{ if $item.has_folders }}
+			<div class="filesavetags">$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+			</div>
+			{{ endif }}
+			</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="like/$item.id?verb=like&return=$return_path#$item.id" class="icon like" title="$item.vote.like.0" ></a>
+				{{ if $item.vote.dislike }}
+				<a href="like/$item.id?verb=dislike&return=$return_path#$item.id" class="icon dislike" title="$item.vote.dislike.0" ></a>
+				{{ endif }}
+				{#<!--{{ 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 }}
+				<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a>
+			{{ endif }}
+			{{ if $item.edpost }}
+				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+			{{ endif }}
+			 
+			{{ if $item.star }}
+			<a href="starred/$item.id?return=$return_path#$item.id" id="starred-$item.id" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+			{{ endif }}
+			{#<!--{{ if $item.tagger }}
+			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.tagger.add"></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 }}			-->#}
+			
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/$item.id')});" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>{{ endif }}
+				{#<!--{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}-->#}
+		</div>
+	</div>	
+	<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
+	<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
+
+	<div class="hide-comments-outer">
+	<a href="display/$user.nickname/$item.id"><span id="hide-comments-total-$item.id" class="hide-comments-total">$item.total_comments_num $item.total_comments_text</span></a>
+	</div>
+<!--	{{ if $item.threaded }}
+	{{ if $item.comment }}
+		$item.comment
+	{{ endif }}
+	{{ endif }}
+
+{{ for $item.children as $child }}
+	{{ inc $child.template with $item=$child }}{{ endinc }}
+{{ endfor }}
+
+{{ if $item.flatten }}
+	$item.comment
+{{ endif }}-->
+</div>
+<!--{{if $item.comment_lastcollapsed}}</div>{{endif}}-->
+
diff --git a/view/theme/decaf-mobile/wallmessage.tpl b/view/theme/decaf-mobile/wallmessage.tpl
new file mode 100644
index 0000000000..e7fa0ec048
--- /dev/null
+++ b/view/theme/decaf-mobile/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/theme/decaf-mobile/wallmsg-end.tpl b/view/theme/decaf-mobile/wallmsg-end.tpl
new file mode 100644
index 0000000000..6074133798
--- /dev/null
+++ b/view/theme/decaf-mobile/wallmsg-end.tpl
@@ -0,0 +1,2 @@
+<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
+
diff --git a/view/theme/decaf-mobile/wallmsg-header.tpl b/view/theme/decaf-mobile/wallmsg-header.tpl
new file mode 100644
index 0000000000..dc6cb82199
--- /dev/null
+++ b/view/theme/decaf-mobile/wallmsg-header.tpl
@@ -0,0 +1,7 @@
+
+<script language="javascript" type="text/javascript">
+{#//window.editSelect = "none";#}
+window.jotId = "#prvmail-text";
+window.imageUploadButton = 'prvmail-upload';
+</script>
+
diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl
index fc3594fdc9..6f263b3d3a 100644
--- a/view/theme/diabook/comment_item.tpl
+++ b/view/theme/diabook/comment_item.tpl
@@ -3,7 +3,7 @@
 				<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="return" value="$return_path" />-->#}
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
 
diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl
index 48930b48ab..f7ed107509 100644
--- a/view/theme/diabook/contact_template.tpl
+++ b/view/theme/diabook/contact_template.tpl
@@ -11,7 +11,13 @@
 			<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
+						{{ for $contact.photo_menu as $c }}
+						{{ if $c.2 }}
+						<li><a target="redir" href="$c.1">$c.0</a></li>
+						{{ else }}
+						<li><a href="$c.1">$c.0</a></li>
+						{{ endif }}
+						{{ endfor }}
                     </ul>
                 </div>
 			{{ endif }}
diff --git a/view/theme/dispy/comment_item.tpl b/view/theme/dispy/comment_item.tpl
index 765b41437d..e940800323 100644
--- a/view/theme/dispy/comment_item.tpl
+++ b/view/theme/dispy/comment_item.tpl
@@ -3,7 +3,7 @@
 				<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="return" value="$return_path" />-->#}
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
 				<input type="hidden" name="post_id_random" value="$rand_num" />
diff --git a/view/theme/dispy/contact_template.tpl b/view/theme/dispy/contact_template.tpl
index 04968bd07d..e656ea5527 100644
--- a/view/theme/dispy/contact_template.tpl
+++ b/view/theme/dispy/contact_template.tpl
@@ -11,7 +11,13 @@
 			<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
+						{{ for $contact.photo_menu as $c }}
+						{{ if $c.2 }}
+						<li><a target="redir" href="$c.1">$c.0</a></li>
+						{{ else }}
+						<li><a href="$c.1">$c.0</a></li>
+						{{ endif }}
+						{{ endfor }}
                     </ul>
                 </div>
 			{{ endif }}
diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/duepuntozero/comment_item.tpl
index 0f655ba43c..24164a0367 100755
--- a/view/theme/duepuntozero/comment_item.tpl
+++ b/view/theme/duepuntozero/comment_item.tpl
@@ -7,7 +7,7 @@
 				<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="return" value="$return_path" />-->#}
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
 				<input type="hidden" name="post_id_random" value="$rand_num" />
diff --git a/view/theme/facepark/comment_item.tpl b/view/theme/facepark/comment_item.tpl
index 7e71aa380b..bb1d4fa79e 100644
--- a/view/theme/facepark/comment_item.tpl
+++ b/view/theme/facepark/comment_item.tpl
@@ -3,7 +3,7 @@
 				<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="return" value="$return_path" />-->#}
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
 				<input type="hidden" name="post_id_random" value="$rand_num" />
diff --git a/view/theme/frost-mobile/comment_item.tpl b/view/theme/frost-mobile/comment_item.tpl
index adcd5d75ed..5410cd4cfb 100755
--- a/view/theme/frost-mobile/comment_item.tpl
+++ b/view/theme/frost-mobile/comment_item.tpl
@@ -1,4 +1,4 @@
-<!--		<script>
+{#<!--		<script>
 		$(document).ready( function () {
 			$(document).mouseup(function(e) {
 				var container = $("#comment-edit-wrapper-$id");
@@ -8,25 +8,25 @@
 				}
 			});
 		});
-		</script>-->
+		</script>-->#}
 
 		<div class="comment-wwedit-wrapper $indent" id="comment-edit-wrapper-$id" style="display: block;" >
 			<form class="comment-edit-form $indent" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;" >
-<!--			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
-			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">-->
+{#<!--			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
+			<form class="comment-edit-form" style="display: none;" 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="source" value="$sourceapp" />
 				<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="return" value="$return_path" />-->#}
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
 				<input type="hidden" name="post_id_random" value="$rand_num" />
 
-				<!--<div class="comment-edit-photo" id="comment-edit-photo-$id" >-->
+				{#<!--<div class="comment-edit-photo" id="comment-edit-photo-$id" >-->#}
 					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				<!--</div>-->
-				<!--<div class="comment-edit-photo-end"></div>-->
+				{#<!--</div>-->#}
+				{#<!--<div class="comment-edit-photo-end"></div>-->#}
 				<ul class="comment-edit-bb-$id">
 					<li><a class="editicon boldbb shadow"
 						style="cursor: pointer;" title="$edbold"
@@ -43,7 +43,7 @@
 					<li><a class="editicon codebb shadow"
 						style="cursor: pointer;" title="$edcode"
 						onclick="insertFormatting('$comment','code', $id);"></a></li>
-<!--					<li><a class="editicon imagebb shadow"
+{#<!--					<li><a class="editicon imagebb shadow"
 						style="cursor: pointer;" title="$edimg"
 						onclick="insertFormatting('$comment','img', $id);"></a></li>
 					<li><a class="editicon urlbb shadow"
@@ -51,10 +51,10 @@
 						onclick="insertFormatting('$comment','url', $id);"></a></li>
 					<li><a class="editicon videobb shadow"
 						style="cursor: pointer;" title="$edvideo"
-						onclick="insertFormatting('$comment','video', $id);"></a></li>-->
+						onclick="insertFormatting('$comment','video', $id);"></a></li>-->#}
 				</ul>	
-				<!--<div class="comment-edit-bb-end"></div>-->
-<!--				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);cmtBbClose($id);" >$comment</textarea>-->
+				{#<!--<div class="comment-edit-bb-end"></div>-->#}
+{#<!--				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);cmtBbClose($id);" >$comment</textarea>-->#}
 				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" >$comment</textarea>
 				{{ if $qcomment }}
 					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
@@ -68,11 +68,11 @@
 				<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="preview-link fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>-->
+					{#<!--<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="preview-link fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>-->#}
 				</div>
 
-				<!--<div class="comment-edit-end"></div>-->
+				{#<!--<div class="comment-edit-end"></div>-->#}
 			</form>
 
 		</div>
diff --git a/view/theme/frost-mobile/contact_template.tpl b/view/theme/frost-mobile/contact_template.tpl
index c27060bb39..7c19b3272e 100644
--- a/view/theme/frost-mobile/contact_template.tpl
+++ b/view/theme/frost-mobile/contact_template.tpl
@@ -5,16 +5,22 @@
 		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id);" 
 		onmouseout="t$contact.id=setTimeout('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>-->
+{#<!--			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>-->#}
 			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">
 			<img src="$contact.thumb" $contact.sparkle alt="$contact.name" />
 			</span>
 
 			{{ 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>-->
+{#<!--			<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
+						{{ for $contact.photo_menu as $c }}
+						{{ if $c.2 }}
+						<li><a target="redir" href="$c.1">$c.0</a></li>
+						{{ else }}
+						<li><a href="$c.1">$c.0</a></li>
+						{{ endif }}
+						{{ endfor }}
                     </ul>
                 </div>
 			{{ endif }}
diff --git a/view/theme/frost-mobile/photos_upload.tpl b/view/theme/frost-mobile/photos_upload.tpl
index d354bc589c..43dbcaad7b 100644
--- a/view/theme/frost-mobile/photos_upload.tpl
+++ b/view/theme/frost-mobile/photos_upload.tpl
@@ -18,6 +18,8 @@
 	</div>
 	<div id="photos-upload-exist-end"></div>
 
+	$default_upload_box
+
 	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
 		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
 		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >$nosharetext</label>
@@ -39,9 +41,9 @@
 
 	<div id="photos-upload-spacer"></div>
 
-	$uploader
+	$alt_uploader
 
-	$default
+	$default_upload_submit
 
 	<div class="photos-upload-end" ></div>
 </form>
diff --git a/view/theme/frost/comment_item.tpl b/view/theme/frost/comment_item.tpl
index 3808038079..5e0919c30f 100755
--- a/view/theme/frost/comment_item.tpl
+++ b/view/theme/frost/comment_item.tpl
@@ -1,4 +1,4 @@
-<!--		<script>
+{#<!--		<script>
 		$(document).ready( function () {
 			$(document).mouseup(function(e) {
 				var container = $("#comment-edit-wrapper-$id");
@@ -8,24 +8,24 @@
 				}
 			});
 		});
-		</script>-->
+		</script>-->#}
 
 		<div class="comment-wwedit-wrapper $indent" 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;">
-<!--			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
-			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">-->
+{#<!--			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
+			<form class="comment-edit-form" style="display: none;" 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="return" value="$return_path" />-->#}
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
 				<input type="hidden" name="post_id_random" value="$rand_num" />
 
-<!--				<div class="comment-edit-photo" id="comment-edit-photo-$id" >-->
+{#<!--				<div class="comment-edit-photo" id="comment-edit-photo-$id" >-->#}
 					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-<!--				</div>-->
-				<!--<div class="comment-edit-photo-end"></div>-->
+{#<!--				</div>-->#}
+				{#<!--<div class="comment-edit-photo-end"></div>-->#}
 				<ul class="comment-edit-bb" id="comment-edit-bb-$id">
 					<li><a class="editicon boldbb shadow"
 						style="cursor: pointer;" title="$edbold"
@@ -52,8 +52,8 @@
 						style="cursor: pointer;" title="$edvideo"
 						onclick="insertFormatting('$comment','video', $id);"></a></li>
 				</ul>	
-<!--				<div class="comment-edit-bb-end"></div>-->
-<!--				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);cmtBbClose($id);" >$comment</textarea>-->
+{#<!--				<div class="comment-edit-bb-end"></div>-->#}
+{#<!--				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);cmtBbClose($id);" >$comment</textarea>-->#}
 				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" >$comment</textarea>
 				{{ if $qcomment }}
 					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
@@ -71,7 +71,7 @@
 					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
 				</div>
 
-				<!--<div class="comment-edit-end"></div>-->
+				{#<!--<div class="comment-edit-end"></div>-->#}
 			</form>
 
 		</div>
diff --git a/view/theme/frost/contact_template.tpl b/view/theme/frost/contact_template.tpl
index 4f66684e11..dd3dbf7945 100644
--- a/view/theme/frost/contact_template.tpl
+++ b/view/theme/frost/contact_template.tpl
@@ -11,7 +11,13 @@
 			<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
+						{{ for $contact.photo_menu as $c }}
+						{{ if $c.2 }}
+						<li><a target="redir" href="$c.1">$c.0</a></li>
+						{{ else }}
+						<li><a href="$c.1">$c.0</a></li>
+						{{ endif }}
+						{{ endfor }}
                     </ul>
                 </div>
 			{{ endif }}
diff --git a/view/theme/frost/photos_upload.tpl b/view/theme/frost/photos_upload.tpl
index 2aa12a3ca1..1a41fcbdb0 100644
--- a/view/theme/frost/photos_upload.tpl
+++ b/view/theme/frost/photos_upload.tpl
@@ -19,6 +19,7 @@
 	<div id="photos-upload-exist-end"></div>
 
 	<div id="photos-upload-choosefile-outer-wrapper">
+	$default_upload_box
 	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
 		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
 		<div id="photos-upload-noshare-label">
@@ -41,9 +42,9 @@
 
 	<div id="photos-upload-spacer"></div>
 
-	$uploader
+	$alt_uploader
 
-	$default
+	$default_upload_submit
 
 	<div class="photos-upload-end" ></div>
 	</div>
diff --git a/view/theme/quattro/comment_item.tpl b/view/theme/quattro/comment_item.tpl
index 3fbde16318..293f93f948 100644
--- a/view/theme/quattro/comment_item.tpl
+++ b/view/theme/quattro/comment_item.tpl
@@ -3,7 +3,7 @@
 				<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="return" value="$return_path" />-->#}
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
 				<input type="hidden" name="post_id_random" value="$rand_num" />
diff --git a/view/theme/quattro/contact_template.tpl b/view/theme/quattro/contact_template.tpl
index b826acc65d..485ee6cac0 100644
--- a/view/theme/quattro/contact_template.tpl
+++ b/view/theme/quattro/contact_template.tpl
@@ -10,7 +10,13 @@
 			{{ 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
+				{{ for $contact.photo_menu as $c }}
+				{{ if $c.2 }}
+				<li><a target="redir" href="$c.1">$c.0</a></li>
+				{{ else }}
+				<li><a href="$c.1">$c.0</a></li>
+				{{ endif }}
+				{{ endfor }}
 			</ul>
 			{{ endif }}
 		</div>
diff --git a/view/theme/testbubble/comment_item.tpl b/view/theme/testbubble/comment_item.tpl
index 1054b23e24..f7fe22dd77 100644
--- a/view/theme/testbubble/comment_item.tpl
+++ b/view/theme/testbubble/comment_item.tpl
@@ -3,7 +3,7 @@
 				<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="return" value="$return_path" />-->#}
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
 				<input type="hidden" name="post_id_random" value="$rand_num" />
diff --git a/view/theme/vier/comment_item.tpl b/view/theme/vier/comment_item.tpl
index fd27e494b9..4e39c0772a 100644
--- a/view/theme/vier/comment_item.tpl
+++ b/view/theme/vier/comment_item.tpl
@@ -7,7 +7,7 @@
 				<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="return" value="$return_path" />-->#}
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
 				<input type="hidden" name="post_id_random" value="$rand_num" />