Merge pull request #44 from beardy-unixer/c8852d455e77624baf9e6ac852c1176f45462e70

Template cleanup

63 files changed, 1 insertions, 2344 deletions

diff --git a/view/tpl/admin_remoteupdate.tpl b/view/tpl/admin_remoteupdate.tpl
deleted file mode 100644
index 874c6e626..000000000
--- a/view/tpl/admin_remoteupdate.tpl
+++ /dev/null
@@ -1,98 +0,0 @@
-<script src="js/jquery.htmlstream.js"></script>
-<script>
-	/* ajax updater */
-	function updateEnd(data){
-		//$("#updatepopup .panel_text").html(data);
-		$("#remoteupdate_form").find("input").removeAttr('disabled');
-		$(".panel_action_close").fadeIn()	
-	}
-	function updateOn(data){
-		
-		var patt=/§([^§]*)§/g; 
-		var matches = data.match(patt);
-		$(matches).each(function(id,data){
-			data = data.replace(/§/g,"");
-			d = data.split("@");
-			console.log(d);
-			elm = $("#updatepopup .panel_text #"+d[0]);
-			html = "<div id='"+d[0]+"' class='progress'>"+d[1]+"<span>"+d[2]+"</span></div>";
-			if (elm.length==0){
-				$("#updatepopup .panel_text").append(html);
-			} else {
-				$(elm).replaceWith(html);
-			}
-		});
-		
-		
-	}
-	
-	$(function(){
-		$("#remoteupdate_form").submit(function(){
-			var data={};
-			$(this).find("input").each(function(i, e){
-				name = $(e).attr('name');
-				value = $(e).val();
-				e.disabled = true;
-				data[name]=value;
-			});
-
-			$("#updatepopup .panel_text").html("");
-			$("#updatepopup").show();
-			$("#updatepopup .panel").hide().slideDown(500);
-			$(".panel_action_close").hide().click(function(){
-				$("#updatepopup .panel").slideUp(500, function(){
-					$("#updatepopup").hide();
-				});				
-			});
-
-			$.post(
-				$(this).attr('action'), 
-				data, 
-				updateEnd,
-				'text',
-				updateOn
-			);
-
-			
-			return false;
-		})
-	});
-</script>
-<div id="updatepopup" class="popup">
-	<div class="background"></div>
-	<div class="panel">
-		<div class="panel_in">
-			<h1>Friendica Update</h1>
-			<div class="panel_text"></div>
-			<div class="panel_actions">
-				<input type="button" value="$close" class="panel_action_close">
-			</div>
-		</div>
-	</div>
-</div>
-<div id="adminpage">
-	<dl> <dt>Your version:</dt><dd>$localversion</dd> </dl>
-{{ if $needupdate }}
-	<dl> <dt>New version:</dt><dd>$remoteversion</dd> </dl>
-
-	<form id="remoteupdate_form" method="POST" action="$baseurl/admin/update">
-	<input type="hidden" name="$remotefile.0" value="$remotefile.2">
-
-	{{ if $canwrite }}
-		<div class="submit"><input type="submit" name="remoteupdate" value="$submit" /></div>
-	{{ else }}
-		<h3>Your friendica installation is not writable by web server.</h3>
-		{{ if $canftp }}
-			<p>You can try to update via FTP</p>
-			{{ inc field_input.tpl with $field=$ftphost }}{{ endinc }}
-			{{ inc field_input.tpl with $field=$ftppath }}{{ endinc }}
-			{{ inc field_input.tpl with $field=$ftpuser }}{{ endinc }}
-			{{ inc field_password.tpl with $field=$ftppwd }}{{ endinc }}
-			<div class="submit"><input type="submit" name="remoteupdate" value="$submit" /></div>
-		{{ endif }}
-	{{ endif }}
-	</form>
-{{ else }}
-<h4>No updates</h4>
-{{ endif }}
-</div>
diff --git a/view/tpl/atom_mail.tpl b/view/tpl/atom_mail.tpl
deleted file mode 100644
index bf7c3efc8..000000000
--- a/view/tpl/atom_mail.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<dfrn:mail>
-
-	<dfrn:sender>
-		<dfrn:name>$name</dfrn:name>
-		<dfrn:uri>$profile_page</dfrn:uri>
-		<dfrn:avatar>$thumb</dfrn:avatar>
-	</dfrn:sender>
-
-	<dfrn:id>$item_id</dfrn:id>
-	<dfrn:in-reply-to>$parent_id</dfrn:in-reply-to>
-	<dfrn:sentdate>$created</dfrn:sentdate>
-	<dfrn:subject>$subject</dfrn:subject>
-	<dfrn:content>$content</dfrn:content>
-
-</dfrn:mail>
-
diff --git a/view/tpl/atom_suggest.tpl b/view/tpl/atom_suggest.tpl
deleted file mode 100644
index 66c61f9b6..000000000
--- a/view/tpl/atom_suggest.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<dfrn:suggest>
-
-	<dfrn:url>$url</dfrn:url>
-	<dfrn:name>$name</dfrn:name>
-	<dfrn:photo>$photo</dfrn:photo>
-	<dfrn:request>$request</dfrn:request>
-	<dfrn:note>$note</dfrn:note>
-
-</dfrn:suggest>
-
diff --git a/view/tpl/auto_request.tpl b/view/tpl/auto_request.tpl
deleted file mode 100644
index 961de9bb3..000000000
--- a/view/tpl/auto_request.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-
-<h1>$header</h1>
-
-<p id="dfrn-request-intro">
-$page_desc<br />
-<ul id="dfrn-request-networks">
-<li><a href="http://friendica.com" title="$friendica">$friendica</a></li>
-<li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li>
-<li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li>
-{{ if $emailnet }}<li>$emailnet</li>{{ endif }}
-</ul>
-</p>
-<p>
-$invite_desc
-</p>
-<p>
-$desc
-</p>
-
-<form action="dfrn_request/$nickname" method="post" />
-
-<div id="dfrn-request-url-wrapper" >
-	<label id="dfrn-url-label" for="dfrn-url" >$your_address</label>
-	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="$myaddr" />
-	<div id="dfrn-request-url-end"></div>
-</div>
-
-
-<div id="dfrn-request-info-wrapper" >
-
-</div>
-
-	<div id="dfrn-request-submit-wrapper">
-		<input type="submit" name="submit" id="dfrn-request-submit-button" value="$submit" />
-		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="$cancel" />
-	</div>
-</form>
diff --git a/view/tpl/contact_edit.tpl b/view/tpl/contact_edit.tpl
deleted file mode 100644
index 4f99b4aca..000000000
--- a/view/tpl/contact_edit.tpl
+++ /dev/null
@@ -1,89 +0,0 @@
-
-<h2>$header</h2>
-
-<div id="contact-edit-wrapper" >
-
-	$tab_str
-
-	<div id="contact-edit-drop-link" >
-		<a href="contacts/$contact_id/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>
-	</div>
-
-	<div id="contact-edit-drop-link-end"></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">
-<input id="contact-closeness-mirror" type="hidden" name="closeness" value="$close" />
-
-	{{ 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</span> $poll_interval <span id="contact-edit-update-now" class="button"><a 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="60" 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/tpl/content.tpl b/view/tpl/content.tpl
deleted file mode 100644
index 466045d39..000000000
--- a/view/tpl/content.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<div id="content-begin"></div>
-<div id="content-end"></div>
diff --git a/view/tpl/dfrn_req_confirm.tpl b/view/tpl/dfrn_req_confirm.tpl
deleted file mode 100644
index 6c916323c..000000000
--- a/view/tpl/dfrn_req_confirm.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<p id="dfrn-request-homecoming" >
-$welcome
-<br />
-$please
-
-</p>
-<form id="dfrn-request-homecoming-form" action="dfrn_request/$nickname" method="post"> 
-<input type="hidden" name="dfrn_url" value="$dfrn_url" />
-<input type="hidden" name="confirm_key" value="$confirm_key" />
-<input type="hidden" name="localconfirm" value="1" />
-$aes_allow
-
-<label id="dfrn-request-homecoming-hide-label" for="dfrn-request-homecoming-hide">$hidethem</label>
-<input type="checkbox" name="hidden-contact" value="1" {{ if $hidechecked }}checked="checked" {{ endif }} />
-
-
-<div id="dfrn-request-homecoming-submit-wrapper" >
-<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="$submit" />
-</div>
-</form>
\ No newline at end of file
diff --git a/view/tpl/dfrn_request.tpl b/view/tpl/dfrn_request.tpl
deleted file mode 100644
index 4f8a87ea2..000000000
--- a/view/tpl/dfrn_request.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-
-<h1>$header</h1>
-
-<p id="dfrn-request-intro">
-$page_desc<br />
-$invite_desc
-</p>
-<p>
-$desc
-</p>
-
-<form action="dfrn_request/$nickname" method="post" />
-
-<div id="dfrn-request-url-wrapper" >
-	<label id="dfrn-url-label" for="dfrn-url" >$your_address</label>
-	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="$myaddr" />
-	<div id="dfrn-request-url-end"></div>
-</div>
-
-<p id="dfrn-request-options">
-$pls_answer
-</p>
-
-<div id="dfrn-request-info-wrapper" >
-
-
-<p id="doiknowyou">
-$does_know
-</p>
-
-		<div id="dfrn-request-know-yes-wrapper">
-		<label id="dfrn-request-knowyou-yes-label" for="dfrn-request-knowyouyes">$yes</label>
-		<input type="radio" name="knowyou" id="knowyouyes" value="1" />
-
-		<div id="dfrn-request-knowyou-break" ></div>	
-		</div>
-		<div id="dfrn-request-know-no-wrapper">
-		<label id="dfrn-request-knowyou-no-label" for="dfrn-request-knowyouno">$no</label>
-		<input type="radio" name="knowyou" id="knowyouno" value="0" checked="checked" />
-
-		<div id="dfrn-request-knowyou-end"></div>
-		</div>
-
-
-<p id="dfrn-request-message-desc">
-$add_note
-</p>
-	<div id="dfrn-request-message-wrapper">
-	<textarea name="dfrn-request-message" rows="4" cols="64" ></textarea>
-	</div>
-
-
-</div>
-
-	<div id="dfrn-request-submit-wrapper">
-		<input type="submit" name="submit" id="dfrn-request-submit-button" value="$submit" />
-		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="$cancel" />
-	</div>
-</form>
diff --git a/view/tpl/diasp_dec_hdr.tpl b/view/tpl/diasp_dec_hdr.tpl
deleted file mode 100644
index e87c61888..000000000
--- a/view/tpl/diasp_dec_hdr.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<decrypted_hdeader>
-  <iv>$inner_iv</iv>
-  <aes_key>$inner_key</aes_key>
-  <author>
-    <name>$author_name</name>
-    <uri>$author_uri</uri>
-  </author>
-</decrypted_header>
diff --git a/view/tpl/directory_item.tpl b/view/tpl/directory_item.tpl
deleted file mode 100644
index d496cb2ad..000000000
--- a/view/tpl/directory_item.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<div class="directory-item lframe" id="directory-item-$id" >
-	<div class="contact-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="contact-photo" id="directory-photo-$id" >
-			<a href="$profile_link" class="directory-profile-link" id="directory-profile-link-$id" ><img class="directory-photo-img" src="$photo" alt="$alt_text" title="$alt_text" /></a>
-		</div>
-	</div>
-
-	<div class="contact-name" id="directory-name-$id">$name</div>
-	<div class="contact-details">$details</div>
-</div>
diff --git a/view/tpl/events.tpl b/view/tpl/events.tpl
deleted file mode 100644
index e0d830691..000000000
--- a/view/tpl/events.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-$tabs
-<h2>$title</h2>
-
-<div id="new-event-link"><a href="$new_event.0" >$new_event.1</a></div>
-
-<div id="event-calendar-wrapper">
-	<a href="$previus.0" class="prevcal $previus.2"><div id="event-calendar-prev" class="icon s22 prev" title="$previus.1"></div></a>
-	$calendar
-	<a href="$next.0" class="nextcal $next.2"><div id="event-calendar-prev" class="icon s22 next" title="$next.1"></div></a>
-</div>
-<div class="event-calendar-end"></div>
-
-
-{{ for $events as $event }}
-	<div class="event">
-	{{ if $event.is_first }}<hr /><a name="link-$event.j" ><div class="event-list-date">$event.d</div></a>{{ endif }}
-	{{ if $event.item.author-name }}<a href="$event.item.author-link" ><img src="$event.item.author-avatar" height="32" width="32" />$event.item.author-name</a>{{ endif }}
-	$event.html
-	{{ if $event.item.plink }}<a href="$event.plink.0" title="$event.plink.1"  class="plink-event-link icon s22 remote-link"></a>{{ endif }}
-	{{ if $event.edit }}<a href="$event.edit.0" title="$event.edit.1" class="edit-event-link icon s22 pencil"></a>{{ endif }}
-	</div>
-	<div class="clear"></div>
-
-{{ endfor }}
diff --git a/view/tpl/fake_feed.tpl b/view/tpl/fake_feed.tpl
deleted file mode 100644
index c37071cf4..000000000
--- a/view/tpl/fake_feed.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<feed xmlns="http://www.w3.org/2005/Atom" >
-
-  <id>fake feed</id>
-  <title>fake title</title>
-
-  <updated>1970-01-01T00:00:00Z</updated>
-
-  <author>
-    <name>Fake Name</name>
-    <uri>http://example.com</uri>
-  </author>
-
diff --git a/view/tpl/field_openid.tpl b/view/tpl/field_openid.tpl
deleted file mode 100644
index acd93ff62..000000000
--- a/view/tpl/field_openid.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field input openid'>
-		<label for='id_$field.0'>$field.1</label>
-		<input name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/tpl/follow_slap.tpl b/view/tpl/follow_slap.tpl
deleted file mode 100644
index 1b1443bee..000000000
--- a/view/tpl/follow_slap.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-	<entry>
-		<author>
-			<name>$name</name>
-			<uri>$profile_page</uri>
-			<link rel="photo"  type="image/jpeg" media:width="80" media:height="80" href="$thumb" />
-			<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$thumb" />
-		</author>
-
-		<id>$item_id</id>
-		<title>$title</title>
-		<published>$published</published>
-		<content type="$type" >$content</content>
-
-		<as:actor>
-		<as:obj_type>http://activitystrea.ms/schema/1.0/person</as:obj_type>
-		<id>$profile_page</id>
-		<title></title>
- 		<link rel="avatar" type="image/jpeg" media:width="175" media:height="175" href="$photo"/>
-		<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$thumb"/>
-		<poco:preferredUsername>$nick</poco:preferredUsername>
-		<poco:displayName>$name</poco:displayName>
-		</as:actor>
- 		<as:verb>$verb</as:verb>
-		$ostat_follow
-	</entry>
diff --git a/view/tpl/magicsig.tpl b/view/tpl/magicsig.tpl
deleted file mode 100644
index 75f9bc475..000000000
--- a/view/tpl/magicsig.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<me:env xmlns:me="http://salmon-protocol.org/ns/magic-env">
-<me:data type="application/atom+xml">
-$data
-</me:data>
-<me:encoding>$encoding</me:encoding>
-<me:alg>$algorithm</me:alg>
-<me:sig key_id="$keyhash">$signature</me:sig>
-</me:env>
diff --git a/view/tpl/moderated_comment.tpl b/view/tpl/moderated_comment.tpl
deleted file mode 100644
index 911c35f33..000000000
--- a/view/tpl/moderated_comment.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				<input type="hidden" name="return" value="$return_path" />
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<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>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<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/tpl/notifications_network_item.tpl b/view/tpl/notifications_network_item.tpl
deleted file mode 100644
index 261ab3643..000000000
--- a/view/tpl/notifications_network_item.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="notif-item">
-	<a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
-</div>
diff --git a/view/tpl/pagetypes.tpl b/view/tpl/pagetypes.tpl
deleted file mode 100644
index c9022a1c1..000000000
--- a/view/tpl/pagetypes.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-	{{inc field_radio.tpl with $field=$page_normal }}{{endinc}}
-	{{inc field_radio.tpl with $field=$page_community }}{{endinc}}
-	{{inc field_radio.tpl with $field=$page_prvgroup }}{{endinc}}
-	{{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
-	{{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}
diff --git a/view/tpl/profile-hide-friends.tpl b/view/tpl/profile-hide-friends.tpl
deleted file mode 100644
index 9ecacfbe0..000000000
--- a/view/tpl/profile-hide-friends.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="hide-friends-text">
-$desc
-</p>
-
-		<div id="hide-friends-yes-wrapper">
-		<label id="hide-friends-yes-label" for="hide-friends-yes">$yes_str</label>
-		<input type="radio" name="hide-friends" id="hide-friends-yes" $yes_selected value="1" />
-
-		<div id="hide-friends-break" ></div>	
-		</div>
-		<div id="hide-friends-no-wrapper">
-		<label id="hide-friends-no-label" for="hide-friends-no">$no_str</label>
-		<input type="radio" name="hide-friends" id="hide-friends-no" $no_selected value="0"  />
-
-		<div id="hide-friends-end"></div>
-		</div>
diff --git a/view/tpl/profile-hide-wall.tpl b/view/tpl/profile-hide-wall.tpl
deleted file mode 100644
index 10185e243..000000000
--- a/view/tpl/profile-hide-wall.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="hide-wall-text">
-$desc
-</p>
-
-		<div id="hide-wall-yes-wrapper">
-		<label id="hide-wall-yes-label" for="hide-wall-yes">$yes_str</label>
-		<input type="radio" name="hidewall" id="hide-wall-yes" $yes_selected value="1" />
-
-		<div id="hide-wall-break" ></div>	
-		</div>
-		<div id="hide-wall-no-wrapper">
-		<label id="hide-wall-no-label" for="hide-wall-no">$no_str</label>
-		<input type="radio" name="hidewall" id="hide-wall-no" $no_selected value="0"  />
-
-		<div id="hide-wall-end"></div>
-		</div>
diff --git a/view/tpl/profile-in-directory.tpl b/view/tpl/profile-in-directory.tpl
deleted file mode 100644
index 56b28d37e..000000000
--- a/view/tpl/profile-in-directory.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="profile-in-directory">
-$desc
-</p>
-
-		<div id="profile-in-dir-yes-wrapper">
-		<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">$yes_str</label>
-		<input type="radio" name="profile_in_directory" id="profile-in-dir-yes" $yes_selected value="1" />
-
-		<div id="profile-in-dir-break" ></div>	
-		</div>
-		<div id="profile-in-dir-no-wrapper">
-		<label id="profile-in-dir-no-label" for="profile-in-dir-no">$no_str</label>
-		<input type="radio" name="profile_in_directory" id="profile-in-dir-no" $no_selected value="0"  />
-
-		<div id="profile-in-dir-end"></div>
-		</div>
diff --git a/view/tpl/profile-in-netdir.tpl b/view/tpl/profile-in-netdir.tpl
deleted file mode 100644
index 882ad2d17..000000000
--- a/view/tpl/profile-in-netdir.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="profile-in-directory">
-$desc
-</p>
-
-		<div id="profile-in-netdir-yes-wrapper">
-		<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">$yes_str</label>
-		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" />
-
-		<div id="profile-in-netdir-break" ></div>	
-		</div>
-		<div id="profile-in-netdir-no-wrapper">
-		<label id="profile-in-netdir-no-label" for="profile-in-netdir-no">$no_str</label>
-		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0"  />
-
-		<div id="profile-in-netdir-end"></div>
-		</div>
diff --git a/view/tpl/profile_publish.tpl b/view/tpl/profile_publish.tpl
deleted file mode 100644
index 8fd0bc913..000000000
--- a/view/tpl/profile_publish.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="profile-publish-desc-$instance">
-$pubdesc
-</p>
-
-		<div id="profile-publish-yes-wrapper-$instance">
-		<label id="profile-publish-yes-label-$instance" for="profile-publish-yes-$instance">$str_yes</label>
-		<input type="radio" name="profile_publish_$instance" id="profile-publish-yes-$instance" $yes_selected value="1" />
-
-		<div id="profile-publish-break-$instance" ></div>	
-		</div>
-		<div id="profile-publish-no-wrapper-$instance">
-		<label id="profile-publish-no-label-$instance" for="profile-publish-no-$instance">$str_no</label>
-		<input type="radio" name="profile_publish_$instance" id="profile-publish-no-$instance" $no_selected value="0"  />
-
-		<div id="profile-publish-end-$instance"></div>
-		</div>
diff --git a/view/tpl/settings_nick_subdir.tpl b/view/tpl/settings_nick_subdir.tpl
deleted file mode 100644
index 303c24df7..000000000
--- a/view/tpl/settings_nick_subdir.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<p>
-It appears that your website is located in a subdirectory of the<br />
-$hostname website, so this setting may not work reliably.<br />
-</p>
-<p>If you have any issues, you may have better results using the profile<br /> address '<strong>$baseurl/profile/$nickname</strong>'.
-</p>
\ No newline at end of file
diff --git a/view/tpl/smarty3/admin_remoteupdate.tpl b/view/tpl/smarty3/admin_remoteupdate.tpl
deleted file mode 100644
index cee0ef9b8..000000000
--- a/view/tpl/smarty3/admin_remoteupdate.tpl
+++ /dev/null
@@ -1,103 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script src="js/jquery.htmlstream.js"></script>
-<script>
-	/* ajax updater */
-	function updateEnd(data){
-		//$("#updatepopup .panel_text").html(data);
-		$("#remoteupdate_form").find("input").removeAttr('disabled');
-		$(".panel_action_close").fadeIn()	
-	}
-	function updateOn(data){
-		
-		var patt=/§([^§]*)§/g; 
-		var matches = data.match(patt);
-		$(matches).each(function(id,data){
-			data = data.replace(/§/g,"");
-			d = data.split("@");
-			console.log(d);
-			elm = $("#updatepopup .panel_text #"+d[0]);
-			html = "<div id='"+d[0]+"' class='progress'>"+d[1]+"<span>"+d[2]+"</span></div>";
-			if (elm.length==0){
-				$("#updatepopup .panel_text").append(html);
-			} else {
-				$(elm).replaceWith(html);
-			}
-		});
-		
-		
-	}
-	
-	$(function(){
-		$("#remoteupdate_form").submit(function(){
-			var data={};
-			$(this).find("input").each(function(i, e){
-				name = $(e).attr('name');
-				value = $(e).val();
-				e.disabled = true;
-				data[name]=value;
-			});
-
-			$("#updatepopup .panel_text").html("");
-			$("#updatepopup").show();
-			$("#updatepopup .panel").hide().slideDown(500);
-			$(".panel_action_close").hide().click(function(){
-				$("#updatepopup .panel").slideUp(500, function(){
-					$("#updatepopup").hide();
-				});				
-			});
-
-			$.post(
-				$(this).attr('action'), 
-				data, 
-				updateEnd,
-				'text',
-				updateOn
-			);
-
-			
-			return false;
-		})
-	});
-</script>
-<div id="updatepopup" class="popup">
-	<div class="background"></div>
-	<div class="panel">
-		<div class="panel_in">
-			<h1>Friendica Update</h1>
-			<div class="panel_text"></div>
-			<div class="panel_actions">
-				<input type="button" value="{{$close}}" class="panel_action_close">
-			</div>
-		</div>
-	</div>
-</div>
-<div id="adminpage">
-	<dl> <dt>Your version:</dt><dd>{{$localversion}}</dd> </dl>
-{{if $needupdate}}
-	<dl> <dt>New version:</dt><dd>{{$remoteversion}}</dd> </dl>
-
-	<form id="remoteupdate_form" method="POST" action="{{$baseurl}}/admin/update">
-	<input type="hidden" name="{{$remotefile.0}}" value="{{$remotefile.2}}">
-
-	{{if $canwrite}}
-		<div class="submit"><input type="submit" name="remoteupdate" value="{{$submit}}" /></div>
-	{{else}}
-		<h3>Your friendica installation is not writable by web server.</h3>
-		{{if $canftp}}
-			<p>You can try to update via FTP</p>
-			{{include file="field_input.tpl" field=$ftphost}}
-			{{include file="field_input.tpl" field=$ftppath}}
-			{{include file="field_input.tpl" field=$ftpuser}}
-			{{include file="field_password.tpl" field=$ftppwd}}
-			<div class="submit"><input type="submit" name="remoteupdate" value="{{$submit}}" /></div>
-		{{/if}}
-	{{/if}}
-	</form>
-{{else}}
-<h4>No updates</h4>
-{{/if}}
-</div>
diff --git a/view/tpl/smarty3/atom_mail.tpl b/view/tpl/smarty3/atom_mail.tpl
deleted file mode 100644
index adf75a3e7..000000000
--- a/view/tpl/smarty3/atom_mail.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<dfrn:mail>
-
-	<dfrn:sender>
-		<dfrn:name>{{$name}}</dfrn:name>
-		<dfrn:uri>{{$profile_page}}</dfrn:uri>
-		<dfrn:avatar>{{$thumb}}</dfrn:avatar>
-	</dfrn:sender>
-
-	<dfrn:id>{{$item_id}}</dfrn:id>
-	<dfrn:in-reply-to>{{$parent_id}}</dfrn:in-reply-to>
-	<dfrn:sentdate>{{$created}}</dfrn:sentdate>
-	<dfrn:subject>{{$subject}}</dfrn:subject>
-	<dfrn:content>{{$content}}</dfrn:content>
-
-</dfrn:mail>
-
diff --git a/view/tpl/smarty3/atom_suggest.tpl b/view/tpl/smarty3/atom_suggest.tpl
deleted file mode 100644
index c0d1a1b3c..000000000
--- a/view/tpl/smarty3/atom_suggest.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<dfrn:suggest>
-
-	<dfrn:url>{{$url}}</dfrn:url>
-	<dfrn:name>{{$name}}</dfrn:name>
-	<dfrn:photo>{{$photo}}</dfrn:photo>
-	<dfrn:request>{{$request}}</dfrn:request>
-	<dfrn:note>{{$note}}</dfrn:note>
-
-</dfrn:suggest>
-
diff --git a/view/tpl/smarty3/auto_request.tpl b/view/tpl/smarty3/auto_request.tpl
deleted file mode 100644
index 662ca2447..000000000
--- a/view/tpl/smarty3/auto_request.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h1>{{$header}}</h1>
-
-<p id="dfrn-request-intro">
-{{$page_desc}}<br />
-<ul id="dfrn-request-networks">
-<li><a href="http://friendica.com" title="{{$friendica}}">{{$friendica}}</a></li>
-<li><a href="http://joindiaspora.com" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
-<li><a href="http://ostatus.org" title="{{$public_net}}" >{{$statusnet}}</a></li>
-{{if $emailnet}}<li>{{$emailnet}}</li>{{/if}}
-</ul>
-</p>
-<p>
-{{$invite_desc}}
-</p>
-<p>
-{{$desc}}
-</p>
-
-<form action="dfrn_request/{{$nickname}}" method="post" />
-
-<div id="dfrn-request-url-wrapper" >
-	<label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
-	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
-	<div id="dfrn-request-url-end"></div>
-</div>
-
-
-<div id="dfrn-request-info-wrapper" >
-
-</div>
-
-	<div id="dfrn-request-submit-wrapper">
-		<input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
-		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
-	</div>
-</form>
diff --git a/view/tpl/smarty3/contact_edit.tpl b/view/tpl/smarty3/contact_edit.tpl
deleted file mode 100644
index 28d067af1..000000000
--- a/view/tpl/smarty3/contact_edit.tpl
+++ /dev/null
@@ -1,94 +0,0 @@
-{{*
- *	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" >
-		<a href="contacts/{{$contact_id}}/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="{{$delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>
-	</div>
-
-	<div id="contact-edit-drop-link-end"></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}}">
-<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
-
-	{{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}}</span> {{$poll_interval}} <span id="contact-edit-update-now" class="button"><a 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="60" 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/tpl/smarty3/content.tpl b/view/tpl/smarty3/content.tpl
deleted file mode 100644
index 811f92dd5..000000000
--- a/view/tpl/smarty3/content.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id="content-begin"></div>
-<div id="content-end"></div>
diff --git a/view/tpl/smarty3/dfrn_req_confirm.tpl b/view/tpl/smarty3/dfrn_req_confirm.tpl
deleted file mode 100644
index c941a201d..000000000
--- a/view/tpl/smarty3/dfrn_req_confirm.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<p id="dfrn-request-homecoming" >
-{{$welcome}}
-<br />
-{{$please}}
-
-</p>
-<form id="dfrn-request-homecoming-form" action="dfrn_request/{{$nickname}}" method="post"> 
-<input type="hidden" name="dfrn_url" value="{{$dfrn_url}}" />
-<input type="hidden" name="confirm_key" value="{{$confirm_key}}" />
-<input type="hidden" name="localconfirm" value="1" />
-{{$aes_allow}}
-
-<label id="dfrn-request-homecoming-hide-label" for="dfrn-request-homecoming-hide">{{$hidethem}}</label>
-<input type="checkbox" name="hidden-contact" value="1" {{if $hidechecked}}checked="checked" {{/if}} />
-
-
-<div id="dfrn-request-homecoming-submit-wrapper" >
-<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="{{$submit}}" />
-</div>
-</form>
\ No newline at end of file
diff --git a/view/tpl/smarty3/dfrn_request.tpl b/view/tpl/smarty3/dfrn_request.tpl
deleted file mode 100644
index b08a0b731..000000000
--- a/view/tpl/smarty3/dfrn_request.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h1>{{$header}}</h1>
-
-<p id="dfrn-request-intro">
-{{$page_desc}}<br />
-{{$invite_desc}}
-</p>
-<p>
-{{$desc}}
-</p>
-
-<form action="dfrn_request/{{$nickname}}" method="post" />
-
-<div id="dfrn-request-url-wrapper" >
-	<label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
-	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
-	<div id="dfrn-request-url-end"></div>
-</div>
-
-<p id="dfrn-request-options">
-{{$pls_answer}}
-</p>
-
-<div id="dfrn-request-info-wrapper" >
-
-
-<p id="doiknowyou">
-{{$does_know}}
-</p>
-
-		<div id="dfrn-request-know-yes-wrapper">
-		<label id="dfrn-request-knowyou-yes-label" for="dfrn-request-knowyouyes">{{$yes}}</label>
-		<input type="radio" name="knowyou" id="knowyouyes" value="1" />
-
-		<div id="dfrn-request-knowyou-break" ></div>	
-		</div>
-		<div id="dfrn-request-know-no-wrapper">
-		<label id="dfrn-request-knowyou-no-label" for="dfrn-request-knowyouno">{{$no}}</label>
-		<input type="radio" name="knowyou" id="knowyouno" value="0" checked="checked" />
-
-		<div id="dfrn-request-knowyou-end"></div>
-		</div>
-
-
-<p id="dfrn-request-message-desc">
-{{$add_note}}
-</p>
-	<div id="dfrn-request-message-wrapper">
-	<textarea name="dfrn-request-message" rows="4" cols="64" ></textarea>
-	</div>
-
-
-</div>
-
-	<div id="dfrn-request-submit-wrapper">
-		<input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
-		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
-	</div>
-</form>
diff --git a/view/tpl/smarty3/diasp_dec_hdr.tpl b/view/tpl/smarty3/diasp_dec_hdr.tpl
deleted file mode 100644
index c3305ecd0..000000000
--- a/view/tpl/smarty3/diasp_dec_hdr.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<decrypted_hdeader>
-  <iv>{{$inner_iv}}</iv>
-  <aes_key>{{$inner_key}}</aes_key>
-  <author>
-    <name>{{$author_name}}</name>
-    <uri>{{$author_uri}}</uri>
-  </author>
-</decrypted_header>
diff --git a/view/tpl/smarty3/directory_item.tpl b/view/tpl/smarty3/directory_item.tpl
deleted file mode 100644
index ae52646b8..000000000
--- a/view/tpl/smarty3/directory_item.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div class="directory-item lframe" id="directory-item-{{$id}}" >
-	<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > 
-		<div class="contact-photo" id="directory-photo-{{$id}}" >
-			<a href="{{$profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$id}}" ><img class="directory-photo-img" src="{{$photo}}" alt="{{$alt_text}}" title="{{$alt_text}}" /></a>
-		</div>
-	</div>
-
-	<div class="contact-name" id="directory-name-{{$id}}">{{$name}}</div>
-	<div class="contact-details">{{$details}}</div>
-</div>
diff --git a/view/tpl/smarty3/events.tpl b/view/tpl/smarty3/events.tpl
deleted file mode 100644
index 45366a77d..000000000
--- a/view/tpl/smarty3/events.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$tabs}}
-<h2>{{$title}}</h2>
-
-<div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div>
-
-<div id="event-calendar-wrapper">
-	<a href="{{$previus.0}}" class="prevcal {{$previus.2}}"><div id="event-calendar-prev" class="icon s22 prev" title="{{$previus.1}}"></div></a>
-	{{$calendar}}
-	<a href="{{$next.0}}" class="nextcal {{$next.2}}"><div id="event-calendar-prev" class="icon s22 next" title="{{$next.1}}"></div></a>
-</div>
-<div class="event-calendar-end"></div>
-
-
-{{foreach $events as $event}}
-	<div class="event">
-	{{if $event.is_first}}<hr /><a name="link-{{$event.j}}" ><div class="event-list-date">{{$event.d}}</div></a>{{/if}}
-	{{if $event.item.author-name}}<a href="{{$event.item.author-link}}" ><img src="{{$event.item.author-avatar}}" height="32" width="32" />{{$event.item.author-name}}</a>{{/if}}
-	{{$event.html}}
-	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}"  class="plink-event-link icon s22 remote-link"></a>{{/if}}
-	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
-	</div>
-	<div class="clear"></div>
-
-{{/foreach}}
diff --git a/view/tpl/smarty3/fake_feed.tpl b/view/tpl/smarty3/fake_feed.tpl
deleted file mode 100644
index fd875de71..000000000
--- a/view/tpl/smarty3/fake_feed.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<?xml version="1.0" encoding="utf-8" ?>
-<feed xmlns="http://www.w3.org/2005/Atom" >
-
-  <id>fake feed</id>
-  <title>fake title</title>
-
-  <updated>1970-01-01T00:00:00Z</updated>
-
-  <author>
-    <name>Fake Name</name>
-    <uri>http://example.com</uri>
-  </author>
-
diff --git a/view/tpl/smarty3/field_openid.tpl b/view/tpl/smarty3/field_openid.tpl
deleted file mode 100644
index b00ddabcd..000000000
--- a/view/tpl/smarty3/field_openid.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<div class='field input openid'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/tpl/smarty3/follow_slap.tpl b/view/tpl/smarty3/follow_slap.tpl
deleted file mode 100644
index b31b4ef95..000000000
--- a/view/tpl/smarty3/follow_slap.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	<entry>
-		<author>
-			<name>{{$name}}</name>
-			<uri>{{$profile_page}}</uri>
-			<link rel="photo"  type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}" />
-			<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}" />
-		</author>
-
-		<id>{{$item_id}}</id>
-		<title>{{$title}}</title>
-		<published>{{$published}}</published>
-		<content type="{{$type}}" >{{$content}}</content>
-
-		<as:actor>
-		<as:obj_type>http://activitystrea.ms/schema/1.0/person</as:obj_type>
-		<id>{{$profile_page}}</id>
-		<title></title>
- 		<link rel="avatar" type="image/jpeg" media:width="175" media:height="175" href="{{$photo}}"/>
-		<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}"/>
-		<poco:preferredUsername>{{$nick}}</poco:preferredUsername>
-		<poco:displayName>{{$name}}</poco:displayName>
-		</as:actor>
- 		<as:verb>{{$verb}}</as:verb>
-		{{$ostat_follow}}
-	</entry>
diff --git a/view/tpl/smarty3/magicsig.tpl b/view/tpl/smarty3/magicsig.tpl
deleted file mode 100644
index af8dbb5bc..000000000
--- a/view/tpl/smarty3/magicsig.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<?xml version="1.0" encoding="UTF-8"?>
-<me:env xmlns:me="http://salmon-protocol.org/ns/magic-env">
-<me:data type="application/atom+xml">
-{{$data}}
-</me:data>
-<me:encoding>{{$encoding}}</me:encoding>
-<me:alg>{{$algorithm}}</me:alg>
-<me:sig key_id="{{$keyhash}}">{{$signature}}</me:sig>
-</me:env>
diff --git a/view/tpl/smarty3/moderated_comment.tpl b/view/tpl/smarty3/moderated_comment.tpl
deleted file mode 100644
index 1e4e9b6d4..000000000
--- a/view/tpl/smarty3/moderated_comment.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-{{*
- *	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>
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-					<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/tpl/smarty3/notifications_network_item.tpl b/view/tpl/smarty3/notifications_network_item.tpl
deleted file mode 100644
index c3381d682..000000000
--- a/view/tpl/smarty3/notifications_network_item.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="notif-item">
-	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
-</div>
diff --git a/view/tpl/smarty3/page_display.tpl b/view/tpl/smarty3/page_display.tpl
index 0f02086f2..e61a86fc9 100644
--- a/view/tpl/smarty3/page_display.tpl
+++ b/view/tpl/smarty3/page_display.tpl
@@ -8,5 +8,5 @@
 
 	<div class="page-author"><a class=="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
 	<div class="page-date">{{$date}}</div>
-	<div class="page-body">body</div>
+	<div class="page-body">{{$body}}</div>
 </div>
diff --git a/view/tpl/smarty3/pagetypes.tpl b/view/tpl/smarty3/pagetypes.tpl
deleted file mode 100644
index 15cd3047a..000000000
--- a/view/tpl/smarty3/pagetypes.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	{{include file="field_radio.tpl" field=$page_normal}}
-	{{include file="field_radio.tpl" field=$page_community}}
-	{{include file="field_radio.tpl" field=$page_prvgroup}}
-	{{include file="field_radio.tpl" field=$page_soapbox}}
-	{{include file="field_radio.tpl" field=$page_freelove}}
diff --git a/view/tpl/smarty3/profile-hide-friends.tpl b/view/tpl/smarty3/profile-hide-friends.tpl
deleted file mode 100644
index 6e3d395d0..000000000
--- a/view/tpl/smarty3/profile-hide-friends.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<p id="hide-friends-text">
-{{$desc}}
-</p>
-
-		<div id="hide-friends-yes-wrapper">
-		<label id="hide-friends-yes-label" for="hide-friends-yes">{{$yes_str}}</label>
-		<input type="radio" name="hide-friends" id="hide-friends-yes" {{$yes_selected}} value="1" />
-
-		<div id="hide-friends-break" ></div>	
-		</div>
-		<div id="hide-friends-no-wrapper">
-		<label id="hide-friends-no-label" for="hide-friends-no">{{$no_str}}</label>
-		<input type="radio" name="hide-friends" id="hide-friends-no" {{$no_selected}} value="0"  />
-
-		<div id="hide-friends-end"></div>
-		</div>
diff --git a/view/tpl/smarty3/profile-hide-wall.tpl b/view/tpl/smarty3/profile-hide-wall.tpl
deleted file mode 100644
index 755908d17..000000000
--- a/view/tpl/smarty3/profile-hide-wall.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<p id="hide-wall-text">
-{{$desc}}
-</p>
-
-		<div id="hide-wall-yes-wrapper">
-		<label id="hide-wall-yes-label" for="hide-wall-yes">{{$yes_str}}</label>
-		<input type="radio" name="hidewall" id="hide-wall-yes" {{$yes_selected}} value="1" />
-
-		<div id="hide-wall-break" ></div>	
-		</div>
-		<div id="hide-wall-no-wrapper">
-		<label id="hide-wall-no-label" for="hide-wall-no">{{$no_str}}</label>
-		<input type="radio" name="hidewall" id="hide-wall-no" {{$no_selected}} value="0"  />
-
-		<div id="hide-wall-end"></div>
-		</div>
diff --git a/view/tpl/smarty3/profile-in-directory.tpl b/view/tpl/smarty3/profile-in-directory.tpl
deleted file mode 100644
index 0efd1bf5c..000000000
--- a/view/tpl/smarty3/profile-in-directory.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<p id="profile-in-directory">
-{{$desc}}
-</p>
-
-		<div id="profile-in-dir-yes-wrapper">
-		<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">{{$yes_str}}</label>
-		<input type="radio" name="profile_in_directory" id="profile-in-dir-yes" {{$yes_selected}} value="1" />
-
-		<div id="profile-in-dir-break" ></div>	
-		</div>
-		<div id="profile-in-dir-no-wrapper">
-		<label id="profile-in-dir-no-label" for="profile-in-dir-no">{{$no_str}}</label>
-		<input type="radio" name="profile_in_directory" id="profile-in-dir-no" {{$no_selected}} value="0"  />
-
-		<div id="profile-in-dir-end"></div>
-		</div>
diff --git a/view/tpl/smarty3/profile-in-netdir.tpl b/view/tpl/smarty3/profile-in-netdir.tpl
deleted file mode 100644
index b9cb456ea..000000000
--- a/view/tpl/smarty3/profile-in-netdir.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<p id="profile-in-directory">
-{{$desc}}
-</p>
-
-		<div id="profile-in-netdir-yes-wrapper">
-		<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">{{$yes_str}}</label>
-		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" {{$yes_selected}} value="1" />
-
-		<div id="profile-in-netdir-break" ></div>	
-		</div>
-		<div id="profile-in-netdir-no-wrapper">
-		<label id="profile-in-netdir-no-label" for="profile-in-netdir-no">{{$no_str}}</label>
-		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" {{$no_selected}} value="0"  />
-
-		<div id="profile-in-netdir-end"></div>
-		</div>
diff --git a/view/tpl/smarty3/profile_publish.tpl b/view/tpl/smarty3/profile_publish.tpl
deleted file mode 100644
index 1dc9eb7fc..000000000
--- a/view/tpl/smarty3/profile_publish.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<p id="profile-publish-desc-{{$instance}}">
-{{$pubdesc}}
-</p>
-
-		<div id="profile-publish-yes-wrapper-{{$instance}}">
-		<label id="profile-publish-yes-label-{{$instance}}" for="profile-publish-yes-{{$instance}}">{{$str_yes}}</label>
-		<input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-yes-{{$instance}}" {{$yes_selected}} value="1" />
-
-		<div id="profile-publish-break-{{$instance}}" ></div>	
-		</div>
-		<div id="profile-publish-no-wrapper-{{$instance}}">
-		<label id="profile-publish-no-label-{{$instance}}" for="profile-publish-no-{{$instance}}">{{$str_no}}</label>
-		<input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-no-{{$instance}}" {{$no_selected}} value="0"  />
-
-		<div id="profile-publish-end-{{$instance}}"></div>
-		</div>
diff --git a/view/tpl/smarty3/settings_nick_subdir.tpl b/view/tpl/smarty3/settings_nick_subdir.tpl
deleted file mode 100644
index 874185db5..000000000
--- a/view/tpl/smarty3/settings_nick_subdir.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<p>
-It appears that your website is located in a subdirectory of the<br />
-{{$hostname}} website, so this setting may not work reliably.<br />
-</p>
-<p>If you have any issues, you may have better results using the profile<br /> address '<strong>{{$baseurl}}/profile/{{$nickname}}</strong>'.
-</p>
\ No newline at end of file
diff --git a/view/tpl/smarty3/tag_slap.tpl b/view/tpl/smarty3/tag_slap.tpl
deleted file mode 100644
index 5521b508d..000000000
--- a/view/tpl/smarty3/tag_slap.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	<entry>
-		<author>
-			<name>{{$name}}</name>
-			<uri>{{$profile_page}}</uri>
-			<link rel="photo"  type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}" />
-			<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}" />
-		</author>
-
-		<id>{{$item_id}}</id>
-		<title>{{$title}}</title>
-		<published>{{$published}}</published>
-		<content type="{{$type}}" >{{$content}}</content>
-		<link rel="mentioned" href="{{$accturi}}" />
-		<as:actor>
-		<as:obj_type>http://activitystrea.ms/schema/1.0/person</as:obj_type>
-		<id>{{$profile_page}}</id>
-		<title></title>
- 		<link rel="avatar" type="image/jpeg" media:width="175" media:height="175" href="{{$photo}}"/>
-		<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}"/>
-		<poco:preferredUsername>{{$nick}}</poco:preferredUsername>
-		<poco:displayName>{{$name}}</poco:displayName>
-		</as:actor>
- 		<as:verb>{{$verb}}</as:verb>
-		<as:object>
-		<as:obj_type></as:obj_type>
-		</as:object>
-		<as:target>
-		<as:obj_type></as:obj_type>
-		</as:target>
-	</entry>
diff --git a/view/tpl/smarty3/wall_item.tpl b/view/tpl/smarty3/wall_item.tpl
deleted file mode 100644
index 6eea3cdfe..000000000
--- a/view/tpl/smarty3/wall_item.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-{{*
- *	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}}"  title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-					<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" />
-				</a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-					<ul>
-						{{$item.item_photo_menu}}
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
-				{{else}}<div class="wall-item-lock"></div>{{/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}}"  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 id="wall-item-ago-{{$item.id}}" class="wall-item-ago"><abbr class="wall-item-ago-time" title="{{$item.isotime}}">{{$item.localtime}}</abbr>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</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='tag'>{{$tag}}</span>
-						{{/foreach}}
-					</div>
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			{{if $item.vote}}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
-				<a href="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
-				<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
-				{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/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}}"  class="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="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
-			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.star.tagger}}"></a>
-			{{/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}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-			</div>
-				{{if $item.drop.pagedropping}}<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 {{$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-comment-wrapper" >
-	{{$item.comment}}
-	</div>
-
-<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
-</div>
diff --git a/view/tpl/smarty3/wall_thread.tpl b/view/tpl/smarty3/wall_thread.tpl
deleted file mode 100644
index 47a1e2a59..000000000
--- a/view/tpl/smarty3/wall_thread.tpl
+++ /dev/null
@@ -1,125 +0,0 @@
-{{*
- *	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="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}}">
-<a name="{{$item.id}}" ></a>
-<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" 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}}" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
-			{{/if}}
-			<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" 
-				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
-                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-                    <ul>
-                        {{$item.item_photo_menu}}
-                    </ul>
-                </div>
-
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
-				{{else}}<div class="wall-item-lock"></div>{{/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}}" 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}}" title="{{$item.localtime}}">{{$item.localtime}}</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='tag'>{{$tag}}</span>
-						{{/foreach}}
-					</div>
-			{{if $item.has_cats}}
-			<div class="categorytags"><span>{{$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"><span>{{$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="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
-				{{if $item.nolike}}
-				<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></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}}
-			</div>
-			{{/if}}
-			{{if $item.plink}}
-				<div class="wall-item-links-wrapper"><a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link{{$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="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
-			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.star.tagger}}"></a>
-			{{/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}}			
-			<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
-			
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/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 {{$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>
-
-			{{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>
-{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/tpl/smarty3/wallmessage.tpl b/view/tpl/smarty3/wallmessage.tpl
deleted file mode 100644
index 6eeabe9ed..000000000
--- a/view/tpl/smarty3/wallmessage.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-{{*
- *	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/tpl/smarty3/wallmsg-header.tpl b/view/tpl/smarty3/wallmsg-header.tpl
deleted file mode 100644
index 1f5a1abc1..000000000
--- a/view/tpl/smarty3/wallmsg-header.tpl
+++ /dev/null
@@ -1,87 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-
-var plaintext = '{{$editselect}}';
-
-if(plaintext != 'none') {
-	tinyMCE.init({
-		theme : "advanced",
-		mode : "specific_textareas",
-		editor_selector: /(profile-jot-text|prvmail-text)/,
-		plugins : "bbcode,paste",
-		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-		theme_advanced_buttons2 : "",
-		theme_advanced_buttons3 : "",
-		theme_advanced_toolbar_location : "top",
-		theme_advanced_toolbar_align : "center",
-		theme_advanced_blockformats : "blockquote,code",
-		gecko_spellcheck : true,
-		paste_text_sticky : true,
-		entity_encoding : "raw",
-		add_unload_trigger : false,
-		remove_linebreaks : false,
-		force_p_newlines : false,
-		force_br_newlines : true,
-		forced_root_block : '',
-		convert_urls: false,
-		content_css: "{{$baseurl}}/view/custom_tinymce.css",
-		     //Character count
-		theme_advanced_path : false,
-		setup : function(ed) {
-			ed.onInit.add(function(ed) {
-				ed.pasteAsPlainText = true;
-				var editorId = ed.editorId;
-				var textarea = $('#'+editorId);
-				if (typeof(textarea.attr('tabindex')) != "undefined") {
-					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
-					textarea.attr('tabindex', null);
-				}
-			});
-		}
-	});
-}
-else
-	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
-
-
-</script>
-<script>
-
-	function jotGetLink() {
-		reply = prompt("{{$linkurl}}");
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-</script>
-
diff --git a/view/tpl/smarty3/wallwall_item.tpl b/view/tpl/smarty3/wallwall_item.tpl
deleted file mode 100644
index a7430e8da..000000000
--- a/view/tpl/smarty3/wallwall_item.tpl
+++ /dev/null
@@ -1,91 +0,0 @@
-{{*
- *	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}} wallwall" id="wall-item-outside-wrapper-{{$item.id}}" >
-	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
-		<div class="wall-item-info wallwall" id="wall-item-info-{{$item.id}}">
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-				<a href="{{$item.owner_url}}"  title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
-			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-{{$item.id}}" 
-				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
-                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}"  title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-                    <ul>
-                        {{$item.item_photo_menu}}
-                    </ul>
-                </div>
-
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
-				{{else}}<div class="wall-item-lock"></div>{{/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}}"  title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a> {{$item.to}} <a href="{{$item.owner_url}}"  title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}<br />
-				<div id="wall-item-ago-{{$item.id}}" class="wall-item-ago"><abbr class="wall-item-ago-time" title="{{$item.localtime}}">{{$item.ago}}</abbr>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</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='tag'>{{$tag}}</span>
-						{{/foreach}}
-					</div>
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			{{if $item.vote}}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
-				<a href="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
-				<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
-				{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/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}}"  class="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="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
-			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.star.tagger}}"></a>
-			{{/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}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-			</div>
-				{{if $item.drop.pagedropping}}<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 {{$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-comment-separator"></div>
-	<div class="wall-item-comment-wrapper">
-	{{$item.comment}}
-	</div>
-
-<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
-</div>
-
diff --git a/view/tpl/smarty3/wallwall_thread.tpl b/view/tpl/smarty3/wallwall_thread.tpl
deleted file mode 100644
index 4c17f5106..000000000
--- a/view/tpl/smarty3/wallwall_thread.tpl
+++ /dev/null
@@ -1,112 +0,0 @@
-{{*
- *	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-outside-wrapper {{$item.indent}}{{$item.previewing}} wallwall" id="wall-item-outside-wrapper-{{$item.id}}" >
-	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
-		<div class="wall-item-info wallwall" id="wall-item-info-{{$item.id}}">
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-				<a href="{{$item.owner_url}}"  title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
-			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-{{$item.id}}" 
-				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
-                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}"  title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-                    <ul>
-                        {{$item.item_photo_menu}}
-                    </ul>
-                </div>
-
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
-				{{else}}<div class="wall-item-lock"></div>{{/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}}"  title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a> {{$item.to}} <a href="{{$item.owner_url}}"  title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
-					<div class="body-tag">
-						{{foreach $item.tags as $tag}}
-							<span class='tag'>{{$tag}}</span>
-						{{/foreach}}
-					</div>
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			{{if $item.vote}}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
-				<a href="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
-				<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
-				{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/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}}"  class="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="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
-			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.star.tagger}}"></a>
-			{{/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}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-			</div>
-				{{if $item.drop.dropping}}<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 {{$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>
-
-			{{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 $item}}
-	{{include file="{{$item.template}}"}}
-{{/foreach}}
-
-{{if $item.flatten}}
-<div class="wall-item-comment-wrapper" >
-	{{$item.comment}}
-</div>
-{{/if}}
-</div>
-{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/tpl/tag_slap.tpl b/view/tpl/tag_slap.tpl
deleted file mode 100644
index 231a13f10..000000000
--- a/view/tpl/tag_slap.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-	<entry>
-		<author>
-			<name>$name</name>
-			<uri>$profile_page</uri>
-			<link rel="photo"  type="image/jpeg" media:width="80" media:height="80" href="$thumb" />
-			<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$thumb" />
-		</author>
-
-		<id>$item_id</id>
-		<title>$title</title>
-		<published>$published</published>
-		<content type="$type" >$content</content>
-		<link rel="mentioned" href="$accturi" />
-		<as:actor>
-		<as:obj_type>http://activitystrea.ms/schema/1.0/person</as:obj_type>
-		<id>$profile_page</id>
-		<title></title>
- 		<link rel="avatar" type="image/jpeg" media:width="175" media:height="175" href="$photo"/>
-		<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$thumb"/>
-		<poco:preferredUsername>$nick</poco:preferredUsername>
-		<poco:displayName>$name</poco:displayName>
-		</as:actor>
- 		<as:verb>$verb</as:verb>
-		<as:object>
-		<as:obj_type></as:obj_type>
-		</as:object>
-		<as:target>
-		<as:obj_type></as:obj_type>
-		</as:target>
-	</entry>
diff --git a/view/tpl/wall_item.tpl b/view/tpl/wall_item.tpl
deleted file mode 100644
index 1e9874dc8..000000000
--- a/view/tpl/wall_item.tpl
+++ /dev/null
@@ -1,79 +0,0 @@
-<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"  title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
-				</a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>				
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url"  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 id="wall-item-ago-$item.id" class="wall-item-ago"><abbr class="wall-item-ago-time" title="$item.isotime">$item.localtime</abbr>{{ if $item.app }}<span class="item.app">$item.str_app</span>{{ endif }}</div>
-				
-		</div>	
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-					<div class="body-tag">
-						{{ for $item.tags as $tag }}
-							<span class='tag'>$tag</span>
-						{{ endfor }}
-					</div>
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
-				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-				{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
-				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-			</div>
-			{{ endif }}
-			{{ if $item.plink }}
-				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title"  class="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="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-			{{ endif }}
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-			{{ endif }}			
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.pagedropping }}<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 $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-comment-wrapper" >
-	$item.comment
-	</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent" ></div>
-</div>
diff --git a/view/tpl/wall_thread.tpl b/view/tpl/wall_thread.tpl
deleted file mode 100644
index cfa63daec..000000000
--- a/view/tpl/wall_thread.tpl
+++ /dev/null
@@ -1,120 +0,0 @@
-{{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="thread-wrapper-$item.id" class="thread-wrapper $item.toplevel">
-<a name="$item.id" ></a>
-<div class="wall-item-outside-wrapper $item.indent$item.previewing{{ if $item.owner_url }} wallwall{{ endif }}" 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" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
-				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
-			{{ endif }}
-			<div class="wall-item-photo-wrapper{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$item.id" 
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
-                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                    <ul>
-                        $item.item_photo_menu
-                    </ul>
-                </div>
-
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" 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" title="$item.localtime">$item.localtime</div>				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-					<div class="body-tag">
-						{{ for $item.tags as $tag }}
-							<span class='tag'>$tag</span>
-						{{ endfor }}
-					</div>
-			{{ if $item.has_cats }}
-			<div class="categorytags"><span>$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"><span>$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="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
-				{{ if $item.nolike }}
-				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></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 }}
-			</div>
-			{{ endif }}
-			{{ if $item.plink }}
-				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link$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="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-			{{ endif }}
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-			{{ endif }}			
-			<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-			
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.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 $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>
-
-			{{ 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>
-{{if $item.comment_lastcollapsed}}</div>{{endif}}
diff --git a/view/tpl/wallmessage.tpl b/view/tpl/wallmessage.tpl
deleted file mode 100644
index 66b2bc3a0..000000000
--- a/view/tpl/wallmessage.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-
-<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/tpl/wallmsg-header.tpl b/view/tpl/wallmsg-header.tpl
deleted file mode 100644
index cb3922572..000000000
--- a/view/tpl/wallmsg-header.tpl
+++ /dev/null
@@ -1,82 +0,0 @@
-
-<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-
-var plaintext = '$editselect';
-
-if(plaintext != 'none') {
-	tinyMCE.init({
-		theme : "advanced",
-		mode : "specific_textareas",
-		editor_selector: /(profile-jot-text|prvmail-text)/,
-		plugins : "bbcode,paste",
-		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-		theme_advanced_buttons2 : "",
-		theme_advanced_buttons3 : "",
-		theme_advanced_toolbar_location : "top",
-		theme_advanced_toolbar_align : "center",
-		theme_advanced_blockformats : "blockquote,code",
-		gecko_spellcheck : true,
-		paste_text_sticky : true,
-		entity_encoding : "raw",
-		add_unload_trigger : false,
-		remove_linebreaks : false,
-		force_p_newlines : false,
-		force_br_newlines : true,
-		forced_root_block : '',
-		convert_urls: false,
-		content_css: "$baseurl/view/custom_tinymce.css",
-		     //Character count
-		theme_advanced_path : false,
-		setup : function(ed) {
-			ed.onInit.add(function(ed) {
-				ed.pasteAsPlainText = true;
-				var editorId = ed.editorId;
-				var textarea = $('#'+editorId);
-				if (typeof(textarea.attr('tabindex')) != "undefined") {
-					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
-					textarea.attr('tabindex', null);
-				}
-			});
-		}
-	});
-}
-else
-	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
-
-
-</script>
-<script>
-
-	function jotGetLink() {
-		reply = prompt("$linkurl");
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-</script>
-
diff --git a/view/tpl/wallwall_item.tpl b/view/tpl/wallwall_item.tpl
deleted file mode 100644
index 9c824fb3b..000000000
--- a/view/tpl/wallwall_item.tpl
+++ /dev/null
@@ -1,86 +0,0 @@
-<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 wallwall" id="wall-item-info-$item.id">
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url"  title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
-				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
-			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
-                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url"  title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                    <ul>
-                        $item.item_photo_menu
-                    </ul>
-                </div>
-
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url"  title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> $item.to <a href="$item.owner_url"  title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall<br />
-				<div id="wall-item-ago-$item.id" class="wall-item-ago"><abbr class="wall-item-ago-time" title="$item.localtime">$item.ago</abbr>{{ if $item.app }}<span class="item.app">$item.str_app</span>{{ endif }}</div>
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-					<div class="body-tag">
-						{{ for $item.tags as $tag }}
-							<span class='tag'>$tag</span>
-						{{ endfor }}
-					</div>
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
-				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-				{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
-				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-			</div>
-			{{ endif }}
-			{{ if $item.plink }}
-				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title"  class="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="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-			{{ endif }}
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-			{{ endif }}			
-			
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.pagedropping }}<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 $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-comment-separator"></div>
-	<div class="wall-item-comment-wrapper">
-	$item.comment
-	</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent" ></div>
-</div>
-
diff --git a/view/tpl/wallwall_thread.tpl b/view/tpl/wallwall_thread.tpl
deleted file mode 100644
index ecfb65aef..000000000
--- a/view/tpl/wallwall_thread.tpl
+++ /dev/null
@@ -1,107 +0,0 @@
-{{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-outside-wrapper $item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info wallwall" id="wall-item-info-$item.id">
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url"  title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
-				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
-			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
-                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url"  title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                    <ul>
-                        $item.item_photo_menu
-                    </ul>
-                </div>
-
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url"  title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> $item.to <a href="$item.owner_url"  title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-					<div class="body-tag">
-						{{ for $item.tags as $tag }}
-							<span class='tag'>$tag</span>
-						{{ endfor }}
-					</div>
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
-				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-				{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
-				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-			</div>
-			{{ endif }}
-			{{ if $item.plink }}
-				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title"  class="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="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-			{{ endif }}
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-			{{ endif }}			
-			
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>	
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like $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>
-
-			{{ 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 $item }}
-	{{ inc $item.template }}{{ endinc }}
-{{ endfor }}
-
-{{ if $item.flatten }}
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
-{{ endif }}
-</div>
-{{if $item.comment_lastcollapsed}}</div>{{endif}}