diff --git a/boot.php b/boot.php
index 102304596..2d796f197 100644
--- a/boot.php
+++ b/boot.php
@@ -589,7 +589,7 @@ if(! class_exists('App')) {
 
 		function init_pagehead() {
 			$this->page['title'] = $this->config['sitename'];
-			$this->page['htmlhead'] = file_get_contents('view/head.tpl');
+			$this->page['htmlhead'] = get_markup_template('head.tpl');
 		}
 
 		function set_curl_code($code) {
@@ -1070,7 +1070,7 @@ if(! function_exists('profile_load')) {
 		 * load/reload current theme info
 		 */
 
-		$theme_info_file = "view/theme/".current_theme()."/theme.php";
+		$theme_info_file = "view/theme/".current_theme()."/php/theme.php";
 		if (file_exists($theme_info_file)){
 			require_once($theme_info_file);
 		}
@@ -1469,17 +1469,17 @@ if(! function_exists('current_theme')) {
 		}
 	
 		if($theme_name &&
-				(file_exists('view/theme/' . $theme_name . '/style.css') ||
-						file_exists('view/theme/' . $theme_name . '/style.php')))
+				(file_exists('view/theme/' . $theme_name . '/css/style.css') ||
+						file_exists('view/theme/' . $theme_name . '/php/style.php')))
 			return($theme_name);
 	
 		foreach($app_base_themes as $t) {
-			if(file_exists('view/theme/' . $t . '/style.css')||
-					file_exists('view/theme/' . $t . '/style.php'))
+			if(file_exists('view/theme/' . $t . '/css/style.css')||
+					file_exists('view/theme/' . $t . '/php/style.php'))
 				return($t);
 		}
 	
-		$fallback = array_merge(glob('view/theme/*/style.css'),glob('view/theme/*/style.php'));
+		$fallback = array_merge(glob('view/theme/*/css/style.css'),glob('view/theme/*/php/style.php'));
 		if(count($fallback))
 			return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
 	
@@ -1494,9 +1494,9 @@ if(! function_exists('current_theme_url')) {
 	function current_theme_url() {
 		global $a;
 		$t = current_theme();
-		if (file_exists('view/theme/' . $t . '/style.php'))
-			return($a->get_baseurl() . '/view/theme/' . $t . '/style.pcss');
-		return($a->get_baseurl() . '/view/theme/' . $t . '/style.css');
+		if (file_exists('view/theme/' . $t . '/php/style.php'))
+			return($a->get_baseurl() . '/view/theme/' . $t . '/php/style.pcss');
+		return($a->get_baseurl() . '/view/theme/' . $t . '/css/style.css');
 	}
 }
 
diff --git a/include/text.php b/include/text.php
index 3e4817898..c7030ad7b 100644
--- a/include/text.php
+++ b/include/text.php
@@ -430,10 +430,16 @@ function get_markup_template($s) {
 	$a=get_app();
 	$theme = current_theme();
 	
-	if(file_exists("view/theme/$theme/$s"))
+	if(file_exists("view/theme/$theme/tpl/$s"))
+		return file_get_contents("view/theme/$theme/tpl/$s");
+	elseif(file_exists("view/theme/$theme/$s"))
 		return file_get_contents("view/theme/$theme/$s");
+	elseif (x($a->theme_info,"extends") && file_exists("view/theme/".$a->theme_info["extends"]."/tpl/$s"))
+		return file_get_contents("view/theme/".$a->theme_info["extends"]."/tpl/$s");
 	elseif (x($a->theme_info,"extends") && file_exists("view/theme/".$a->theme_info["extends"]."/$s"))
 		return file_get_contents("view/theme/".$a->theme_info["extends"]."/$s");
+	elseif(file_exists("view/tpl/$s"))
+		return file_get_contents("view/tpl/$s");
 	else
 		return file_get_contents("view/$s");
 
@@ -1633,7 +1639,7 @@ function undo_post_tagging($s) {
 
 function fix_mce_lf($s) {
 	$s = str_replace("\r\n","\n",$s);
-	$s = str_replace("\n\n","\n",$s);
+//	$s = str_replace("\n\n","\n",$s);
 	return $s;
 }
 
diff --git a/index.php b/index.php
index 15d2eb460..2c545922b 100644
--- a/index.php
+++ b/index.php
@@ -357,13 +357,13 @@ if($a->module != 'install') {
  */
 
 
-$page_css = 'view/theme/' . current_theme() . '/' 
+$page_css = 'view/theme/' . current_theme() . '/css/' 
 	. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.css';
 
 if(! file_exists($page_css))
 	$page_css = str_replace('theme/' . current_theme() . '/', '', $page_css);
 
-$module_css = 'view/theme/' . current_theme() . '/mod_' . $a->module . '.css';  
+$module_css = 'view/theme/' . current_theme() . '/css/mod_' . $a->module . '.css';  
 
 if(! file_exists($module_css))
 	$module_css = str_replace('theme/' . current_theme() . '/', '', $module_css);
@@ -420,7 +420,7 @@ $profile = $a->profile;
 
 header("Content-type: text/html; charset=utf-8");
 
-$template = 'view/theme/' . current_theme() . '/' 
+$template = 'view/theme/' . current_theme() . '/php/' 
 	. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php';
 
 if(file_exists($template))
diff --git a/mod/display.php b/mod/display.php
index 541df23ec..7e3514cd3 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -16,15 +16,7 @@ function display_content(&$a) {
 
 	$o = '<div id="live-display"></div>' . "\r\n";
 
-	$a->page['htmlhead'] .= <<<EOT
-<script>
-$(document).ready(function() {
-	$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-	// make auto-complete work in more places
-	$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-});
-</script>
-EOT;
+	$a->page['htmlhead'] .= get_markup_template('display-head.tpl');
 
 
 	$nick = (($a->argc > 1) ? $a->argv[1] : '');
diff --git a/mod/poke.php b/mod/poke.php
index 9cff0262e..5dbbd1727 100755
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -27,8 +27,8 @@ function poke_init(&$a) {
 	if(! $contact_id)
 		return;
 
+	$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : 0);
 
-	$private = ((x($_GET,'private')) ? intval($_GET['private']) : 0);
 
 	logger('poke: verb ' . $verb . ' contact ' . $contact_id, LOGGER_DEBUG);
 
@@ -45,6 +45,35 @@ function poke_init(&$a) {
 
 	$target = $r[0];
 
+	if($parent) {
+		$r = q("select uri, private, allow_cid, allow_gid, deny_cid, deny_gid 
+			from item where id = %d and parent = %d and uid = %d limit 1",
+			intval($parent),
+			intval($parent),
+			intval($uid)
+		);
+		if(count($r)) {
+			$parent_uri = $r[0]['uri'];
+			$private    = $r[0]['private'];
+			$allow_cid  = $r[0]['allow_cid'];
+			$allow_gid  = $r[0]['allow_gid'];
+			$deny_cid   = $r[0]['deny_cid'];
+			$deny_gid   = $r[0]['deny_gid'];
+		}
+	}
+	else {
+
+		$private = ((x($_GET,'private')) ? intval($_GET['private']) : 0);
+
+		$allow_cid     = (($private) ? '<' . $target['id']. '>' : $a->user['allow_cid']);
+		$allow_gid     = (($private) ? '' : $a->user['allow_gid']);
+		$deny_cid      = (($private) ? '' : $a->user['deny_cid']);
+		$deny_gid      = (($private) ? '' : $a->user['deny_gid']);
+	}
+
+
+
+
 	$poster = $a->contact;
 
 	$uri = item_new_uri($a->get_hostname(),$owner_uid);
@@ -53,7 +82,7 @@ function poke_init(&$a) {
 
 	$arr['uid']           = $uid;
 	$arr['uri']           = $uri;
-	$arr['parent-uri']    = $uri;
+	$arr['parent-uri']    = (($parent_uri) ? $parent_uri : $uri);
 	$arr['type']          = 'activity';
 	$arr['wall']          = 1;
 	$arr['contact-id']    = $poster['id'];
@@ -64,10 +93,10 @@ function poke_init(&$a) {
 	$arr['author-link']   = $poster['url'];
 	$arr['author-avatar'] = $poster['thumb'];
 	$arr['title']         = '';
-	$arr['allow_cid']     = (($private) ? '<' . $target['id']. '>' : $a->user['allow_cid']);
-	$arr['allow_gid']     = (($private) ? '' : $a->user['allow_gid']);
-	$arr['deny_cid']      = (($private) ? '' : $a->user['deny_cid']);
-	$arr['deny_gid']      = (($private) ? '' : $a->user['deny_gid']);
+	$arr['allow_cid']     = $allow_cid;
+	$arr['allow_gid']     = $allow_gid;
+	$arr['deny_cid']      = $deny_cid;
+	$arr['deny_gid']      = $deny_gid;
 	$arr['last-child']    = 1;
 	$arr['visible']       = 1;
 	$arr['verb']          = $activity;
@@ -132,12 +161,12 @@ function poke_content(&$a) {
 
 <script>$(document).ready(function() { 
 	var a; 
-	a = $("#recip").autocomplete({ 
+	a = $("#poke-recip").autocomplete({ 
 		serviceUrl: '$base/acl',
 		minChars: 2,
 		width: 350,
 		onSelect: function(value,data) {
-			$("#recip-complete").val(data);
+			$("#poke-recip-complete").val(data);
 		}			
 	});
 	a.setOptions({ params: { type: 'a' }});
@@ -148,6 +177,9 @@ function poke_content(&$a) {
 </script>
 EOT;
 
+	$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
+
+
 
 	$verbs = get_poke_verbs();
 
@@ -164,6 +196,7 @@ EOT;
 		'$clabel' => t('Recipient'),
 		'$choice' => t('Choose what you wish to do to recipient'),
 		'$verbs' => $shortlist,
+		'$parent' => $parent,
 		'$prv_desc' => t('Make this post private'),
 		'$submit' => t('Submit'),
 		'$name' => $name,
diff --git a/view/custom_tinymce.css b/view/css/custom_tinymce.css
similarity index 100%
rename from view/custom_tinymce.css
rename to view/css/custom_tinymce.css
diff --git a/view/default.css b/view/css/default.css
similarity index 100%
rename from view/default.css
rename to view/css/default.css
diff --git a/view/full.css b/view/css/full.css
similarity index 100%
rename from view/full.css
rename to view/css/full.css
diff --git a/view/mod_zentity.css b/view/css/mod_zentity.css
similarity index 100%
rename from view/mod_zentity.css
rename to view/css/mod_zentity.css
diff --git a/view/mod_zregister.css b/view/css/mod_zregister.css
similarity index 100%
rename from view/mod_zregister.css
rename to view/css/mod_zregister.css
diff --git a/view/default.php b/view/php/default.php
similarity index 100%
rename from view/default.php
rename to view/php/default.php
diff --git a/view/full.php b/view/php/full.php
similarity index 100%
rename from view/full.php
rename to view/php/full.php
diff --git a/view/minimal.php b/view/php/minimal.php
similarity index 100%
rename from view/minimal.php
rename to view/php/minimal.php
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/css/style.css
similarity index 97%
rename from view/theme/duepuntozero/style.css
rename to view/theme/duepuntozero/css/style.css
index 5a7142a24..56464ea50 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/css/style.css
@@ -9,7 +9,7 @@ body {
 	font-family: helvetica,arial,freesans,clean,sans-serif;
 	font-size: 12px;
 	background-color: #ffffff;
-	background-image: url(head.jpg);
+//	background-image: url(../img/head.jpg);
 	background-repeat: repeat-x;
 	color: #000000;
 	margin: 0px;
@@ -32,7 +32,7 @@ input {
 img { border :0px; }
 
 #id_openid_url, .openid input {
-   background: url(login-bg.gif) no-repeat;
+   background: url(../img/login-bg.gif) no-repeat;
    background-position: 0 50%;
    padding-left: 18px;
 }
@@ -180,7 +180,7 @@ aside {
 	min-height: 112px;
 	margin-left: 10%;
 	padding: 1em;
-	background-image: url(border.jpg);
+	background-image: url(../img/border.jpg);
 	background-position: top left;
 	background-repeat: no-repeat;
 }
@@ -193,7 +193,7 @@ aside {
 	border-radius: 5px;
 	padding: 5px;
 	font-weight: bold;
-	background: #3465a4 url('friendika-16.png') no-repeat 95% center;
+	background: #3465a4 url('../img/friendika-16.png') no-repeat 95% center;
 }
 #wallmessage-link {
 	display: block;
@@ -212,14 +212,14 @@ section {
 	padding-top: 1em;
 	padding-right: 1em;
 	background-color: #ffffff;
-	background-image: url(border.jpg);
+	background-image: url(../img/border.jpg);
 	background-position: top right;
 	background-repeat: no-repeat;
 }
 
 .tabs {
 	height: 27px;
-	background-image: url(head.jpg);
+	background-image: url(../img/head.jpg);
 	background-repeat: repeat-x;	
 	background-position: 0px -20px;
 	border-bottom: 1px solid #babdb6;
@@ -250,7 +250,7 @@ footer {
 }
 
 div.wall-item-content-wrapper.shiny {
-  background-image: url('shiny.png');
+  background-image: url('../img/shiny.png');
   background-position: -5px 30px;
   background-repeat:no-repeat;
 }
@@ -436,7 +436,7 @@ div.wall-item-content-wrapper.shiny {
 
 input#dfrn-url {
 	float: left;
-	background: url(friendika-16.png) no-repeat;
+	background: url(../img/friendika-16.png) no-repeat;
 	background-position: 2px center;
 	font-size: 17px;
 	padding-left: 21px;
@@ -962,7 +962,7 @@ input#dfrn-url {
 .wall-item-photo-menu-button {
 	display: block;
 	position: absolute;
-	background-image: url("photo-menu.jpg");
+	background-image: url("../img/photo-menu.jpg");
 	background-position: top left; 
 	background-repeat: no-repeat;
 	margin: 0px; padding: 0px;
@@ -1155,7 +1155,7 @@ input#dfrn-url {
 
 .wall-item-tools {
 	clear: both;
-	background-image: url("head.jpg");
+	background-image: url("../img/head.jpg");
     background-position: 0 -20px;
     background-repeat: repeat-x;
    	padding: 5px 10px 0px;
@@ -1591,7 +1591,7 @@ input#dfrn-url {
 
 .contact-photo-menu-button {
 	position: absolute;
-	background-image: url("photo-menu.jpg");
+	background-image: url("../img/photo-menu.jpg");
 	background-position: top left; 
 	background-repeat: no-repeat;
 	margin: 0px; padding: 0px;
@@ -1660,7 +1660,7 @@ input#dfrn-url {
 }
 #acl-search {
 	float:right;
-	background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+	background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
 	padding-right:20px;
 }
 #acl-showall {
@@ -1669,7 +1669,7 @@ input#dfrn-url {
 	width: auto;
 	height: 18px;
 	background-color: #cccccc;
-	background-image: url("../../../images/show_all_off.png");
+	background-image: url("../../../../images/show_all_off.png");
 	background-position: 7px 7px;
 	background-repeat: no-repeat;
 	padding: 7px 5px 0px 30px;
@@ -1681,7 +1681,7 @@ input#dfrn-url {
 #acl-showall.selected {
 	color: #000000;
 	background-color: #ff9900;
-	background-image: url("../../../images/show_all_on.png");
+	background-image: url("../../../../images/show_all_on.png");
 }
 
 #acl-list {
@@ -1729,18 +1729,18 @@ input#dfrn-url {
 	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 { 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");
+	background-image: url("../../../../images/show_on.png");
 }
 .acl-button-hide.selected {
 	color: #000000;
 	background-color: #ff4141;
-	background-image: url("../../../images/hide_on.png");
+	background-image: url("../../../../images/hide_on.png");
 }
 .acl-list-item.groupshow { border-color: #9ade00; }
 .acl-list-item.grouphide { border-color: #ff4141; }
@@ -2276,7 +2276,7 @@ aside input[type='text'] {
 }
 
 .sparkle {
-	cursor: url('lock.cur'), pointer;
+	cursor: url('../img/lock.cur'), pointer;
 /*	cursor: pointer !important; */
 }
 
@@ -2483,7 +2483,7 @@ aside input[type='text'] {
 }
 
 .event-description:before {
-	content: url('../../../images/calendar.png');
+	content: url('../../../../images/calendar.png');
 	margin-right: 15px;
 }
 
@@ -2839,7 +2839,7 @@ aside input[type='text'] {
 .field .onoff a {
 	display: block;
 	border:1px solid #666666;
-	background-image:url("../../../images/onoff.jpg");
+	background-image:url("../../../../images/onoff.jpg");
 	background-repeat: no-repeat;
 	padding: 4px 2px 2px 2px;
 	height: 16px;
@@ -2971,7 +2971,7 @@ aside input[type='text'] {
 	margin: 10px;
 }
 .oauthapp img.noicon {
-	background-image: url("../../../images/icons/48/plugin.png");
+	background-image: url("../../../../images/icons/48/plugin.png");
 	background-position: center center;
 	background-repeat: no-repeat;
 }
@@ -2988,7 +2988,7 @@ aside input[type='text'] {
 
 .icon {
 	display: block; width: 16px; height: 16px;
-	background-image: url('../../../images/icons.png');
+	background-image: url('../../../../images/icons.png');
 }
 .article { background-position: 0px 0px;}
 .audio { background-position: -16px 0px;}
@@ -3032,7 +3032,7 @@ aside input[type='text'] {
 
 .filer-icon {
 	display: block; width: 16px; height: 16px;
-	background-image: url('file.gif');
+	background-image: url('../img/file.gif');
 }
 
 .icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
@@ -3054,7 +3054,7 @@ aside input[type='text'] {
     display: inline-block;
     width: 16px;
     height: 16px;
-    background-image: url(bbedit.png);
+    background-image: url(../img/bbedit.png);
 	background-color: #fff;
     text-decoration: none;
 }
@@ -3113,7 +3113,7 @@ aside input[type='text'] {
 .attachtype {
 	display: block; width: 20px; height: 23px;
 	float: left;
-	background-image: url('../../../images/content-types.png');
+	background-image: url('../../../../images/content-types.png');
 }
 
 .body-attach {
@@ -3150,12 +3150,12 @@ aside input[type='text'] {
 
 /* popup notifications */
 div.jGrowl div.notice {
-  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
   color: #ffffff;
   padding-left: 58px;
 }
 div.jGrowl div.info {
-  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
   color: #ffffff;
   padding-left: 58px;
 }
diff --git a/view/theme/duepuntozero/bbedit.png b/view/theme/duepuntozero/img/bbedit.png
similarity index 100%
rename from view/theme/duepuntozero/bbedit.png
rename to view/theme/duepuntozero/img/bbedit.png
diff --git a/view/theme/duepuntozero/border.jpg b/view/theme/duepuntozero/img/border.jpg
similarity index 100%
rename from view/theme/duepuntozero/border.jpg
rename to view/theme/duepuntozero/img/border.jpg
diff --git a/view/theme/duepuntozero/editicons.png b/view/theme/duepuntozero/img/editicons.png
similarity index 100%
rename from view/theme/duepuntozero/editicons.png
rename to view/theme/duepuntozero/img/editicons.png
diff --git a/view/theme/duepuntozero/ff-16.jpg b/view/theme/duepuntozero/img/ff-16.jpg
similarity index 100%
rename from view/theme/duepuntozero/ff-16.jpg
rename to view/theme/duepuntozero/img/ff-16.jpg
diff --git a/view/theme/duepuntozero/file.gif b/view/theme/duepuntozero/img/file.gif
similarity index 100%
rename from view/theme/duepuntozero/file.gif
rename to view/theme/duepuntozero/img/file.gif
diff --git a/view/theme/duepuntozero/friendika-16.png b/view/theme/duepuntozero/img/friendika-16.png
similarity index 100%
rename from view/theme/duepuntozero/friendika-16.png
rename to view/theme/duepuntozero/img/friendika-16.png
diff --git a/view/theme/duepuntozero/head.jpg b/view/theme/duepuntozero/img/head.jpg
similarity index 100%
rename from view/theme/duepuntozero/head.jpg
rename to view/theme/duepuntozero/img/head.jpg
diff --git a/view/theme/duepuntozero/lock.cur b/view/theme/duepuntozero/img/lock.cur
similarity index 100%
rename from view/theme/duepuntozero/lock.cur
rename to view/theme/duepuntozero/img/lock.cur
diff --git a/view/theme/duepuntozero/login-bg.gif b/view/theme/duepuntozero/img/login-bg.gif
similarity index 100%
rename from view/theme/duepuntozero/login-bg.gif
rename to view/theme/duepuntozero/img/login-bg.gif
diff --git a/view/theme/duepuntozero/photo-menu.jpg b/view/theme/duepuntozero/img/photo-menu.jpg
similarity index 100%
rename from view/theme/duepuntozero/photo-menu.jpg
rename to view/theme/duepuntozero/img/photo-menu.jpg
diff --git a/view/theme/duepuntozero/screenshot.jpg b/view/theme/duepuntozero/img/screenshot.jpg
similarity index 100%
rename from view/theme/duepuntozero/screenshot.jpg
rename to view/theme/duepuntozero/img/screenshot.jpg
diff --git a/view/theme/duepuntozero/shiny.png b/view/theme/duepuntozero/img/shiny.png
similarity index 100%
rename from view/theme/duepuntozero/shiny.png
rename to view/theme/duepuntozero/img/shiny.png
diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/php/theme.php
similarity index 100%
rename from view/theme/duepuntozero/theme.php
rename to view/theme/duepuntozero/php/theme.php
diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/duepuntozero/tpl/comment_item.tpl
similarity index 100%
rename from view/theme/duepuntozero/comment_item.tpl
rename to view/theme/duepuntozero/tpl/comment_item.tpl
diff --git a/view/theme/duepuntozero/lang_selector.tpl b/view/theme/duepuntozero/tpl/lang_selector.tpl
similarity index 100%
rename from view/theme/duepuntozero/lang_selector.tpl
rename to view/theme/duepuntozero/tpl/lang_selector.tpl
diff --git a/view/theme/duepuntozero/moderated_comment.tpl b/view/theme/duepuntozero/tpl/moderated_comment.tpl
similarity index 100%
rename from view/theme/duepuntozero/moderated_comment.tpl
rename to view/theme/duepuntozero/tpl/moderated_comment.tpl
diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/tpl/nav.tpl
similarity index 100%
rename from view/theme/duepuntozero/nav.tpl
rename to view/theme/duepuntozero/tpl/nav.tpl
diff --git a/view/theme/duepuntozero/profile_vcard.tpl b/view/theme/duepuntozero/tpl/profile_vcard.tpl
similarity index 100%
rename from view/theme/duepuntozero/profile_vcard.tpl
rename to view/theme/duepuntozero/tpl/profile_vcard.tpl
diff --git a/view/theme/duepuntozero/prv_message.tpl b/view/theme/duepuntozero/tpl/prv_message.tpl
similarity index 100%
rename from view/theme/duepuntozero/prv_message.tpl
rename to view/theme/duepuntozero/tpl/prv_message.tpl
diff --git a/view/theme/slackr/style.css b/view/theme/slackr/css/style.css
similarity index 98%
rename from view/theme/slackr/style.css
rename to view/theme/slackr/css/style.css
index 9f10ee540..7ee6d133d 100644
--- a/view/theme/slackr/style.css
+++ b/view/theme/slackr/css/style.css
@@ -1,4 +1,4 @@
-@import url('../duepuntozero/style.css');
+@import url('../../duepuntozero/css/style.css');
 
 nav #banner #logo-text a {
 	color: #ff0000;
diff --git a/view/theme/slackr/editicons.png b/view/theme/slackr/img/editicons.png
similarity index 100%
rename from view/theme/slackr/editicons.png
rename to view/theme/slackr/img/editicons.png
diff --git a/view/theme/slackr/screenshot.jpg b/view/theme/slackr/img/screenshot.jpg
similarity index 100%
rename from view/theme/slackr/screenshot.jpg
rename to view/theme/slackr/img/screenshot.jpg
diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/php
similarity index 100%
rename from view/theme/slackr/theme.php
rename to view/theme/slackr/php
diff --git a/view/404.tpl b/view/tpl/404.tpl
similarity index 100%
rename from view/404.tpl
rename to view/tpl/404.tpl
diff --git a/view/acl_selector.tpl b/view/tpl/acl_selector.tpl
similarity index 100%
rename from view/acl_selector.tpl
rename to view/tpl/acl_selector.tpl
diff --git a/view/admin_aside.tpl b/view/tpl/admin_aside.tpl
similarity index 100%
rename from view/admin_aside.tpl
rename to view/tpl/admin_aside.tpl
diff --git a/view/admin_logs.tpl b/view/tpl/admin_logs.tpl
similarity index 100%
rename from view/admin_logs.tpl
rename to view/tpl/admin_logs.tpl
diff --git a/view/admin_plugins.tpl b/view/tpl/admin_plugins.tpl
similarity index 100%
rename from view/admin_plugins.tpl
rename to view/tpl/admin_plugins.tpl
diff --git a/view/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl
similarity index 100%
rename from view/admin_plugins_details.tpl
rename to view/tpl/admin_plugins_details.tpl
diff --git a/view/admin_remoteupdate.tpl b/view/tpl/admin_remoteupdate.tpl
similarity index 100%
rename from view/admin_remoteupdate.tpl
rename to view/tpl/admin_remoteupdate.tpl
diff --git a/view/admin_site.tpl b/view/tpl/admin_site.tpl
similarity index 100%
rename from view/admin_site.tpl
rename to view/tpl/admin_site.tpl
diff --git a/view/admin_summary.tpl b/view/tpl/admin_summary.tpl
similarity index 100%
rename from view/admin_summary.tpl
rename to view/tpl/admin_summary.tpl
diff --git a/view/admin_users.tpl b/view/tpl/admin_users.tpl
similarity index 100%
rename from view/admin_users.tpl
rename to view/tpl/admin_users.tpl
diff --git a/view/album_edit.tpl b/view/tpl/album_edit.tpl
similarity index 100%
rename from view/album_edit.tpl
rename to view/tpl/album_edit.tpl
diff --git a/view/api_config_xml.tpl b/view/tpl/api_config_xml.tpl
similarity index 100%
rename from view/api_config_xml.tpl
rename to view/tpl/api_config_xml.tpl
diff --git a/view/api_friends_xml.tpl b/view/tpl/api_friends_xml.tpl
similarity index 100%
rename from view/api_friends_xml.tpl
rename to view/tpl/api_friends_xml.tpl
diff --git a/view/api_ratelimit_xml.tpl b/view/tpl/api_ratelimit_xml.tpl
similarity index 100%
rename from view/api_ratelimit_xml.tpl
rename to view/tpl/api_ratelimit_xml.tpl
diff --git a/view/api_status_xml.tpl b/view/tpl/api_status_xml.tpl
similarity index 100%
rename from view/api_status_xml.tpl
rename to view/tpl/api_status_xml.tpl
diff --git a/view/api_test_xml.tpl b/view/tpl/api_test_xml.tpl
similarity index 100%
rename from view/api_test_xml.tpl
rename to view/tpl/api_test_xml.tpl
diff --git a/view/api_timeline_atom.tpl b/view/tpl/api_timeline_atom.tpl
similarity index 100%
rename from view/api_timeline_atom.tpl
rename to view/tpl/api_timeline_atom.tpl
diff --git a/view/api_timeline_rss.tpl b/view/tpl/api_timeline_rss.tpl
similarity index 100%
rename from view/api_timeline_rss.tpl
rename to view/tpl/api_timeline_rss.tpl
diff --git a/view/api_timeline_xml.tpl b/view/tpl/api_timeline_xml.tpl
similarity index 100%
rename from view/api_timeline_xml.tpl
rename to view/tpl/api_timeline_xml.tpl
diff --git a/view/api_user_xml.tpl b/view/tpl/api_user_xml.tpl
similarity index 100%
rename from view/api_user_xml.tpl
rename to view/tpl/api_user_xml.tpl
diff --git a/view/apps.tpl b/view/tpl/apps.tpl
similarity index 100%
rename from view/apps.tpl
rename to view/tpl/apps.tpl
diff --git a/view/atom_feed.tpl b/view/tpl/atom_feed.tpl
similarity index 100%
rename from view/atom_feed.tpl
rename to view/tpl/atom_feed.tpl
diff --git a/view/atom_feed_dfrn.tpl b/view/tpl/atom_feed_dfrn.tpl
similarity index 100%
rename from view/atom_feed_dfrn.tpl
rename to view/tpl/atom_feed_dfrn.tpl
diff --git a/view/atom_mail.tpl b/view/tpl/atom_mail.tpl
similarity index 100%
rename from view/atom_mail.tpl
rename to view/tpl/atom_mail.tpl
diff --git a/view/atom_suggest.tpl b/view/tpl/atom_suggest.tpl
similarity index 100%
rename from view/atom_suggest.tpl
rename to view/tpl/atom_suggest.tpl
diff --git a/view/auto_request.tpl b/view/tpl/auto_request.tpl
similarity index 100%
rename from view/auto_request.tpl
rename to view/tpl/auto_request.tpl
diff --git a/view/birthdays_reminder.tpl b/view/tpl/birthdays_reminder.tpl
similarity index 97%
rename from view/birthdays_reminder.tpl
rename to view/tpl/birthdays_reminder.tpl
index a00e5c7f8..8db7d22f4 100644
--- a/view/birthdays_reminder.tpl
+++ b/view/tpl/birthdays_reminder.tpl
@@ -5,6 +5,6 @@
 {{ for $events as $event }}
 <div class="birthday-list" id="birthday-$event.id"></a> <a href="$event.link">$event.title</a> $event.date </div>
 {{ endfor }}
-</div></div>
+</div>
 {{ endif }}
 
diff --git a/view/categories_widget.tpl b/view/tpl/categories_widget.tpl
similarity index 100%
rename from view/categories_widget.tpl
rename to view/tpl/categories_widget.tpl
diff --git a/view/comment_item.tpl b/view/tpl/comment_item.tpl
similarity index 100%
rename from view/comment_item.tpl
rename to view/tpl/comment_item.tpl
diff --git a/view/common_friends.tpl b/view/tpl/common_friends.tpl
similarity index 100%
rename from view/common_friends.tpl
rename to view/tpl/common_friends.tpl
diff --git a/view/common_tabs.tpl b/view/tpl/common_tabs.tpl
similarity index 100%
rename from view/common_tabs.tpl
rename to view/tpl/common_tabs.tpl
diff --git a/view/contact_block.tpl b/view/tpl/contact_block.tpl
similarity index 100%
rename from view/contact_block.tpl
rename to view/tpl/contact_block.tpl
diff --git a/view/contact_edit.tpl b/view/tpl/contact_edit.tpl
similarity index 100%
rename from view/contact_edit.tpl
rename to view/tpl/contact_edit.tpl
diff --git a/view/contact_head.tpl b/view/tpl/contact_head.tpl
similarity index 100%
rename from view/contact_head.tpl
rename to view/tpl/contact_head.tpl
diff --git a/view/contact_slider.tpl b/view/tpl/contact_slider.tpl
similarity index 100%
rename from view/contact_slider.tpl
rename to view/tpl/contact_slider.tpl
diff --git a/view/contact_template.tpl b/view/tpl/contact_template.tpl
similarity index 100%
rename from view/contact_template.tpl
rename to view/tpl/contact_template.tpl
diff --git a/view/contacts-template.tpl b/view/tpl/contacts-template.tpl
similarity index 100%
rename from view/contacts-template.tpl
rename to view/tpl/contacts-template.tpl
diff --git a/view/content.tpl b/view/tpl/content.tpl
similarity index 100%
rename from view/content.tpl
rename to view/tpl/content.tpl
diff --git a/view/conv.tpl b/view/tpl/conv.tpl
similarity index 100%
rename from view/conv.tpl
rename to view/tpl/conv.tpl
diff --git a/view/conv_frame.tpl b/view/tpl/conv_frame.tpl
similarity index 100%
rename from view/conv_frame.tpl
rename to view/tpl/conv_frame.tpl
diff --git a/view/conversation.tpl b/view/tpl/conversation.tpl
similarity index 100%
rename from view/conversation.tpl
rename to view/tpl/conversation.tpl
diff --git a/view/crepair.tpl b/view/tpl/crepair.tpl
similarity index 100%
rename from view/crepair.tpl
rename to view/tpl/crepair.tpl
diff --git a/view/cropbody.tpl b/view/tpl/cropbody.tpl
similarity index 100%
rename from view/cropbody.tpl
rename to view/tpl/cropbody.tpl
diff --git a/view/crophead.tpl b/view/tpl/crophead.tpl
similarity index 100%
rename from view/crophead.tpl
rename to view/tpl/crophead.tpl
diff --git a/view/delegate.tpl b/view/tpl/delegate.tpl
similarity index 100%
rename from view/delegate.tpl
rename to view/tpl/delegate.tpl
diff --git a/view/dfrn_req_confirm.tpl b/view/tpl/dfrn_req_confirm.tpl
similarity index 100%
rename from view/dfrn_req_confirm.tpl
rename to view/tpl/dfrn_req_confirm.tpl
diff --git a/view/dfrn_request.tpl b/view/tpl/dfrn_request.tpl
similarity index 100%
rename from view/dfrn_request.tpl
rename to view/tpl/dfrn_request.tpl
diff --git a/view/diasp_dec_hdr.tpl b/view/tpl/diasp_dec_hdr.tpl
similarity index 100%
rename from view/diasp_dec_hdr.tpl
rename to view/tpl/diasp_dec_hdr.tpl
diff --git a/view/diaspora_comment.tpl b/view/tpl/diaspora_comment.tpl
similarity index 100%
rename from view/diaspora_comment.tpl
rename to view/tpl/diaspora_comment.tpl
diff --git a/view/diaspora_comment_relay.tpl b/view/tpl/diaspora_comment_relay.tpl
similarity index 100%
rename from view/diaspora_comment_relay.tpl
rename to view/tpl/diaspora_comment_relay.tpl
diff --git a/view/diaspora_conversation.tpl b/view/tpl/diaspora_conversation.tpl
similarity index 100%
rename from view/diaspora_conversation.tpl
rename to view/tpl/diaspora_conversation.tpl
diff --git a/view/diaspora_like.tpl b/view/tpl/diaspora_like.tpl
similarity index 100%
rename from view/diaspora_like.tpl
rename to view/tpl/diaspora_like.tpl
diff --git a/view/diaspora_like_relay.tpl b/view/tpl/diaspora_like_relay.tpl
similarity index 100%
rename from view/diaspora_like_relay.tpl
rename to view/tpl/diaspora_like_relay.tpl
diff --git a/view/diaspora_message.tpl b/view/tpl/diaspora_message.tpl
similarity index 100%
rename from view/diaspora_message.tpl
rename to view/tpl/diaspora_message.tpl
diff --git a/view/diaspora_photo.tpl b/view/tpl/diaspora_photo.tpl
similarity index 100%
rename from view/diaspora_photo.tpl
rename to view/tpl/diaspora_photo.tpl
diff --git a/view/diaspora_post.tpl b/view/tpl/diaspora_post.tpl
similarity index 100%
rename from view/diaspora_post.tpl
rename to view/tpl/diaspora_post.tpl
diff --git a/view/diaspora_profile.tpl b/view/tpl/diaspora_profile.tpl
similarity index 100%
rename from view/diaspora_profile.tpl
rename to view/tpl/diaspora_profile.tpl
diff --git a/view/diaspora_relay_retraction.tpl b/view/tpl/diaspora_relay_retraction.tpl
similarity index 100%
rename from view/diaspora_relay_retraction.tpl
rename to view/tpl/diaspora_relay_retraction.tpl
diff --git a/view/diaspora_relayable_retraction.tpl b/view/tpl/diaspora_relayable_retraction.tpl
similarity index 100%
rename from view/diaspora_relayable_retraction.tpl
rename to view/tpl/diaspora_relayable_retraction.tpl
diff --git a/view/diaspora_retract.tpl b/view/tpl/diaspora_retract.tpl
similarity index 100%
rename from view/diaspora_retract.tpl
rename to view/tpl/diaspora_retract.tpl
diff --git a/view/diaspora_share.tpl b/view/tpl/diaspora_share.tpl
similarity index 100%
rename from view/diaspora_share.tpl
rename to view/tpl/diaspora_share.tpl
diff --git a/view/diaspora_signed_retract.tpl b/view/tpl/diaspora_signed_retract.tpl
similarity index 100%
rename from view/diaspora_signed_retract.tpl
rename to view/tpl/diaspora_signed_retract.tpl
diff --git a/view/diaspora_vcard.tpl b/view/tpl/diaspora_vcard.tpl
similarity index 100%
rename from view/diaspora_vcard.tpl
rename to view/tpl/diaspora_vcard.tpl
diff --git a/view/directory_header.tpl b/view/tpl/directory_header.tpl
similarity index 100%
rename from view/directory_header.tpl
rename to view/tpl/directory_header.tpl
diff --git a/view/directory_item.tpl b/view/tpl/directory_item.tpl
similarity index 100%
rename from view/directory_item.tpl
rename to view/tpl/directory_item.tpl
diff --git a/view/tpl/display-head.tpl b/view/tpl/display-head.tpl
new file mode 100644
index 000000000..3d4e7e96a
--- /dev/null
+++ b/view/tpl/display-head.tpl
@@ -0,0 +1,8 @@
+<script>
+$(document).ready(function() {
+	$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+	// make auto-complete work in more places
+	$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+});
+</script>
+
diff --git a/view/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
similarity index 100%
rename from view/email_notify_html.tpl
rename to view/tpl/email_notify_html.tpl
diff --git a/view/email_notify_text.tpl b/view/tpl/email_notify_text.tpl
similarity index 100%
rename from view/email_notify_text.tpl
rename to view/tpl/email_notify_text.tpl
diff --git a/view/event.tpl b/view/tpl/event.tpl
similarity index 100%
rename from view/event.tpl
rename to view/tpl/event.tpl
diff --git a/view/event_form.tpl b/view/tpl/event_form.tpl
similarity index 100%
rename from view/event_form.tpl
rename to view/tpl/event_form.tpl
diff --git a/view/event_head.tpl b/view/tpl/event_head.tpl
similarity index 100%
rename from view/event_head.tpl
rename to view/tpl/event_head.tpl
diff --git a/view/events-js.tpl b/view/tpl/events-js.tpl
similarity index 100%
rename from view/events-js.tpl
rename to view/tpl/events-js.tpl
diff --git a/view/events.tpl b/view/tpl/events.tpl
similarity index 100%
rename from view/events.tpl
rename to view/tpl/events.tpl
diff --git a/view/events_reminder.tpl b/view/tpl/events_reminder.tpl
similarity index 100%
rename from view/events_reminder.tpl
rename to view/tpl/events_reminder.tpl
diff --git a/view/failed_updates.tpl b/view/tpl/failed_updates.tpl
similarity index 100%
rename from view/failed_updates.tpl
rename to view/tpl/failed_updates.tpl
diff --git a/view/fake_feed.tpl b/view/tpl/fake_feed.tpl
similarity index 100%
rename from view/fake_feed.tpl
rename to view/tpl/fake_feed.tpl
diff --git a/view/field.tpl b/view/tpl/field.tpl
similarity index 100%
rename from view/field.tpl
rename to view/tpl/field.tpl
diff --git a/view/field_checkbox.tpl b/view/tpl/field_checkbox.tpl
similarity index 100%
rename from view/field_checkbox.tpl
rename to view/tpl/field_checkbox.tpl
diff --git a/view/field_combobox.tpl b/view/tpl/field_combobox.tpl
similarity index 100%
rename from view/field_combobox.tpl
rename to view/tpl/field_combobox.tpl
diff --git a/view/field_custom.tpl b/view/tpl/field_custom.tpl
similarity index 100%
rename from view/field_custom.tpl
rename to view/tpl/field_custom.tpl
diff --git a/view/field_input.tpl b/view/tpl/field_input.tpl
similarity index 100%
rename from view/field_input.tpl
rename to view/tpl/field_input.tpl
diff --git a/view/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl
similarity index 100%
rename from view/field_intcheckbox.tpl
rename to view/tpl/field_intcheckbox.tpl
diff --git a/view/field_openid.tpl b/view/tpl/field_openid.tpl
similarity index 100%
rename from view/field_openid.tpl
rename to view/tpl/field_openid.tpl
diff --git a/view/field_password.tpl b/view/tpl/field_password.tpl
similarity index 100%
rename from view/field_password.tpl
rename to view/tpl/field_password.tpl
diff --git a/view/field_radio.tpl b/view/tpl/field_radio.tpl
similarity index 100%
rename from view/field_radio.tpl
rename to view/tpl/field_radio.tpl
diff --git a/view/field_richtext.tpl b/view/tpl/field_richtext.tpl
similarity index 100%
rename from view/field_richtext.tpl
rename to view/tpl/field_richtext.tpl
diff --git a/view/field_select.tpl b/view/tpl/field_select.tpl
similarity index 100%
rename from view/field_select.tpl
rename to view/tpl/field_select.tpl
diff --git a/view/field_select_raw.tpl b/view/tpl/field_select_raw.tpl
similarity index 100%
rename from view/field_select_raw.tpl
rename to view/tpl/field_select_raw.tpl
diff --git a/view/field_textarea.tpl b/view/tpl/field_textarea.tpl
similarity index 100%
rename from view/field_textarea.tpl
rename to view/tpl/field_textarea.tpl
diff --git a/view/field_themeselect.tpl b/view/tpl/field_themeselect.tpl
similarity index 100%
rename from view/field_themeselect.tpl
rename to view/tpl/field_themeselect.tpl
diff --git a/view/field_yesno.tpl b/view/tpl/field_yesno.tpl
similarity index 100%
rename from view/field_yesno.tpl
rename to view/tpl/field_yesno.tpl
diff --git a/view/fileas_widget.tpl b/view/tpl/fileas_widget.tpl
similarity index 100%
rename from view/fileas_widget.tpl
rename to view/tpl/fileas_widget.tpl
diff --git a/view/filebrowser.tpl b/view/tpl/filebrowser.tpl
similarity index 100%
rename from view/filebrowser.tpl
rename to view/tpl/filebrowser.tpl
diff --git a/view/filer_dialog.tpl b/view/tpl/filer_dialog.tpl
similarity index 100%
rename from view/filer_dialog.tpl
rename to view/tpl/filer_dialog.tpl
diff --git a/view/follow.tpl b/view/tpl/follow.tpl
similarity index 100%
rename from view/follow.tpl
rename to view/tpl/follow.tpl
diff --git a/view/follow_slap.tpl b/view/tpl/follow_slap.tpl
similarity index 100%
rename from view/follow_slap.tpl
rename to view/tpl/follow_slap.tpl
diff --git a/view/generic_links_widget.tpl b/view/tpl/generic_links_widget.tpl
similarity index 100%
rename from view/generic_links_widget.tpl
rename to view/tpl/generic_links_widget.tpl
diff --git a/view/group_drop.tpl b/view/tpl/group_drop.tpl
similarity index 100%
rename from view/group_drop.tpl
rename to view/tpl/group_drop.tpl
diff --git a/view/group_edit.tpl b/view/tpl/group_edit.tpl
similarity index 100%
rename from view/group_edit.tpl
rename to view/tpl/group_edit.tpl
diff --git a/view/group_selection.tpl b/view/tpl/group_selection.tpl
similarity index 100%
rename from view/group_selection.tpl
rename to view/tpl/group_selection.tpl
diff --git a/view/group_side.tpl b/view/tpl/group_side.tpl
similarity index 100%
rename from view/group_side.tpl
rename to view/tpl/group_side.tpl
diff --git a/view/groupeditor.tpl b/view/tpl/groupeditor.tpl
similarity index 100%
rename from view/groupeditor.tpl
rename to view/tpl/groupeditor.tpl
diff --git a/view/head.tpl b/view/tpl/head.tpl
similarity index 100%
rename from view/head.tpl
rename to view/tpl/head.tpl
diff --git a/view/hide_comments.tpl b/view/tpl/hide_comments.tpl
similarity index 100%
rename from view/hide_comments.tpl
rename to view/tpl/hide_comments.tpl
diff --git a/view/install.tpl b/view/tpl/install.tpl
similarity index 100%
rename from view/install.tpl
rename to view/tpl/install.tpl
diff --git a/view/install_checks.tpl b/view/tpl/install_checks.tpl
similarity index 100%
rename from view/install_checks.tpl
rename to view/tpl/install_checks.tpl
diff --git a/view/install_db.tpl b/view/tpl/install_db.tpl
similarity index 100%
rename from view/install_db.tpl
rename to view/tpl/install_db.tpl
diff --git a/view/install_settings.tpl b/view/tpl/install_settings.tpl
similarity index 100%
rename from view/install_settings.tpl
rename to view/tpl/install_settings.tpl
diff --git a/view/intros.tpl b/view/tpl/intros.tpl
similarity index 100%
rename from view/intros.tpl
rename to view/tpl/intros.tpl
diff --git a/view/invite.tpl b/view/tpl/invite.tpl
similarity index 97%
rename from view/invite.tpl
rename to view/tpl/invite.tpl
index 01a45c774..a47ef0162 100644
--- a/view/invite.tpl
+++ b/view/tpl/invite.tpl
@@ -23,4 +23,5 @@ $msg_text
 <input type="submit" name="submit" value="$submit" />
 </div>
 
-</form>
\ No newline at end of file
+</div>
+</form>
diff --git a/view/jot-header.tpl b/view/tpl/jot-header.tpl
similarity index 100%
rename from view/jot-header.tpl
rename to view/tpl/jot-header.tpl
diff --git a/view/jot.tpl b/view/tpl/jot.tpl
similarity index 100%
rename from view/jot.tpl
rename to view/tpl/jot.tpl
diff --git a/view/jot_geotag.tpl b/view/tpl/jot_geotag.tpl
similarity index 100%
rename from view/jot_geotag.tpl
rename to view/tpl/jot_geotag.tpl
diff --git a/view/lang_selector.tpl b/view/tpl/lang_selector.tpl
similarity index 100%
rename from view/lang_selector.tpl
rename to view/tpl/lang_selector.tpl
diff --git a/view/like_noshare.tpl b/view/tpl/like_noshare.tpl
similarity index 100%
rename from view/like_noshare.tpl
rename to view/tpl/like_noshare.tpl
diff --git a/view/login.tpl b/view/tpl/login.tpl
similarity index 100%
rename from view/login.tpl
rename to view/tpl/login.tpl
diff --git a/view/logout.tpl b/view/tpl/logout.tpl
similarity index 100%
rename from view/logout.tpl
rename to view/tpl/logout.tpl
diff --git a/view/lostpass.tpl b/view/tpl/lostpass.tpl
similarity index 100%
rename from view/lostpass.tpl
rename to view/tpl/lostpass.tpl
diff --git a/view/magicsig.tpl b/view/tpl/magicsig.tpl
similarity index 100%
rename from view/magicsig.tpl
rename to view/tpl/magicsig.tpl
diff --git a/view/mail_conv.tpl b/view/tpl/mail_conv.tpl
similarity index 100%
rename from view/mail_conv.tpl
rename to view/tpl/mail_conv.tpl
diff --git a/view/mail_display.tpl b/view/tpl/mail_display.tpl
similarity index 100%
rename from view/mail_display.tpl
rename to view/tpl/mail_display.tpl
diff --git a/view/mail_head.tpl b/view/tpl/mail_head.tpl
similarity index 100%
rename from view/mail_head.tpl
rename to view/tpl/mail_head.tpl
diff --git a/view/mail_list.tpl b/view/tpl/mail_list.tpl
similarity index 100%
rename from view/mail_list.tpl
rename to view/tpl/mail_list.tpl
diff --git a/view/main_slider.tpl b/view/tpl/main_slider.tpl
similarity index 100%
rename from view/main_slider.tpl
rename to view/tpl/main_slider.tpl
diff --git a/view/match.tpl b/view/tpl/match.tpl
similarity index 100%
rename from view/match.tpl
rename to view/tpl/match.tpl
diff --git a/view/message_side.tpl b/view/tpl/message_side.tpl
similarity index 100%
rename from view/message_side.tpl
rename to view/tpl/message_side.tpl
diff --git a/view/moderated_comment.tpl b/view/tpl/moderated_comment.tpl
similarity index 100%
rename from view/moderated_comment.tpl
rename to view/tpl/moderated_comment.tpl
diff --git a/view/msg-header.tpl b/view/tpl/msg-header.tpl
similarity index 100%
rename from view/msg-header.tpl
rename to view/tpl/msg-header.tpl
diff --git a/view/nav.tpl b/view/tpl/nav.tpl
similarity index 100%
rename from view/nav.tpl
rename to view/tpl/nav.tpl
diff --git a/view/netfriend.tpl b/view/tpl/netfriend.tpl
similarity index 100%
rename from view/netfriend.tpl
rename to view/tpl/netfriend.tpl
diff --git a/view/nets.tpl b/view/tpl/nets.tpl
similarity index 100%
rename from view/nets.tpl
rename to view/tpl/nets.tpl
diff --git a/view/nogroup-template.tpl b/view/tpl/nogroup-template.tpl
similarity index 100%
rename from view/nogroup-template.tpl
rename to view/tpl/nogroup-template.tpl
diff --git a/view/notifications.tpl b/view/tpl/notifications.tpl
similarity index 100%
rename from view/notifications.tpl
rename to view/tpl/notifications.tpl
diff --git a/view/notifications_comments_item.tpl b/view/tpl/notifications_comments_item.tpl
similarity index 100%
rename from view/notifications_comments_item.tpl
rename to view/tpl/notifications_comments_item.tpl
diff --git a/view/notifications_dislikes_item.tpl b/view/tpl/notifications_dislikes_item.tpl
similarity index 100%
rename from view/notifications_dislikes_item.tpl
rename to view/tpl/notifications_dislikes_item.tpl
diff --git a/view/notifications_friends_item.tpl b/view/tpl/notifications_friends_item.tpl
similarity index 100%
rename from view/notifications_friends_item.tpl
rename to view/tpl/notifications_friends_item.tpl
diff --git a/view/notifications_likes_item.tpl b/view/tpl/notifications_likes_item.tpl
similarity index 100%
rename from view/notifications_likes_item.tpl
rename to view/tpl/notifications_likes_item.tpl
diff --git a/view/notifications_network_item.tpl b/view/tpl/notifications_network_item.tpl
similarity index 100%
rename from view/notifications_network_item.tpl
rename to view/tpl/notifications_network_item.tpl
diff --git a/view/notifications_posts_item.tpl b/view/tpl/notifications_posts_item.tpl
similarity index 100%
rename from view/notifications_posts_item.tpl
rename to view/tpl/notifications_posts_item.tpl
diff --git a/view/notify.tpl b/view/tpl/notify.tpl
similarity index 100%
rename from view/notify.tpl
rename to view/tpl/notify.tpl
diff --git a/view/oauth_authorize.tpl b/view/tpl/oauth_authorize.tpl
similarity index 100%
rename from view/oauth_authorize.tpl
rename to view/tpl/oauth_authorize.tpl
diff --git a/view/oauth_authorize_done.tpl b/view/tpl/oauth_authorize_done.tpl
similarity index 100%
rename from view/oauth_authorize_done.tpl
rename to view/tpl/oauth_authorize_done.tpl
diff --git a/view/oembed_video.tpl b/view/tpl/oembed_video.tpl
similarity index 100%
rename from view/oembed_video.tpl
rename to view/tpl/oembed_video.tpl
diff --git a/view/oexchange_xrd.tpl b/view/tpl/oexchange_xrd.tpl
similarity index 100%
rename from view/oexchange_xrd.tpl
rename to view/tpl/oexchange_xrd.tpl
diff --git a/view/opensearch.tpl b/view/tpl/opensearch.tpl
similarity index 100%
rename from view/opensearch.tpl
rename to view/tpl/opensearch.tpl
diff --git a/view/pagetypes.tpl b/view/tpl/pagetypes.tpl
similarity index 100%
rename from view/pagetypes.tpl
rename to view/tpl/pagetypes.tpl
diff --git a/view/peoplefind.tpl b/view/tpl/peoplefind.tpl
similarity index 100%
rename from view/peoplefind.tpl
rename to view/tpl/peoplefind.tpl
diff --git a/view/photo_album.tpl b/view/tpl/photo_album.tpl
similarity index 100%
rename from view/photo_album.tpl
rename to view/tpl/photo_album.tpl
diff --git a/view/photo_drop.tpl b/view/tpl/photo_drop.tpl
similarity index 100%
rename from view/photo_drop.tpl
rename to view/tpl/photo_drop.tpl
diff --git a/view/photo_edit.tpl b/view/tpl/photo_edit.tpl
similarity index 100%
rename from view/photo_edit.tpl
rename to view/tpl/photo_edit.tpl
diff --git a/view/photo_item.tpl b/view/tpl/photo_item.tpl
similarity index 100%
rename from view/photo_item.tpl
rename to view/tpl/photo_item.tpl
diff --git a/view/photo_top.tpl b/view/tpl/photo_top.tpl
similarity index 100%
rename from view/photo_top.tpl
rename to view/tpl/photo_top.tpl
diff --git a/view/photo_view.tpl b/view/tpl/photo_view.tpl
similarity index 100%
rename from view/photo_view.tpl
rename to view/tpl/photo_view.tpl
diff --git a/view/photos_recent.tpl b/view/tpl/photos_recent.tpl
similarity index 100%
rename from view/photos_recent.tpl
rename to view/tpl/photos_recent.tpl
diff --git a/view/photos_upload.tpl b/view/tpl/photos_upload.tpl
similarity index 99%
rename from view/photos_upload.tpl
rename to view/tpl/photos_upload.tpl
index 33c48cbeb..93c0b7d54 100644
--- a/view/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -26,6 +26,7 @@
 		<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;">
diff --git a/view/poco_entry_xml.tpl b/view/tpl/poco_entry_xml.tpl
similarity index 100%
rename from view/poco_entry_xml.tpl
rename to view/tpl/poco_entry_xml.tpl
diff --git a/view/poco_xml.tpl b/view/tpl/poco_xml.tpl
similarity index 100%
rename from view/poco_xml.tpl
rename to view/tpl/poco_xml.tpl
diff --git a/view/poke_content.tpl b/view/tpl/poke_content.tpl
similarity index 57%
rename from view/poke_content.tpl
rename to view/tpl/poke_content.tpl
index 18438787a..b9e089f5b 100644
--- a/view/poke_content.tpl
+++ b/view/tpl/poke_content.tpl
@@ -8,9 +8,9 @@
 
 <div id="poke-recip-label">$clabel</div>
 <br />
-<input id="recip" type="text" size="64" maxlength="255" value="$name" name="pokename" autocomplete="off">
-<input id="recip-complete" type="hidden" value="$id" name="cid">
-
+<input id="poke-recip" type="text" size="64" maxlength="255" value="$name" name="pokename" autocomplete="off" />
+<input id="poke-recip-complete" type="hidden" value="$id" name="cid" />
+<input id="poke-parent" type="hidden" value="$parent" name="parent" />
 <br />
 <br />
 <div id="poke-action-label">$choice</div>
@@ -24,7 +24,7 @@
 <br />
 <br />
 <div id="poke-private-desc">$prv_desc</div>
-<input type="checkbox" name="private" value="1" />
+<input type="checkbox" name="private" {{ if $parent }}disabled="disabled"{{ endif }} value="1" />
 <br />
 <br />
 <input type="submit" name="submit" value="$submit" />
diff --git a/view/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl
similarity index 100%
rename from view/posted_date_widget.tpl
rename to view/tpl/posted_date_widget.tpl
diff --git a/view/profed_head.tpl b/view/tpl/profed_head.tpl
similarity index 100%
rename from view/profed_head.tpl
rename to view/tpl/profed_head.tpl
diff --git a/view/profile-hide-friends.tpl b/view/tpl/profile-hide-friends.tpl
similarity index 100%
rename from view/profile-hide-friends.tpl
rename to view/tpl/profile-hide-friends.tpl
diff --git a/view/profile-hide-wall.tpl b/view/tpl/profile-hide-wall.tpl
similarity index 100%
rename from view/profile-hide-wall.tpl
rename to view/tpl/profile-hide-wall.tpl
diff --git a/view/profile-in-directory.tpl b/view/tpl/profile-in-directory.tpl
similarity index 100%
rename from view/profile-in-directory.tpl
rename to view/tpl/profile-in-directory.tpl
diff --git a/view/profile-in-netdir.tpl b/view/tpl/profile-in-netdir.tpl
similarity index 100%
rename from view/profile-in-netdir.tpl
rename to view/tpl/profile-in-netdir.tpl
diff --git a/view/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
similarity index 100%
rename from view/profile_advanced.tpl
rename to view/tpl/profile_advanced.tpl
diff --git a/view/profile_edit.tpl b/view/tpl/profile_edit.tpl
similarity index 100%
rename from view/profile_edit.tpl
rename to view/tpl/profile_edit.tpl
diff --git a/view/profile_edlink.tpl b/view/tpl/profile_edlink.tpl
similarity index 100%
rename from view/profile_edlink.tpl
rename to view/tpl/profile_edlink.tpl
diff --git a/view/profile_entry.tpl b/view/tpl/profile_entry.tpl
similarity index 100%
rename from view/profile_entry.tpl
rename to view/tpl/profile_entry.tpl
diff --git a/view/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl
similarity index 100%
rename from view/profile_listing_header.tpl
rename to view/tpl/profile_listing_header.tpl
diff --git a/view/profile_photo.tpl b/view/tpl/profile_photo.tpl
similarity index 100%
rename from view/profile_photo.tpl
rename to view/tpl/profile_photo.tpl
diff --git a/view/profile_publish.tpl b/view/tpl/profile_publish.tpl
similarity index 100%
rename from view/profile_publish.tpl
rename to view/tpl/profile_publish.tpl
diff --git a/view/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
similarity index 100%
rename from view/profile_vcard.tpl
rename to view/tpl/profile_vcard.tpl
diff --git a/view/prv_message.tpl b/view/tpl/prv_message.tpl
similarity index 100%
rename from view/prv_message.tpl
rename to view/tpl/prv_message.tpl
diff --git a/view/pwdreset.tpl b/view/tpl/pwdreset.tpl
similarity index 100%
rename from view/pwdreset.tpl
rename to view/tpl/pwdreset.tpl
diff --git a/view/register.tpl b/view/tpl/register.tpl
similarity index 100%
rename from view/register.tpl
rename to view/tpl/register.tpl
diff --git a/view/remote_friends_common.tpl b/view/tpl/remote_friends_common.tpl
similarity index 100%
rename from view/remote_friends_common.tpl
rename to view/tpl/remote_friends_common.tpl
diff --git a/view/removeme.tpl b/view/tpl/removeme.tpl
similarity index 100%
rename from view/removeme.tpl
rename to view/tpl/removeme.tpl
diff --git a/view/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl
similarity index 100%
rename from view/saved_searches_aside.tpl
rename to view/tpl/saved_searches_aside.tpl
diff --git a/view/search_item.tpl b/view/tpl/search_item.tpl
similarity index 100%
rename from view/search_item.tpl
rename to view/tpl/search_item.tpl
diff --git a/view/settings.tpl b/view/tpl/settings.tpl
similarity index 100%
rename from view/settings.tpl
rename to view/tpl/settings.tpl
diff --git a/view/settings_addons.tpl b/view/tpl/settings_addons.tpl
similarity index 100%
rename from view/settings_addons.tpl
rename to view/tpl/settings_addons.tpl
diff --git a/view/settings_connectors.tpl b/view/tpl/settings_connectors.tpl
similarity index 100%
rename from view/settings_connectors.tpl
rename to view/tpl/settings_connectors.tpl
diff --git a/view/settings_display.tpl b/view/tpl/settings_display.tpl
similarity index 100%
rename from view/settings_display.tpl
rename to view/tpl/settings_display.tpl
diff --git a/view/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl
similarity index 100%
rename from view/settings_nick_set.tpl
rename to view/tpl/settings_nick_set.tpl
diff --git a/view/settings_nick_subdir.tpl b/view/tpl/settings_nick_subdir.tpl
similarity index 100%
rename from view/settings_nick_subdir.tpl
rename to view/tpl/settings_nick_subdir.tpl
diff --git a/view/settings_oauth.tpl b/view/tpl/settings_oauth.tpl
similarity index 100%
rename from view/settings_oauth.tpl
rename to view/tpl/settings_oauth.tpl
diff --git a/view/settings_oauth_edit.tpl b/view/tpl/settings_oauth_edit.tpl
similarity index 100%
rename from view/settings_oauth_edit.tpl
rename to view/tpl/settings_oauth_edit.tpl
diff --git a/view/suggest_friends.tpl b/view/tpl/suggest_friends.tpl
similarity index 100%
rename from view/suggest_friends.tpl
rename to view/tpl/suggest_friends.tpl
diff --git a/view/suggestions.tpl b/view/tpl/suggestions.tpl
similarity index 100%
rename from view/suggestions.tpl
rename to view/tpl/suggestions.tpl
diff --git a/view/tag_slap.tpl b/view/tpl/tag_slap.tpl
similarity index 100%
rename from view/tag_slap.tpl
rename to view/tpl/tag_slap.tpl
diff --git a/view/viewcontact_template.tpl b/view/tpl/viewcontact_template.tpl
similarity index 100%
rename from view/viewcontact_template.tpl
rename to view/tpl/viewcontact_template.tpl
diff --git a/view/wall_item.tpl b/view/tpl/wall_item.tpl
similarity index 100%
rename from view/wall_item.tpl
rename to view/tpl/wall_item.tpl
diff --git a/view/wallmessage.tpl b/view/tpl/wallmessage.tpl
similarity index 100%
rename from view/wallmessage.tpl
rename to view/tpl/wallmessage.tpl
diff --git a/view/wallmsg-header.tpl b/view/tpl/wallmsg-header.tpl
similarity index 100%
rename from view/wallmsg-header.tpl
rename to view/tpl/wallmsg-header.tpl
diff --git a/view/wallwall_item.tpl b/view/tpl/wallwall_item.tpl
similarity index 100%
rename from view/wallwall_item.tpl
rename to view/tpl/wallwall_item.tpl
diff --git a/view/xrd_diaspora.tpl b/view/tpl/xrd_diaspora.tpl
similarity index 100%
rename from view/xrd_diaspora.tpl
rename to view/tpl/xrd_diaspora.tpl
diff --git a/view/xrd_host.tpl b/view/tpl/xrd_host.tpl
similarity index 100%
rename from view/xrd_host.tpl
rename to view/tpl/xrd_host.tpl
diff --git a/view/xrd_person.tpl b/view/tpl/xrd_person.tpl
similarity index 100%
rename from view/xrd_person.tpl
rename to view/tpl/xrd_person.tpl
diff --git a/view/zentity.tpl b/view/tpl/zentity.tpl
similarity index 100%
rename from view/zentity.tpl
rename to view/tpl/zentity.tpl
diff --git a/view/zregister.tpl b/view/tpl/zregister.tpl
similarity index 100%
rename from view/zregister.tpl
rename to view/tpl/zregister.tpl